Merge branch 'beta' into release

ember-cli · Mar 4, 2023 · 5d26aed · 5d26aed
2 parents f0f98be + eb4c9df
commit 5d26aed
Show file tree

Hide file tree

Showing 22 changed files with 1,388 additions and 1,616 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # ember-cli Changelog
 
+## v4.11.0-beta.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.10.0...v4.11.0-beta.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.10.0...v4.11.0-beta.0)
+
+#### Changelog
+
+- [#10103](https://github.com/ember-cli/ember-cli/pull/10103) Update `markdown-it-terminal` to v0.4.0 (resolve `markdown-it` vulnerability) [@bertdeblock](https://github.com/bertdeblock)
+- [#10109](https://github.com/ember-cli/ember-cli/pull/10109) [RFC 811] Add `ember-modifier` dependency to app blueprint [@SergeAstapov](https://github.com/SergeAstapov)
+- [#10110](https://github.com/ember-cli/ember-cli/pull/10110) [RFC 812] Add `tracked-built-ins` dependency to app blueprint [@SergeAstapov](https://github.com/SergeAstapov)
+
+Thank you to all who took the time to contribute!
+
 ## v4.10.0
 
 #### Blueprint Changes

diff --git a/blueprints/addon/additional-package.json b/blueprints/addon/additional-package.json
@@ -6,7 +6,7 @@
     "test:ember-compatibility": "ember try:each"
   },
   "devDependencies": {
-    "@embroider/test-setup": "^2.0.2",
+    "@embroider/test-setup": "^2.1.1",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^2.0.0"
   },

diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
@@ -27,45 +27,46 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.9.3<% if (embroider) { %>",
-    "@embroider/compat": "^2.0.2",
-    "@embroider/core": "^2.0.2",
-    "@embroider/webpack": "^2.0.2<% } %>",
+    "@embroider/compat": "^2.1.1",
+    "@embroider/core": "^2.1.1",
+    "@embroider/webpack": "^2.1.1<% } %>",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
-    "@typescript-eslint/eslint-plugin": "^5.48.2",
-    "@typescript-eslint/parser": "^5.48.2<% } else { %>",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0<% } else { %>",
     "babel-eslint": "^10.1.0<% } %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^7.6.0",
-    "ember-auto-import": "^2.5.0",
+    "ember-auto-import": "^2.6.1",
     "ember-cli": "~<%= emberCLIVersion %>",
-    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-app-version": "^6.0.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-htmlbars": "^6.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.9.1",
+    "ember-data": "~4.11.3",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
+    "ember-modifier": "^4.1.0",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.1.1",
+    "ember-qunit": "^6.2.0",
     "ember-resolver": "^10.0.0",
-    "ember-source": "~4.10.0",
-    "ember-template-lint": "^5.3.1<% if (welcome) { %>",
-    "ember-welcome-page": "^6.2.0<% } %>",
+    "ember-source": "~4.11.0",
+    "ember-template-lint": "^5.6.0<% if (welcome) { %>",
+    "ember-welcome-page": "^7.0.1<% } %>",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-ember": "^11.4.3",
+    "eslint-plugin-ember": "^11.4.7",
     "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.3.4",
     "loader.js": "^4.7.0",
-    "prettier": "^2.8.3",
-    "qunit": "^2.19.3",
+    "prettier": "^2.8.4",
+    "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
-    "tracked-built-ins": "^3.1.0",
+    "tracked-built-ins": "^3.1.1",
     "webpack": "^5.75.0"
   },
   "engines": {

diff --git a/lib/experiments/index.js b/lib/experiments/index.js
@@ -3,7 +3,7 @@
 const chalk = require('chalk');
 const availableExperiments = Object.freeze(['PACKAGER', 'EMBROIDER', 'CLASSIC']);
 
-const deprecatedExperiments = Object.freeze(['BROCCOLI_WATCHER', 'PACKAGER']);
+const deprecatedExperiments = Object.freeze(['PACKAGER']);
 const enabledExperiments = Object.freeze([]);
 const deprecatedExperimentsDeprecationsIssued = [];
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.10.0",
+  "version": "4.11.0-beta.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -37,8 +37,8 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@babel/core": "^7.19.6",
-    "@babel/plugin-transform-modules-amd": "^7.18.6",
+    "@babel/core": "^7.20.12",
+    "@babel/plugin-transform-modules-amd": "^7.19.6",
     "amd-name-resolver": "^1.3.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "bower-config": "^1.4.3",
@@ -61,7 +61,7 @@
     "calculate-cache-key-for-tree": "^2.0.0",
     "capture-exit": "^2.0.0",
     "chalk": "^4.1.2",
-    "ci-info": "^3.5.0",
+    "ci-info": "^3.7.0",
     "clean-base-url": "^1.0.0",
     "compression": "^1.7.4",
     "configstore": "^5.0.1",
@@ -93,7 +93,7 @@
     "heimdalljs-graph": "^1.0.0",
     "heimdalljs-logger": "^0.1.10",
     "http-proxy": "^1.18.1",
-    "inflection": "^1.13.4",
+    "inflection": "^2.0.1",
     "inquirer": "^8.2.1",
     "is-git-url": "^1.0.0",
     "is-language-code": "^3.1.0",
@@ -102,11 +102,11 @@
     "leek": "0.0.24",
     "lodash.template": "^4.5.0",
     "markdown-it": "^13.0.1",
-    "markdown-it-terminal": "0.2.1",
+    "markdown-it-terminal": "^0.4.0",
     "minimatch": "^5.1.0",
     "morgan": "^1.10.0",
     "nopt": "^3.0.6",
-    "npm-package-arg": "^9.1.2",
+    "npm-package-arg": "^10.1.0",
     "os-locale": "^5.0.0",
     "p-defer": "^3.0.0",
     "portfinder": "^1.0.32",
@@ -123,40 +123,40 @@
     "sort-package-json": "^1.57.0",
     "symlink-or-copy": "^1.3.1",
     "temp": "0.9.4",
-    "testem": "^3.9.0",
+    "testem": "^3.10.1",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
     "uuid": "^8.3.2",
     "walk-sync": "^3.0.0",
     "watch-detector": "^1.0.2",
-    "workerpool": "^6.2.1",
+    "workerpool": "^6.3.1",
     "yam": "^1.0.0"
   },
   "devDependencies": {
     "@ember/edition-utils": "^1.2.0",
     "@octokit/rest": "^19.0.5",
     "broccoli-plugin": "^4.0.3",
     "broccoli-test-helper": "^2.0.0",
-    "chai": "^4.3.6",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "chai-files": "^1.4.0",
     "chai-jest-snapshot": "^2.0.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
-    "eslint": "^8.24.0",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-chai-expect": "^3.0.0",
     "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-n": "^15.3.0",
     "eslint-plugin-prettier": "^4.2.1",
     "fixturify": "^2.1.0",
-    "jsdom": "^20.0.0",
+    "jsdom": "^20.0.3",
     "latest-version": "^5.1.0",
     "mocha": "^10.0.0",
     "nock": "^13.2.9",
     "nyc": "^15.1.0",
-    "prettier": "2.7.1",
-    "release-it": "^15.4.2",
+    "prettier": "2.8.2",
+    "release-it": "^15.6.0",
     "rimraf": "^3.0.2",
     "strip-ansi": "^6.0.0",
     "supertest": "^6.3.1",
@@ -173,9 +173,6 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "greenkeeper": {
-    "ignore": []
-  },
   "release-it": {
     "hooks": {
       "after:release": "node ./dev/update-output-repos.js"

diff --git a/tests/acceptance/destroy-test.js b/tests/acceptance/destroy-test.js
@@ -101,9 +101,11 @@ describe('Acceptance: ember destroy', function () {
     return assertDestroyAfterGenerate(commandArgs, files);
   });
 
-  it('deletes files generated using blueprint paths', function () {
-    let commandArgs = [`${__dirname}/../../blueprints/http-proxy`, 'foo', 'bar'];
-    let files = ['server/proxies/foo.js'];
+  it('deletes files generated using blueprint paths', async function () {
+    await fs.outputFile('path/to/blueprints/foo/files/foo/__name__.js', "console.log('bar');\n");
+
+    let commandArgs = [path.join('path', 'to', 'blueprints', 'foo'), 'bar'];
+    let files = ['foo/bar.js'];
 
     return assertDestroyAfterGenerate(commandArgs, files);
   });

diff --git a/tests/acceptance/generate-test.js b/tests/acceptance/generate-test.js
@@ -145,13 +145,10 @@ describe('Acceptance: ember generate', function () {
   });
 
   it('allows a path to be specified to a blueprint', async function () {
-    await outputFile(
-      'blueprints/http-proxy/files/server/proxies/__name__.js',
-      "import Ember from 'ember';\n" + 'export default Ember.Object.extend({ foo: true });\n'
-    );
-    await generate([path.resolve(`${__dirname}/../../blueprints/http-proxy`), 'foo', 'http://localhost:5000']);
+    await outputFile('path/to/blueprints/foo/files/foo/__name__.js', "console.log('bar');\n");
+    await generate([path.join('path', 'to', 'blueprints', 'foo'), 'bar']);
 
-    expect(file('server/index.js')).to.not.contain('foo: true', 'the local blueprint is not used');
+    expect(file('foo/bar.js')).to.contain("console.log('bar');\n");
   });
 
   it('passes custom cli arguments to blueprint options', async function () {

diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json
@@ -33,35 +33,35 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.9.3",
-    "@embroider/test-setup": "^2.0.2",
+    "@embroider/test-setup": "^2.1.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^7.6.0",
-    "ember-auto-import": "^2.5.0",
+    "ember-auto-import": "^2.6.1",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.1.1",
+    "ember-qunit": "^6.2.0",
     "ember-resolver": "^10.0.0",
-    "ember-source": "~4.10.0",
+    "ember-source": "~4.11.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.3.1",
+    "ember-template-lint": "^5.6.0",
     "ember-try": "^2.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-ember": "^11.4.3",
+    "eslint-plugin-ember": "^11.4.7",
     "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.3.4",
     "loader.js": "^4.7.0",
-    "prettier": "^2.8.3",
-    "qunit": "^2.19.3",
+    "prettier": "^2.8.4",
+    "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
     "webpack": "^5.75.0"
   },

diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json
@@ -33,36 +33,36 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.9.3",
-    "@embroider/test-setup": "^2.0.2",
+    "@embroider/test-setup": "^2.1.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^7.6.0",
-    "ember-auto-import": "^2.5.0",
+    "ember-auto-import": "^2.6.1",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.1.1",
+    "ember-qunit": "^6.2.0",
     "ember-resolver": "^10.0.0",
-    "ember-source": "~4.10.0",
+    "ember-source": "~4.11.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.3.1",
+    "ember-template-lint": "^5.6.0",
     "ember-try": "^2.0.0",
-    "ember-welcome-page": "^6.2.0",
+    "ember-welcome-page": "^7.0.1",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-ember": "^11.4.3",
+    "eslint-plugin-ember": "^11.4.7",
     "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.3.4",
     "loader.js": "^4.7.0",
-    "prettier": "^2.8.3",
-    "qunit": "^2.19.3",
+    "prettier": "^2.8.4",
+    "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
     "webpack": "^5.75.0"
   },

diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json
@@ -31,35 +31,36 @@
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^7.6.0",
-    "ember-auto-import": "^2.5.0",
+    "ember-auto-import": "^2.6.1",
     "ember-cli": "~<%= emberCLIVersion %>",
-    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-app-version": "^6.0.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-htmlbars": "^6.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.9.1",
+    "ember-data": "~4.11.3",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
+    "ember-modifier": "^4.1.0",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.1.1",
+    "ember-qunit": "^6.2.0",
     "ember-resolver": "^10.0.0",
-    "ember-source": "~4.10.0",
-    "ember-template-lint": "^5.3.1",
-    "ember-welcome-page": "^6.2.0",
+    "ember-source": "~4.11.0",
+    "ember-template-lint": "^5.6.0",
+    "ember-welcome-page": "^7.0.1",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-ember": "^11.4.3",
+    "eslint-plugin-ember": "^11.4.7",
     "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.3.4",
     "loader.js": "^4.7.0",
-    "prettier": "^2.8.3",
-    "qunit": "^2.19.3",
+    "prettier": "^2.8.4",
+    "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
-    "tracked-built-ins": "^3.1.0",
+    "tracked-built-ins": "^3.1.1",
     "webpack": "^5.75.0"
   },
   "engines": {