ember-source 7.2.0-alpha.1 → 7.2.0-alpha.3

package/blueprints/acceptance-test/index.js

@@ -1,14 +1,12 @@
-'use strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import pathUtil from 'ember-cli-path-utils';
+import stringUtils from 'ember-cli-string-utils';
 
-const fs = require('fs');
-const path = require('path');
-const pathUtil = require('ember-cli-path-utils');
-const stringUtils = require('ember-cli-string-utils');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
+import { modulePrefixForProject } from '../-utils.js';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const { modulePrefixForProject } = require('../-utils');
-
-module.exports = {
+export default {
   description: 'Generates an acceptance test for a feature.',
 
   shouldTransformTypeScript: true,

package/blueprints/component/index.js

@@ -1,16 +1,14 @@
-'use strict';
+import chalk from 'chalk';
+import stringUtil from 'ember-cli-string-utils';
+import getPathOption from 'ember-cli-get-component-path-option';
+import normalizeEntityName from 'ember-cli-normalize-entity-name';
+import SilentError from 'silent-error';
+import { generateComponentSignature } from '../-utils.js';
 
-const chalk = require('chalk');
-const stringUtil = require('ember-cli-string-utils');
-const getPathOption = require('ember-cli-get-component-path-option');
-const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const SilentError = require('silent-error');
-const { generateComponentSignature } = require('../-utils');
-
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
 
 // intentionally avoiding use-edition-detector
-module.exports = {
+export default {
   description: 'Generates a component.',
 
   shouldTransformTypeScript: true,

package/blueprints/component-addon/index.js

@@ -1,11 +1,9 @@
-'use strict';
+import path from 'node:path';
+import stringUtil from 'ember-cli-string-utils';
+import getPathOption from 'ember-cli-get-component-path-option';
+import normalizeEntityName from 'ember-cli-normalize-entity-name';
 
-const path = require('path');
-const stringUtil = require('ember-cli-string-utils');
-const getPathOption = require('ember-cli-get-component-path-option');
-const normalizeEntityName = require('ember-cli-normalize-entity-name');
-
-module.exports = {
+export default {
   description: 'Generates a component.',
 
   fileMapTokens: function () {

package/blueprints/component-class/index.js

@@ -1,14 +1,12 @@
-'use strict';
+import stringUtil from 'ember-cli-string-utils';
+import getPathOption from 'ember-cli-get-component-path-option';
+import normalizeEntityName from 'ember-cli-normalize-entity-name';
+import { generateComponentSignature } from '../-utils.js';
 
-const stringUtil = require('ember-cli-string-utils');
-const getPathOption = require('ember-cli-get-component-path-option');
-const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const { generateComponentSignature } = require('../-utils');
-
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
 
 // intentionally avoiding use-edition-detector
-module.exports = {
+export default {
   description: 'Generates a component class.',
 
   shouldTransformTypeScript: true,

package/blueprints/component-class-addon/index.js

@@ -1,11 +1,9 @@
-'use strict';
+import path from 'node:path';
+import stringUtil from 'ember-cli-string-utils';
+import getPathOption from 'ember-cli-get-component-path-option';
+import normalizeEntityName from 'ember-cli-normalize-entity-name';
 
-const path = require('path');
-const stringUtil = require('ember-cli-string-utils');
-const getPathOption = require('ember-cli-get-component-path-option');
-const normalizeEntityName = require('ember-cli-normalize-entity-name');
-
-module.exports = {
+export default {
   description: 'Generates a component class.',
 
   fileMapTokens: function () {

package/blueprints/component-test/index.js

@@ -1,12 +1,10 @@
-'use strict';
+import path from 'node:path';
+import stringUtil from 'ember-cli-string-utils';
+import getPathOption from 'ember-cli-get-component-path-option';
+import semver from 'semver';
 
-const path = require('path');
-const stringUtil = require('ember-cli-string-utils');
-const getPathOption = require('ember-cli-get-component-path-option');
-const semver = require('semver');
-
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const { modulePrefixForProject } = require('../-utils');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
+import { modulePrefixForProject } from '../-utils.js';
 
 function invocationFor(options) {
   let parts = options.entity.name.split('/');
@@ -19,7 +17,7 @@ function invocationForStrictComponentAuthoringFormat(options) {
   return stringUtil.classify(componentName);
 }
 
-module.exports = {
+export default {
   description: 'Generates a component integration or unit test.',
 
   shouldTransformTypeScript: true,

package/blueprints/controller/index.js

@@ -1,8 +1,6 @@
-'use strict';
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-
-module.exports = {
+export default {
   description: 'Generates a controller.',
 
   shouldTransformTypeScript: true,

package/blueprints/controller-test/index.js

@@ -1,13 +1,11 @@
-'use strict';
+import stringUtil from 'ember-cli-string-utils';
 
-const stringUtil = require('ember-cli-string-utils');
+import path from 'node:path';
 
-const path = require('path');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
+import { modulePrefixForProject } from '../-utils.js';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const { modulePrefixForProject } = require('../-utils');
-
-module.exports = {
+export default {
   description: 'Generates a controller unit test.',
 
   shouldTransformTypeScript: true,

package/blueprints/helper/index.js

@@ -1,10 +1,8 @@
-'use strict';
+import normalizeEntityName from 'ember-cli-normalize-entity-name';
 
-const normalizeEntityName = require('ember-cli-normalize-entity-name');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-
-module.exports = {
+export default {
   description: 'Generates a helper function.',
 
   shouldTransformTypeScript: true,

package/blueprints/helper-addon/index.js

@@ -1,3 +1,3 @@
-'use strict';
+import addonImport from '../-addon-import.js';
 
-module.exports = require('../-addon-import');
+export default addonImport;

package/blueprints/helper-test/index.js

@@ -1,11 +1,9 @@
-'use strict';
+import semver from 'semver';
 
-const semver = require('semver');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
+import { modulePrefixForProject } from '../-utils.js';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const { modulePrefixForProject } = require('../-utils');
-
-module.exports = {
+export default {
   description: 'Generates a helper integration test.',
 
   shouldTransformTypeScript: true,

package/blueprints/initializer/index.js

@@ -1,8 +1,6 @@
-'use strict';
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-
-module.exports = {
+export default {
   description: 'Generates an initializer.',
 
   shouldTransformTypeScript: true,

package/blueprints/initializer-addon/index.js

@@ -1,3 +1,3 @@
-'use strict';
+import addonImport from '../-addon-import.js';
 
-module.exports = require('../-addon-import');
+export default addonImport;

package/blueprints/initializer-test/index.js

@@ -1,12 +1,10 @@
-'use strict';
+import fs from 'node:fs';
+import path from 'node:path';
 
-const fs = require('fs');
-const path = require('path');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
+import { modulePrefixForProject } from '../-utils.js';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const { modulePrefixForProject } = require('../-utils');
-
-module.exports = {
+export default {
   description: 'Generates an initializer unit test.',
 
   shouldTransformTypeScript: true,

package/blueprints/instance-initializer/index.js

@@ -1,8 +1,6 @@
-'use strict';
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-
-module.exports = {
+export default {
   shouldTransformTypeScript: true,
 
   description: 'Generates an instance initializer.',

package/blueprints/instance-initializer-addon/index.js

@@ -1,3 +1,3 @@
-'use strict';
+import addonImport from '../-addon-import.js';
 
-module.exports = require('../-addon-import');
+export default addonImport;

package/blueprints/instance-initializer-test/index.js

@@ -1,12 +1,10 @@
-'use strict';
+import fs from 'node:fs';
+import path from 'node:path';
 
-const fs = require('fs');
-const path = require('path');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
+import { modulePrefixForProject } from '../-utils.js';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const { modulePrefixForProject } = require('../-utils');
-
-module.exports = {
+export default {
   description: 'Generates an instance initializer unit test.',
 
   shouldTransformTypeScript: true,

package/blueprints/mixin/index.js

@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports = {
+export default {
   description: 'Generates a mixin.',
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files

package/blueprints/mixin-test/index.js

@@ -1,8 +1,6 @@
-'use strict';
+import path from 'node:path';
 
-const path = require('path');
-
-module.exports = {
+export default {
   description: 'Generates a mixin unit test.',
 
   fileMapTokens() {

package/blueprints/route/index.js

@@ -1,15 +1,13 @@
-'use strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import chalk from 'chalk';
+import stringUtil from 'ember-cli-string-utils';
+import EmberRouterGenerator from 'ember-router-generator';
+import SilentError from 'silent-error';
 
-const fs = require('fs');
-const path = require('path');
-const chalk = require('chalk');
-const stringUtil = require('ember-cli-string-utils');
-const EmberRouterGenerator = require('ember-router-generator');
-const SilentError = require('silent-error');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-
-module.exports = {
+export default {
   description: 'Generates a route and a template, and registers the route with the router.',
 
   shouldTransformTypeScript: true,

package/blueprints/route-addon/index.js

@@ -1,10 +1,8 @@
-'use strict';
+import path from 'node:path';
+import stringUtil from 'ember-cli-string-utils';
+import inflector from 'inflection';
 
-const path = require('path');
-const stringUtil = require('ember-cli-string-utils');
-const inflector = require('inflection');
-
-module.exports = {
+export default {
   description: 'Generates import wrappers for a route and its template.',
 
   fileMapTokens: function () {

package/blueprints/route-test/index.js

@@ -1,12 +1,10 @@
-'use strict';
+import path from 'node:path';
+import stringUtil from 'ember-cli-string-utils';
 
-const path = require('path');
-const stringUtil = require('ember-cli-string-utils');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
+import { modulePrefixForProject } from '../-utils.js';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const { modulePrefixForProject } = require('../-utils');
-
-module.exports = {
+export default {
   description: 'Generates a route unit test.',
 
   shouldTransformTypeScript: true,

package/blueprints/service/index.js

@@ -1,8 +1,6 @@
-'use strict';
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-
-module.exports = {
+export default {
   description: 'Generates a service.',
 
   shouldTransformTypeScript: true,

package/blueprints/service-test/index.js

@@ -1,9 +1,7 @@
-'use strict';
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
+import { modulePrefixForProject } from '../-utils.js';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const { modulePrefixForProject } = require('../-utils');
-
-module.exports = {
+export default {
   description: 'Generates a service unit test.',
 
   shouldTransformTypeScript: true,

package/blueprints/template/index.js

@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports = {
+export default {
   description: 'Generates a template.',
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.hbs$/, ''); //Prevent generation of ".hbs.hbs" files

package/blueprints/util/index.js

@@ -1,8 +1,6 @@
-'use strict';
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-
-module.exports = {
+export default {
   description: 'Generates a simple utility module/function.',
 
   shouldTransformTypeScript: true,

package/blueprints/util-test/index.js

@@ -1,11 +1,9 @@
-'use strict';
+import path from 'node:path';
 
-const path = require('path');
+import typescriptBlueprintPolyfill from 'ember-cli-typescript-blueprint-polyfill';
+import { modulePrefixForProject } from '../-utils.js';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const { modulePrefixForProject } = require('../-utils');
-
-module.exports = {
+export default {
   description: 'Generates a util unit test.',
 
   shouldTransformTypeScript: true,

package/build-metadata.json

@@ -1,6 +1,6 @@
 {
-  "version": "7.2.0-alpha.1",
+  "version": "7.2.0-alpha.3",
   "buildType": "tag",
-  "SHA": "e633fbd20860bd0769a48e8cb51ec1445fbad293",
-  "assetPath": "/tag/shas/e633fbd20860bd0769a48e8cb51ec1445fbad293.tgz"
+  "SHA": "a9f0322b34c292dee9a01d53fc13583d33ee0e57",
+  "assetPath": "/tag/shas/a9f0322b34c292dee9a01d53fc13583d33ee0e57.tgz"
 }

package/dist/dev/packages/@ember/engine/index.js

@@ -15,6 +15,7 @@ import '../../shared-chunks/unrecognized-url-error-B3wUTorp.js';
 import RoutingService from '../routing/lib/routing-service.js';
 import { a as setupEngineRegistry } from '../../shared-chunks/setup-registry-BC5VMvei.js';
 import RegistryProxyMixin from '../-internals/runtime/lib/mixins/registry_proxy.js';
+import { StrictResolver } from './lib/strict-resolver.js';
 import { assert } from '../debug/lib/assert.js';
 
 function props(obj) {
@@ -263,6 +264,15 @@ class Engine extends Namespace.extend(RegistryProxyMixin) {
      @property resolver
     @public
   */
+  Resolver = StrictResolver;
+
+  /**
+    Set this to opt-in to using a strict resolver that will only return the
+    given set of ES modules. The names of the modules should all be relative to
+    the root of the app and start with "./"
+     @property modules
+    @public
+  */
 
   init(properties) {
     super.init(properties);

package/dist/dev/packages/@ember/engine/lib/strict-resolver.js

@@ -0,0 +1,122 @@
+import '../../debug/index.js';
+import { assert } from '../../debug/lib/assert.js';
+
+class StrictResolver {
+  // Ember's router uses this flag to decide whether to auto-generate
+  // `${name}_loading` and `${name}_error` substates for routes defined in
+  // `Router.map(...)`. Since we always resolve against an ES module registry,
+  // we unconditionally opt in.
+  moduleBasedResolver = true;
+  #modules = new Map();
+  original;
+  static create({
+    namespace
+  }) {
+    (!(namespace.modules) && assert(`<Application#modules> must be set when using the StrictResolver`, namespace.modules));
+    return new StrictResolver(namespace.modules);
+  }
+  constructor(modules) {
+    this.addModules(modules);
+  }
+  addModules(modules) {
+    for (let [moduleName, module] of Object.entries(modules)) {
+      this.#modules.set(this.#normalizeModule(moduleName), module);
+    }
+  }
+  #normalizeModule(moduleName) {
+    return moduleName.replace(fileExtension, '').replace(leadingDotSlash, '');
+  }
+  #plural(word) {
+    if (word === 'config') {
+      return word;
+    }
+    return word + 's';
+  }
+  resolve(fullName) {
+    let [type, name] = fullName.split(':');
+    name = this.#normalizeName(type, name);
+    for (let strategy of [this.#resolveSelf, this.#mainLookup, this.#defaultLookup, this.#nestedColocationLookup]) {
+      let result = strategy.call(this, type, name);
+      if (result) {
+        return this.#extractDefaultExport(result.hit);
+      }
+    }
+    return undefined;
+  }
+  #extractDefaultExport(module) {
+    if (module && module['default']) {
+      module = module['default'];
+    }
+    return module;
+  }
+  normalize(fullName) {
+    let [type, name] = fullName.split(':');
+    name = this.#normalizeName(type, name);
+    return `${type}:${name}`;
+  }
+  #normalizeName(type, name) {
+    if (type === 'component' || type === 'helper' || type === 'modifier' || type === 'template' && name.indexOf('components/') === 0) {
+      return name.replace(/_/g, '-');
+    } else {
+      return dasherize(name.replace(/\./g, '/'));
+    }
+  }
+  #resolveSelf(type, name) {
+    if (type === 'resolver' && name === 'current') {
+      return {
+        hit: {
+          create: () => this
+        }
+      };
+    }
+    return undefined;
+  }
+  #mainLookup(type, name) {
+    if (name === 'main') {
+      let module = this.#modules.get(type);
+      if (module) {
+        return {
+          hit: module
+        };
+      }
+    }
+    return undefined;
+  }
+  #defaultLookup(type, name) {
+    let dir = this.#plural(type);
+    let target = `${dir}/${name}`;
+    let module = this.#modules.get(target);
+    if (module) {
+      return {
+        hit: module
+      };
+    }
+    return undefined;
+  }
+
+  // Supports the nested colocation pattern where `component:my-widget`
+  // resolves to `./components/my-widget/index.{js,ts,gjs,gts}`. The index
+  // file is typically the component class, and it's commonly paired with a
+  // sibling `index.hbs` inside the same folder.
+  #nestedColocationLookup(type, name) {
+    if (type !== 'component') return undefined;
+    let dir = this.#plural(type);
+    let target = `${dir}/${name}/index`;
+    let module = this.#modules.get(target);
+    if (module) {
+      return {
+        hit: module
+      };
+    }
+    return undefined;
+  }
+}
+const fileExtension = /\.\w{1,4}$/;
+const leadingDotSlash = /^\.\//;
+const camelCaseBoundary = /([a-z\d])([A-Z])/g;
+const spacesAndUnderscores = /[ _]/g;
+function dasherize(str) {
+  return str.replace(camelCaseBoundary, '$1_$2').toLowerCase().replace(spacesAndUnderscores, '-');
+}
+
+export { StrictResolver };

package/dist/dev/packages/ember/version.js

@@ -1,4 +1,4 @@
 // this file gets replaced with the real value during the build
-const VERSION = '7.2.0-alpha.1';
+const VERSION = '7.2.0-alpha.3';
 
 export { VERSION as default };

package/dist/prod/packages/@ember/engine/index.js

@@ -13,6 +13,7 @@ import '../../shared-chunks/unrecognized-url-error-DDBwfzdm.js';
 import RoutingService from '../routing/lib/routing-service.js';
 import { a as setupEngineRegistry } from '../../shared-chunks/setup-registry-C2KfZJWI.js';
 import RegistryProxyMixin from '../-internals/runtime/lib/mixins/registry_proxy.js';
+import { StrictResolver } from './lib/strict-resolver.js';
 
 function props(obj) {
   let properties = [];
@@ -260,6 +261,15 @@ class Engine extends Namespace.extend(RegistryProxyMixin) {
      @property resolver
     @public
   */
+  Resolver = StrictResolver;
+
+  /**
+    Set this to opt-in to using a strict resolver that will only return the
+    given set of ES modules. The names of the modules should all be relative to
+    the root of the app and start with "./"
+     @property modules
+    @public
+  */
 
   init(properties) {
     super.init(properties);

package/dist/prod/packages/@ember/engine/lib/strict-resolver.js

@@ -0,0 +1,118 @@
+class StrictResolver {
+  // Ember's router uses this flag to decide whether to auto-generate
+  // `${name}_loading` and `${name}_error` substates for routes defined in
+  // `Router.map(...)`. Since we always resolve against an ES module registry,
+  // we unconditionally opt in.
+  moduleBasedResolver = true;
+  #modules = new Map();
+  original;
+  static create({
+    namespace
+  }) {
+    return new StrictResolver(namespace.modules);
+  }
+  constructor(modules) {
+    this.addModules(modules);
+  }
+  addModules(modules) {
+    for (let [moduleName, module] of Object.entries(modules)) {
+      this.#modules.set(this.#normalizeModule(moduleName), module);
+    }
+  }
+  #normalizeModule(moduleName) {
+    return moduleName.replace(fileExtension, '').replace(leadingDotSlash, '');
+  }
+  #plural(word) {
+    if (word === 'config') {
+      return word;
+    }
+    return word + 's';
+  }
+  resolve(fullName) {
+    let [type, name] = fullName.split(':');
+    name = this.#normalizeName(type, name);
+    for (let strategy of [this.#resolveSelf, this.#mainLookup, this.#defaultLookup, this.#nestedColocationLookup]) {
+      let result = strategy.call(this, type, name);
+      if (result) {
+        return this.#extractDefaultExport(result.hit);
+      }
+    }
+    return undefined;
+  }
+  #extractDefaultExport(module) {
+    if (module && module['default']) {
+      module = module['default'];
+    }
+    return module;
+  }
+  normalize(fullName) {
+    let [type, name] = fullName.split(':');
+    name = this.#normalizeName(type, name);
+    return `${type}:${name}`;
+  }
+  #normalizeName(type, name) {
+    if (type === 'component' || type === 'helper' || type === 'modifier' || type === 'template' && name.indexOf('components/') === 0) {
+      return name.replace(/_/g, '-');
+    } else {
+      return dasherize(name.replace(/\./g, '/'));
+    }
+  }
+  #resolveSelf(type, name) {
+    if (type === 'resolver' && name === 'current') {
+      return {
+        hit: {
+          create: () => this
+        }
+      };
+    }
+    return undefined;
+  }
+  #mainLookup(type, name) {
+    if (name === 'main') {
+      let module = this.#modules.get(type);
+      if (module) {
+        return {
+          hit: module
+        };
+      }
+    }
+    return undefined;
+  }
+  #defaultLookup(type, name) {
+    let dir = this.#plural(type);
+    let target = `${dir}/${name}`;
+    let module = this.#modules.get(target);
+    if (module) {
+      return {
+        hit: module
+      };
+    }
+    return undefined;
+  }
+
+  // Supports the nested colocation pattern where `component:my-widget`
+  // resolves to `./components/my-widget/index.{js,ts,gjs,gts}`. The index
+  // file is typically the component class, and it's commonly paired with a
+  // sibling `index.hbs` inside the same folder.
+  #nestedColocationLookup(type, name) {
+    if (type !== 'component') return undefined;
+    let dir = this.#plural(type);
+    let target = `${dir}/${name}/index`;
+    let module = this.#modules.get(target);
+    if (module) {
+      return {
+        hit: module
+      };
+    }
+    return undefined;
+  }
+}
+const fileExtension = /\.\w{1,4}$/;
+const leadingDotSlash = /^\.\//;
+const camelCaseBoundary = /([a-z\d])([A-Z])/g;
+const spacesAndUnderscores = /[ _]/g;
+function dasherize(str) {
+  return str.replace(camelCaseBoundary, '$1_$2').toLowerCase().replace(spacesAndUnderscores, '-');
+}
+
+export { StrictResolver };

package/dist/prod/packages/ember/version.js

@@ -1,4 +1,4 @@
 // this file gets replaced with the real value during the build
-const VERSION = '7.2.0-alpha.1';
+const VERSION = '7.2.0-alpha.3';
 
 export { VERSION as default };

package/docs/data.json

@@ -3,7 +3,7 @@
     "name": "The Ember API",
     "description": "The Ember API: a framework for building ambitious web applications",
     "url": "https://emberjs.com/",
-    "version": "7.2.0-alpha.1"
+    "version": "7.2.0-alpha.3"
   },
   "files": {
     "node_modules/rsvp/lib/rsvp/promise/all.js": {
@@ -4546,7 +4546,7 @@
       "module": "@ember/engine",
       "namespace": "",
       "file": "packages/@ember/engine/index.ts",
-      "line": 40,
+      "line": 41,
       "description": "The `Engine` class contains core functionality for both applications and\nengines.\n\nEach engine manages a registry that's used for dependency injection and\nexposed through `RegistryProxy`.\n\nEngines also manage initializers and instance initializers.\n\nEngines can spawn `EngineInstance` instances via `buildInstance()`.",
       "extends": "Ember.Namespace",
       "uses": [
@@ -13646,7 +13646,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 62,
+      "line": 63,
       "description": "The goal of initializers should be to register dependencies and injections.\nThis phase runs once. Because these initializers may load code, they are\nallowed to defer application readiness and advance it. If you need to access\nthe container or store you should use an InstanceInitializer that will be run\nafter all initializers and therefore after all code is loaded and the app is\nready.\n\nInitializer receives an object which has the following attributes:\n`name`, `before`, `after`, `initialize`. The only required attribute is\n`initialize`, all others are optional.\n\n* `name` allows you to specify under which name the initializer is registered.\nThis must be a unique name, as trying to register two initializers with the\nsame name will result in an error.\n\n```app/initializer/named-initializer.js\nimport { debug } from '@ember/debug';\n\nexport function initialize() {\n  debug('Running namedInitializer!');\n}\n\nexport default {\n  name: 'named-initializer',\n  initialize\n};\n```\n\n* `before` and `after` are used to ensure that this initializer is ran prior\nor after the one identified by the value. This value can be a single string\nor an array of strings, referencing the `name` of other initializers.\n\nAn example of ordering initializers, we create an initializer named `first`:\n\n```app/initializer/first.js\nimport { debug } from '@ember/debug';\n\nexport function initialize() {\n  debug('First initializer!');\n}\n\nexport default {\n  name: 'first',\n  initialize\n};\n```\n\n```bash\n// DEBUG: First initializer!\n```\n\nWe add another initializer named `second`, specifying that it should run\nafter the initializer named `first`:\n\n```app/initializer/second.js\nimport { debug } from '@ember/debug';\n\nexport function initialize() {\n  debug('Second initializer!');\n}\n\nexport default {\n  name: 'second',\n  after: 'first',\n  initialize\n};\n```\n\n```\n// DEBUG: First initializer!\n// DEBUG: Second initializer!\n```\n\nAfterwards we add a further initializer named `pre`, this time specifying\nthat it should run before the initializer named `first`:\n\n```app/initializer/pre.js\nimport { debug } from '@ember/debug';\n\nexport function initialize() {\n  debug('Pre initializer!');\n}\n\nexport default {\n  name: 'pre',\n  before: 'first',\n  initialize\n};\n```\n\n```bash\n// DEBUG: Pre initializer!\n// DEBUG: First initializer!\n// DEBUG: Second initializer!\n```\n\nFinally we add an initializer named `post`, specifying it should run after\nboth the `first` and the `second` initializers:\n\n```app/initializer/post.js\nimport { debug } from '@ember/debug';\n\nexport function initialize() {\n  debug('Post initializer!');\n}\n\nexport default {\n  name: 'post',\n  after: ['first', 'second'],\n  initialize\n};\n```\n\n```bash\n// DEBUG: Pre initializer!\n// DEBUG: First initializer!\n// DEBUG: Second initializer!\n// DEBUG: Post initializer!\n```\n\n* `initialize` is a callback function that receives one argument,\n  `application`, on which you can operate.\n\nExample of using `application` to register an adapter:\n\n```app/initializer/api-adapter.js\nimport ApiAdapter from '../utils/api-adapter';\n\nexport function initialize(application) {\n  application.register('api-adapter:main', ApiAdapter);\n}\n\nexport default {\n  name: 'post',\n  after: ['first', 'second'],\n  initialize\n};\n```",
       "itemtype": "method",
       "name": "initializer",
@@ -13664,7 +13664,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 209,
+      "line": 210,
       "description": "Instance initializers run after all initializers have run. Because\ninstance initializers run after the app is fully set up. We have access\nto the store, container, and other items. However, these initializers run\nafter code has loaded and are not allowed to defer readiness.\n\nInstance initializer receives an object which has the following attributes:\n`name`, `before`, `after`, `initialize`. The only required attribute is\n`initialize`, all others are optional.\n\n* `name` allows you to specify under which name the instanceInitializer is\nregistered. This must be a unique name, as trying to register two\ninstanceInitializer with the same name will result in an error.\n\n```app/initializer/named-instance-initializer.js\nimport { debug } from '@ember/debug';\n\nexport function initialize() {\n  debug('Running named-instance-initializer!');\n}\n\nexport default {\n  name: 'named-instance-initializer',\n  initialize\n};\n```\n\n* `before` and `after` are used to ensure that this initializer is ran prior\nor after the one identified by the value. This value can be a single string\nor an array of strings, referencing the `name` of other initializers.\n\n* See Application.initializer for discussion on the usage of before\nand after.\n\nExample instanceInitializer to preload data into the store.\n\n```app/initializer/preload-data.js\n\nexport function initialize(application) {\n    var userConfig, userConfigEncoded, store;\n    // We have a HTML escaped JSON representation of the user's basic\n    // configuration generated server side and stored in the DOM of the main\n    // index.html file. This allows the app to have access to a set of data\n    // without making any additional remote calls. Good for basic data that is\n    // needed for immediate rendering of the page. Keep in mind, this data,\n    // like all local models and data can be manipulated by the user, so it\n    // should not be relied upon for security or authorization.\n\n    // Grab the encoded data from the meta tag\n    userConfigEncoded = document.querySelector('head meta[name=app-user-config]').attr('content');\n\n    // Unescape the text, then parse the resulting JSON into a real object\n    userConfig = JSON.parse(unescape(userConfigEncoded));\n\n    // Lookup the store\n    store = application.lookup('service:store');\n\n    // Push the encoded JSON into the store\n    store.pushPayload(userConfig);\n}\n\nexport default {\n  name: 'named-instance-initializer',\n  initialize\n};\n```",
       "itemtype": "method",
       "name": "instanceInitializer",
@@ -13681,7 +13681,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 285,
+      "line": 286,
       "description": "This creates a registry with the default Ember naming conventions.\n\nIt also configures the registry:\n\n* registered views are created every time they are looked up (they are\n  not singletons)\n* registered templates are not factories; the registered value is\n  returned directly.\n* the router receives the application as its `namespace` property\n* all controllers receive the router as their `target` and `controllers`\n  properties\n* all controllers receive the application as their `namespace` property\n* the application view receives the application controller as its\n  `controller` property\n* the application view receives the application template as its\n  `defaultTemplate` property",
       "itemtype": "method",
       "name": "buildRegistry",
@@ -13704,7 +13704,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 325,
+      "line": 326,
       "description": "Set this to provide an alternate class to `DefaultResolver`",
       "itemtype": "property",
       "name": "resolver",
@@ -13715,7 +13715,18 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 338,
+      "line": 334,
+      "description": "Set this to opt-in to using a strict resolver that will only return the\ngiven set of ES modules. The names of the modules should all be relative to\nthe root of the app and start with \"./\"",
+      "itemtype": "property",
+      "name": "modules",
+      "access": "public",
+      "tagname": "",
+      "class": "Engine",
+      "module": "@ember/engine"
+    },
+    {
+      "file": "packages/@ember/engine/index.ts",
+      "line": 349,
       "description": "A private flag indicating whether an engine's initializers have run yet.",
       "access": "private",
       "tagname": "",
@@ -13726,7 +13737,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 346,
+      "line": 357,
       "description": "Ensure that initializers are run once, and only once, per engine.",
       "access": "private",
       "tagname": "",
@@ -13737,7 +13748,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 359,
+      "line": 370,
       "description": "Create an EngineInstance for this engine.",
       "access": "public",
       "tagname": "",
@@ -13752,7 +13763,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 371,
+      "line": 382,
       "description": "Build and configure the registry for the current engine.",
       "access": "private",
       "tagname": "",
@@ -13767,7 +13778,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 384,
+      "line": 395,
       "access": "private",
       "tagname": "",
       "itemtype": "method",
@@ -13777,7 +13788,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 392,
+      "line": 403,
       "access": "private",
       "tagname": "",
       "itemtype": "method",
@@ -13787,7 +13798,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 400,
+      "line": 411,
       "access": "private",
       "tagname": "",
       "itemtype": "method",
@@ -13797,7 +13808,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 414,
+      "line": 425,
       "access": "private",
       "tagname": "",
       "since": "1.12.0",
@@ -13808,7 +13819,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 448,
+      "line": 459,
       "description": "This function defines the default lookup rules for container lookups:\n\n* templates are looked up on `Ember.TEMPLATES`\n* other names are looked up on the application after classifying the name.\n  For example, `controller:post` looks up `App.PostController` by default.\n* if the default lookup fails, look for registered classes on the container\n\nThis allows the application to register default injections in the container\nthat could be overridden by the normal naming convention.",
       "access": "private",
       "tagname": "",
@@ -13830,7 +13841,7 @@
     },
     {
       "file": "packages/@ember/engine/index.ts",
-      "line": 470,
+      "line": 481,
       "class": "Engine",
       "module": "@ember/engine"
     },
@@ -25248,7 +25259,7 @@
     },
     {
       "message": "Missing item type",
-      "line": " packages/@ember/engine/index.ts:470"
+      "line": " packages/@ember/engine/index.ts:481"
     },
     {
       "message": "Missing item type\nUnfortunately, a lot of existing code assumes booting an instance is\nsynchronous – specifically, a lot of tests assume the last call to\n`app.advanceReadiness()` or `app.reset()` will result in a new instance\nbeing fully-booted when the current runloop completes.\n\nWe would like new code (like the `visit` API) to stop making this\nassumption, so we created the asynchronous version above that returns a\npromise. But until we have migrated all the code, we would have to expose\nthis method for use *internally* in places where we need to boot an instance\nsynchronously.",

package/lib/{index.js → index.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 const path = require('path');
-const Overrides = require('./overrides');
-const SupportedBrowsers = require('./browsers');
+const Overrides = require('./overrides.cjs');
+const SupportedBrowsers = require('./browsers.cjs');
 
 const isProduction = process.env.EMBER_ENV === 'production';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "7.2.0-alpha.1",
+  "version": "7.2.0-alpha.3",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"
@@ -21,7 +21,7 @@
     "url": "https://github.com/emberjs/ember.js/issues"
   },
   "license": "MIT",
-  "main": "lib/index.js",
+  "main": "lib/index.cjs",
   "files": [
     "build-metadata.json",
     "blueprints",
@@ -44,17 +44,17 @@
     "docs": "ember ember-cli-yuidoc",
     "start": "vite dev",
     "lint": "npm-run-all --continue-on-error --aggregate-output --parallel \"lint:!(fix)\"",
-    "lint:docs": "qunit tests/docs/coverage-test.js",
+    "lint:docs": "qunit tests/docs/coverage-test.cjs",
     "lint:eslint": "eslint --report-unused-disable-directives --cache .",
     "lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"",
     "lint:fix": "npm-run-all lint:*:fix",
     "lint:format": "prettier --check .",
     "lint:format:fix": "prettier --write .",
-    "test": "testem ci -f testem.js --host 127.0.0.1 --port 13141",
+    "test": "testem ci -f testem.cjs --host 127.0.0.1 --port 13141",
     "test:blueprints": "mocha node-tests/blueprints/**/*-test.js",
-    "test:node": "qunit tests/node/**/*-test.js",
+    "test:node": "qunit tests/node/**/*-test.cjs",
     "test:node:vitest": "pnpm --filter ember-test-node-vitest test:node",
-    "test:browserstack": "node bin/run-browserstack-tests.js",
+    "test:browserstack": "node bin/run-browserstack-tests.cjs",
     "test:wip": "vite build --mode development --minify false && testem ci",
     "type-check:internals": "tsc --noEmit",
     "type-check:handlebars": "tsc --noEmit --project packages/@handlebars/parser/tsconfig.json",
@@ -106,7 +106,7 @@
     "babel-plugin-ember-template-compilation": "^4.0.0",
     "dag-map": "^2.0.2",
     "decorator-transforms": "2.3.2",
-    "ember-cli": "^6.11.1",
+    "ember-cli": "^7.0.1",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-browserstack": "^4.0.0",
     "ember-cli-dependency-checker": "^3.3.1",
@@ -136,7 +136,7 @@
     "router_js": "workspace:*",
     "rsvp": "^4.8.5",
     "terser": "^5.42.0",
-    "testem": "^3.10.1",
+    "testem": "^3.20.1",
     "testem-failure-only-reporter": "^1.0.0",
     "tracerbench": "^8.0.1",
     "typescript": "^5.7.3",
@@ -151,7 +151,8 @@
       "rollup": "^4.2.0",
       "ember-cli-htmlbars": "^7.0.0",
       "babel-plugin-ember-template-compilation": "^4.0.0",
-      "ember-cli-babel": "^8.3.1"
+      "ember-cli-babel": "^8.3.1",
+      "testem": "^3.20.1"
     },
     "onlyBuiltDependencies": [
       "@swc/core",
@@ -233,6 +234,7 @@
       "@ember/engine/index.js": "ember-source/@ember/engine/index.js",
       "@ember/engine/instance.js": "ember-source/@ember/engine/instance.js",
       "@ember/engine/lib/engine-parent.js": "ember-source/@ember/engine/lib/engine-parent.js",
+      "@ember/engine/lib/strict-resolver.js": "ember-source/@ember/engine/lib/strict-resolver.js",
       "@ember/engine/parent.js": "ember-source/@ember/engine/parent.js",
       "@ember/enumerable/index.js": "ember-source/@ember/enumerable/index.js",
       "@ember/enumerable/mutable.js": "ember-source/@ember/enumerable/mutable.js",

package/types/stable/@ember/engine/index.d.ts

@@ -287,6 +287,15 @@ declare module '@ember/engine' {
           @public
         */
         Resolver: ResolverClass;
+        /**
+          Set this to opt-in to using a strict resolver that will only return the
+          given set of ES modules. The names of the modules should all be relative to
+          the root of the app and start with "./"
+      
+          @property modules
+          @public
+        */
+        modules?: Record<string, unknown>;
         init(properties: object | undefined): void;
         /**
           A private flag indicating whether an engine's initializers have run yet.

package/types/stable/@ember/engine/lib/strict-resolver.d.ts

@@ -0,0 +1,16 @@
+declare module '@ember/engine/lib/strict-resolver' {
+    import type { Factory, Resolver } from "@ember/-internals/owner";
+    import type Engine from "..";
+    export class StrictResolver implements Resolver {
+        #private;
+        moduleBasedResolver: boolean;
+        original: any;
+        static create({ namespace }: {
+            namespace: Engine;
+        }): StrictResolver;
+        constructor(modules: Record<string, unknown>);
+        addModules(modules: Record<string, unknown>): void;
+        resolve(fullName: string): Factory<object> | object | undefined;
+        normalize(fullName: `${string}:${string}`): `${string}:${string}`;
+    }
+}

package/types/stable/index.d.ts

@@ -212,6 +212,7 @@
 /// <reference path="./@ember/engine/index.d.ts" />
 /// <reference path="./@ember/engine/instance.d.ts" />
 /// <reference path="./@ember/engine/lib/engine-parent.d.ts" />
+/// <reference path="./@ember/engine/lib/strict-resolver.d.ts" />
 /// <reference path="./@ember/engine/parent.d.ts" />
 /// <reference path="./@ember/enumerable/index.d.ts" />
 /// <reference path="./@ember/enumerable/mutable.d.ts" />