finishing merge

packages/compat/src/compat-adapters/ember-source.ts

@@ -22,10 +22,7 @@ export default class extends V1Addon {
     return pkg;
   }
   get v2Tree() {
-    return broccoliMergeTrees([
-      super.v2Tree,
-      new Funnel(this.rootTree, { include: ['dist/ember-template-compiler.js'] }),
-    ]);
+    return mergeTrees([super.v2Tree, new Funnel(this.rootTree, { include: ['dist/ember-template-compiler.js'] })]);
   }
 
   // when using real modules, we're replacing treeForAddon and treeForVendor

packages/core/src/babel-plugin-inline-hbs.ts

@@ -1,7 +1,7 @@
 import type * as t from '@babel/types';
 import type { NodePath } from '@babel/traverse';
 import { join } from 'path';
-import { TemplateCompiler, TemplateCompilerParams } from './template-compiler';
+import { TemplateCompiler } from './template-compiler-common';
 import { parse } from '@babel/core';
 import { ResolvedDep } from './resolver';
 import { ImportAdder } from './babel-import-adder';

packages/core/src/browser-index.ts

@@ -1,5 +1 @@
-export type { default as Package } from './package';
-export { getOrCreate } from './get-or-create';
-export { explicitRelative, extensionsPattern } from './paths';
-export { default as PackageCache } from './browser-package-cache';
 export { TemplateCompiler, TemplateCompilerParams } from './template-compiler-common';

packages/macros/src/babel/macros-babel-plugin.ts

@@ -1,16 +1,5 @@
 import type { NodePath } from '@babel/traverse';
-import type {
-  CallExpression,
-  Identifier,
-  IfStatement,
-  ConditionalExpression,
-  ForOfStatement,
-  FunctionDeclaration,
-  OptionalMemberExpression,
-  Program,
-  stringLiteral,
-  importNamespaceSpecifier,
-} from '@babel/types';
+import type * as t from '@babel/types';
 import { PackageCache } from '@embroider/shared-internals';
 import State, { sourceFile, pathToRuntime } from './state';
 import { inlineRuntimeConfig, insertConfig, Mode as GetConfigMode } from './get-config';
