@embroider/macros 1.20.0 → 1.20.2

package/README.md

@@ -39,7 +39,6 @@ module.exports = {
     [
       "babel-plugin-ember-template-compilation",
       {
-        compilerPath: "ember-source/dist/ember-template-compiler.js",
         transforms: [...macros.templateMacros],
       },
     ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/macros",
-  "version": "1.20.0",
+  "version": "1.20.2",
   "private": false,
   "description": "Standardized build-time macros for ember apps.",
   "keywords": [
@@ -49,13 +49,13 @@
     "@types/node": "^22.9.3",
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.6",
-    "babel-plugin-ember-template-compilation": "^3.0.0",
+    "babel-plugin-ember-template-compilation": "^3.1.0",
     "code-equality-assertions": "^1.0.1",
     "scenario-tester": "^3.0.1",
     "typescript": "^5.4.5",
     "vitest": "^3.2.4",
-    "@embroider/test-support": "0.36.0",
-    "@embroider/core": "4.4.4"
+    "@embroider/core": "4.4.7",
+    "@embroider/test-support": "0.36.0"
   },
   "peerDependencies": {
     "@glint/template": "^1.0.0"

package/src/addon/runtime.js

@@ -55,7 +55,24 @@ export function setTesting(isTesting) {
   runtimeConfig.global['@embroider/macros'].isTesting = Boolean(isTesting);
 }
 
-const runtimeConfig = initializeRuntimeMacrosConfig();
+// Welcome intrepid developer!
+//
+// While this data is "global", this is a private variable.
+//
+// do not build features based off of its contents,
+// or assume it will have the same name in future releases.
+const runtimeConfig = globalThis.__embroider_macros__runtime_config__ ||= {};
+
+runtimeConfig.packages ||= {};
+runtimeConfig.global ||= {};
+
+// In the off chance there are duplicate copies of @embroider/macros in the dep graph
+// (due to the package manager messing up)
+// Let's try to merge them together via the above global well known variable
+const localConfig = initializeRuntimeMacrosConfig();
+
+Object.assign(runtimeConfig.packages, localConfig.packages);
+Object.assign(runtimeConfig.global, localConfig.global);
 
 // this exists to be targeted by our babel plugin
 function initializeRuntimeMacrosConfig() {

package/src/index.d.ts

@@ -8,7 +8,7 @@ export declare function getOwnConfig<T>(): T;
 export declare function getGlobalConfig<T>(): T;
 export declare function isDevelopingApp(): boolean;
 export declare function isTesting(): boolean;
-export declare function setTesting(): boolean;
+export declare function setTesting(value: boolean): boolean;
 export declare function failBuild(message: string): void;
 export declare function moduleExists(packageName: string): boolean;
 import type { HelperLike } from '@glint/template';

package/src/index.js

@@ -62,8 +62,8 @@ function isDevelopingApp() {
 function isTesting() {
     throw new Oops();
 }
-function setTesting() {
-    throw new Oops();
+function setTesting(value) {
+    throw new Oops(value);
 }
 function failBuild(message) {
     throw new Oops(message);

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA,2BAA2B;;AAkB3B,kDAEC;AAED,8CAEC;AAED,wCAEC;AAED,oBAEC;AAKD,gCAEC;AAED,8BAEC;AAED,oCAEC;AAED,0CAEC;AAED,0CAEC;AAED,8BAEC;AAED,gCAEC;AAED,8BAEC;AAED,oCAEC;AArED;;;;;;;;;;;;;;EAcE;AAEF,SAAgB,mBAAmB,CAAC,WAAmB,EAAE,WAAmB;IAC1E,MAAM,IAAI,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,iBAAiB,CAAC,WAAmB;IACnD,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;AAC9B,CAAC;AAED,SAAgB,cAAc,CAAC,SAAkB;IAC/C,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,IAAI,CAAI,KAAU;IAChC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,4BAA4B;AAC5B,mFAAmF;AACnF,kDAAkD;AAClD,SAAgB,UAAU,CAAC,SAAiB;IAC1C,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,SAAS,CAAI,WAAmB;IAC9C,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;AAC9B,CAAC;AAED,SAAgB,YAAY;IAC1B,MAAM,IAAI,IAAI,EAAE,CAAC;AACnB,CAAC;AAED,SAAgB,eAAe;IAC7B,MAAM,IAAI,IAAI,EAAE,CAAC;AACnB,CAAC;AAED,SAAgB,eAAe;IAC7B,MAAM,IAAI,IAAI,EAAE,CAAC;AACnB,CAAC;AAED,SAAgB,SAAS;IACvB,MAAM,IAAI,IAAI,EAAE,CAAC;AACnB,CAAC;AAED,SAAgB,UAAU;IACxB,MAAM,IAAI,IAAI,EAAE,CAAC;AACnB,CAAC;AAED,SAAgB,SAAS,CAAC,OAAe;IACvC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;AAC1B,CAAC;AAED,SAAgB,YAAY,CAAC,WAAmB;IAC9C,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,IAAK,SAAQ,KAAK;IAEtB,YAAY,GAAG,MAAa;QAC1B,KAAK,CACH,6HAA6H,CAC9H,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF","sourcesContent":["/* Macro Type Signatures */\n\n/*\n  CAUTION: this code is not necessarily what you are actually running. In\n  general, the macros are implemented at build time using babel, and so calls to\n  these functions get compiled away before they ever run. However, this code is\n  here because it provides types to typescript users of the macros.\n\n  Some macros also have runtime implementations that are useful in development\n  mode, in addition to their build-time implementations in babel. You can find\n  the runtime implementations in runtime.ts.\n\n  Having a runtime mode lets us do things like produce a single build in\n  development that works for both fastboot and browser, using the macros to\n  switch between modes. For production, you would switch to the build-time macro\n  implementation to get two optimized builds instead.\n*/\n\nexport function dependencySatisfies(packageName: string, semverRange: string): boolean {\n  throw new Oops(packageName, semverRange);\n}\n\nexport function appEmberSatisfies(semverRange: string): boolean {\n  throw new Oops(semverRange);\n}\n\nexport function macroCondition(predicate: boolean): boolean {\n  throw new Oops(predicate);\n}\n\nexport function each<T>(array: T[]): T[] {\n  throw new Oops(array);\n}\n\n// We would prefer to write:\n//   export function importSync<T extends string>(specifier: T): typeof import(T) {\n// but TS doesn't seem to support that at present.\nexport function importSync(specifier: string): unknown {\n  throw new Oops(specifier);\n}\n\nexport function getConfig<T>(packageName: string): T {\n  throw new Oops(packageName);\n}\n\nexport function getOwnConfig<T>(): T {\n  throw new Oops();\n}\n\nexport function getGlobalConfig<T>(): T {\n  throw new Oops();\n}\n\nexport function isDevelopingApp(): boolean {\n  throw new Oops();\n}\n\nexport function isTesting(): boolean {\n  throw new Oops();\n}\n\nexport function setTesting(): boolean {\n  throw new Oops();\n}\n\nexport function failBuild(message: string): void {\n  throw new Oops(message);\n}\n\nexport function moduleExists(packageName: string): boolean {\n  throw new Oops(packageName);\n}\n\nclass Oops extends Error {\n  params: any[];\n  constructor(...params: any[]) {\n    super(\n      `this method is really implemented at compile time via a babel plugin. If you're seeing this exception, something went wrong`\n    );\n    this.params = params;\n  }\n}\n\nimport type { HelperLike } from '@glint/template';\n\nexport interface EmbroiderMacrosRegistry {\n  macroGetOwnConfig: HelperLike<{\n    Args: { Positional: [...keys: string[]] };\n    Return: ReturnType<typeof getOwnConfig>;\n  }>;\n  macroGetConfig: HelperLike<{\n    Args: { Positional: [packageName: string, ...keys: string[]] };\n    Return: ReturnType<typeof getConfig>;\n  }>;\n  macroCondition: HelperLike<{\n    Args: { Positional: [predicate: boolean] };\n    Return: boolean;\n  }>;\n  macroDependencySatisfies: HelperLike<{\n    Args: { Positional: Parameters<typeof dependencySatisfies> };\n    Return: ReturnType<typeof dependencySatisfies>;\n  }>;\n  macroAppEmberSatisfies: HelperLike<{\n    Args: { Positional: Parameters<typeof appEmberSatisfies> };\n    Return: ReturnType<typeof appEmberSatisfies>;\n  }>;\n  macroMaybeAttrs: HelperLike<{\n    Args: { Positional: [predicate: boolean, ...bareAttrs: unknown[]] };\n    Return: void;\n  }>;\n  macroFailBuild: HelperLike<{\n    Args: { Positional: Parameters<typeof failBuild> };\n    Return: ReturnType<typeof failBuild>;\n  }>;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA,2BAA2B;;AAkB3B,kDAEC;AAED,8CAEC;AAED,wCAEC;AAED,oBAEC;AAKD,gCAEC;AAED,8BAEC;AAED,oCAEC;AAED,0CAEC;AAED,0CAEC;AAED,8BAEC;AAED,gCAEC;AAED,8BAEC;AAED,oCAEC;AArED;;;;;;;;;;;;;;EAcE;AAEF,SAAgB,mBAAmB,CAAC,WAAmB,EAAE,WAAmB;IAC1E,MAAM,IAAI,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,iBAAiB,CAAC,WAAmB;IACnD,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;AAC9B,CAAC;AAED,SAAgB,cAAc,CAAC,SAAkB;IAC/C,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,IAAI,CAAI,KAAU;IAChC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,4BAA4B;AAC5B,mFAAmF;AACnF,kDAAkD;AAClD,SAAgB,UAAU,CAAC,SAAiB;IAC1C,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,SAAS,CAAI,WAAmB;IAC9C,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;AAC9B,CAAC;AAED,SAAgB,YAAY;IAC1B,MAAM,IAAI,IAAI,EAAE,CAAC;AACnB,CAAC;AAED,SAAgB,eAAe;IAC7B,MAAM,IAAI,IAAI,EAAE,CAAC;AACnB,CAAC;AAED,SAAgB,eAAe;IAC7B,MAAM,IAAI,IAAI,EAAE,CAAC;AACnB,CAAC;AAED,SAAgB,SAAS;IACvB,MAAM,IAAI,IAAI,EAAE,CAAC;AACnB,CAAC;AAED,SAAgB,UAAU,CAAC,KAAc;IACvC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,SAAgB,SAAS,CAAC,OAAe;IACvC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;AAC1B,CAAC;AAED,SAAgB,YAAY,CAAC,WAAmB;IAC9C,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,IAAK,SAAQ,KAAK;IAEtB,YAAY,GAAG,MAAa;QAC1B,KAAK,CACH,6HAA6H,CAC9H,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF","sourcesContent":["/* Macro Type Signatures */\n\n/*\n  CAUTION: this code is not necessarily what you are actually running. In\n  general, the macros are implemented at build time using babel, and so calls to\n  these functions get compiled away before they ever run. However, this code is\n  here because it provides types to typescript users of the macros.\n\n  Some macros also have runtime implementations that are useful in development\n  mode, in addition to their build-time implementations in babel. You can find\n  the runtime implementations in runtime.ts.\n\n  Having a runtime mode lets us do things like produce a single build in\n  development that works for both fastboot and browser, using the macros to\n  switch between modes. For production, you would switch to the build-time macro\n  implementation to get two optimized builds instead.\n*/\n\nexport function dependencySatisfies(packageName: string, semverRange: string): boolean {\n  throw new Oops(packageName, semverRange);\n}\n\nexport function appEmberSatisfies(semverRange: string): boolean {\n  throw new Oops(semverRange);\n}\n\nexport function macroCondition(predicate: boolean): boolean {\n  throw new Oops(predicate);\n}\n\nexport function each<T>(array: T[]): T[] {\n  throw new Oops(array);\n}\n\n// We would prefer to write:\n//   export function importSync<T extends string>(specifier: T): typeof import(T) {\n// but TS doesn't seem to support that at present.\nexport function importSync(specifier: string): unknown {\n  throw new Oops(specifier);\n}\n\nexport function getConfig<T>(packageName: string): T {\n  throw new Oops(packageName);\n}\n\nexport function getOwnConfig<T>(): T {\n  throw new Oops();\n}\n\nexport function getGlobalConfig<T>(): T {\n  throw new Oops();\n}\n\nexport function isDevelopingApp(): boolean {\n  throw new Oops();\n}\n\nexport function isTesting(): boolean {\n  throw new Oops();\n}\n\nexport function setTesting(value: boolean): boolean {\n  throw new Oops(value);\n}\n\nexport function failBuild(message: string): void {\n  throw new Oops(message);\n}\n\nexport function moduleExists(packageName: string): boolean {\n  throw new Oops(packageName);\n}\n\nclass Oops extends Error {\n  params: any[];\n  constructor(...params: any[]) {\n    super(\n      `this method is really implemented at compile time via a babel plugin. If you're seeing this exception, something went wrong`\n    );\n    this.params = params;\n  }\n}\n\nimport type { HelperLike } from '@glint/template';\n\nexport interface EmbroiderMacrosRegistry {\n  macroGetOwnConfig: HelperLike<{\n    Args: { Positional: [...keys: string[]] };\n    Return: ReturnType<typeof getOwnConfig>;\n  }>;\n  macroGetConfig: HelperLike<{\n    Args: { Positional: [packageName: string, ...keys: string[]] };\n    Return: ReturnType<typeof getConfig>;\n  }>;\n  macroCondition: HelperLike<{\n    Args: { Positional: [predicate: boolean] };\n    Return: boolean;\n  }>;\n  macroDependencySatisfies: HelperLike<{\n    Args: { Positional: Parameters<typeof dependencySatisfies> };\n    Return: ReturnType<typeof dependencySatisfies>;\n  }>;\n  macroAppEmberSatisfies: HelperLike<{\n    Args: { Positional: Parameters<typeof appEmberSatisfies> };\n    Return: ReturnType<typeof appEmberSatisfies>;\n  }>;\n  macroMaybeAttrs: HelperLike<{\n    Args: { Positional: [predicate: boolean, ...bareAttrs: unknown[]] };\n    Return: void;\n  }>;\n  macroFailBuild: HelperLike<{\n    Args: { Positional: Parameters<typeof failBuild> };\n    Return: ReturnType<typeof failBuild>;\n  }>;\n}\n"]}