Skip to content

Commit 8e8469c

Browse files
authored
Merge pull request #126 from jrjohnson/update-ember-cli-3.18
Update Ember CLI v3.16.0...v3.18.0
2 parents 08b7d99 + 38e8a53 commit 8e8469c

File tree

8 files changed

+2885
-2830
lines changed

8 files changed

+2885
-2830
lines changed

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
35
parser: 'babel-eslint',

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: lint hbs
2828
run: npm run lint:hbs
2929
- name: test
30-
run: npm test
30+
run: npm run test:ember
3131

3232
test-floating:
3333
name: Floating Dependencies
@@ -41,7 +41,7 @@ jobs:
4141
- name: install dependencies
4242
run: npm install --no-package-lock
4343
- name: test
44-
run: npm test
44+
run: npm run test:ember
4545

4646
try-scenarios:
4747
name: ember-try

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: install dependencies
1616
run: npm ci
1717
- name: test
18-
run: npm test
18+
run: npm run test:ember
1919

2020
publish-npm:
2121
needs: build

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
* `ember serve`
2424
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2525

26-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

package-lock.json

Lines changed: 2841 additions & 2813 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,48 +17,51 @@
1717
},
1818
"scripts": {
1919
"build": "ember build --environment=production",
20+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
2021
"lint:hbs": "ember-template-lint .",
2122
"lint:js": "eslint .",
2223
"start": "ember serve",
23-
"test": "ember test",
24-
"test:all": "ember try:each"
24+
"test": "npm-run-all lint:* test:*",
25+
"test:ember": "ember test",
26+
"test:ember-compatibility": "ember try:each"
2527
},
2628
"dependencies": {
2729
"broccoli-caching-writer": "^3.0.3",
2830
"broccoli-funnel": "^3.0.2",
2931
"broccoli-merge-trees": "^4.1.0",
30-
"ember-cli-babel": "^7.17.2",
31-
"ember-cli-htmlbars": "^4.2.2",
32+
"ember-cli-babel": "^7.19.0",
33+
"ember-cli-htmlbars": "^4.3.1",
3234
"rsvp": "^4.7.0",
3335
"sharp": "^0.25.1"
3436
},
3537
"devDependencies": {
3638
"@ember/optional-features": "^1.3.0",
3739
"@glimmer/component": "^1.0.0",
3840
"@glimmer/tracking": "^1.0.0",
39-
"babel-eslint": "^10.0.3",
41+
"babel-eslint": "^10.1.0",
4042
"broccoli-asset-rev": "^3.0.0",
4143
"ember-auto-import": "^1.5.3",
42-
"ember-cli": "~3.16.0",
44+
"ember-cli": "~3.18.0",
4345
"ember-cli-dependency-checker": "^3.2.0",
44-
"ember-cli-eslint": "^5.1.0",
4546
"ember-cli-inject-live-reload": "^2.0.2",
4647
"ember-cli-sri": "^2.1.1",
47-
"ember-cli-template-lint": "^1.0.0-beta.3",
4848
"ember-cli-uglify": "^3.0.0",
4949
"ember-disable-prototype-extensions": "^1.1.3",
5050
"ember-export-application-global": "^2.0.1",
5151
"ember-load-initializers": "^2.1.1",
5252
"ember-maybe-import-regenerator": "^0.1.6",
5353
"ember-qunit": "^4.6.0",
54-
"ember-resolver": "^7.0.0",
55-
"ember-source": "~3.16.0",
54+
"ember-resolver": "^8.0.0",
55+
"ember-source": "~3.18.0",
5656
"ember-source-channel-url": "^2.0.1",
57+
"ember-template-lint": "^2.6.0",
5758
"ember-try": "^1.4.0",
58-
"eslint-plugin-ember": "^7.7.2",
59-
"eslint-plugin-node": "^11.0.0",
59+
"eslint": "^6.8.0",
60+
"eslint-plugin-ember": "^8.4.0",
61+
"eslint-plugin-node": "^11.1.0",
6062
"loader.js": "^4.7.0",
61-
"qunit-dom": "^1.0.0"
63+
"npm-run-all": "^4.1.5",
64+
"qunit-dom": "^1.2.0"
6265
},
6366
"engines": {
6467
"node": "10.* || >= 12"

testem.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
module.exports = {
24
test_page: 'tests/index.html?hidepassed',
35
disable_watching: true,
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"schemaVersion": "1.0.0",
3+
"packages": [
4+
{
5+
"name": "ember-cli",
6+
"version": "3.18.0",
7+
"blueprints": [
8+
{
9+
"name": "addon",
10+
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
11+
"codemodsSource": "ember-addon-codemods-manifest@1",
12+
"isBaseBlueprint": true,
13+
"options": [
14+
"--no-welcome"
15+
]
16+
}
17+
]
18+
}
19+
]
20+
}

0 commit comments

Comments
 (0)