From 06f124b26901065c28c91397faa8e55aa9ce5167 Mon Sep 17 00:00:00 2001 From: Matthew Hartstonge Date: Wed, 9 Oct 2024 14:03:48 +1300 Subject: [PATCH] feat(deps): initial v3.20.2 update. --- .eslintrc.js | 8 ++---- config/ember-try.js | 20 +++++++------- package.json | 33 +++++++++++++----------- tests/dummy/app/app.js | 2 +- tests/dummy/app/router.js | 2 +- tests/dummy/config/ember-cli-update.json | 2 +- tests/dummy/config/targets.js | 18 +++++++++++++ tests/test-helper.js | 12 +++++---- 8 files changed, 57 insertions(+), 40 deletions(-) create mode 100644 tests/dummy/config/targets.js diff --git a/.eslintrc.js b/.eslintrc.js index 85a1900..9285859 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -20,9 +20,7 @@ module.exports = { env: { browser: true }, - rules: { - 'ember/no-jquery': 'error' - }, + rules: {}, overrides: [ // node files { @@ -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'] } ] }; diff --git a/config/ember-try.js b/config/ember-try.js index 91935e1..e60acd9 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -21,6 +21,14 @@ module.exports = async function() { } } }, + { + name: 'ember-lts-3.20', + npm: { + devDependencies: { + 'ember-source': '~3.20.5' + } + } + }, { name: 'ember-release', npm: { @@ -45,16 +53,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: { @@ -64,7 +62,7 @@ module.exports = async function() { }, npm: { devDependencies: { - '@ember/jquery': '^0.5.1' + '@ember/jquery': '^1.1.0' } } }, diff --git a/package.json b/package.json index 541822a..33e6f2c 100644 --- a/package.json +++ b/package.json @@ -17,45 +17,48 @@ }, "scripts": { "build": "ember build --environment=production", - "lint:js": "eslint .", "lint:hbs": "ember-template-lint .", + "lint:js": "eslint .", + "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*", "start": "ember server", - "test": "ember try:each", + "test": "npm-run-all lint:* test:*", "test:ember": "ember test", + "test:ember-compatibility": "ember try:each", "ci": "yarn install --ignore-engines --frozen-lockfile" }, "dependencies": { - "ember-auto-import": "^1.5.3", - "ember-cli-babel": "^7.17.2", - "ember-cli-htmlbars": "^4.2.2", + "ember-auto-import": "^1.6.0", + "ember-cli-babel": "^7.21.0", + "ember-cli-htmlbars": "^5.2.0", "zxcvbn": "^4.4.2" }, "devDependencies": { "@ember/optional-features": "^1.3.0", - "@glimmer/component": "^1.0.0", + "@glimmer/component": "^1.0.1", "@glimmer/tracking": "^1.0.0", - "babel-eslint": "^10.0.3", + "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~3.16.2", + "ember-cli": "~3.20.2", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-eslint": "^5.1.0", "ember-cli-github-pages": "^0.2.1", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sass": "^7.0.0", "ember-cli-shims": "^1.2.0", "ember-cli-sri": "^2.1.1", - "ember-cli-template-lint": "^1.0.0-beta.3", "ember-cli-uglify": "^3.0.0", "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", "ember-load-initializers": "^2.1.1", "ember-paper": "1.0.0-beta.20", "ember-qunit": "^4.6.0", - "ember-resolver": "^7.0.0", - "ember-source": "~3.16.0", - "eslint-plugin-ember": "^7.7.2", - "eslint-plugin-node": "^11.0.0", - "loader.js": "^4.7.0" + "ember-resolver": "^8.0.0", + "ember-source": "~3.20.2", + "ember-template-lint": "^2.9.1", + "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" }, "resolutions": { "ember-cli-babel": "^7.17.2" diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index d8e2088..523bad6 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -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; diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index 224ca42..bdf0187 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -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; diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json index ff2e2d5..3c0c55f 100644 --- a/tests/dummy/config/ember-cli-update.json +++ b/tests/dummy/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "3.16.2", + "version": "3.20.2", "blueprints": [ { "name": "addon", diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js new file mode 100644 index 0000000..228a078 --- /dev/null +++ b/tests/dummy/config/targets.js @@ -0,0 +1,18 @@ +'use strict'; + +const browsers = [ + 'last 1 Chrome versions', + 'last 1 Firefox versions', + 'last 1 Safari versions' +]; + +const isCI = Boolean(process.env.CI); +const isProduction = process.env.EMBER_ENV === 'production'; + +if (isCI || isProduction) { + browsers.push('ie 11'); +} + +module.exports = { + browsers +}; diff --git a/tests/test-helper.js b/tests/test-helper.js index e6cfb70..4eae06f 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,6 +1,8 @@ -import resolver from './helpers/resolver'; -import { - setResolver -} from 'ember-qunit'; +import Application from 'dummy/app'; +import config from 'dummy/config/environment'; +import { setApplication } from '@ember/test-helpers'; +import { start } from 'ember-qunit'; -setResolver(resolver); +setApplication(Application.create(config.APP)); + +start();