Skip to content

Commit b53b3e1

Browse files
ember-cli 3.18
1 parent ba30c9f commit b53b3e1

File tree

17 files changed

+4403
-944
lines changed

17 files changed

+4403
-944
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

.eslintrc.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
47
ecmaVersion: 2018,
5-
sourceType: 'module'
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true
11+
}
612
},
713
plugins: [
814
'ember'
@@ -15,6 +21,7 @@ module.exports = {
1521
browser: true
1622
},
1723
rules: {
24+
'ember/no-jquery': 'error'
1825
},
1926
overrides: [
2027
// node files

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.eslintignore
1414
/.eslintrc.js
15+
/.git/
1516
/.gitignore
1617
/.template-lintrc.js
1718
/.travis.yml

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'recommended'
4+
extends: 'octane'
55
};

.travis.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "8"
6+
- "10"
77

8-
sudo: false
98
dist: trusty
109

1110
addons:
1211
chrome: stable
1312

1413
cache:
15-
directories:
16-
- $HOME/.npm
14+
yarn: true
1715

1816
env:
1917
global:
@@ -27,40 +25,41 @@ branches:
2725
- /^v\d+\.\d+\.\d+/
2826

2927
jobs:
30-
fail_fast: true
28+
fast_finish: true
3129
allow_failures:
3230
- env: EMBER_TRY_SCENARIO=ember-canary
3331

3432
include:
3533
# runs linting and tests with current locked deps
36-
3734
- stage: "Tests"
3835
name: "Tests"
39-
install:
40-
- yarn install --non-interactive
4136
script:
42-
- yarn lint:hbs
43-
- yarn lint:js
44-
- yarn test
37+
- yarn lint
38+
- yarn test:ember
4539

46-
- name: "Floating Dependencies"
40+
- stage: "Additional Tests"
41+
name: "Floating Dependencies"
42+
install:
43+
- yarn install --no-lockfile --non-interactive
4744
script:
48-
- yarn test
45+
- yarn test:ember
4946

5047
# we recommend new addons test the current and previous LTS
5148
# as well as latest stable release (bonus points to beta/canary)
52-
- stage: "Additional Tests"
53-
env: EMBER_TRY_SCENARIO=ember-lts-3.4
54-
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
49+
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
5551
- env: EMBER_TRY_SCENARIO=ember-release
5652
- env: EMBER_TRY_SCENARIO=ember-beta
5753
- env: EMBER_TRY_SCENARIO=ember-canary
5854
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
55+
- env: EMBER_TRY_SCENARIO=ember-classic
5956

6057
before_install:
61-
- npm config set spin false
62-
- npm install -g npm@4
63-
- npm --version
58+
- curl -o- -L https://yarnpkg.com/install.sh | bash
59+
- export PATH=$HOME/.yarn/bin:$PATH
60+
61+
install:
62+
- yarn install --non-interactive
6463

6564
script:
6665
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

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/).

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ This addon allows you to configure your Netlify headers and redirects.
1717
Compatibility
1818
------------------------------------------------------------------------------
1919

20-
* Ember.js v3.4 or above
20+
* Ember.js v3.12 or above
2121
* Ember CLI v2.13 or above
22-
* Node.js v8 or above
22+
* Node.js v10 or above
2323

2424

2525
Installation

config/ember-try.js

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ module.exports = async function() {
77
useYarn: true,
88
scenarios: [
99
{
10-
name: 'ember-lts-3.4',
10+
name: 'ember-lts-3.12',
1111
npm: {
1212
devDependencies: {
13-
'ember-source': '~3.4.0'
13+
'ember-source': '~3.12.0'
1414
}
1515
}
1616
},
1717
{
18-
name: 'ember-lts-3.8',
18+
name: 'ember-lts-3.16',
1919
npm: {
2020
devDependencies: {
21-
'ember-source': '~3.8.0'
21+
'ember-source': '~3.16.0'
2222
}
2323
}
2424
},
@@ -68,6 +68,21 @@ module.exports = async function() {
6868
'@ember/jquery': '^0.5.1'
6969
}
7070
}
71+
},
72+
{
73+
name: 'ember-classic',
74+
env: {
75+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
76+
'application-template-wrapper': true,
77+
'default-async-observers': false,
78+
'template-only-glimmer-components': false
79+
})
80+
},
81+
npm: {
82+
ember: {
83+
edition: 'classic'
84+
}
85+
}
7186
}
7287
]
7388
};

