Skip to content

Commit

Permalink
chore: ember-cli-update --to 3.13.1 (#149)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
awesome341 authored Oct 2, 2019
1 parent 18048f7 commit 54ce9a1
Show file tree
Hide file tree
Showing 8 changed files with 1,106 additions and 397 deletions.
6 changes: 3 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
root: true,
parser: "babel-eslint",
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module'
Expand All @@ -16,6 +16,7 @@ module.exports = {
browser: true
},
rules: {
'ember/no-jquery': 'warn',
},
overrides: [
// node files
Expand All @@ -37,8 +38,7 @@ module.exports = {
'tests/dummy/app/**'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
sourceType: 'script'
},
env: {
browser: false,
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/.env*
/.eslintignore
/.eslintrc.js
/.git/
/.gitignore
/.template-lintrc.js
/.travis.yml
Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
language: node_js
node_js:
- "8"
- "10"
- "12"

Expand All @@ -19,6 +20,7 @@ env:
global:
# See https://git.io/vdao3 for details.
- JOBS=1
- NODE_OPTIONS=--max_old_space_size=2048

branches:
only:
Expand All @@ -43,6 +45,7 @@ jobs:
env: EMBER_TRY_SCENARIO=ember-lts-2.16
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
Expand Down
160 changes: 81 additions & 79 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,95 +2,97 @@

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

module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary')
]).then((urls) => {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-2.16',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.16.0'
}
}
module.exports = async function() {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-2.16',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
},
{
name: 'ember-lts-2.18',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.18.0'
}
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.16.0'
}
}
},
{
name: 'ember-lts-2.18',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({'jquery-integration': true})
},
{
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'ember-source': '~3.4.0'
}
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.18.0'
}
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': urls[0]
}
}
},
{
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'ember-source': '~3.4.0'
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1]
}
},
{
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': urls[2]
}
}
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': await getChannelURL('release')
}
},
// The default `.travis.yml` runs this scenario via `npm test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: 'ember-default',
npm: {
devDependencies: {}
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': await getChannelURL('beta')
}
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': await getChannelURL('canary')
}
}
},
// The default `.travis.yml` runs this scenario via `npm test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: 'ember-default',
npm: {
devDependencies: {}
}
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true
})
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true
})
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1'
}
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1'
}
}
]
};
});
}
]
};
};
9 changes: 8 additions & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
let app = new EmberAddon(defaults, {
// Add options here
// Plotly.js uses the `has-hover` package which relies on Node.js' `global` object
autoImport: {
webpack: {
node: {
global: true
}
}
}
});

/*
Expand Down
19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,21 @@
},
"dependencies": {
"debug": "4.1.1",
"ember-auto-import": "1.3.0",
"ember-cli-babel": "7.8.0",
"ember-cli-htmlbars": "3.0.1",
"ember-auto-import": "1.5.2",
"ember-cli-babel": "7.12.0",
"ember-cli-htmlbars": "4.0.3",
"ember-decorators": "6.1.1",
"ember-lodash": "4.19.5",
"plotly.js": "1.49.5"
},
"devDependencies": {
"@ember/optional-features": "0.7.0",
"@ember/optional-features": "1.0.0",
"babel-eslint": "10.0.3",
"broccoli-asset-rev": "3.0.0",
"ember-cli": "3.10.1",
"ember-cli": "3.13.1",
"ember-cli-dependency-checker": "3.2.0",
"ember-cli-deprecation-workflow": "1.0.1",
"ember-cli-eslint": "5.1.0",
"ember-cli-htmlbars-inline-precompile": "2.1.0",
"ember-cli-inject-live-reload": "2.0.1",
"ember-cli-sri": "2.1.1",
"ember-cli-template-lint": "1.0.0-beta.3",
Expand All @@ -57,12 +56,12 @@
"ember-decorators-polyfill": "1.0.6",
"ember-disable-prototype-extensions": "1.1.3",
"ember-export-application-global": "2.0.0",
"ember-load-initializers": "2.0.0",
"ember-load-initializers": "2.1.0",
"ember-maybe-import-regenerator": "0.1.6",
"ember-md5": "1.2.0",
"ember-qunit": "4.5.1",
"ember-resolver": "5.1.3",
"ember-source": "3.10.2",
"ember-resolver": "5.3.0",
"ember-source": "3.13.2",
"ember-source-channel-url": "2.0.1",
"ember-truth-helpers": "2.1.0",
"ember-try": "1.2.1",
Expand All @@ -74,7 +73,7 @@
"testdouble": "3.12.4"
},
"engines": {
"node": "8.* || >= 10.*"
"node": "8.* || 10.* || >= 12.*"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
1 change: 0 additions & 1 deletion testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module.exports = {
// --no-sandbox is needed when running Chrome inside a container
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
Expand Down
Loading

0 comments on commit 54ce9a1

Please sign in to comment.