@embroider/compat 3.8.1-unstable.fc482ba → 3.8.1

package/src/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compatBuild = exports.prebuild = exports.V1Addon = exports.recommendedOptions = exports.Addons = exports.App = void 0;
+exports.templateTagCodemod = exports.compatBuild = exports.V1Addon = exports.recommendedOptions = exports.Addons = exports.App = void 0;
 var compat_app_1 = require("./compat-app");
 Object.defineProperty(exports, "App", { enumerable: true, get: function () { return __importDefault(compat_app_1).default; } });
 var compat_addons_1 = require("./compat-addons");
@@ -13,6 +13,7 @@ Object.defineProperty(exports, "recommendedOptions", { enumerable: true, get: fu
 var v1_addon_1 = require("./v1-addon");
 Object.defineProperty(exports, "V1Addon", { enumerable: true, get: function () { return __importDefault(v1_addon_1).default; } });
 var default_pipeline_1 = require("./default-pipeline");
-Object.defineProperty(exports, "prebuild", { enumerable: true, get: function () { return default_pipeline_1.prebuild; } });
-Object.defineProperty(exports, "compatBuild", { enumerable: true, get: function () { return default_pipeline_1.compatBuild; } });
+Object.defineProperty(exports, "compatBuild", { enumerable: true, get: function () { return __importDefault(default_pipeline_1).default; } });
+var template_tag_codemod_1 = require("./template-tag-codemod");
+Object.defineProperty(exports, "templateTagCodemod", { enumerable: true, get: function () { return __importDefault(template_tag_codemod_1).default; } });
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA8C;AAArC,kHAAA,OAAO,OAAO;AACvB,iDAAoD;AAA3C,wHAAA,OAAO,OAAU;AAC1B,qCAAmE;AAAtC,6GAAA,kBAAkB,OAAA;AAC/C,uCAAgD;AAAvC,oHAAA,OAAO,OAAW;AAC3B,uDAA4E;AAAnE,4GAAA,QAAQ,OAAA;AAAE,+GAAA,WAAW,OAAA","sourcesContent":["export { default as App } from './compat-app';\nexport { default as Addons } from './compat-addons';\nexport { default as Options, recommendedOptions } from './options';\nexport { default as V1Addon } from './v1-addon';\nexport { prebuild, compatBuild, PipelineOptions } from './default-pipeline';\nexport { PackageRules, ModuleRules } from './dependency-rules';\nexport type { Options as ResolverTransformOptions } from './resolver-transform';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA8C;AAArC,kHAAA,OAAO,OAAO;AACvB,iDAAoD;AAA3C,wHAAA,OAAO,OAAU;AAC1B,qCAAmE;AAAtC,6GAAA,kBAAkB,OAAA;AAC/C,uCAAgD;AAAvC,oHAAA,OAAO,OAAW;AAC3B,uDAA6E;AAApE,gIAAA,OAAO,OAAe;AAC/B,+DAAuE;AAA9D,2IAAA,OAAO,OAAsB","sourcesContent":["export { default as App } from './compat-app';\nexport { default as Addons } from './compat-addons';\nexport { default as Options, recommendedOptions } from './options';\nexport { default as V1Addon } from './v1-addon';\nexport { default as compatBuild, PipelineOptions } from './default-pipeline';\nexport { default as templateTagCodemod } from './template-tag-codemod';\nexport { PackageRules, ModuleRules } from './dependency-rules';\n"]}

package/src/options.d.ts

@@ -1,15 +1,52 @@
 import type { V1AddonConstructor } from './v1-addon';
+import type { Node } from 'broccoli-node-api';
 import type { Options as CoreOptions } from '@embroider/core';
 import type { PackageRules } from './dependency-rules';
 export default interface Options extends CoreOptions {
+    /**
+     * Controls whether your addon's "addon" trees should be resolved statically
+     * at build time.
+     *
+     * Note: This setting will be removed in the next version of Embroider and
+     * will effectively default to true
+     *
+     *   false (the current default): implies maximum backward compatibility at
+     *   the cost of bigger builds. In this mode, we force every file into the
+     *   Ember app, which is the legacy behavior.
+     *
+     *   true: produces smaller builds. The addon files must be imported from
+     *   somewhere we can statically see during the build. In this mode, your app
+     *   will only include files that are actually imported from somewhere.
+     *
+     * Commentary: most v1 addons already work well with this set to true, because
+     * they tend to either offer Javascript that users are supposed to directly
+     * `import` or components / helpers / services that get directly imported and
+     * re-exported by code in App Javascript. The exceptions are addons that do
+     * runtime shenanigans with `require` or scoped runtime resolutions.
+     *
+     * To workaround an addon that is preventing you from enabling this flag, you
+     * can use addonDependencyRules.
+     */
     staticAddonTrees?: boolean;
     staticAddonTestSupportTrees?: boolean;
+    /**
+     * When true, we will load ember-source as ES modules. This means unused parts
+     * of ember-source won't be included. But it also means that addons using old
+     * APIs to try to `require()` things from Ember -- particularly from within
+     * vendor.js -- cannot do that anymore.
+     *
+     * When false (the default) we load ember-source the traditional way, which is
+     * that a big ol' script gets smooshed into vendor.js, and none of ember's
+     * public module API actually exists as modules at build time.
+     *
+     * Note: This setting will be removed in the next version of Embroider and
+     * will effectively default to true
+     */
+    staticEmberSource?: boolean;
     compatAdapters?: Map<string, V1AddonConstructor | null>;
+    extraPublicTrees?: Node[];
     packageRules?: PackageRules[];
     allowUnsafeDynamicComponents?: boolean;
-    availableContentForTypes?: string[];
-    useAddonAppBoot?: boolean;
-    useAddonConfigModule?: boolean;
 }
 export type CompatOptionsType = Required<Omit<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>> & Pick<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>;
 export declare function optionsWithDefaults(options?: Options): CompatOptionsType;

package/src/options.js

@@ -6,16 +6,23 @@ const core_1 = require("@embroider/core");
 const defaults = Object.assign((0, core_1.optionsWithDefaults)(), {
     staticAddonTrees: false,
     staticAddonTestSupportTrees: false,
+    staticEmberSource: false,
     compatAdapters: new Map(),
     extraPublicTrees: [],
     workspaceDir: null,
     packageRules: [],
     allowUnsafeDynamicComponents: false,
-    availableContentForTypes: [],
-    useAddonAppBoot: true,
-    useAddonConfigModule: true,
 });
 function optionsWithDefaults(options) {
+    if (!(options === null || options === void 0 ? void 0 : options.staticEmberSource)) {
+        console.log(`The setting 'staticEmberSource' will default to true in the next version of Embroider and can't be turned off. To prepare for this you should set 'staticEmberSource: true' in your Embroider config.`);
+    }
+    if (!(options === null || options === void 0 ? void 0 : options.staticAddonTrees)) {
+        console.log(`The setting 'staticAddonTrees' will default to true in the next version of Embroider and can't be turned off. To prepare for this you should set 'staticAddonTrees: true' in your Embroider config.`);
+    }
+    if (!(options === null || options === void 0 ? void 0 : options.staticAddonTestSupportTrees)) {
+        console.log(`The setting 'staticAddonTestSupportTrees' will default to true in the next version of Embroider and can't be turned off. To prepare for this you should set 'staticAddonTestSupportTrees: true' in your Embroider config.`);
+    }
     return Object.assign({}, defaults, options);
 }
 // These are recommended configurations for addons to test themselves under. By
@@ -27,6 +34,7 @@ exports.recommendedOptions = Object.freeze({
     optimized: Object.freeze({
         staticAddonTrees: true,
         staticAddonTestSupportTrees: true,
+        staticEmberSource: true,
         allowUnsafeDynamicComponents: false,
         staticInvokables: true,
     }),

package/src/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";;;AAuHA,kDAEC;AAvHD,0CAA0E;AAmG1E,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAA,0BAAgB,GAAE,EAAE;IACjD,gBAAgB,EAAE,KAAK;IACvB,2BAA2B,EAAE,KAAK;IAClC,cAAc,EAAE,IAAI,GAAG,EAAE;IACzB,gBAAgB,EAAE,EAAE;IACpB,YAAY,EAAE,IAAI;IAClB,YAAY,EAAE,EAAE;IAChB,4BAA4B,EAAE,KAAK;IACnC,wBAAwB,EAAE,EAAE;IAC5B,eAAe,EAAE,IAAI;IACrB,oBAAoB,EAAE,IAAI;CAC3B,CAAC,CAAC;AAOH,SAAgB,mBAAmB,CAAC,OAAiB;IACnD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,+EAA+E;AAC/E,6EAA6E;AAC7E,+EAA+E;AAC/E,cAAc;AACD,QAAA,kBAAkB,GAAgC,MAAM,CAAC,MAAM,CAAC;IAC3E,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC;QACvB,gBAAgB,EAAE,IAAI;QACtB,2BAA2B,EAAE,IAAI;QACjC,4BAA4B,EAAE,KAAK;QACnC,gBAAgB,EAAE,IAAI;KACvB,CAAC;CACH,CAAC,CAAC","sourcesContent":["import type { V1AddonConstructor } from './v1-addon';\nimport type { Options as CoreOptions } from '@embroider/core';\nimport { optionsWithDefaults as coreWithDefaults } from '@embroider/core';\nimport type { PackageRules } from './dependency-rules';\n\n// These options control how hard we will try to achieve compatibility with v1\n// addons. The defaults are conservative and try to maximize compatibility, at\n// the cost of slower or bigger builds. As you eliminate sources of legacy\n// behavior you can benefit from the more aggressive modes.\nexport default interface Options extends CoreOptions {\n  // Controls whether your addon's \"addon\" trees should be resolved statically\n  // at build time.\n  //\n  //   false (the default): implies maximum backward compatibility at the cost\n  //   of bigger builds. In this mode, we force every file into the Ember app,\n  //   which is the legacy behavior.\n  //\n  //   true: produces smaller builds. The addon files must be imported from\n  //   somewhere we can statically see during the build. In this mode, your app\n  //   will only include files that are actually imported from somewhere.\n  //\n  // Commentary: most v1 addons already work well with this set to true, because\n  // they tend to either offer Javascript that users are supposed to directly\n  // `import` or components / helpers / services that get directly imported and\n  // re-exported by code in App Javascript. The exceptions are addons that do\n  // runtime shenanigans with `require` or scoped runtime resolutions.\n  //\n  // To workaround an addon that is preventing you from enabling this flag, you\n  // can use addonDependencyRules.\n  staticAddonTrees?: boolean;\n\n  // Controls whether your addon's \"addonTestSupport\" trees should be resolved\n  // statically at build time.\n  //\n  //   false (the default): implies maximum backward compatibility at the cost\n  //   of bigger builds. All test support files will be forced into your Ember\n  //   app, which is the legacy behavior.\n  //\n  //   true: produces smaller builds. Only files that are explicitly imported\n  //   will end up in your app.\n  //\n  // Commentary: this is analogous to staticAddonTrees and the same guidelines\n  // apply.\n  staticAddonTestSupportTrees?: boolean;\n\n  // Allows you to override how specific addons will build. Like:\n  //\n  //   import V1Addon from '@embroider/compat'; let compatAdapters = new Map();\n  //   compatAdapters.set('some-addon', class extends V1Addon {// do stuff here:\n  //   see examples in ./compat-adapters\n  //   });\n  //\n  // This should be understood as a temporary way to keep yourself from getting\n  // stuck, not an alternative to actually fixing upstream. For the most part,\n  // the real solution will be converting the addon in question to natively\n  // publish as v2.\n  //\n  // We ship with some default compatAdapters to fix otherwise incompatible\n  // behaviors in popular addons. You can override the default adapters by\n  // setting your own value here (including null to completely disable it).\n  compatAdapters?: Map<string, V1AddonConstructor | null>;\n\n  // Allows you to tell Embroider about otherwise dynamic dependencies within\n  // your app and addons that it can't figure out on its own. These are combined\n  // with the default rules that ship with Embroider. Your own rules take\n  // precedence over the built-ins. Order matters, first matching rule will\n  // apply to any given addon.\n  //\n  // See the addon-dependency-rules directory in the @embroider/compat package\n  // for the built-in rules.\n  //\n  // These ONLY APPLY to v1-formatted addons. An addon that ships as native v2\n  // is expected to do the right thing on its own.\n  //\n  // Follow to the definition of PackageRules for more info.\n  packageRules?: PackageRules[];\n\n  // This turns build errors into runtime errors. It is not a good idea to keep\n  // it on in production. But it can be helpful when testing how much of your\n  // app is able to work with staticComponents enabled.\n  allowUnsafeDynamicComponents?: boolean;\n\n  // Allows you to customize the list of content types addons use to provide HTML\n  // to {{content-for}}. By default, the following content types are expected:\n  // 'head', 'test-head', 'head-footer', 'test-head-footer', 'body', 'test-body',\n  // 'body-footer', 'test-body-footer'. You need to use this config only to extend\n  // this list.\n  availableContentForTypes?: string[];\n\n  // Allows you to cancel the warning that at least one classic addon provides\n  // content-for 'app-boot'. This warning brings awareness for developers\n  // switching to Embroider, but is no longer necessary once content-for\n  // 'app-boot' code has been properly moved to the app-side.\n  useAddonAppBoot?: boolean;\n\n  // content-for 'config-module'. This warning brings awareness for developers\n  // switching to Embroider, but is no longer necessary once content-for\n  // 'config-module' code has been properly moved to the app-side.\n  useAddonConfigModule?: boolean;\n}\n\nconst defaults = Object.assign(coreWithDefaults(), {\n  staticAddonTrees: false,\n  staticAddonTestSupportTrees: false,\n  compatAdapters: new Map(),\n  extraPublicTrees: [],\n  workspaceDir: null,\n  packageRules: [],\n  allowUnsafeDynamicComponents: false,\n  availableContentForTypes: [],\n  useAddonAppBoot: true,\n  useAddonConfigModule: true,\n});\n\nexport type CompatOptionsType = Required<\n  Omit<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>\n> &\n  Pick<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>;\n\nexport function optionsWithDefaults(options?: Options): CompatOptionsType {\n  return Object.assign({}, defaults, options);\n}\n\n// These are recommended configurations for addons to test themselves under. By\n// keeping them here, it's easier to do ecosystem-wide compatibility testing.\n// See the `@embroider/test-setup` package which can help consume these to test\n// them in CI.\nexport const recommendedOptions: { [name: string]: Options } = Object.freeze({\n  safe: Object.freeze({}),\n  optimized: Object.freeze({\n    staticAddonTrees: true,\n    staticAddonTestSupportTrees: true,\n    allowUnsafeDynamicComponents: false,\n    staticInvokables: true,\n  }),\n});\n"]}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";;;AA6HA,kDAoBC;AA9ID,0CAA0E;AA0G1E,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAA,0BAAgB,GAAE,EAAE;IACjD,gBAAgB,EAAE,KAAK;IACvB,2BAA2B,EAAE,KAAK;IAClC,iBAAiB,EAAE,KAAK;IACxB,cAAc,EAAE,IAAI,GAAG,EAAE;IACzB,gBAAgB,EAAE,EAAE;IACpB,YAAY,EAAE,IAAI;IAClB,YAAY,EAAE,EAAE;IAChB,4BAA4B,EAAE,KAAK;CACpC,CAAC,CAAC;AAOH,SAAgB,mBAAmB,CAAC,OAAiB;IACnD,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,CAAA,EAAE,CAAC;QAChC,OAAO,CAAC,GAAG,CACT,uMAAuM,CACxM,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAAA,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CACT,qMAAqM,CACtM,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,2BAA2B,CAAA,EAAE,CAAC;QAC1C,OAAO,CAAC,GAAG,CACT,2NAA2N,CAC5N,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,+EAA+E;AAC/E,6EAA6E;AAC7E,+EAA+E;AAC/E,cAAc;AACD,QAAA,kBAAkB,GAAgC,MAAM,CAAC,MAAM,CAAC;IAC3E,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC;QACvB,gBAAgB,EAAE,IAAI;QACtB,2BAA2B,EAAE,IAAI;QACjC,iBAAiB,EAAE,IAAI;QACvB,4BAA4B,EAAE,KAAK;QACnC,gBAAgB,EAAE,IAAI;KACvB,CAAC;CACH,CAAC,CAAC","sourcesContent":["import type { V1AddonConstructor } from './v1-addon';\nimport type { Node } from 'broccoli-node-api';\nimport type { Options as CoreOptions } from '@embroider/core';\nimport { optionsWithDefaults as coreWithDefaults } from '@embroider/core';\nimport type { PackageRules } from './dependency-rules';\n\n// These options control how hard we will try to achieve compatibility with v1\n// addons. The defaults are conservative and try to maximize compatibility, at\n// the cost of slower or bigger builds. As you eliminate sources of legacy\n// behavior you can benefit from the more aggressive modes.\nexport default interface Options extends CoreOptions {\n  /**\n   * Controls whether your addon's \"addon\" trees should be resolved statically\n   * at build time.\n   *\n   * Note: This setting will be removed in the next version of Embroider and\n   * will effectively default to true\n   *\n   *   false (the current default): implies maximum backward compatibility at\n   *   the cost of bigger builds. In this mode, we force every file into the\n   *   Ember app, which is the legacy behavior.\n   *\n   *   true: produces smaller builds. The addon files must be imported from\n   *   somewhere we can statically see during the build. In this mode, your app\n   *   will only include files that are actually imported from somewhere.\n   *\n   * Commentary: most v1 addons already work well with this set to true, because\n   * they tend to either offer Javascript that users are supposed to directly\n   * `import` or components / helpers / services that get directly imported and\n   * re-exported by code in App Javascript. The exceptions are addons that do\n   * runtime shenanigans with `require` or scoped runtime resolutions.\n   *\n   * To workaround an addon that is preventing you from enabling this flag, you\n   * can use addonDependencyRules.\n   */\n  staticAddonTrees?: boolean;\n\n  // Controls whether your addon's \"addonTestSupport\" trees should be resolved\n  // statically at build time.\n  //\n  //   false (the default): implies maximum backward compatibility at the cost\n  //   of bigger builds. All test support files will be forced into your Ember\n  //   app, which is the legacy behavior.\n  //\n  //   true: produces smaller builds. Only files that are explicitly imported\n  //   will end up in your app.\n  //\n  // Commentary: this is analogous to staticAddonTrees and the same guidelines\n  // apply.\n  staticAddonTestSupportTrees?: boolean;\n\n  /**\n   * When true, we will load ember-source as ES modules. This means unused parts\n   * of ember-source won't be included. But it also means that addons using old\n   * APIs to try to `require()` things from Ember -- particularly from within\n   * vendor.js -- cannot do that anymore.\n   *\n   * When false (the default) we load ember-source the traditional way, which is\n   * that a big ol' script gets smooshed into vendor.js, and none of ember's\n   * public module API actually exists as modules at build time.\n   *\n   * Note: This setting will be removed in the next version of Embroider and\n   * will effectively default to true\n   */\n  staticEmberSource?: boolean;\n\n  // Allows you to override how specific addons will build. Like:\n  //\n  //   import V1Addon from '@embroider/compat'; let compatAdapters = new Map();\n  //   compatAdapters.set('some-addon', class extends V1Addon {// do stuff here:\n  //   see examples in ./compat-adapters\n  //   });\n  //\n  // This should be understood as a temporary way to keep yourself from getting\n  // stuck, not an alternative to actually fixing upstream. For the most part,\n  // the real solution will be converting the addon in question to natively\n  // publish as v2.\n  //\n  // We ship with some default compatAdapters to fix otherwise incompatible\n  // behaviors in popular addons. You can override the default adapters by\n  // setting your own value here (including null to completely disable it).\n  compatAdapters?: Map<string, V1AddonConstructor | null>;\n\n  // optional list of additional broccoli trees that should be incorporated into\n  // the final build. This exists because the classic `app.toTree()` method\n  // accepts an optional tree argument that has the same purpose.\n  extraPublicTrees?: Node[];\n\n  // Allows you to tell Embroider about otherwise dynamic dependencies within\n  // your app and addons that it can't figure out on its own. These are combined\n  // with the default rules that ship with Embroider. Your own rules take\n  // precedence over the built-ins. Order matters, first matching rule will\n  // apply to any given addon.\n  //\n  // See the addon-dependency-rules directory in the @embroider/compat package\n  // for the built-in rules.\n  //\n  // These ONLY APPLY to v1-formatted addons. An addon that ships as native v2\n  // is expected to do the right thing on its own.\n  //\n  // Follow to the definition of PackageRules for more info.\n  packageRules?: PackageRules[];\n\n  // This turns build errors into runtime errors. It is not a good idea to keep\n  // it on in production. But it can be helpful when testing how much of your\n  // app is able to work with staticComponents enabled.\n  allowUnsafeDynamicComponents?: boolean;\n}\n\nconst defaults = Object.assign(coreWithDefaults(), {\n  staticAddonTrees: false,\n  staticAddonTestSupportTrees: false,\n  staticEmberSource: false,\n  compatAdapters: new Map(),\n  extraPublicTrees: [],\n  workspaceDir: null,\n  packageRules: [],\n  allowUnsafeDynamicComponents: false,\n});\n\nexport type CompatOptionsType = Required<\n  Omit<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>\n> &\n  Pick<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>;\n\nexport function optionsWithDefaults(options?: Options): CompatOptionsType {\n  if (!options?.staticEmberSource) {\n    console.log(\n      `The setting 'staticEmberSource' will default to true in the next version of Embroider and can't be turned off. To prepare for this you should set 'staticEmberSource: true' in your Embroider config.`\n    );\n  }\n\n  if (!options?.staticAddonTrees) {\n    console.log(\n      `The setting 'staticAddonTrees' will default to true in the next version of Embroider and can't be turned off. To prepare for this you should set 'staticAddonTrees: true' in your Embroider config.`\n    );\n  }\n\n  if (!options?.staticAddonTestSupportTrees) {\n    console.log(\n      `The setting 'staticAddonTestSupportTrees' will default to true in the next version of Embroider and can't be turned off. To prepare for this you should set 'staticAddonTestSupportTrees: true' in your Embroider config.`\n    );\n  }\n\n  return Object.assign({}, defaults, options);\n}\n\n// These are recommended configurations for addons to test themselves under. By\n// keeping them here, it's easier to do ecosystem-wide compatibility testing.\n// See the `@embroider/test-setup` package which can help consume these to test\n// them in CI.\nexport const recommendedOptions: { [name: string]: Options } = Object.freeze({\n  safe: Object.freeze({}),\n  optimized: Object.freeze({\n    staticAddonTrees: true,\n    staticAddonTestSupportTrees: true,\n    staticEmberSource: true,\n    allowUnsafeDynamicComponents: false,\n    staticInvokables: true,\n  }),\n});\n"]}

package/src/rename-require-plugin.d.ts

@@ -0,0 +1 @@
+export default function inlineHBSTransform(): unknown;

package/src/rename-require-plugin.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = inlineHBSTransform;
+function inlineHBSTransform() {
+    return {
+        visitor: {
+            ImportDefaultSpecifier(path) {
+                if (path.node.local.name === 'require') {
+                    path.scope.rename('require');
+                }
+            },
+        },
+    };
+}
+//# sourceMappingURL=rename-require-plugin.js.map

package/src/rename-require-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rename-require-plugin.js","sourceRoot":"","sources":["rename-require-plugin.ts"],"names":[],"mappings":";;AAGA,qCAUC;AAVD,SAAwB,kBAAkB;IACxC,OAAO;QACL,OAAO,EAAE;YACP,sBAAsB,CAAC,IAAwC;gBAC7D,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACvC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAC/B,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { types as t } from '@babel/core';\nimport type { NodePath } from '@babel/traverse';\n\nexport default function inlineHBSTransform(): unknown {\n  return {\n    visitor: {\n      ImportDefaultSpecifier(path: NodePath<t.ImportDefaultSpecifier>) {\n        if (path.node.local.name === 'require') {\n          path.scope.rename('require');\n        }\n      },\n    },\n  };\n}\n"]}

package/src/resolver-transform.js

@@ -14,6 +14,7 @@ const dependency_rules_1 = require("./dependency-rules");
 const typescript_memoize_1 = require("typescript-memoize");
 const assert_never_1 = __importDefault(require("assert-never"));
 const path_1 = require("path");
+const fs_extra_1 = require("fs-extra");
 const dasherize_component_name_1 = require("./dasherize-component-name");
 const core_1 = require("@embroider/core");
 const lodash_1 = require("lodash");
@@ -95,9 +96,7 @@ class TemplateResolver {
         this.scopeStack = new ScopeStack();
         this.visitor = {
             Template: {
-                enter: (node, path) => {
-                    this.ownRules = this.findRules(this.env.filename);
-                    this.implementInvokesRule(node, path);
+                enter: () => {
                     if (this.env.locals) {
                         this.scopeStack.pushMustacheBlock(this.env.locals);
                     }
@@ -141,7 +140,7 @@ class TemplateResolver {
                     });
                     return;
                 }
-                let resolution = this.targetComponent(node.path.original, node.path.original);
+                let resolution = this.targetComponent(node.path.original);
                 this.emit(path, resolution, (node, newId) => {
                     node.path = newId;
                 });
@@ -283,7 +282,7 @@ class TemplateResolver {
                         // if it starts with lower case, it can't be a component we need to
                         // globally resolve
                         if (node.tag[0] !== node.tag[0].toLowerCase()) {
-                            resolution = this.targetComponent((0, dasherize_component_name_1.dasherize)(node.tag), node.tag);
+                            resolution = this.targetComponent((0, dasherize_component_name_1.dasherize)(node.tag));
                         }
                         this.emit(path, resolution, (node, newId) => {
                             node.tag = newId.original;
@@ -482,9 +481,6 @@ class TemplateResolver {
         return { files, components };
     }
     findRules(absPath) {
-        // when babel is invoked by vite our filenames can have query params still
-        // hanging off them. That would break rule matching.
-        absPath = (0, core_1.cleanUrl)(absPath);
         let fileRules = this.rules.files.get(absPath);
         let componentRules;
         let componentName = this.moduleResolver.reverseComponentLookup(absPath);
@@ -503,7 +499,7 @@ class TemplateResolver {
         }
         return name;
     }
-    targetComponent(name, nameHint) {
+    targetComponent(name) {
         if (!this.staticComponentsEnabled) {
             return null;
         }
@@ -529,16 +525,15 @@ class TemplateResolver {
         let componentRules = this.rules.components.get(name);
         return {
             type: 'component',
-            specifier: `@embroider/virtual/components/${name}`,
+            specifier: `#embroider_compat/components/${name}`,
             importedName: 'default',
             yieldsComponents: componentRules ? componentRules.yieldsSafeComponents : [],
             yieldsArguments: componentRules ? componentRules.yieldsArguments : [],
             argumentsAreComponents: componentRules ? componentRules.argumentsAreComponents : [],
-            nameHint: this.nameHint(nameHint),
+            nameHint: this.nameHint(name),
         };
     }
     targetComponentHelper(component, loc, impliedBecause) {
-        var _a;
         if (!this.staticComponentsEnabled) {
             return null;
         }
@@ -558,7 +553,8 @@ class TemplateResolver {
             };
         }
         if (component.type === 'path') {
-            if ((_a = this.ownRules) === null || _a === void 0 ? void 0 : _a.safeInteriorPaths.includes(component.path)) {
+            let ownComponentRules = this.findRules(this.env.filename);
+            if (ownComponentRules && ownComponentRules.safeInteriorPaths.includes(component.path)) {
                 return null;
             }
             return {
@@ -568,7 +564,7 @@ class TemplateResolver {
                 loc,
             };
         }
-        return this.targetComponent(component.path, component.path);
+        return this.targetComponent(component.path);
     }
     targetHelper(path) {
         if (!this.staticHelpersEnabled) {
@@ -593,7 +589,7 @@ class TemplateResolver {
         }
         return {
             type: 'helper',
-            specifier: `@embroider/virtual/helpers/${path}`,
+            specifier: `#embroider_compat/helpers/${path}`,
             importedName: 'default',
             nameHint: this.nameHint(path),
         };
@@ -682,7 +678,7 @@ class TemplateResolver {
         if (ownComponentRules === null || ownComponentRules === void 0 ? void 0 : ownComponentRules.disambiguate[path]) {
             switch (ownComponentRules.disambiguate[path]) {
                 case 'component':
-                    return this.targetComponent(path, path);
+                    return this.targetComponent(path);
                 case 'helper':
                     return this.targetHelper(path);
                 case 'data':
@@ -717,7 +713,7 @@ class TemplateResolver {
         let componentRules = this.rules.components.get(path);
         return {
             type: 'component',
-            specifier: `@embroider/virtual/ambiguous/${path}`,
+            specifier: `#embroider_compat/ambiguous/${path}`,
             importedName: 'default',
             yieldsComponents: componentRules ? componentRules.yieldsSafeComponents : [],
             yieldsArguments: componentRules ? componentRules.yieldsArguments : [],
@@ -744,7 +740,7 @@ class TemplateResolver {
         }
         return {
             type: 'modifier',
-            specifier: `@embroider/virtual/modifiers/${path}`,
+            specifier: `#embroider_compat/modifiers/${path}`,
             importedName: 'default',
             nameHint: this.nameHint(path),
         };
@@ -803,36 +799,13 @@ class TemplateResolver {
         }
         return null;
     }
-    implementInvokesRule(node, path) {
-        var _a;
-        if (!((_a = this.ownRules) === null || _a === void 0 ? void 0 : _a.invokes)) {
-            return;
-        }
-        let registrations = [];
-        for (let snippets of Object.values(this.ownRules.invokes)) {
-            for (let snippet of snippets) {
-                let dasherizedName = (0, dasherize_component_name_1.snippetToDasherizedName)(snippet);
-                if (!dasherizedName) {
-                    throw new Error(`Package rule contains unparseable component snippet: ${snippet}`);
-                }
-                let resolution = this.targetComponentHelper({ type: 'literal', path: dasherizedName }, node.loc);
-                this.emit(path, resolution, (_target, id) => {
-                    registrations.push(this.env.syntax.builders.pair(dasherizedName, id));
-                });
-            }
-        }
-        if (registrations.length > 0) {
-            node.body.unshift(this.env.syntax.builders.mustache(this.env.meta.jsutils.bindExpression(registrationHelper, path, { nameHint: 'registerComponents' }), [], this.env.syntax.builders.hash(registrations)));
-        }
-    }
 }
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], TemplateResolver.prototype, "rules", null);
 // This is the AST transform that resolves components, helpers and modifiers at build time
 function makeResolverTransform({ appRoot, emberVersion, externalNameHint }) {
-    let loader = new core_1.ResolverLoader(appRoot);
-    let config = loader.resolver.options;
+    let config = (0, fs_extra_1.readJSONSync)((0, path_1.join)((0, core_1.locateEmbroiderWorkingDir)(appRoot), 'resolver.json'));
     const resolverTransform = env => {
         if (env.strictMode) {
             return {
@@ -1012,18 +985,4 @@ function parts(path) {
         return;
     return 'original' in path ? path.original.split('.') : path.parts;
 }
-function registrationHelper(context) {
-    let Helper = context.import('@ember/component/helper', 'default', 'Helper');
-    let getOwner = context.import('@ember/owner', 'getOwner');
-    return `
-    (class extends ${Helper} {
-      compute(_positional, registrations) {
-        let owner = ${getOwner}(this);
-        for (let [name, definition] of Object.entries(registrations)) {
-          owner.register(\`component:\${name}\`, definition);
-        }
-      }
-    })
-  `;
-}
 //# sourceMappingURL=resolver-transform.js.map