From 2583b041a1dc12bfd92c513c9c8eced6d7a8a842 Mon Sep 17 00:00:00 2001 From: Stanislav Romanov Date: Tue, 21 Sep 2021 15:19:15 +0300 Subject: [PATCH] v3.26.1...v3.28.0 --- .eslintignore | 1 + .eslintrc.js | 23 ++++++++++++--------- .template-lintrc.js | 2 +- .travis.yml | 2 +- config/ember-cli-update.json | 2 +- config/targets.js | 20 ++++++++++++------ package.json | 39 ++++++++++++++++++------------------ tests/index.html | 2 +- 8 files changed, 53 insertions(+), 38 deletions(-) diff --git a/.eslintignore b/.eslintignore index 9221655..701947e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -13,6 +13,7 @@ # misc /coverage/ !.* +.*/ .eslintcache # ember-try diff --git a/.eslintrc.js b/.eslintrc.js index da079e3..41a1a43 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -24,15 +24,15 @@ module.exports = { // node files { files: [ - '.eslintrc.js', - '.prettierrc.js', - '.template-lintrc.js', - 'ember-cli-build.js', - 'testem.js', - 'blueprints/*/index.js', - 'config/**/*.js', - 'lib/*/index.js', - 'server/**/*.js', + './.eslintrc.js', + './.prettierrc.js', + './.template-lintrc.js', + './ember-cli-build.js', + './testem.js', + './blueprints/*/index.js', + './config/**/*.js', + './lib/*/index.js', + './server/**/*.js', ], parserOptions: { sourceType: 'script', @@ -49,5 +49,10 @@ module.exports = { 'node/no-unpublished-require': 'off', }, }, + { + // Test files: + files: ['tests/**/*-test.{js,ts}'], + extends: ['plugin:qunit/recommended'], + }, ], }; diff --git a/.template-lintrc.js b/.template-lintrc.js index 3b0b9af..f35f61c 100644 --- a/.template-lintrc.js +++ b/.template-lintrc.js @@ -1,5 +1,5 @@ 'use strict'; module.exports = { - extends: 'octane', + extends: 'recommended', }; diff --git a/.travis.yml b/.travis.yml index 5b5ce9d..bf02ddc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: node_js node_js: - - "10" + - "12" dist: xenial diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json index 150c9ae..8897127 100644 --- a/config/ember-cli-update.json +++ b/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "3.26.1", + "version": "3.28.0", "blueprints": [ { "name": "app", diff --git a/config/targets.js b/config/targets.js index 4b33327..3cd797a 100644 --- a/config/targets.js +++ b/config/targets.js @@ -6,12 +6,20 @@ const browsers = [ 'last 1 Safari versions', ]; -const isCI = Boolean(process.env.CI); -const isProduction = process.env.EMBER_ENV === 'production'; - -if (isCI || isProduction) { - browsers.push('ie 11'); -} +// Ember's browser support policy is changing, and IE11 support will end in +// v4.0 onwards. +// +// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy +// +// If you need IE11 support on a version of Ember that still offers support +// for it, uncomment the code block below. +// +// 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/package.json b/package.json index 4b98d54..9ecdeef 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "scripts": { "build": "ember build --environment=production", - "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'", + "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"", "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix", "lint:hbs": "ember-template-lint .", "lint:hbs:fix": "ember-template-lint . --fix", @@ -29,7 +29,7 @@ }, "devDependencies": { "@ember/optional-features": "^2.0.0", - "@ember/test-helpers": "^2.2.5", + "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "@mdi/svg": "^5.9.55", @@ -53,41 +53,42 @@ "autoprefixer": "^10.2.1", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.11.2", - "ember-cli": "~3.26.1", + "ember-auto-import": "^1.11.3", + "ember-cli": "~3.28.0", "ember-cli-app-version": "^5.0.0", - "ember-cli-babel": "^7.26.3", + "ember-cli-babel": "^7.26.6", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-htmlbars": "^5.7.1", - "ember-cli-inject-live-reload": "^2.0.2", + "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-postcss": "^7.0.0", "ember-cli-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", - "ember-data": "~3.26.0", + "ember-cli-terser": "^4.0.2", + "ember-data": "~3.28.0", "ember-export-application-global": "^2.0.1", - "ember-fetch": "^8.0.4", + "ember-fetch": "^8.1.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", "ember-mdi": "^0.9.0", - "ember-page-title": "^6.2.1", + "ember-page-title": "^6.2.2", "ember-qunit": "^5.1.4", "ember-resolver": "^8.0.2", - "ember-source": "~3.26.1", - "ember-template-lint": "^3.2.0", - "eslint": "^7.23.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "ember-source": "~3.28.0", + "ember-template-lint": "^3.6.0", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-prettier": "^3.4.1", + "eslint-plugin-qunit": "^6.2.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", + "prettier": "^2.3.2", + "qunit": "^2.16.0", "qunit-dom": "^1.6.0", "tailwindcss": "^2.1.4" }, "engines": { - "node": "10.* || >= 12" + "node": "12.* || 14.* || >= 16" }, "ember": { "edition": "octane" diff --git a/tests/index.html b/tests/index.html index a83974b..a96eef1 100644 --- a/tests/index.html +++ b/tests/index.html @@ -28,7 +28,7 @@ - +