upgrade ember to 3.10 (#235)

Also adds a handy shortcut to run the bundlesize tests: `yarn test:bundlesize`.
This commit is contained in:
Jeldrik Hanschke 2019-07-13 10:26:30 +02:00 committed by GitHub
parent 38bfd5be60
commit 7c523357dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 1287 additions and 1041 deletions

View file

@ -1,7 +1,7 @@
module.exports = { module.exports = {
root: true, root: true,
parserOptions: { parserOptions: {
ecmaVersion: 2017, ecmaVersion: 2018,
sourceType: 'module' sourceType: 'module'
}, },
plugins: [ plugins: [
@ -38,7 +38,15 @@ module.exports = {
env: { env: {
browser: false, browser: false,
node: true node: true
} },
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off'
})
} }
] ]
}; };

View file

@ -28,6 +28,8 @@ env:
- "BROWSERSTACK_ACCESS_KEY=xaM9Uxurv2GyxFLKQXgj" - "BROWSERSTACK_ACCESS_KEY=xaM9Uxurv2GyxFLKQXgj"
before_install: before_install:
# use a recent node version if ember build is tested
- if [ $TEST = "EMBER" ] || [ $TEST = "BROWSER" ] || [ $TEST = "BUNDLESIZE" ]; then nvm install --lts; fi
# provide yarn if ember build is tested # provide yarn if ember build is tested
- if [ $TEST = "EMBER" ] || [ $TEST = "BROWSER" ] || [ $TEST = "BUNDLESIZE" ]; then curl -o- -L https://yarnpkg.com/install.sh | bash; fi - if [ $TEST = "EMBER" ] || [ $TEST = "BROWSER" ] || [ $TEST = "BUNDLESIZE" ]; then curl -o- -L https://yarnpkg.com/install.sh | bash; fi
- if [ $TEST = "EMBER" ] || [ $TEST = "BROWSER" ] || [ $TEST = "BUNDLESIZE" ]; then export PATH=$HOME/.yarn/bin:$PATH; fi - if [ $TEST = "EMBER" ] || [ $TEST = "BROWSER" ] || [ $TEST = "BUNDLESIZE" ]; then export PATH=$HOME/.yarn/bin:$PATH; fi
@ -54,7 +56,7 @@ script:
# test against different browsers using sauce lab # test against different browsers using sauce lab
- if [ $TEST = "BROWSER" ]; then yarn test --config-file testem.browserstack.js; fi - if [ $TEST = "BROWSER" ]; then yarn test --config-file testem.browserstack.js; fi
# test bundle size # test bundle size
- if [ $TEST = "BUNDLESIZE" ]; then node_modules/ember-cli/bin/ember bundlesize:test; fi - if [ $TEST = "BUNDLESIZE" ]; then yarn test:bundlesize; fi
# run api tests with composer # run api tests with composer
- if [ $TEST = "API" ]; then cd api/ && ./vendor/bin/codecept run && cd ..; fi - if [ $TEST = "API" ]; then cd api/ && ./vendor/bin/codecept run && cd ..; fi

View file

