Skip to content

Commit 324be12

Browse files
bertdeblockbertdeblock
authored
Merge pull request #1027 from bertdeblock/update-lint-setup
Update lint setup
2 parents 19831ac + 5daae62 commit 324be12

17 files changed

Lines changed: 268 additions & 276 deletions

‎.codeclimate.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ engines:
88
enabled: true
99
ratings:
1010
paths:
11-
- "**.js"
11+
- '**.js'
1212
exclude_paths:
13-
- config/
14-
- app/
15-
- addon/
16-
- tests/
17-
- vendor/
13+
- config/
14+
- app/
15+
- addon/
16+
- tests/
17+
- vendor/

‎.eslintrc.js‎

Lines changed: 12 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,19 @@
11
module.exports = {
2-
root: true,
2+
extends: ['eslint:recommended', 'plugin:n/recommended', 'prettier'],
3+
overrides: [
4+
{
5+
env: { mocha: true },
6+
files: ['test/**/*.js'],
7+
},
8+
],
39
parser: '@babel/eslint-parser',
410
parserOptions: {
511
ecmaVersion: 'latest',
612
requireConfigFile: false,
7-
sourceType: 'module'
13+
sourceType: 'script',
14+
},
15+
root: true,
16+
rules: {
17+
'n/no-process-exit': 'off',
818
},
9-
extends: [
10-
'eslint:recommended',
11-
'plugin:prettier/recommended',
12-
],
13-
rules: {},
14-
overrides: [
15-
// node files
16-
{
17-
files: [
18-
'.template-lintrc.js',
19-
'ember-cli-build.js',
20-
'index.js',
21-
'testem.js',
22-
'blueprints/*/index.js',
23-
'config/**/*.js',
24-
'tests/dummy/config/**/*.js',
25-
'test/**/*.js',
26-
'lib/**/*.js'
27-
],
28-
excludedFiles: [
29-
'addon/**',
30-
'addon-test-support/**',
31-
'app/**',
32-
'tests/dummy/app/**'
33-
],
34-
parserOptions: {
35-
sourceType: 'script',
36-
ecmaVersion: 2018
37-
},
38-
env: {
39-
browser: false,
40-
node: true
41-
},
42-
extends: ['plugin:node/recommended'],
43-
rules: {
44-
// add your custom rules and overrides for node files here
45-
'no-process-exit': 'off'
46-
}
47-
},
48-
// test files
49-
{
50-
env: { mocha: true },
51-
files: ['test/**/*.js'],
52-
}
53-
]
5419
};

‎.github/dependabot.yml‎

