Fix some edge-cases with classic builds

wycats · wycats · commit 66e8841c4814 · 2024-10-17T14:42:19.000-07:00
1. Re-export all of the plugins from locations in
  `ember-template-compiler/lib/plugins` to support the AMD compat
  entrypoints. I prioritized avoiding changes to the
  `amd-compat-entrypoints` file over absolutely minimizing the amount of
  duplication in `ember-template-compiler`. The implementations
  themselves are still not duplicated, but if we create new files in
  `@ember/template-compiler`, this may have implications for
  `ember-template-compiler`.
2. Fix a problem where `export import` in the barrel file wasn't playing
   nice with some piece of updated infrastructure.
3. Rename some of the exposed exports to include `-internal` in their
   module name.
diff --git a/package.json b/package.json
@@ -292,6 +292,29 @@
       "@ember/runloop/index.js": "ember-source/@ember/runloop/index.js",
       "@ember/service/index.js": "ember-source/@ember/service/index.js",
       "@ember/template-compilation/index.js": "ember-source/@ember/template-compilation/index.js",
+      "@ember/template-compiler/-internal-primitives.js": "ember-source/@ember/template-compiler/-internal-primitives.js",
+      "@ember/template-compiler/index.js": "ember-source/@ember/template-compiler/index.js",
+      "@ember/template-compiler/lib/-internal/primitives.js": "ember-source/@ember/template-compiler/lib/-internal/primitives.js",
+      "@ember/template-compiler/lib/compile-options.js": "ember-source/@ember/template-compiler/lib/compile-options.js",
+      "@ember/template-compiler/lib/dasherize-component-name.js": "ember-source/@ember/template-compiler/lib/dasherize-component-name.js",
+      "@ember/template-compiler/lib/plugins/assert-against-attrs.js": "ember-source/@ember/template-compiler/lib/plugins/assert-against-attrs.js",
+      "@ember/template-compiler/lib/plugins/assert-against-named-outlets.js": "ember-source/@ember/template-compiler/lib/plugins/assert-against-named-outlets.js",
+      "@ember/template-compiler/lib/plugins/assert-input-helper-without-block.js": "ember-source/@ember/template-compiler/lib/plugins/assert-input-helper-without-block.js",
+      "@ember/template-compiler/lib/plugins/assert-reserved-named-arguments.js": "ember-source/@ember/template-compiler/lib/plugins/assert-reserved-named-arguments.js",
+      "@ember/template-compiler/lib/plugins/index.js": "ember-source/@ember/template-compiler/lib/plugins/index.js",
+      "@ember/template-compiler/lib/plugins/transform-action-syntax.js": "ember-source/@ember/template-compiler/lib/plugins/transform-action-syntax.js",
+      "@ember/template-compiler/lib/plugins/transform-each-in-into-each.js": "ember-source/@ember/template-compiler/lib/plugins/transform-each-in-into-each.js",
+      "@ember/template-compiler/lib/plugins/transform-each-track-array.js": "ember-source/@ember/template-compiler/lib/plugins/transform-each-track-array.js",
+      "@ember/template-compiler/lib/plugins/transform-in-element.js": "ember-source/@ember/template-compiler/lib/plugins/transform-in-element.js",
+      "@ember/template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.js": "ember-source/@ember/template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.js",
+      "@ember/template-compiler/lib/plugins/transform-resolutions.js": "ember-source/@ember/template-compiler/lib/plugins/transform-resolutions.js",
+      "@ember/template-compiler/lib/plugins/transform-wrap-mount-and-outlet.js": "ember-source/@ember/template-compiler/lib/plugins/transform-wrap-mount-and-outlet.js",
+      "@ember/template-compiler/lib/plugins/utils.js": "ember-source/@ember/template-compiler/lib/plugins/utils.js",
+      "@ember/template-compiler/lib/public-api.js": "ember-source/@ember/template-compiler/lib/public-api.js",
+      "@ember/template-compiler/lib/runtime.js": "ember-source/@ember/template-compiler/lib/runtime.js",
+      "@ember/template-compiler/lib/system/calculate-location-display.js": "ember-source/@ember/template-compiler/lib/system/calculate-location-display.js",
+      "@ember/template-compiler/lib/template.js": "ember-source/@ember/template-compiler/lib/template.js",
+      "@ember/template-compiler/runtime.js": "ember-source/@ember/template-compiler/runtime.js",
       "@ember/template-factory/index.js": "ember-source/@ember/template-factory/index.js",
       "@ember/template/index.js": "ember-source/@ember/template/index.js",
       "@ember/test/adapter.js": "ember-source/@ember/test/adapter.js",