package.json

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,49 +19,57 @@
1919
"test": "tests"
2020
},
2121
"scripts": {
22-
"build": "ember build",
22+
"build": "ember build --environment=production",
23+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
2324
"lint:hbs": "ember-template-lint .",
2425
"lint:js": "eslint .",
2526
"start": "ember serve",
26-
"test": "ember test",
27-
"test:all": "ember try:each"
27+
"test": "npm-run-all lint:* test:*",
28+
"test:ember": "ember test",
29+
"test:ember-compatibility": "ember try:each"
2830
},
2931
"devDependencies": {
30-
"@ember/optional-features": "^0.7.0",
32+
"@ember/optional-features": "^1.3.0",
33+
"@glimmer/component": "^1.0.0",
34+
"@glimmer/tracking": "^1.0.0",
35+
"babel-eslint": "^10.1.0",
3136
"broccoli-asset-rev": "^3.0.0",
32-
"ember-cli": "~3.11.0",
33-
"ember-cli-babel": "^7.7.3",
34-
"ember-cli-dependency-checker": "^3.1.0",
35-
"ember-cli-eslint": "^5.1.0",
36-
"ember-cli-htmlbars": "^3.0.1",
37-
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
38-
"ember-cli-inject-live-reload": "^1.8.2",
37+
"ember-auto-import": "^1.5.3",
38+
"ember-cli": "~3.18.0",
39+
"ember-cli-babel": "^7.19.0",
40+
"ember-cli-dependency-checker": "^3.2.0",
41+
"ember-cli-inject-live-reload": "^2.0.2",
3942
"ember-cli-sri": "^2.1.1",
40-
"ember-cli-template-lint": "^1.0.0-beta.1",
41-
"ember-cli-uglify": "^2.1.0",
43+
"ember-cli-uglify": "^3.0.0",
4244
"ember-disable-prototype-extensions": "^1.1.3",
43-
"ember-export-application-global": "^2.0.0",
44-
"ember-load-initializers": "^2.0.0",
45+
"ember-export-application-global": "^2.0.1",
46+
"ember-load-initializers": "^2.1.1",
4547
"ember-maybe-import-regenerator": "^0.1.6",
46-
"ember-qunit": "^4.4.1",
47-
"ember-resolver": "^5.0.1",
48-
"ember-source": "~3.11.1",
49-
"ember-source-channel-url": "^1.1.0",
50-
"ember-try": "^1.0.0",
51-
"eslint-plugin-ember": "^6.2.0",
52-
"eslint-plugin-node": "^9.0.1",
48+
"ember-qunit": "^4.6.0",
49+
"ember-resolver": "^8.0.0",
50+
"ember-source": "~3.18.0",
51+
"ember-source-channel-url": "^2.0.1",
52+
"ember-template-lint": "^2.6.0",
53+
"ember-try": "^1.4.0",
54+
"eslint": "^6.8.0",
55+
"eslint-plugin-ember": "^8.4.0",
56+
"eslint-plugin-node": "^11.1.0",
5357
"fs-extra": "^8.0.1",
5458
"loader.js": "^4.7.0",
55-
"qunit-dom": "^0.8.4",
59+
"npm-run-all": "^4.1.5",
60+
"qunit-dom": "^1.2.0",
5661
"release-it": "^13.6.0",
5762
"release-it-lerna-changelog": "^2.3.0"
5863
},
5964
"engines": {
60-
"node": "8.* || >= 10.*"
65+
"node": "10.* || >= 12"
6166
},
6267
"publishConfig": {
6368
"registry": "https://registry.npmjs.org"
6469
},
70+
"ember": {
71+
"edition": "octane"
72+
},
6573
"ember-addon": {
6674
"configPath": "tests/dummy/config"
6775
},
@@ -79,5 +87,8 @@
7987
"release": true,
8088
"tokenRef": "GITHUB_AUTH"
8189
}
90+
},
91+
"dependencies": {
92+
"ember-cli-htmlbars": "^4.3.1"
8293
}
8394
}

testem.js

Lines changed: 3 additions & 1 deletion
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,
@@ -7,13 +9,13 @@ module.exports = {
79
launch_in_dev: [
810
'Chrome'
911
],
12+
browser_start_timeout: 120,
1013
browser_args: {
1114
Chrome: {
1215
ci: [
1316
// --no-sandbox is needed when running Chrome inside a container
1417
process.env.CI ? '--no-sandbox' : null,
1518
'--headless',
16-
'--disable-gpu',
1719
'--disable-dev-shm-usage',
1820
'--disable-software-rasterizer',
1921
'--mute-audio',

0 commit comments

Comments
 (0)