Lines changed: 86 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,88 @@
11
version: 2
22
updates:
3-
- package-ecosystem: npm
4-
directory: "/"
5-
schedule:
6-
interval: weekly
7-
day: wednesday
8-
time: "03:00"
9-
open-pull-requests-limit: 10
10-
ignore:
11-
- dependency-name: ember-cli
12-
versions:
13-
- 3.24.0
14-
- 3.25.0
15-
- 3.25.1
16-
- 3.25.2
17-
- 3.25.3
18-
- 3.26.0
19-
- dependency-name: eslint
20-
versions:
21-
- 7.18.0
22-
- 7.19.0
23-
- 7.20.0
24-
- 7.21.0
25-
- 7.22.0
26-
- 7.23.0
27-
- 7.24.0
28-
- dependency-name: eslint-config-prettier
29-
versions:
30-
- 7.2.0
31-
- 8.0.0
32-
- 8.1.0
33-
- 8.2.0
34-
- dependency-name: release-it
35-
versions:
36-
- 14.2.2
37-
- 14.3.0
38-
- 14.4.0
39-
- 14.4.1
40-
- 14.5.0
41-
- 14.5.1
42-
- dependency-name: y18n
43-
versions:
44-
- 4.0.1
45-
- 4.0.2
46-
- dependency-name: eslint-plugin-prettier
47-
versions:
48-
- 3.3.1
49-
- dependency-name: fs-extra
50-
update-types: ["version-update:semver-major"]
51-
- package-ecosystem: npm
52-
directory: "/smoke-test-app"
53-
schedule:
54-
interval: weekly
55-
day: wednesday
56-
time: "03:00"
57-
open-pull-requests-limit: 10
58-
ignore:
59-
- dependency-name: ember-cli
60-
versions:
61-
- 3.24.0
62-
- 3.25.0
63-
- 3.25.1
64-
- 3.25.2
65-
- 3.25.3
66-
- 3.26.0
67-
- dependency-name: y18n
68-
versions:
69-
- 4.0.1
70-
- 4.0.2
71-
- dependency-name: ember-cli-babel
72-
versions:
73-
- 7.23.1
74-
- 7.26.2
75-
- dependency-name: ember-source
76-
versions:
77-
- 3.24.1
78-
- 3.25.0
79-
- 3.25.1
80-
- 3.25.3
81-
- 3.26.0
82-
- dependency-name: ember-cli-htmlbars
83-
versions:
84-
- 5.3.2
85-
- 5.6.2
86-
- 5.6.4
87-
- 5.6.5
88-
- dependency-name: ember-data
89-
versions:
90-
- 3.24.0
91-
- 3.25.0
3+
- package-ecosystem: npm
4+
directory: '/'
5+
schedule:
6+
interval: weekly
7+
day: wednesday
8+
time: '03:00'
9+
open-pull-requests-limit: 10
10+
ignore:
11+
- dependency-name: ember-cli
12+
versions:
13+
- 3.24.0
14+
- 3.25.0
15+
- 3.25.1
16+
- 3.25.2
17+
- 3.25.3
18+
- 3.26.0
19+
- dependency-name: eslint
20+
versions:
21+
- 7.18.0
22+
- 7.19.0
23+
- 7.20.0
24+
- 7.21.0
25+
- 7.22.0
26+
- 7.23.0
27+
- 7.24.0
28+
- dependency-name: eslint-config-prettier
29+
versions:
30+
- 7.2.0
31+
- 8.0.0
32+
- 8.1.0
33+
- 8.2.0
34+
- dependency-name: release-it
35+
versions:
36+
- 14.2.2
37+
- 14.3.0
38+
- 14.4.0
39+
- 14.4.1
40+
- 14.5.0
41+
- 14.5.1
42+
- dependency-name: y18n
43+
versions:
44+
- 4.0.1
45+
- 4.0.2
46+
- dependency-name: fs-extra
47+
update-types: ['version-update:semver-major']
48+
- package-ecosystem: npm
49+
directory: '/smoke-test-app'
50+
schedule:
51+
interval: weekly
52+
day: wednesday
53+
time: '03:00'
54+
open-pull-requests-limit: 10
55+
ignore:
56+
- dependency-name: ember-cli
57+
versions:
58+
- 3.24.0
59+
- 3.25.0
60+
- 3.25.1
61+
- 3.25.2
62+
- 3.25.3
63+
- 3.26.0
64+
- dependency-name: y18n
65+
versions:
66+
- 4.0.1
67+
- 4.0.2
68+
- dependency-name: ember-cli-babel
69+
versions:
70+
- 7.23.1
71+
- 7.26.2
72+
- dependency-name: ember-source
73+
versions:
74+
- 3.24.1
75+
- 3.25.0
76+
- 3.25.1
77+
- 3.25.3
78+
- 3.26.0
79+
- dependency-name: ember-cli-htmlbars
80+
versions:
81+
- 5.3.2
82+
- 5.6.2
83+
- 5.6.4
84+
- 5.6.5
85+
- dependency-name: ember-data
86+
versions:
87+
- 3.24.0
88+
- 3.25.0

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- run: yarn install
2727
- run: yarn lint
2828
test:
29-
name: "Tests"
29+
name: 'Tests'
3030
runs-on: ubuntu-latest
3131
timeout-minutes: 10
3232

@@ -46,9 +46,8 @@ jobs:
4646
fail_ci_if_error: true
4747
token: ${{ secrets.CODECOV_TOKEN }}
4848

49-
5049
floating:
51-
name: "Floating Dependencies"
50+
name: 'Floating Dependencies'
5251
runs-on: ubuntu-latest
5352
timeout-minutes: 10
5453

@@ -178,7 +177,7 @@ jobs:
178177
- name: install smoke-test-app deps
179178
run: npm install
180179
working-directory: smoke-test-app
181-
- run: ./node_modules/.bin/ember try:one test2 --config-path='../test/fixtures/dummy-ember-try-config-with-npm-scenarios.js'
180+
- run: ./node_modules/.bin/ember try:one test2 --config-path='../test/fixtures/dummy-ember-try-config-with-npm-scenarios.js'
182181
working-directory: smoke-test-app
183182

184183
yarn-smoke-tests:
@@ -206,7 +205,7 @@ jobs:
206205
- name: install smoke-test-app deps
207206
run: yarn install
208207
working-directory: smoke-test-app
209-
- run: ./node_modules/.bin/ember try:one test2 --config-path='../test/fixtures/dummy-ember-try-config-with-yarn-scenarios.js'
208+
- run: ./node_modules/.bin/ember try:one test2 --config-path='../test/fixtures/dummy-ember-try-config-with-yarn-scenarios.js'
210209
working-directory: smoke-test-app
211210

