ember-source 4.4.1 → 4.4.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Ember Changelog
 
+### v4.4.3 (October 12, 2022)
+
+- [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Fix missing `RouteInfo` entries
+
+### v4.4.2 (June 13, 2022)
+
+- [#20114](https://github.com/emberjs/ember.js/pull/20114) [BUGFIX] Fix generated import paths for test setup functions in addons
+
 ### v4.4.1 (May 31, 2022)
 
 - [#20082](https://github.com/emberjs/ember.js/pull/20082) [BUGFIX] Fix blueprints publication

package/blueprints/-utils.js

@@ -0,0 +1,9 @@
+const { dasherize } = require('ember-cli-string-utils');
+
+function modulePrefixForProject(project) {
+  return dasherize(project.config().modulePrefix);
+}
+
+module.exports = {
+  modulePrefixForProject,
+};

package/blueprints/acceptance-test/index.js

@@ -6,6 +6,7 @@ const pathUtil = require('ember-cli-path-utils');
 const stringUtils = require('ember-cli-string-utils');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -35,7 +36,8 @@ module.exports = useTestFrameworkDetector({
     ].join(' | ');
 
     return {
-      testFolderRoot: testFolderRoot,
+      modulePrefix: modulePrefixForProject(options.project),
+      testFolderRoot,
       friendlyTestName,
       destroyAppExists,
     };

package/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts

@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('<%= friendlyTestName %>', function () {

package/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestName %>', function (hooks) {
   setupApplicationTest(hooks);

package/blueprints/component-test/index.js

@@ -7,6 +7,7 @@ const getPathOption = require('ember-cli-get-component-path-option');
 const semver = require('semver');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 function invocationFor(options) {
@@ -81,6 +82,7 @@ module.exports = useTestFrameworkDetector({
     let selfCloseComponent = (descriptor) => `<${descriptor} />`;
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       path: getPathOption(options),
       testType: testType,
       componentName,

package/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,6 +1,6 @@
 <% if (testType === 'integration') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -26,7 +26,7 @@ describe('<%= friendlyTestDescription %>', function () {
   });
 });<% } else if (testType === 'unit') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,5 +1,5 @@
 <% if (testType === 'integration') { %>import { module, test } from 'qunit';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -24,7 +24,7 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     assert.dom(this.element).hasText('template block text');
   });
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints/controller-test/index.js

@@ -6,6 +6,7 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 const path = require('path');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a controller unit test.',
@@ -22,6 +23,7 @@ module.exports = useTestFrameworkDetector({
     let controllerPathName = dasherizedModuleName;
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       controllerPathName: controllerPathName,
       friendlyTestDescription: ['Unit', 'Controller', dasherizedModuleName].join(' | '),
     };

package/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints/helper-test/index.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const stringUtils = require('ember-cli-string-utils');
 const isPackageMissing = require('ember-cli-is-package-missing');
 const semver = require('semver');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -34,15 +34,14 @@ module.exports = useTestFrameworkDetector({
 
   locals: function (options) {
     let friendlyTestName = ['Integration', 'Helper', options.entity.name].join(' | ');
-    let dasherizedModulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
 
     let hbsImportStatement = this._useNamedHbsImport()
       ? "import { hbs } from 'ember-cli-htmlbars';"
       : "import hbs from 'htmlbars-inline-precompile';";
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       friendlyTestName,
-      dasherizedModulePrefix,
       hbsImportStatement,
     };
   },

package/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 

package/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 

package/blueprints/route-test/index.js

@@ -5,6 +5,7 @@ const stringUtil = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a route unit test.',
@@ -57,6 +58,7 @@ module.exports = useTestFrameworkDetector({
     }
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       friendlyTestDescription: ['Unit', 'Route', options.entity.name].join(' | '),
       moduleName: stringUtil.dasherize(moduleName),
     };

package/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints/service-test/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -26,6 +27,7 @@ module.exports = useTestFrameworkDetector({
 
   locals(options) {
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       friendlyTestDescription: ['Unit', 'Service', options.entity.name].join(' | '),
     };
   },

package/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js

@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('<%= friendlyTestName %>', function () {

package/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestName %>', function (hooks) {
   setupApplicationTest(hooks);

package/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -1,6 +1,6 @@
 <% if (testType === 'integration') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -26,7 +26,7 @@ describe('<%= friendlyTestDescription %>', function () {
   });
 });<% } else if (testType === 'unit') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -1,5 +1,5 @@
 <% if (testType === 'integration') { %>import { module, test } from 'qunit';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -24,7 +24,7 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     assert.dom(this.element).hasText('template block text');
   });
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 

package/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 

package/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/build-metadata.json

@@ -1,6 +1,6 @@
 {
-  "version": "4.4.1",
+  "version": "4.4.3",
   "buildType": "tag",
-  "SHA": "94d5702511ae9c13ad3e8b12e2fff8fba244d363",
-  "assetPath": "/tag/shas/94d5702511ae9c13ad3e8b12e2fff8fba244d363.tgz"
+  "SHA": "c9f609b5dee9fda3956254d0b98eab7bf9554a25",
+  "assetPath": "/tag/shas/c9f609b5dee9fda3956254d0b98eab7bf9554a25.tgz"
 }

package/dist/dependencies/router_js.js

@@ -655,7 +655,7 @@ class InternalRouteInfo {
         let resolved = new ResolvedRouteInfo(this.router, this.name, this.paramNames, params, this.route, context);
         if (cached !== undefined) {
             // SAFETY: This is potentially a bit risker, but for what we're doing, it should be ok.
-            ROUTE_INFOS.set(this, cached);
+            ROUTE_INFOS.set(resolved, cached);
         }
         return resolved;
     }

package/dist/ember-template-compiler.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   4.4.1
+ * @version   4.4.3
  */
 
 /* eslint-disable no-var */
@@ -18732,7 +18732,7 @@ define("ember/version", ["exports"], function (_exports) {
     value: true
   });
   _exports.default = void 0;
-  var _default = "4.4.1";
+  var _default = "4.4.3";
   _exports.default = _default;
 });
 define("simple-html-tokenizer", ["exports"], function (_exports) {