ember-cli 6.3.1 → 6.4.0-beta.1

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # ember-cli Changelog
 
+## v6.4.0-beta.1
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v6.4.0-beta.0...v6.4.0-beta.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v6.4.0-beta.0...v6.4.0-beta.1)
+
+#### Changelog
+
+- [#10685](https://github.com/ember-cli/ember-cli/pull/10685) Add configuration to ember-cli-build to opt new projects out of the deprecated behavior of the Store class extending EmberObject [@kategengler](https://github.com/kategengler)
+
+Thank you to all who took the time to contribute!
+
+## v6.4.0-beta.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v6.3.0...v6.4.0-beta.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v6.3.0...v6.4.0-beta.0)
+
+#### Changelog
+
+- [#10598](https://github.com/ember-cli/ember-cli/pull/10598) [INTERNAL] Remove "locked versions for pre-v1.0.0 packages" tests [@bertdeblock](https://github.com/bertdeblock)
+- [#10620](https://github.com/ember-cli/ember-cli/pull/10620) [BUGFIX] Handle errors gracefully when proxy target is down [@dwickern](https://github.com/dwickern)
+- [#10641](https://github.com/ember-cli/ember-cli/pull/10641) [Bugfix] Fix missing lint dependency for typescript projects [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#10659](https://github.com/ember-cli/ember-cli/pull/10659) [BUGFIX] Improve de-typing `.gts` files [@bertdeblock](https://github.com/bertdeblock)
+- [#10661](https://github.com/ember-cli/ember-cli/pull/10661) [ENHANCEMENT] Update `ember-try` to v4 in blueprints [@bertdeblock](https://github.com/bertdeblock)
+
+Thank you to all who took the time to contribute!
+
 ## v6.3.1
 
 #### Blueprint Changes

package/blueprints/addon/additional-package.json

@@ -8,7 +8,7 @@
   "devDependencies": {
     "@embroider/test-setup": "^4.0.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-try": "^3.0.0"
+    "ember-try": "^4.0.0"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0"

package/blueprints/addon/files/{addon-config → config}/ember-try.js

@@ -5,9 +5,8 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
 module.exports = async function () {
   return {
-    <% if (pnpm) { %>usePnpm: true,
-    <% } else if (yarn) { %>useYarn: true,
-    <% } %>scenarios: [
+    packageManager: '<%= packageManager %>',
+    scenarios: [
       {
         name: 'ember-lts-5.8',
         npm: {

package/blueprints/addon/files/npmignore

@@ -26,10 +26,3 @@
 /yarn-error.log
 /yarn.lock
 .gitkeep
-
-# ember-try
-/.node_modules.ember-try/
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try

package/blueprints/addon/index.js

@@ -283,8 +283,6 @@ module.exports = {
     '^config.*': 'tests/dummy/:path',
     '^public.*': 'tests/dummy/:path',
 
-    '^addon-config/ember-try.js': 'tests/dummy/config/ember-try.js',
-
     '^npmignore': '.npmignore',
   },
 

package/blueprints/app/files/.prettierignore

@@ -11,6 +11,3 @@
 /pnpm-lock.yaml
 ember-cli-update.json
 *.html
-
-# ember-try
-/.node_modules.ember-try/

package/blueprints/app/files/.stylelintignore

@@ -3,6 +3,3 @@
 
 # compiled output
 /dist/
-
-# addons
-/.node_modules.ember-try/

package/blueprints/app/files/gitignore

@@ -14,12 +14,5 @@
 /testem.log
 /yarn-error.log
 
-# ember-try
-/.node_modules.ember-try/
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
-
 # broccoli-debug
 /DEBUG/

package/blueprints/app/files/package.json

@@ -71,14 +71,14 @@
     "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>",
-    "ember-data": "~5.3.12<% } %>",
+    "ember-data": "~5.4.0-beta.18<% } %>",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
     "ember-page-title": "^9.0.1",
     "ember-qunit": "^9.0.1",
     "ember-resolver": "^13.1.0",
-    "ember-source": "~6.3.0",
+    "ember-source": "~6.4.0-beta.1",
     "ember-template-imports": "^4.3.0",
     "ember-template-lint": "^6.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",

package/lib/models/blueprint.js

@@ -540,14 +540,18 @@ let Blueprint = CoreObject.extend({
       const { Preprocessor } = require('content-tag');
       const preprocessor = new Preprocessor();
       // Strip template tags
-      const templateTagIdentifier = (index) => `template = __TEMPLATE_TAG_${index}__;`;
-      const templateTagIdentifierBraces = (index) => `(template = __TEMPLATE_TAG_${index}__);`;
+      const replacementClassMember = (i) => `template = __TEMPLATE_TAG_${i}__;`;
+      const replacementExpression = (i) => `__TEMPLATE_TAG_${i}__`;
       const templateTagMatches = preprocessor.parse(code);
       let strippedCode = code;
       for (let i = 0; i < templateTagMatches.length; i++) {
         const match = templateTagMatches[i];
         const templateTag = substringBytes(code, match.range.start, match.range.end);
-        strippedCode = strippedCode.replace(templateTag, templateTagIdentifier(i));
+        if (match.type === 'class-member') {
+          strippedCode = strippedCode.replace(templateTag, replacementClassMember(i));
+        } else {
+          strippedCode = strippedCode.replace(templateTag, replacementExpression(i));
+        }
       }
 
       // Remove types
@@ -558,8 +562,14 @@ let Blueprint = CoreObject.extend({
       for (let i = 0; i < templateTagMatches.length; i++) {
         const match = templateTagMatches[i];
         const templateTag = substringBytes(code, match.range.start, match.range.end);
-        transformedWithTemplateTag = transformedWithTemplateTag.replace(templateTagIdentifier(i), templateTag);
-        transformedWithTemplateTag = transformedWithTemplateTag.replace(templateTagIdentifierBraces(i), templateTag);
+        if (match.type === 'class-member') {
+          transformedWithTemplateTag = transformedWithTemplateTag.replace(replacementClassMember(i), templateTag);
+        } else {
+          // babel-remove-types uses prettier under the hood, and adds trailing `;` where allowed,
+          // so we need to take that into account when restoring the template tags:
+          transformedWithTemplateTag = transformedWithTemplateTag.replace(`${replacementExpression(i)};`, templateTag);
+          transformedWithTemplateTag = transformedWithTemplateTag.replace(replacementExpression(i), templateTag);
+        }
       }
 
       return transformedWithTemplateTag;

package/lib/tasks/server/middleware/proxy-server/index.js

@@ -26,9 +26,13 @@ class ProxyServerAddon {
         timeout: options.proxyInTimeout,
       });
 
-      proxy.on('error', (e) => {
+      proxy.on('error', (e, req, res) => {
         options.ui.writeLine(`Error proxying to ${options.proxy}`);
         options.ui.writeError(e);
+        if (typeof res.status === 'function') {
+          res.status(502);
+          res.end();
+        }
       });
 
       const morgan = require('morgan');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "6.3.1",
+  "version": "6.4.0-beta.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -38,7 +38,7 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@pnpm/find-workspace-dir": "^7.0.2",
+    "@pnpm/find-workspace-dir": "^1000.1.0",
     "babel-remove-types": "^1.0.1",
     "broccoli": "^3.5.2",
     "broccoli-concat": "^4.2.5",
@@ -57,10 +57,10 @@
     "chalk": "^4.1.2",
     "ci-info": "^4.0.0",
     "clean-base-url": "^1.0.0",
-    "compression": "^1.7.4",
+    "compression": "^1.8.0",
     "configstore": "^5.0.1",
     "console-ui": "^3.1.2",
-    "content-tag": "^3.1.0",
+    "content-tag": "^3.1.1",
     "core-object": "^3.1.5",
     "dag-map": "^2.0.2",
     "diff": "^7.0.0",
@@ -104,11 +104,11 @@
     "promise-map-series": "^0.3.0",
     "promise.hash.helper": "^1.0.8",
     "quick-temp": "^0.1.8",
-    "resolve": "^1.22.1",
+    "resolve": "^1.22.10",
     "resolve-package-path": "^4.0.3",
     "safe-stable-stringify": "^2.4.3",
     "sane": "^5.0.1",
-    "semver": "^7.7.0",
+    "semver": "^7.7.1",
     "silent-error": "^1.1.1",
     "sort-package-json": "^2.12.0",
     "symlink-or-copy": "^1.3.1",
@@ -140,7 +140,7 @@
     "fixturify": "^3.0.0",
     "jsdom": "^21.1.1",
     "latest-version": "^5.1.0",
-    "mocha": "^11.0.1",
+    "mocha": "^11.1.0",
     "nock": "^13.5.5",
     "nyc": "^15.1.0",
     "prettier": "2.8.7",

package/tests/helpers/assert-version-lock.js

@@ -1,16 +0,0 @@
-'use strict';
-
-// eslint-disable-next-line n/no-unpublished-require
-const { expect } = require('chai');
-const semver = require('semver');
-
-module.exports = function assertVersionLock(_deps) {
-  let deps = _deps || {};
-
-  Object.keys(deps).forEach(function (name) {
-    if (name !== 'ember-cli' && semver.valid(deps[name]) && semver.gtr('1.0.0', deps[name])) {
-      // only valid if the version is fixed
-      expect(semver.valid(deps[name]), `"${name}" has a valid version`).to.be.ok;
-    }
-  });
-};