diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b6d796058..7c41453cca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,23 @@ # ember-cli Changelog -## v3.27.1-beta.0 + +## v3.27.0-beta.2 + +#### Blueprint Changes + +- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.27.0-beta.1...v3.27.0-beta.2) +- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.27.0-beta.1...v3.27.0-beta.2) + +#### Changelog + +- [#9504](https://github.com/ember-cli/ember-cli/pull/9504) Update minimum version of broccoli-concat to address a major issue with cache invalidation [@brendenpalmer](https://github.com/brendenpalmer) +- [#9535](https://github.com/ember-cli/ember-cli/pull/9535) Disable Embroider by default. [@rwjblue](https://github.com/rwjblue) +- [#9557](https://github.com/ember-cli/ember-cli/pull/9557) Update app and addon blueprint dependencies to latest. [@rwjblue](https://github.com/rwjblue) +- [#9558](https://github.com/ember-cli/ember-cli/pull/9558) Switch from `octane` template lint config to `recommended` [@bmish](https://github.com/bmish) + +Thank you to all who took the time to contribute! + +## v3.27.1-beta.1 #### Blueprint Changes diff --git a/blueprints/addon/additional-dev-dependencies.json b/blueprints/addon/additional-dev-dependencies.json index 0abb16a5d2..23be64cc34 100644 --- a/blueprints/addon/additional-dev-dependencies.json +++ b/blueprints/addon/additional-dev-dependencies.json @@ -1,6 +1,6 @@ { "devDependencies": { - "@embroider/test-setup": "^0.39.1", + "@embroider/test-setup": "^0.41.0", "ember-disable-prototype-extensions": "^1.1.3", "ember-try": "^1.4.0", "ember-source-channel-url": "^3.0.0" diff --git a/blueprints/app/files/.template-lintrc.js b/blueprints/app/files/.template-lintrc.js index 3b0b9af953..f35f61c7b3 100644 --- a/blueprints/app/files/.template-lintrc.js +++ b/blueprints/app/files/.template-lintrc.js @@ -1,5 +1,5 @@ 'use strict'; module.exports = { - extends: 'octane', + extends: 'recommended', }; diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index 310d77e4e8..2e5df34c8a 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -25,44 +25,45 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5<% if (embroider) { %>", - "@embroider/compat": "^0.39.1", - "@embroider/core": "^0.39.1", - "@embroider/webpack": "^0.39.1<% } %>", + "@embroider/compat": "^0.41.0", + "@embroider/core": "^0.41.0", + "@embroider/webpack": "^0.41.0<% } %>", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.11.2", + "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", "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-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", - "ember-data": "~3.27.0-beta.0", + "ember-cli-terser": "^4.0.2", + "ember-data": "~3.27.1", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.4", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", - "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.27.0-beta.3", - "ember-template-lint": "^3.2.0<% if (welcome) { %>", + "ember-source": "~3.27.2", + "ember-template-lint": "^3.4.2<% if (welcome) { %>", "ember-welcome-page": "^4.0.0<% } %>", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "eslint": "^7.27.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.4.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-qunit": "^6.0.0", + "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-qunit": "^6.1.1", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", - "qunit-dom": "^1.6.0" + "prettier": "^2.3.0", + "qunit": "^2.15.0", + "qunit-dom": "^1.6.0<% if (embroider) { %>", + "webpack": "^5.38.1<% } %>" }, "engines": { "node": "10.* || >= 12" diff --git a/package.json b/package.json index 661414d95b..fb47cddb95 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "3.27.0-beta.1", + "version": "3.27.0-beta.2", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/tests/acceptance/new-test.js b/tests/acceptance/new-test.js index 0ced6d107b..e9e85414a2 100644 --- a/tests/acceptance/new-test.js +++ b/tests/acceptance/new-test.js @@ -321,13 +321,16 @@ describe('Acceptance: ember new', function () { fs.mkdirsSync('my_blueprint/files'); fs.writeFileSync('my_blueprint/index.js', 'module.exports = {};'); - fs.writeFileSync('my_blueprint/files/package.json', '{ "name": "foo", "dependencies": { "fs-extra": "*" }}'); + fs.writeFileSync( + 'my_blueprint/files/package.json', + '{ "name": "foo", "dependencies": { "ember-try-test-suite-helper": "*" }}' + ); fs.writeFileSync('my_blueprint/files/yarn.lock', ''); await ember(['new', 'foo', '--skip-git', '--blueprint=./my_blueprint']); expect(file('yarn.lock')).to.not.be.empty; - expect(dir('node_modules/fs-extra')).to.not.be.empty; + expect(dir('node_modules/ember-try-test-suite-helper')).to.not.be.empty; }); it('ember new without skip-git flag creates .git dir', async function () { diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index e2f55cc755..360078a550 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -26,44 +26,44 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "ember-cli-babel": "^7.26.3", + "ember-cli-babel": "^7.26.6", "ember-cli-htmlbars": "^5.7.1" }, "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", - "@embroider/test-setup": "^0.39.1", + "@embroider/test-setup": "^0.41.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.11.2", + "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", + "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", - "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.27.0-beta.3", + "ember-source": "~3.27.2", "ember-source-channel-url": "^3.0.0", - "ember-template-lint": "^3.2.0", + "ember-template-lint": "^3.4.2", "ember-try": "^1.4.0", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "eslint": "^7.27.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.4.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-qunit": "^6.0.0", + "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-qunit": "^6.1.1", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", + "prettier": "^2.3.0", + "qunit": "^2.15.0", "qunit-dom": "^1.6.0" }, "engines": { diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 18a321888d..1ff4f05d87 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -26,45 +26,45 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "ember-cli-babel": "^7.26.3", + "ember-cli-babel": "^7.26.6", "ember-cli-htmlbars": "^5.7.1" }, "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", - "@embroider/test-setup": "^0.39.1", + "@embroider/test-setup": "^0.41.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.11.2", + "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", + "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", - "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.27.0-beta.3", + "ember-source": "~3.27.2", "ember-source-channel-url": "^3.0.0", - "ember-template-lint": "^3.2.0", + "ember-template-lint": "^3.4.2", "ember-try": "^1.4.0", "ember-welcome-page": "^4.0.0", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "eslint": "^7.27.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.4.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-qunit": "^6.0.0", + "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-qunit": "^6.1.1", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", + "prettier": "^2.3.0", + "qunit": "^2.15.0", "qunit-dom": "^1.6.0" }, "engines": { diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index e0c367f64a..5c43bc47f5 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -29,36 +29,36 @@ "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.11.2", + "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", "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-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", - "ember-data": "~3.27.0-beta.0", + "ember-cli-terser": "^4.0.2", + "ember-data": "~3.27.1", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.4", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", - "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.27.0-beta.3", - "ember-template-lint": "^3.2.0", + "ember-source": "~3.27.2", + "ember-template-lint": "^3.4.2", "ember-welcome-page": "^4.0.0", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "eslint": "^7.27.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.4.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-qunit": "^6.0.0", + "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-qunit": "^6.1.1", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", + "prettier": "^2.3.0", + "qunit": "^2.15.0", "qunit-dom": "^1.6.0" }, "engines": { diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index 4358386939..2e691a41de 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -25,43 +25,44 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", - "@embroider/compat": "^0.39.1", - "@embroider/core": "^0.39.1", - "@embroider/webpack": "^0.39.1", + "@embroider/compat": "^0.41.0", + "@embroider/core": "^0.41.0", + "@embroider/webpack": "^0.41.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.11.2", + "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", "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-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", - "ember-data": "~3.27.0-beta.0", + "ember-cli-terser": "^4.0.2", + "ember-data": "~3.27.1", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.4", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", - "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.27.0-beta.3", - "ember-template-lint": "^3.2.0", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "ember-source": "~3.27.2", + "ember-template-lint": "^3.4.2", + "eslint": "^7.27.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.4.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-qunit": "^6.0.0", + "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-qunit": "^6.1.1", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", - "qunit-dom": "^1.6.0" + "prettier": "^2.3.0", + "qunit": "^2.15.0", + "qunit-dom": "^1.6.0", + "webpack": "^5.38.1" }, "engines": { "node": "10.* || >= 12" diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index cacb82513c..957bc318fb 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -25,44 +25,45 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", - "@embroider/compat": "^0.39.1", - "@embroider/core": "^0.39.1", - "@embroider/webpack": "^0.39.1", + "@embroider/compat": "^0.41.0", + "@embroider/core": "^0.41.0", + "@embroider/webpack": "^0.41.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.11.2", + "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", "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-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", - "ember-data": "~3.27.0-beta.0", + "ember-cli-terser": "^4.0.2", + "ember-data": "~3.27.1", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.4", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", - "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.27.0-beta.3", - "ember-template-lint": "^3.2.0", + "ember-source": "~3.27.2", + "ember-template-lint": "^3.4.2", "ember-welcome-page": "^4.0.0", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "eslint": "^7.27.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.4.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-qunit": "^6.0.0", + "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-qunit": "^6.1.1", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", - "qunit-dom": "^1.6.0" + "prettier": "^2.3.0", + "qunit": "^2.15.0", + "qunit-dom": "^1.6.0", + "webpack": "^5.38.1" }, "engines": { "node": "10.* || >= 12" diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index cacb82513c..957bc318fb 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -25,44 +25,45 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", - "@embroider/compat": "^0.39.1", - "@embroider/core": "^0.39.1", - "@embroider/webpack": "^0.39.1", + "@embroider/compat": "^0.41.0", + "@embroider/core": "^0.41.0", + "@embroider/webpack": "^0.41.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.11.2", + "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", "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-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", - "ember-data": "~3.27.0-beta.0", + "ember-cli-terser": "^4.0.2", + "ember-data": "~3.27.1", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.4", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", - "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.27.0-beta.3", - "ember-template-lint": "^3.2.0", + "ember-source": "~3.27.2", + "ember-template-lint": "^3.4.2", "ember-welcome-page": "^4.0.0", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "eslint": "^7.27.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.4.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-qunit": "^6.0.0", + "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-qunit": "^6.1.1", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", - "qunit-dom": "^1.6.0" + "prettier": "^2.3.0", + "qunit": "^2.15.0", + "qunit-dom": "^1.6.0", + "webpack": "^5.38.1" }, "engines": { "node": "10.* || >= 12" diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index b90a4cae2d..16f68b78ee 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -29,35 +29,35 @@ "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.11.2", + "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", "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-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", - "ember-data": "~3.27.0-beta.0", + "ember-cli-terser": "^4.0.2", + "ember-data": "~3.27.1", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.4", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", - "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.27.0-beta.3", - "ember-template-lint": "^3.2.0", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "ember-source": "~3.27.2", + "ember-template-lint": "^3.4.2", + "eslint": "^7.27.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.4.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-qunit": "^6.0.0", + "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-qunit": "^6.1.1", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", + "prettier": "^2.3.0", + "qunit": "^2.15.0", "qunit-dom": "^1.6.0" }, "engines": { diff --git a/tests/fixtures/app/with-blueprint-override-lint-fail/.template-lintrc.js b/tests/fixtures/app/with-blueprint-override-lint-fail/.template-lintrc.js index 6f77a224e9..8360c930a4 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/.template-lintrc.js +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/.template-lintrc.js @@ -1,7 +1,7 @@ 'use strict'; module.exports = { - extends: 'octane', + extends: 'recommended', rules: { 'require-button-type': true, // blueprint override has missing button type }, diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index e0c367f64a..5c43bc47f5 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -29,36 +29,36 @@ "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.11.2", + "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", "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-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", - "ember-data": "~3.27.0-beta.0", + "ember-cli-terser": "^4.0.2", + "ember-data": "~3.27.1", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.4", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^0.1.6", - "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.27.0-beta.3", - "ember-template-lint": "^3.2.0", + "ember-source": "~3.27.2", + "ember-template-lint": "^3.4.2", "ember-welcome-page": "^4.0.0", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "eslint": "^7.27.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.4.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-qunit": "^6.0.0", + "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-qunit": "^6.1.1", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", + "prettier": "^2.3.0", + "qunit": "^2.15.0", "qunit-dom": "^1.6.0" }, "engines": {