Skip to content

Commit

Permalink
TASK: Use new generation version of editorconfig-checker (neos#2357)
Browse files Browse the repository at this point in the history
  • Loading branch information
mstruebing authored and dimaip committed Mar 22, 2019
1 parent 3fc2130 commit db6437b
Show file tree
Hide file tree
Showing 7 changed files with 150 additions and 1,965 deletions.
4 changes: 4 additions & 0 deletions .ecrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
LICENSE(\.txt)?$
\.vanilla-css$
banner\.js$
Plugins\/ckeditor
2 changes: 1 addition & 1 deletion .styleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ preset: psr2

finder:
path:
- "Classes"
- "Classes"
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ addons:
mariadb: '10.2'
apt:
sources:
- google-chrome
- google-chrome
packages:
- google-chrome-stable fluxbox
- google-chrome-stable fluxbox
notifications:
email: false

Expand Down
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,7 @@ lint-js:


lint-editorconfig:
$(editorconfigChecker) \
--exclude-regexp 'LICENSE|\.vanilla\-css$$|banner\.js$$' \
--exclude-pattern \
'./{README.md,**/*.snap,**/*{fontAwesome,Resources,dist}/**/*}'

$(editorconfigChecker)

################################################################################
# Releasing
Expand Down
42 changes: 20 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ The new UI is [already included](https://github.com/neos/neos-base-distribution/
1. You need to have Neos CMS 3.3 or newer up & running.

2. Run the following command:
```
composer require neos/neos-ui neos/neos-ui-compiled
```
```
composer require neos/neos-ui neos/neos-ui-compiled
```

3. Now you are all set up and you can login to the new interface as usual via `/neos` route.

Expand Down Expand Up @@ -79,33 +79,31 @@ In order to start contributing, follow the following steps:

4) Inside `Configuration/Settings.yaml`, set the following property for disabling the pre-compiled files:

```
Neos:
Neos:
Ui:
frontendDevelopmentMode: true
```
```
Neos:
Neos:
Ui:
frontendDevelopmentMode: true
```

5) Run the initialization script:

```
make setup
```
```
make setup
```

6) Get an overview about the codebase. We've recorded [an introduction on YouTube](https://www.youtube.com/watch?v=RYBUS5Nxxxk) which
gets you acquainted with the basics. Additionally, please get in touch with us on [Slack](http://slack.neos.io) in the
channel #project-ui-rewrite. We're eager to help you get started!
6) Get an overview about the codebase. We've recorded [an introduction on YouTube](https://www.youtube.com/watch?v=RYBUS5Nxxxk) which gets you acquainted with the basics. Additionally, please get in touch with us on [Slack](http://slack.neos.io) in the channel #project-ui-rewrite. We're eager to help you get started!

#### Doing upmerges

1) Develop only in the `2.x` branch, unless this feature is only compatible with Neos 4.x, then in `master`

2) To do the upmerge do the following commands

```
git checkout master
git merge --no-ff --no-commit 2.x
```
```
git checkout master
git merge --no-ff --no-commit 2.x
```
Review the changes and commit the changes with the following commit message:

`MERGE: Merge branch '2.x' into master`
Expand Down Expand Up @@ -137,9 +135,9 @@ An example file would look like this:

```
module.exports = {
protocol: 'http',
port: '123',
hostname: 'localhost'
protocol: 'http',
port: '123',
hostname: 'localhost'
};
```

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"cpx": "^1.3.1",
"cross-env": "^5.1.3",
"css-loader": "^0.28.4",
"editorconfig-checker": "^1.2.0",
"editorconfig-checker": "^2.0.6",
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.7.1",
"eslint": "^5.3.0",
Expand Down
Loading

0 comments on commit db6437b

Please sign in to comment.