Skip to content

Commit

Permalink
Run ember-cli-update to 3.20
Browse files Browse the repository at this point in the history
  • Loading branch information
nickschot authored and mansona committed Aug 19, 2020
1 parent f9697ae commit 87e549d
Show file tree
Hide file tree
Showing 10 changed files with 3,212 additions and 1,911 deletions.
8 changes: 2 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ module.exports = {
env: {
browser: true
},
rules: {
'ember/no-jquery': 'error'
},
rules: {},
overrides: [
// node files
{
Expand Down Expand Up @@ -50,9 +48,7 @@ module.exports = {
node: true
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
extends: ['plugin:node/recommended']
}
]
};
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ node_js:
# so that your addon works for all apps
- "10"

dist: trusty
dist: xenial

addons:
chrome: stable
Expand Down
10 changes: 0 additions & 10 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@ module.exports = async function() {
}
}
},
// 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: {
Expand Down
5,049 changes: 3,172 additions & 1,877 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
"ember-compatibility-test": "ember try:each"
},
"dependencies": {
"@glimmer/component": "^1.0.0",
"@glimmer/component": "^1.0.1",
"@glimmer/tracking": "^1.0.0",
"broccoli-concat": "^4.2.4",
"broccoli-funnel": "^3.0.2",
"ember-auto-import": "^1.5.3",
"ember-cli-babel": "^7.18.0",
"ember-cli-htmlbars": "^4.2.3",
"ember-auto-import": "^1.6.0",
"ember-cli-babel": "^7.21.0",
"ember-cli-htmlbars": "^5.2.0",
"ember-composable-helpers": "^3.1.1",
"ember-concurrency": "^1.2.1",
"ember-concurrency-test-waiter": "^0.3.2",
Expand All @@ -52,7 +52,7 @@
"auto-changelog": "github:mansona/auto-changelog#epic",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.17.0",
"ember-cli": "~3.20.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-fastboot": "^2.2.1",
"ember-cli-inject-live-reload": "^2.0.2",
Expand All @@ -65,20 +65,20 @@
"ember-load-initializers": "^2.1.1",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.6.0",
"ember-resolver": "^7.0.0",
"ember-source": "~3.17.0",
"ember-resolver": "^8.0.0",
"ember-source": "~3.20.2",
"ember-source-channel-url": "^2.0.1",
"ember-template-lint": "^2.4.0",
"ember-template-lint": "^2.9.1",
"ember-test-selectors": "^4.0.0",
"ember-try": "^1.4.0",
"empress-blog": "^1.8.1",
"eslint": "^6.8.0",
"eslint-plugin-ember": "^7.10.1",
"eslint-plugin-node": "^11.0.0",
"eslint": "^7.5.0",
"eslint-plugin-ember": "^8.9.1",
"eslint-plugin-node": "^11.1.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prember": "^1.0.3",
"qunit-dom": "^1.1.0"
"qunit-dom": "^1.2.0"
},
"engines": {
"node": "10.* || >= 12"
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/app.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Application from '@ember/application';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';
import config from 'dummy/config/environment';

export default class App extends Application {
modulePrefix = config.modulePrefix;
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/router.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import EmberRouter from '@ember/routing/router';
import config from './config/environment';
import config from 'dummy/config/environment';

export default class Router extends EmberRouter {
location = config.locationType;
Expand Down
20 changes: 20 additions & 0 deletions tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.20.0",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--no-welcome"
]
}
]
}
]
}
2 changes: 1 addition & 1 deletion tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const browsers = [
'last 1 Safari versions'
];

const isCI = !!process.env.CI;
const isCI = Boolean(process.env.CI);
const isProduction = process.env.EMBER_ENV === 'production';

if (isCI || isProduction) {
Expand Down
4 changes: 2 additions & 2 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Application from '../app';
import config from '../config/environment';
import Application from 'dummy/app';
import config from 'dummy/config/environment';
import { setApplication } from '@ember/test-helpers';
import { start } from 'ember-qunit';

Expand Down

0 comments on commit 87e549d

Please sign in to comment.