212211
windows-smoke-tests:
@@ -229,5 +228,5 @@ jobs:
229228
- name: install smoke-test-app deps
230229
run: npm install
231230
working-directory: smoke-test-app
232-
- run: ./node_modules/.bin/ember try:one test2 --config-path='../test/fixtures/dummy-ember-try-config-with-npm-scenarios.js'
231+
- run: ./node_modules/.bin/ember try:one test2 --config-path='../test/fixtures/dummy-ember-try-config-with-npm-scenarios.js'
233232
working-directory: smoke-test-app

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/testem.log
1717
/yarn-error.log
1818

19+
/.eslintcache
1920
/.nyc_output
2021
*.tgz
2122
.scratch

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/CHANGELOG.md

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ or
4747
```
4848

4949
When running in a CI environment where changes are discarded you can skip resetting your environment back to its original state by specifying --skip-cleanup=true as an option to ember try.
50-
*Warning: If you use this option and, without cleaning up, build and deploy as the result of a passing test suite, it will build with the last set of dependencies ember try was run with.*
50+
_Warning: If you use this option and, without cleaning up, build and deploy as the result of a passing test suite, it will build with the last set of dependencies ember try was run with._
5151

5252
```
5353
ember try:one ember-beta --skip-cleanup=true --- ember test
@@ -74,6 +74,7 @@ Displays the configuration that will be used. Also takes an optional `--config-p
7474
### Config
7575

7676
##### versionCompatibility
77+
7778
If you're using `ember-try` with an Ember addon, there is a short cut to test many Ember versions. In your `package.json` under the `ember-addon` key, add the following:
7879

7980
```json
@@ -226,6 +227,7 @@ in `package.json`, allowing you to try scenarios in monorepo style repositories.
226227
[Yarn's documentation of workspaces](https://yarnpkg.com/lang/en/docs/workspaces/) for more details.
227228

228229
### Video
230+
229231
[![How to use EmberTry](https://i.vimeocdn.com/video/559399937_500.jpg)](https://vimeo.com/157688157)
230232

231233
See an example of using `ember-try` for CI [here](https://github.com/kategengler/ember-feature-flags/commit/aaf0226975c76630c875cf6b923fdc23b025aa79), and the resulting build [output](https://travis-ci.org/kategengler/ember-feature-flags/builds/55597086).
@@ -234,7 +236,6 @@ See an example of using `ember-try` for CI [here](https://github.com/kategengler
234236

235237
- Much credit is due to [Edward Faulkner](https://github.com/ef4) The scripts in [liquid-fire](https://github.com/ef4/liquid-fire) that test against multiple ember versions were the inspiration for this project.
236238

237-
238239
### Developing
239240

240241
- Be sure to run `npm link` and `npm link ember-try`, otherwise any `ember try` commands you run will use the version of ember-try included by ember-cli itself.

‎RELEASE.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@ guiding principle here is that changelogs are for humans, not machines.
1717

1818
When reviewing merged PR's the labels to be used are:
1919

20-
* breaking - Used when the PR is considered a breaking change.
21-
* enhancement - Used when the PR adds a new feature or enhancement.
22-
* bug - Used when the PR fixes a bug included in a previous release.
23-
* documentation - Used when the PR adds or updates documentation.
24-
* internal - Used for internal changes that still require a mention in the
20+
- breaking - Used when the PR is considered a breaking change.
21+
- enhancement - Used when the PR adds a new feature or enhancement.
22+
- bug - Used when the PR fixes a bug included in a previous release.
23+
- documentation - Used when the PR adds or updates documentation.
24+
- internal - Used for internal changes that still require a mention in the
2525
changelog/release notes.
2626

2727
## Release
2828

2929
Once the prep work is completed, the actual release is straight forward:
3030

31-
* First, ensure that you have installed your projects dependencies:
31+
- First, ensure that you have installed your projects dependencies:
3232

3333
```sh
3434
yarn install
3535
```
3636

37-
* Second, ensure that you have obtained a
37+
- Second, ensure that you have obtained a
3838
[GitHub personal access token][generate-token] with the `repo` scope (no
3939
other permissions are needed). Make sure the token is available as the
4040
`GITHUB_AUTH` environment variable.
@@ -47,7 +47,7 @@ yarn install
4747

4848
[generate-token]: https://github.com/settings/tokens/new?scopes=repo&description=GITHUB_AUTH+env+variable
4949

50-
* And last (but not least 😁) do your release.
50+
- And last (but not least 😁) do your release.
5151

5252
```sh
5353
npx release-it

0 commit comments

Comments
 (0)