diff --git a/packages/@ember/template-compiler/-internal-primitives.ts b/packages/@ember/template-compiler/-internal-primitives.ts
@@ -0,0 +1 @@
+export * from './lib/-internal/primitives';
diff --git a/packages/@ember/template-compiler/lib/-internal/primitives.ts b/packages/@ember/template-compiler/lib/-internal/primitives.ts
@@ -2,4 +2,5 @@ export {
   RESOLUTION_MODE_TRANSFORMS,
   STRICT_MODE_TRANSFORMS,
   STRICT_MODE_KEYWORDS,
-} from './plugins';
+  INTERNAL_PLUGINS,
+} from '../plugins';
diff --git a/packages/@ember/template-compiler/lib/plugins/index.ts b/packages/@ember/template-compiler/lib/plugins/index.ts
@@ -10,6 +10,20 @@ import TransformQuotedBindingsIntoJustBindings from './transform-quoted-bindings
 import TransformResolutions from './transform-resolutions';
 import TransformWrapMountAndOutlet from './transform-wrap-mount-and-outlet';
 
+export const INTERNAL_PLUGINS = {
+  AssertAgainstAttrs,
+  AssertAgainstNamedOutlets,
+  AssertInputHelperWithoutBlock,
+  AssertReservedNamedArguments,
+  TransformActionSyntax,
+  TransformEachInIntoEach,
+  TransformEachTrackArray,
+  TransformInElement,
+  TransformQuotedBindingsIntoJustBindings,
+  TransformResolutions,
+  TransformWrapMountAndOutlet,
+} as const;
+
 // order of plugins is important
 export const RESOLUTION_MODE_TRANSFORMS = Object.freeze([
   TransformQuotedBindingsIntoJustBindings,
diff --git a/packages/@ember/template-compiler/package.json b/packages/@ember/template-compiler/package.json
@@ -4,7 +4,7 @@
   "exports": {
     ".": "./index.ts",
     "./runtime": "./runtime.ts",
-    "./primitives": "./primitives.ts",
+    "./-internal-primitives": "./-internal-primitives.ts",
     "./types": "./lib/types.ts"
   },
   "dependencies": {
diff --git a/packages/@ember/template-compiler/primitives.ts b/packages/@ember/template-compiler/primitives.ts
diff --git a/packages/ember-template-compiler/lib/-internal.ts b/packages/ember-template-compiler/lib/-internal.ts
@@ -0,0 +1 @@
+export { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.AssertAgainstAttrs;
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts b/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.AssertAgainstNamedOutlets;
diff --git a/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts b/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.AssertInputHelperWithoutBlock;
diff --git a/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts b/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.AssertReservedNamedArguments;
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -0,0 +1,68 @@
+import AssertAgainstAttrs from './assert-against-attrs';
+import AssertAgainstNamedOutlets from './assert-against-named-outlets';
+import AssertInputHelperWithoutBlock from './assert-input-helper-without-block';
+import AssertReservedNamedArguments from './assert-reserved-named-arguments';
+import TransformActionSyntax from './transform-action-syntax';
+import TransformEachInIntoEach from './transform-each-in-into-each';
+import TransformEachTrackArray from './transform-each-track-array';
+import TransformInElement from './transform-in-element';
+import TransformQuotedBindingsIntoJustBindings from './transform-quoted-bindings-into-just-bindings';
+import TransformResolutions from './transform-resolutions';
+import TransformWrapMountAndOutlet from './transform-wrap-mount-and-outlet';
+
+export const INTERNAL_PLUGINS = {
+  AssertAgainstAttrs,
+  AssertAgainstNamedOutlets,
+  AssertInputHelperWithoutBlock,
+  AssertReservedNamedArguments,
+  TransformActionSyntax,
+  TransformEachInIntoEach,
+  TransformEachTrackArray,
+  TransformInElement,
+  TransformQuotedBindingsIntoJustBindings,
+  TransformResolutions,
+  TransformWrapMountAndOutlet,
+} as const;
+
+// order of plugins is important
+export const RESOLUTION_MODE_TRANSFORMS = Object.freeze([
+  TransformQuotedBindingsIntoJustBindings,
+  AssertReservedNamedArguments,
+  TransformActionSyntax,
+  AssertAgainstAttrs,
+  TransformEachInIntoEach,
+  AssertInputHelperWithoutBlock,
+  TransformInElement,
+  TransformEachTrackArray,
+  AssertAgainstNamedOutlets,
+  TransformWrapMountAndOutlet,
+  TransformResolutions,
+]);
+
+export const STRICT_MODE_TRANSFORMS = Object.freeze([
+  TransformQuotedBindingsIntoJustBindings,
+  AssertReservedNamedArguments,
+  TransformActionSyntax,
+  TransformEachInIntoEach,
+  TransformInElement,
+  TransformEachTrackArray,
+  AssertAgainstNamedOutlets,
+  TransformWrapMountAndOutlet,
+]);
+
+export const STRICT_MODE_KEYWORDS = Object.freeze([
+  'action',
+  'mut',
+  'readonly',
+  'unbound',
+
+  // TransformEachInIntoEach
+  '-each-in',
+  // TransformInElement
+  '-in-el-null',
+  // TransformEachTrackArray
+  '-track-array',
+  // TransformWrapMountAndOutlet
+  '-mount',
+  '-outlet',
+]);
diff --git a/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.TransformActionSyntax;
diff --git a/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts b/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.TransformEachInIntoEach;
diff --git a/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts b/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.TransformEachTrackArray;
diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.TransformInElement;
diff --git a/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts b/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.TransformQuotedBindingsIntoJustBindings;
diff --git a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.TransformResolutions;
diff --git a/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts b/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts
@@ -0,0 +1,3 @@
+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';
+
+export default INTERNAL_PLUGINS.TransformWrapMountAndOutlet;
diff --git a/packages/ember-template-compiler/lib/public-api.ts b/packages/ember-template-compiler/lib/public-api.ts
@@ -13,7 +13,7 @@ export {
 export {
   RESOLUTION_MODE_TRANSFORMS,
   STRICT_MODE_TRANSFORMS,
-} from '@ember/template-compiler/primitives';
+} from '@ember/template-compiler/-internal-primitives';
 export type { EmberPrecompileOptions } from './types';
 
 export { preprocess as _preprocess, print as _print } from '@glimmer/syntax';
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -3,7 +3,7 @@ import {
   RESOLUTION_MODE_TRANSFORMS,
   STRICT_MODE_KEYWORDS,
   STRICT_MODE_TRANSFORMS,
-} from '@ember/template-compiler/primitives';
+} from '@ember/template-compiler/-internal-primitives';
 import type { EmberPrecompileOptions, PluginFunc } from '../types';
 import COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE from './dasherize-component-name';
 
diff --git a/packages/ember-template-compiler/package.json b/packages/ember-template-compiler/package.json
@@ -4,7 +4,8 @@
   "type": "module",
   "exports": {
     ".": "./index.ts",
-    "./minimal": "./minimal.ts"
+    "./minimal": "./minimal.ts",
+    "./-internal": "./lib/system/-internal.ts"
   },
   "dependencies": {
     "@ember/-internals": "workspace:*",
diff --git a/packages/ember/barrel.ts b/packages/ember/barrel.ts
@@ -196,8 +196,8 @@ namespace Ember {
   // This syntax is namespace-specific: `import` in a namespace is aliasing one
   // namespace to another, while `export` marks the item public on the namespace
   // (as with the rest of the exported items).
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  export import RSVP = _RSVP;
+  export const RSVP = _RSVP;
+  export type RSVP = typeof _RSVP;
 
   // ****@ember/-internals/view****
   export const ComponentLookup = views.ComponentLookup;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export * from './lib/-internal/primitives';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { INTERNAL_PLUGINS } from '@ember/template-compiler/-internal-primitives';`
	`2`	`+`
	`3`	`+export default INTERNAL_PLUGINS.AssertAgainstAttrs;`