@@ -25,43 +14,44 @@ import { BabelContext } from './babel-context';
 const packageCache = PackageCache.shared('embroider-stage3');
 
 export default function main(context: BabelContext): unknown {
+  let t = context.types;
   let visitor = {
     Program: {
-      enter(_: NodePath<Program>, state: State) {
+      enter(_: NodePath<t.Program>, state: State) {
         state.generatedRequires = new Set();
         state.jobs = [];
         state.removed = new Set();
         state.calledIdentifiers = new Set();
         state.neededRuntimeImports = new Map();
         state.neededEagerImports = new Map();
       },
-      exit(path: NodePath<Program>, state: State) {
+      exit(path: NodePath<t.Program>, state: State) {
         pruneMacroImports(path);
         addRuntimeImports(path, state, context);
-        addEagerImports(path, state);
+        addEagerImports(path, state, t);
         for (let handler of state.jobs) {
           handler();
         }
       },
     },
     'IfStatement|ConditionalExpression': {
-      enter(path: NodePath<IfStatement | ConditionalExpression>, state: State) {
+      enter(path: NodePath<t.IfStatement | t.ConditionalExpression>, state: State) {
         if (isMacroConditionPath(path)) {
           state.calledIdentifiers.add(path.get('test').get('callee').node);
           macroCondition(path, state);
         }
       },
     },
     ForOfStatement: {
-      enter(path: NodePath<ForOfStatement>, state: State) {
+      enter(path: NodePath<t.ForOfStatement>, state: State) {
         if (isEachPath(path)) {
           state.calledIdentifiers.add(path.get('right').get('callee').node);
           insertEach(path, state, context);
         }
       },
     },
     FunctionDeclaration: {
-      enter(path: NodePath<FunctionDeclaration>, state: State) {
+      enter(path: NodePath<t.FunctionDeclaration>, state: State) {
         let id = path.get('id');
         if (id.isIdentifier() && id.node.name === 'initializeRuntimeMacrosConfig') {
           let pkg = packageCache.ownerOfFile(sourceFile(path, state));
@@ -72,7 +62,7 @@ export default function main(context: BabelContext): unknown {
       },
     },
     CallExpression: {
-      enter(path: NodePath<CallExpression>, state: State) {
+      enter(path: NodePath<t.CallExpression>, state: State) {
         let callee = path.get('callee');
         if (!callee.isIdentifier()) {
           return;
@@ -127,7 +117,7 @@ export default function main(context: BabelContext): unknown {
           path.replaceWith(buildLiterals(result.value, context));
         }
       },
-      exit(path: NodePath<CallExpression>, state: State) {
+      exit(path: NodePath<t.CallExpression>, state: State) {
         let callee = path.get('callee');
         if (!callee.isIdentifier()) {
           return;
@@ -151,15 +141,15 @@ export default function main(context: BabelContext): unknown {
             replacePaths.push(path);
             state.calledIdentifiers.add(callee.node);
           } else {
-            let r = context.types.identifier('require');
+            let r = t.identifier('require');
             state.generatedRequires.add(r);
             callee.replaceWith(r);
           }
           return;
         }
       },
     },
-    ReferencedIdentifier(path: NodePath<Identifier>, state: State) {
+    ReferencedIdentifier(path: NodePath<t.Identifier>, state: State) {
       for (let candidate of [
         'dependencySatisfies',
         'moduleExists',
@@ -211,7 +201,7 @@ export default function main(context: BabelContext): unknown {
         // Our importSync macro has been compiled to `require`. But we want to
         // distinguish that from any pre-existing, user-written `require` in an
         // Ember addon, which should retain its *runtime* meaning.
-        path.replaceWith(context.types.memberExpression(context.types.identifier('window'), path.node));
+        path.replaceWith(t.memberExpression(t.identifier('window'), path.node));
       }
     },
   };
@@ -221,7 +211,7 @@ export default function main(context: BabelContext): unknown {
     // optional chaining. To make that work we need to see the optional chaining
     // before preset-env compiles them away.
     (visitor as any).OptionalMemberExpression = {
-      enter(path: NodePath<OptionalMemberExpression>, state: State) {
+      enter(path: NodePath<t.OptionalMemberExpression>, state: State) {
         if (state.opts.mode === 'compile-time') {
           let result = new Evaluator({ state }).evaluate(path);
           if (result.confident) {
@@ -248,7 +238,7 @@ function pruneMacroImports(path: NodePath) {
   }
 }
 
-function addRuntimeImports(path: NodePath<Program>, state: State, context: BabelContext) {
+function addRuntimeImports(path: NodePath<t.Program>, state: State, context: BabelContext) {
   let t = context.types;
   if (state.neededRuntimeImports.size > 0) {
     path.node.body.push(
@@ -262,14 +252,16 @@ function addRuntimeImports(path: NodePath<Program>, state: State, context: Babel
   }
 }
 
-function addEagerImports(path: NodePath<Program>, state: State) {
+function addEagerImports(path: NodePath<t.Program>, state: State, t: BabelContext['types']) {
   let createdNames = new Set<string>();
   for (let [specifier, replacePaths] of state.neededEagerImports.entries()) {
     let local = unusedNameLike('a', replacePaths, createdNames);
     createdNames.add(local);
-    path.node.body.push(importDeclaration([importNamespaceSpecifier(identifier(local))], stringLiteral(specifier)));
+    path.node.body.push(
+      t.importDeclaration([t.importNamespaceSpecifier(t.identifier(local))], t.stringLiteral(specifier))
+    );
     for (let nodePath of replacePaths) {
-      nodePath.replaceWith(identifier(local));
+      nodePath.replaceWith(t.identifier(local));
     }
   }
 }

packages/shared-internals/package.json

@@ -8,6 +8,12 @@
     "url": "https://github.com/embroider-build/embroider.git",
     "directory": "packages/shared-internals"
   },
+  "exports": {
+    ".": {
+      "browser": "./src/browser-index.js",
+      "default": "./src/index.js"
+    }
+  },
   "license": "MIT",
   "author": "Edward Faulkner",
   "main": "src/index.js",

packages/shared-internals/src/browser-index.ts

@@ -0,0 +1,4 @@
+export type { default as Package } from './package';
+export { getOrCreate } from './get-or-create';
+export { explicitRelative, extensionsPattern } from './paths';
+export { default as PackageCache } from './browser-package-cache';