@ -4,7 +4,7 @@ module.exports = {
app: { app: {
javascript: { javascript: {
pattern: 'assets/*.js', pattern: 'assets/*.js',
limit: '376KB', limit: '379KB',
compression: 'gzip' compression: 'gzip'
}, },
css: { css: {

View file

@ -3,8 +3,9 @@ self.deprecationWorkflow = self.deprecationWorkflow || {};
self.deprecationWorkflow.config = { self.deprecationWorkflow.config = {
workflow: [ workflow: [
{ handler: "silence", matchId: "ember-cli-page-object.old-collection-api" }, { handler: "silence", matchId: "ember-cli-page-object.old-collection-api" },
{ handler: "silence", matchId: "ember-name-key-usage" }, { handler: "silence", matchId: "deprecate-fetch-ember-data-support" },
{ handler: "silence", matchId: "ember-metal.run.sync" }, { handler: "silence", matchId: "computed-property.override" },
{ handler: "silence", matchId: "ember-cp-validations.inline-validator" },
{ handler: "silence", matchId: "ember-runtime.deprecate-copy-copyable" } { handler: "silence", matchId: "ember-runtime.deprecate-copy-copyable" }
] ]
}; };

View file

@ -9,7 +9,7 @@ module.exports = function(environment) {
EmberENV: { EmberENV: {
FEATURES: { FEATURES: {
// Here you can enable experimental features on an ember canary build // Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
}, },
EXTEND_PROTOTYPES: { EXTEND_PROTOTYPES: {
Array: true, Array: true,

View file

@ -2,5 +2,8 @@
"name": "include-api-in-build", "name": "include-api-in-build",
"keywords": [ "keywords": [
"ember-addon" "ember-addon"
] ],
"dependencies": {
"fs-extra": "*"
}
} }

View file

@ -14,7 +14,8 @@
"lint:hbs": "ember-template-lint .", "lint:hbs": "ember-template-lint .",
"lint:js": "eslint .", "lint:js": "eslint .",
"start": "ember serve", "start": "ember serve",
"test": "ember test" "test": "ember test",
"test:bundlesize": "ember bundlesize:test"
}, },
"devDependencies": { "devDependencies": {
"@ember/optional-features": "^0.7.0", "@ember/optional-features": "^0.7.0",
@ -24,10 +25,10 @@
"ember-awesome-macros": "^5.0.0", "ember-awesome-macros": "^5.0.0",
"ember-bootstrap": "^2.7.1", "ember-bootstrap": "^2.7.1",
"ember-bootstrap-cp-validations": "^1.0.0", "ember-bootstrap-cp-validations": "^1.0.0",
"ember-cli": "~3.8.2", "ember-cli": "~3.10.1",
"ember-cli-acceptance-test-helpers": "^1.0.0", "ember-cli-acceptance-test-helpers": "^1.0.0",
"ember-cli-app-version": "^3.2.0", "ember-cli-app-version": "^3.2.0",
"ember-cli-babel": "^7.1.2", "ember-cli-babel": "^7.7.3",
"ember-cli-browser-navigation-button-test-helper": "^0.1.1", "ember-cli-browser-navigation-button-test-helper": "^0.1.1",
"ember-cli-browserstack": "^0.0.7", "ember-cli-browserstack": "^0.0.7",
"ember-cli-bundlesize": "^0.2.0", "ember-cli-bundlesize": "^0.2.0",
@ -36,10 +37,10 @@
"ember-cli-content-security-policy": "^1.0.0", "ember-cli-content-security-policy": "^1.0.0",
"ember-cli-dependency-checker": "^3.1.0", "ember-cli-dependency-checker": "^3.1.0",
"ember-cli-deprecation-workflow": "^1.0.1", "ember-cli-deprecation-workflow": "^1.0.1",
"ember-cli-eslint": "^4.2.3", "ember-cli-eslint": "^5.1.0",
"ember-cli-flash": "^1.4.0", "ember-cli-flash": "^1.4.0",
"ember-cli-htmlbars": "^3.0.0", "ember-cli-htmlbars": "^3.0.1",
"ember-cli-htmlbars-inline-precompile": "^1.0.3", "ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-inject-live-reload": "^1.8.2", "ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-mirage": "^1.0.0-beta.1", "ember-cli-mirage": "^1.0.0-beta.1",
"ember-cli-moment-shim": "^3.7.1", "ember-cli-moment-shim": "^3.7.1",
@ -51,34 +52,35 @@
"ember-cli-uglify": "^2.1.0", "ember-cli-uglify": "^2.1.0",
"ember-composable-helpers": "^2.1.0", "ember-composable-helpers": "^2.1.0",
"ember-cp-validations": "^4.0.0-beta.8", "ember-cp-validations": "^4.0.0-beta.8",
"ember-data": "~3.8.0", "ember-data": "~3.10.0",
"ember-data-model-fragments": "^4.0.0", "ember-data-model-fragments": "^4.0.0",
"ember-fetch": "^6.5.1", "ember-fetch": "^6.5.1",
"ember-i18n": "^5.0.2", "ember-i18n": "^5.0.2",
"ember-i18n-cp-validations": "^3.0.2", "ember-i18n-cp-validations": "^3.0.2",
"ember-load-initializers": "^1.1.0", "ember-load-initializers": "^2.0.0",
"ember-math-helpers": "^2.8.1", "ember-math-helpers": "^2.8.1",
"ember-maybe-import-regenerator": "^0.1.6", "ember-maybe-import-regenerator": "^0.1.6",
"ember-moment": "^7.8.0", "ember-moment": "^7.8.0",
"ember-page-title": "^5.0.0", "ember-page-title": "^5.0.0",
"ember-power-calendar": "^0.13.1", "ember-power-calendar": "^0.13.1",
"ember-power-calendar-moment": "^0.1.4", "ember-power-calendar-moment": "^0.1.4",
"ember-qunit": "^4.4.0", "ember-qunit": "^4.4.1",
"ember-resolver": "^5.0.1", "ember-resolver": "^5.0.1",
"ember-source": "~3.8.0", "ember-source": "~3.10.0",
"ember-test-selectors": "^2.0.0", "ember-test-selectors": "^2.0.0",
"ember-transition-helper": "^1.0.0", "ember-transition-helper": "^1.0.0",
"ember-truth-helpers": "^2.1.0", "ember-truth-helpers": "^2.1.0",
"eslint-plugin-ember": "^6.4.1", "eslint-plugin-ember": "^6.4.1",
"eslint-plugin-node": "^9.0.1",
"fs-extra": "^8.0.0", "fs-extra": "^8.0.0",
"loader.js": "^4.7.0", "loader.js": "^4.7.0",
"open-iconic": "^1.1.1", "open-iconic": "^1.1.1",
"qunit-dom": "^0.8.0", "qunit-dom": "^0.8.4",
"sass": "^1.19.0", "sass": "^1.19.0",
"sjcl": "^1.0.8" "sjcl": "^1.0.8"
}, },
"engines": { "engines": {
"node": "6.* || 8.* || >= 10.*" "node": "8.* || >= 10.*"
}, },
"ember-addon": { "ember-addon": {
"paths": [ "paths": [
@ -88,6 +90,7 @@
}, },
"resolutions": { "resolutions": {
"chart.js": "~2.6.0", "chart.js": "~2.6.0",
"ember-macro-helpers": "^4.0.0",
"jquery": "~3.3.1" "jquery": "~3.3.1"
} }
} }

2271
yarn.lock

File diff suppressed because it is too large Load diff