Skip to content

Commit 0067268

Browse files
jacobqjacobq
authored
chore: ember-cli-update --to 3.13.1 (#149)
* chore: ember-cli-update --to 3.13.1 Also mass-upgrade dependencies * fix: re-enable node polyfills in ember-auto-import This fixes a test failure that began appearing after upgrading ember-auto-import, which stopped automatically enabling webpack polyfills in v1.4.0. See the URLs below for more details: https://github.com/ef4/ember-auto-import#i-upgraded-my-ember-auto-import-version-and-now-things-dont-import-what-changed embroider-build/ember-auto-import#224 (comment) https://webpack.js.org/configuration/node/ This commit also drops `ember-cli-htmlbars-inline-precompile` since it is now deprecated and no longer needed. * ci: test on node 8 * ci: increase memory limit to 2GiB This is to work around what appears to be a problem with babel/ember-cli-babel/... on node 8 / 10.
1 parent a98f84f commit 0067268

File tree

8 files changed

+1106
-397
lines changed

8 files changed

+1106
-397
lines changed

‎.eslintrc.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
root: true,
3-
parser: "babel-eslint",
3+
parser: 'babel-eslint',
44
parserOptions: {
55
ecmaVersion: 2018,
66
sourceType: 'module'
@@ -16,6 +16,7 @@ module.exports = {
1616
browser: true
1717
},
1818
rules: {
19+
'ember/no-jquery': 'warn',
1920
},
2021
overrides: [
2122
// node files
@@ -37,8 +38,7 @@ module.exports = {
3738
'tests/dummy/app/**'
3839
],
3940
parserOptions: {
40-
sourceType: 'script',
41-
ecmaVersion: 2015
41+
sourceType: 'script'
4242
},
4343
env: {
4444
browser: false,

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

‎.travis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
language: node_js
33
node_js:
4+
- "8"
45
- "10"
56
- "12"
67

@@ -19,6 +20,7 @@ env:
1920
global:
2021
# See https://git.io/vdao3 for details.
2122
- JOBS=1
23+
- NODE_OPTIONS=--max_old_space_size=2048
2224

2325
branches:
2426
only:
@@ -43,6 +45,7 @@ jobs:
4345
env: EMBER_TRY_SCENARIO=ember-lts-2.16
4446
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
4547
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
48+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
4649
- env: EMBER_TRY_SCENARIO=ember-release
4750
- env: EMBER_TRY_SCENARIO=ember-beta
4851
- env: EMBER_TRY_SCENARIO=ember-canary

‎config/ember-try.js‎

Lines changed: 81 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -2,95 +2,97 @@
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.16',
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.16.0'
23-
}
24-
}
5+
module.exports = async function() {
6+
return {
7+
useYarn: true,
8+
scenarios: [
9+
{
10+
name: 'ember-lts-2.16',
11+
env: {
12+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
2513
},
26-
{
27-
name: 'ember-lts-2.18',
28-
env: {
29-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
30-
},
31-
npm: {
32-
devDependencies: {
33-
'@ember/jquery': '^0.5.1',
34-
'ember-source': '~2.18.0'
35-
}
14+
npm: {
15+
devDependencies: {
16+
'@ember/jquery': '^0.5.1',
17+
'ember-source': '~2.16.0'
3618
}
19+
}
20+
},
21+
{
22+
name: 'ember-lts-2.18',
23+
env: {
24+
EMBER_OPTIONAL_FEATURES: JSON.stringify({'jquery-integration': true})
3725
},
38-
{
39-
name: 'ember-lts-3.4',
40-
npm: {
41-
devDependencies: {
42-
'ember-source': '~3.4.0'
43-
}
26+
npm: {
27+
devDependencies: {
28+
'@ember/jquery': '^0.5.1',
29+
'ember-source': '~2.18.0'
4430
}
45-
},
46-
{
47-
name: 'ember-release',
48-
npm: {
49-
devDependencies: {
50-
'ember-source': urls[0]
51-
}
31+
}
32+
},
33+
{
34+
name: 'ember-lts-3.4',
35+
npm: {
36+
devDependencies: {
37+
'ember-source': '~3.4.0'
5238
}
5339
},
54-
{
55-
name: 'ember-beta',
56-
npm: {
57-
devDependencies: {
58-
'ember-source': urls[1]
59-
}
40+
},
41+
{
42+
name: 'ember-lts-3.8',
43+
npm: {
44+
devDependencies: {
45+
'ember-source': '~3.8.0'
6046
}
61-
},
62-
{
63-
name: 'ember-canary',
64-
npm: {
65-
devDependencies: {
66-
'ember-source': urls[2]
67-
}
47+
}
48+
},
49+
{
50+
name: 'ember-release',
51+
npm: {
52+
devDependencies: {
53+
'ember-source': await getChannelURL('release')
6854
}
69-
},
70-
// The default `.travis.yml` runs this scenario via `npm test`,
71-
// not via `ember try`. It's still included here so that running
72-
// `ember try:each` manually or from a customized CI config will run it
73-
// along with all the other scenarios.
74-
{
75-
name: 'ember-default',
76-
npm: {
77-
devDependencies: {}
55+
}
56+
},
57+
{
58+
name: 'ember-beta',
59+
npm: {
60+
devDependencies: {
61+
'ember-source': await getChannelURL('beta')
62+
}
63+
}
64+
},
65+
{
66+
name: 'ember-canary',
67+
npm: {
68+
devDependencies: {
69+
'ember-source': await getChannelURL('canary')
7870
}
71+
}
72+
},
73+
// The default `.travis.yml` runs this scenario via `npm test`,
74+
// not via `ember try`. It's still included here so that running
75+
// `ember try:each` manually or from a customized CI config will run it
76+
// along with all the other scenarios.
77+
{
78+
name: 'ember-default',
79+
npm: {
80+
devDependencies: {}
81+
}
82+
},
83+
{
84+
name: 'ember-default-with-jquery',
85+
env: {
86+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
87+
'jquery-integration': true
88+
})
7989
},
80-
{
81-
name: 'ember-default-with-jquery',
82-
env: {
83-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
84-
'jquery-integration': true
85-
})
86-
},
87-
npm: {
88-
devDependencies: {
89-
'@ember/jquery': '^0.5.1'
90-
}
90+
npm: {
91+
devDependencies: {
92+
'@ember/jquery': '^0.5.1'
9193
}
9294
}
93-
]
94-
};
95-
});
95+
}
96+
]
97+
};
9698
};

‎ember-cli-build.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
module.exports = function(defaults) {
66
let app = new EmberAddon(defaults, {
7-
// Add options here
7+
// Plotly.js uses the `has-hover` package which relies on Node.js' `global` object
8+
autoImport: {
9+
webpack: {
10+
node: {
11+
global: true
12+
}
13+
}
14+
}
815
});
916

1017
/*

‎package.json‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,21 @@
3232
},
3333
"dependencies": {
3434
"debug": "4.1.1",
35-
"ember-auto-import": "1.3.0",
36-
"ember-cli-babel": "7.8.0",
37-
"ember-cli-htmlbars": "3.0.1",
35+
"ember-auto-import": "1.5.2",
36+
"ember-cli-babel": "7.12.0",
37+
"ember-cli-htmlbars": "4.0.3",
3838
"ember-decorators": "6.1.1",
3939
"ember-lodash": "4.19.5",
4040
"plotly.js": "1.49.5"
4141
},
4242
"devDependencies": {
43-
"@ember/optional-features": "0.7.0",
43+
"@ember/optional-features": "1.0.0",
4444
"babel-eslint": "10.0.3",
4545
"broccoli-asset-rev": "3.0.0",
46-
"ember-cli": "3.10.1",
46+
"ember-cli": "3.13.1",
4747
"ember-cli-dependency-checker": "3.2.0",
4848
"ember-cli-deprecation-workflow": "1.0.1",
4949
"ember-cli-eslint": "5.1.0",
50-
"ember-cli-htmlbars-inline-precompile": "2.1.0",
5150
"ember-cli-inject-live-reload": "2.0.1",
5251
"ember-cli-sri": "2.1.1",
5352
"ember-cli-template-lint": "1.0.0-beta.3",
@@ -57,12 +56,12 @@
5756
"ember-decorators-polyfill": "1.0.6",
5857
"ember-disable-prototype-extensions": "1.1.3",
5958
"ember-export-application-global": "2.0.0",
60-
"ember-load-initializers": "2.0.0",
59+
"ember-load-initializers": "2.1.0",
6160
"ember-maybe-import-regenerator": "0.1.6",
6261
"ember-md5": "1.2.0",
6362
"ember-qunit": "4.5.1",
64-
"ember-resolver": "5.1.3",
65-
"ember-source": "3.10.2",
63+
"ember-resolver": "5.3.0",
64+
"ember-source": "3.13.2",
6665
"ember-source-channel-url": "2.0.1",
6766
"ember-truth-helpers": "2.1.0",
6867
"ember-try": "1.2.1",
@@ -74,7 +73,7 @@
7473
"testdouble": "3.12.4"
7574
},
7675
"engines": {
77-
"node": "8.* || >= 10.*"
76+
"node": "8.* || 10.* || >= 12.*"
7877
},
7978
"ember-addon": {
8079
"configPath": "tests/dummy/config"

‎testem.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ module.exports = {
1313
// --no-sandbox is needed when running Chrome inside a container
1414
process.env.CI ? '--no-sandbox' : null,
1515
'--headless',
16-
'--disable-gpu',
1716
'--disable-dev-shm-usage',
1817
'--disable-software-rasterizer',
1918
'--mute-audio',

0 commit comments

Comments
 (0)