Skip to content

Commit 7add29c

Browse files
chancancodechancancode
committed
Upgrade to ember-cli 3.16
1 parent d63bead commit 7add29c

20 files changed

Lines changed: 5556 additions & 1353 deletions

File tree

‎.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: 10 additions & 4 deletions
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: {
4-
ecmaVersion: 2017,
5-
sourceType: 'module'
7+
ecmaVersion: 2018,
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
@@ -36,8 +43,7 @@ module.exports = {
3643
'tests/dummy/app/**'
3744
],
3845
parserOptions: {
39-
sourceType: 'script',
40-
ecmaVersion: 2015
46+
sourceType: 'script'
4147
},
4248
env: {
4349
browser: false,

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# misc
1212
/.env*
13+
/.pnp*
1314
/.sass-cache
1415
/connect.lock
1516
/coverage/

‎.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

‎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: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ The hope is that Ember itself will provide a mechanism for populating
99
head tags from your app at some time in the future. Until then this
1010
addon provides that functionality.
1111

12+
## Compatibility
13+
14+
* Ember.js v2.18 or above
15+
* Ember CLI v2.13 or above
16+
* Node.js v10 or above
17+
1218
## Installation
1319

1420
Install by running
@@ -128,3 +134,11 @@ If you care to read more about the details of render please see the PR that intr
128134
But for now, if you are upgrading to 0.4.x, you simply need to add `{{head-layout}}` component to your application wide template.
129135

130136
If you make use of this mode the content of `<head>` will be the static FastBoot rendered content through the life of your App.
137+
138+
## Contributing
139+
140+
See the [Contributing](CONTRIBUTING.md) guide for details.
141+
142+
## License
143+
144+
This project is licensed under the [MIT License](LICENSE.md).

‎addon/templates/components/head-layout.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
{{#-in-element headElement}}
1+
{{#-in-element this.headElement}}
22
<meta name="ember-cli-head-start" content="">{{head-content}}<meta name="ember-cli-head-end" content="">
33
{{/-in-element}}

‎config/ember-try.js‎

Lines changed: 107 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -2,114 +2,125 @@
22

33
const getChannelURL = require('ember-source-channel-url');
44

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release'),
8-
getChannelURL('beta'),
9-
getChannelURL('canary')
10-
]).then((urls) => {
11-
return {
12-
useYarn: true,
13-
scenarios: [
14-
{
15-
name: 'ember-lts-2.18',
16-
env: {
17-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
18-
},
19-
npm: {
20-
devDependencies: {
21-
'@ember/jquery': '^0.5.1',
22-
'ember-source': '~2.18.0'
23-
}
24-
}
5+
module.exports = async function() {
6+
return {
7+
useYarn: true,
8+
scenarios: [
9+
{
10+
name: 'ember-lts-2.18',
11+
env: {
12+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
13+
'jquery-integration': true
14+
})
2515
},
26-
{
27-
name: 'ember-lts-3.4',
28-
npm: {
29-
devDependencies: {
30-
'ember-source': '~3.4.0'
31-
}
16+
npm: {
17+
devDependencies: {
18+
'@ember/jquery': '^0.5.1',
19+
'ember-source': '~2.18.0'
3220
}
33-
},
34-
{
35-
name: 'ember-lts-3.8',
36-
npm: {
37-
devDependencies: {
38-
'ember-source': '~3.8.0'
39-
}
21+
}
22+
},
23+
{
24+
name: 'ember-lts-3.4',
25+
npm: {
26+
devDependencies: {
27+
'ember-source': '~3.4.0'
4028
}
41-
},
42-
{
43-
name: 'ember-lts-3.12',
44-
npm: {
45-
devDependencies: {
46-
'ember-source': '~3.12.0'
47-
}
29+
}
30+
},
31+
{
32+
name: 'ember-lts-3.8',
33+
npm: {
34+
devDependencies: {
35+
'ember-source': '~3.8.0'
4836
}
49-
},
50-
{
51-
name: 'ember-lts-3.16',
52-
npm: {
53-
devDependencies: {
54-
'ember-source': '~3.16.0'
55-
}
37+
}
38+
},
39+
{
40+
name: 'ember-lts-3.12',
41+
npm: {
42+
devDependencies: {
43+
'ember-source': '~3.12.0'
5644
}
57-
},
58-
{
59-
name: 'ember-release',
60-
npm: {
61-
devDependencies: {
62-
'ember-source': urls[0]
63-
}
45+
}
46+
},
47+
{
48+
name: 'ember-lts-3.16',
49+
npm: {
50+
devDependencies: {
51+
'ember-source': '~3.16.0'
6452
}
65-
},
66-
{
67-
name: 'ember-beta',
68-
npm: {
69-
devDependencies: {
70-
'ember-source': urls[1]
71-
}
53+
}
54+
},
55+
{
56+
name: 'ember-release',
57+
npm: {
58+
devDependencies: {
59+
'ember-source': await getChannelURL('release')
7260
}
73-
},
74-
{
75-
name: 'ember-canary',
76-
npm: {
77-
devDependencies: {
78-
'ember-source': urls[2]
79-
}
61+
}
62+
},
63+
{
64+
name: 'ember-beta',
65+
npm: {
66+
devDependencies: {
67+
'ember-source': await getChannelURL('beta')
8068
}
81-
},
82-
// The default `.travis.yml` runs this scenario via `yarn test`,
83-
// not via `ember try`. It's still included here so that running
84-
// `ember try:each` manually or from a customized CI config will run it
85-
// along with all the other scenarios.
86-
{
87-
name: 'ember-default',
88-
npm: {
89-
devDependencies: {}
69+
}
70+
},
71+
{
72+
name: 'ember-canary',
73+
npm: {
74+
devDependencies: {
75+
'ember-source': await getChannelURL('canary')
9076
}
77+
}
78+
},
79+
// The default `.travis.yml` runs this scenario via `yarn test`,
80+
// not via `ember try`. It's still included here so that running
81+
// `ember try:each` manually or from a customized CI config will run it
82+
// along with all the other scenarios.
83+
{
84+
name: 'ember-default',
85+
npm: {
86+
devDependencies: {}
87+
}
88+
},
89+
{
90+
name: 'ember-default-with-jquery',
91+
env: {
92+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
93+
'jquery-integration': true
94+
})
9195
},
92-
{
93-
name: 'ember-default-with-jquery',
94-
env: {
95-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
96-
'jquery-integration': true
97-
})
98-
},
99-
npm: {
100-
devDependencies: {
101-
'@ember/jquery': '^0.5.1'
102-
}
96+
npm: {
97+
devDependencies: {
98+
'@ember/jquery': '^0.5.1'
10399
}
100+
}
101+
},
102+
{
103+
name: 'ember-default-with-fastboot',
104+
command: 'ember fastboot:test',
105+
npm: {
106+
devDependencies: {}
107+
}
108+
},
109+
{
110+
name: 'ember-classic',
111+
env: {
112+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
113+
'application-template-wrapper': true,
114+
'default-async-observers': false,
115+
'template-only-glimmer-components': false
116+
})
104117
},
105-
{
106-
name: 'ember-default-with-fastboot',
107-
command: 'ember fastboot:test',
108-
npm: {
109-
devDependencies: {}
118+
npm: {
119+
ember: {
120+
edition: 'classic'
110121
}
111122
}
112-
]
113-
};
114-
});
123+
}
124+
]
125+
};
115126
};

‎package.json‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"license": "MIT",
1515
"author": "",
1616
"scripts": {
17-
"build": "ember build",
17+
"build": "ember build --environment=production",
1818
"lint:hbs": "ember-template-lint .",
1919
"lint:js": "eslint .",
2020
"start": "ember serve",
@@ -28,41 +28,47 @@
2828
"seo"
2929
],
3030
"dependencies": {
31-
"ember-cli-babel": "^7.1.2",
32-
"ember-cli-htmlbars": "^3.0.0"
31+
"ember-cli-babel": "^7.17.2",
32+
"ember-cli-htmlbars": "^4.2.2"
3333
},
3434
"devDependencies": {
35-
"@ember/optional-features": "^0.6.3",
36-
"broccoli-asset-rev": "^2.7.0",
35+
"@ember/optional-features": "^1.3.0",
36+
"@glimmer/component": "^1.0.0",
37+
"@glimmer/tracking": "^1.0.0",
38+
"babel-eslint": "^10.0.3",
39+
"broccoli-asset-rev": "^3.0.0",
3740
"chai": "^4.1.2",
38-
"ember-cli": "~3.7.1",
39-
"ember-cli-dependency-checker": "^3.0.0",
40-
"ember-cli-eslint": "^4.2.3",
41+
"ember-auto-import": "^1.5.3",
42+
"ember-cli": "~3.16.1",
43+
"ember-cli-dependency-checker": "^3.2.0",
44+
"ember-cli-eslint": "^5.1.0",
4145
"ember-cli-fastboot": "^2.0.0",
42-
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
43-
"ember-cli-inject-live-reload": "^1.8.2",
46+
"ember-cli-inject-live-reload": "^2.0.2",
4447
"ember-cli-sri": "^2.1.1",
45-
"ember-cli-template-lint": "^1.0.0-beta.1",
46-
"ember-cli-uglify": "^2.1.0",
48+
"ember-cli-template-lint": "^1.0.0-beta.3",
49+
"ember-cli-uglify": "^3.0.0",
4750
"ember-disable-prototype-extensions": "^1.1.3",
48-
"ember-export-application-global": "^2.0.0",
51+
"ember-export-application-global": "^2.0.1",
4952
"ember-fastboot-addon-tests": "^0.4.0",
50-
"ember-load-initializers": "^1.1.0",
53+
"ember-load-initializers": "^2.1.1",
5154
"ember-maybe-import-regenerator": "^0.1.6",
52-
"ember-qunit": "^3.4.1",
53-
"ember-resolver": "^5.0.1",
54-
"ember-source": "~3.7.0",
55-
"ember-source-channel-url": "^1.1.0",
56-
"ember-try": "^1.0.0",
55+
"ember-qunit": "^4.6.0",
56+
"ember-resolver": "^7.0.0",
57+
"ember-source": "~3.16.0",
58+
"ember-source-channel-url": "^2.0.1",
59+
"ember-try": "^1.4.0",
5760
"ember-welcome-page": "^3.2.0",
58-
"eslint-plugin-ember": "^5.2.0",
59-
"eslint-plugin-node": "^7.0.1",
61+
"eslint-plugin-ember": "^7.7.2",
62+
"eslint-plugin-node": "^11.0.0",
6063
"loader.js": "^4.7.0",
61-
"qunit-dom": "^0.8.0"
64+
"qunit-dom": "^1.0.0"
6265
},
6366
"engines": {
6467
"node": "10.* || >= 12"
6568
},
69+
"ember": {
70+
"edition": "octane"
71+
},
6672
"ember-addon": {
6773
"configPath": "tests/dummy/config"
6874
},

0 commit comments

Comments
 (0)