@embroider/core 1.8.3 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "1.8.3",
+  "version": "2.0.0",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -11,24 +11,12 @@
   "license": "MIT",
   "author": "Edward Faulkner",
   "main": "src/index.js",
-  "exports": {
-    ".": {
-      "browser": "./src/browser-index.js",
-      "default": "./src/index.js"
-    },
-    "./src/messages": "./src/messages.js",
-    "./src/babel-plugin-inline-hbs": "./src/babel-plugin-inline-hbs.js",
-    "./src/babel-plugin-stage1-inline-hbs": "./src/babel-plugin-stage1-inline-hbs.js",
-    "./src/mini-modules-polyfill": "./src/mini-modules-polyfill.js",
-    "./src/load-ember-template-compiler": "./src/load-ember-template-compiler.js"
-  },
   "files": [
     "src/**/*.js",
     "src/**/*.d.ts",
     "src/**/*.js.map"
   ],
   "scripts": {
-    "prepare": "tsc",
     "test": "jest"
   },
   "dependencies": {
@@ -38,11 +26,11 @@
     "@babel/plugin-transform-runtime": "^7.14.5",
     "@babel/runtime": "^7.14.5",
     "@babel/traverse": "^7.14.5",
-    "@embroider/macros": "1.8.3",
-    "@embroider/shared-internals": "1.8.3",
+    "@embroider/macros": "1.10.0",
+    "@embroider/shared-internals": "2.0.0",
     "assert-never": "^1.2.1",
     "babel-import-util": "^1.1.0",
-    "babel-plugin-ember-template-compilation": "^1.0.0",
+    "babel-plugin-ember-template-compilation": "^2.0.0",
     "broccoli-node-api": "^1.7.0",
     "broccoli-persistent-filter": "^3.1.2",
     "broccoli-plugin": "^4.0.7",
@@ -59,14 +47,13 @@
     "lodash": "^4.17.21",
     "resolve": "^1.20.0",
     "resolve-package-path": "^4.0.1",
-    "strip-bom": "^4.0.0",
     "typescript-memoize": "^1.0.1",
-    "walk-sync": "^3.0.0",
-    "wrap-legacy-hbs-plugin-if-needed": "^1.0.1"
+    "walk-sync": "^3.0.0"
   },
   "devDependencies": {
     "@embroider/sample-transforms": "0.0.0",
     "@embroider/test-support": "0.36.0",
+    "@glimmer/syntax": "^0.84.2",
     "@types/babel__core": "^7.1.14",
     "@types/debug": "^4.1.5",
     "@types/filesize": "^4.0.0",
@@ -74,7 +61,6 @@
     "@types/lodash": "^4.14.170",
     "@types/node": "^15.12.2",
     "@types/resolve": "^1.20.0",
-    "@types/strip-bom": "^4.0.1",
     "@types/tmp": "^0.1.0",
     "fixturify": "^2.1.1",
     "tmp": "^0.1.0",

package/src/app.d.ts

@@ -4,9 +4,8 @@ import { Asset } from './asset';
 import Options from './options';
 import { MacrosConfig } from '@embroider/macros/src/node';
 import { TransformOptions } from '@babel/core';
-import { TemplateCompilerPlugins } from '.';
-import { Resolver } from './resolver';
 import { Options as AdjustImportsOptions } from './babel-plugin-adjust-imports';
+import type { Transform } from 'babel-plugin-ember-template-compilation';
 export declare type EmberENV = unknown;
 export interface AppAdapter<TreeNames> {
     readonly allActiveAddons: AddonPackage[];
@@ -22,10 +21,10 @@ export interface AppAdapter<TreeNames> {
     podModulePrefix(): string | undefined;
     rootURL(): string;
     templateCompilerPath(): string;
-    templateResolver(): Resolver;
+    resolverTransform(): Transform | undefined;
     adjustImportsOptions(): AdjustImportsOptions;
     adjustImportsOptionsPath(): string;
-    htmlbarsPlugins(): TemplateCompilerPlugins;
+    htmlbarsPlugins(): Transform[];
     babelConfig(): TransformOptions;
     babelMajorVersion(): 7;
     emberENV(): EmberENV;
@@ -76,7 +75,7 @@ export declare class AppBuilder<TreeNames> {
     private gatherAssets;
     build(inputPaths: OutputPaths<TreeNames>): Promise<void>;
     private combinePackageJSON;
-    private templateCompiler;
+    private etcOptions;
     private get portableHints();
     private addBabelConfig;
     private shouldSplitRoute;

package/src/app.js

@@ -55,7 +55,6 @@ const mergeWith_1 = __importDefault(require("lodash/mergeWith"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const portable_1 = require("./portable");
 const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
-const load_ember_template_compiler_1 = require("./load-ember-template-compiler");
 function excludeDotFiles(files) {
     return files.filter(file => !file.startsWith('.') && !file.includes('/.'));
 }
@@ -172,7 +171,7 @@ class AppBuilder {
             result.unshift({
                 kind: 'in-memory',
                 relativePath: '_ember_env_.js',
-                source: `window.EmberENV=${JSON.stringify(emberENV, null, 2)};`,
+                source: `window.EmberENV={ ...(window.EmberENV || {}), ...${JSON.stringify(emberENV, null, 2)} };`,
             });
             result.push({
                 kind: 'in-memory',
@@ -243,7 +242,7 @@ class AppBuilder {
         babel.plugins.push(require.resolve('@babel/plugin-syntax-dynamic-import'));
         return babel;
     }
-    babelConfig(templateCompilerParams, appFiles) {
+    babelConfig(appFiles) {
         let babel = (0, cloneDeep_1.default)(this.adapter.babelConfig());
         if (!babel.plugins) {
             babel.plugins = [];
@@ -253,38 +252,38 @@ class AppBuilder {
         babel.plugins.push(require.resolve('@babel/plugin-syntax-dynamic-import'));
         // https://github.com/webpack/webpack/issues/12154
         babel.plugins.push(require.resolve('./rename-require-plugin'));
-        if (this.adapter.adjustImportsOptions().emberNeedsModulesPolyfill) {
-            // on older ember versions that need the modules-api-polyfill, we use our
-            // bespoke inline template compiler plugin.
-            babel.plugins.push([
-                (0, path_1.join)(__dirname, 'babel-plugin-inline-hbs-node.js'),
-                {
-                    templateCompiler: templateCompilerParams,
-                    stage: 3,
-                },
-            ]);
-        }
-        else {
-            // on newer ember versions that don't need the modules-api-polyfill, we
-            // can compose with the newer babel-plugin-ember-template-compilation, and
-            // use a simpler plugin that only needs to handle inserting discovered
-            // dependencies.
-            babel.plugins.push([
-                (0, path_1.join)(__dirname, '../src/babel-plugin-inline-hbs-deps-node.js'),
-                { templateCompiler: templateCompilerParams },
-            ]);
-            babel.plugins.push([
-                require.resolve('babel-plugin-ember-template-compilation'),
-                {
-                    precompilerPath: (0, path_1.join)(__dirname, '../src/babel-plugin-inline-hbs-deps-node.js'),
-                },
-            ]);
-        }
+        babel.plugins.push([require.resolve('babel-plugin-ember-template-compilation'), this.etcOptions()]);
         // this is @embroider/macros configured for full stage3 resolution
         babel.plugins.push(...this.macrosConfig.babelPluginConfig());
         let colocationOptions = {
-            packageGuard: true,
             appRoot: this.root,
+            // This extra weirdness is a compromise in favor of build performance.
+            //
+            // 1. When auto-upgrading an addon from v1 to v2, we definitely want to
+            //    run any custom AST transforms in stage1.
+            //
+            // 2. In general case, AST transforms are allowed to manipulate Javascript
+            //    scope. This means that running transforms -- even when we're doing
+            //    source-to-source compilation that emits handlebars and not wire
+            //    format -- implies changing .hbs files into .js files.
+            //
+            // 3. So stage1 may need to rewrite .hbs to .hbs.js (to avoid colliding
+            //    with an existing co-located .js file).
+            //
+            // 4. But stage1 doesn't necessarily want to run babel over the
+            //    corresponding JS file. Most of the time, that's just an
+            //    unnecessarily expensive second parse. (We only run it in stage1 to
+            //    eliminate an addon's custom babel plugins, and many addons don't
+            //    have any.)
+            //
+            // 5. Therefore, the work of template-colocation gets defered until here,
+            //    and it may see co-located templates named `.hbs.js` instead of the
+            //    usual `.hbs.
+            templateExtensions: ['.hbs', '.hbs.js'],
+            // All of the above only applies to auto-upgraded packages that were
+            // authored in v1. V2 packages don't get any of this complexity, they're
+            // supposed to take care of colocating their own templates explicitly.
+            packageGuard: true,
         };
         babel.plugins.push([
             require.resolve('@embroider/shared-internals/src/template-colocation-plugin'),
@@ -304,7 +303,7 @@ class AppBuilder {
         let relocatedFiles = {};
         for (let { destPath, appFiles } of engines) {
             for (let [relativePath, originalPath] of appFiles.relocatedFiles) {
-                relocatedFiles[(0, path_1.join)(destPath, relativePath).split(path_1.sep).join('/')] = originalPath;
+                relocatedFiles[(0, path_1.join)(destPath, relativePath)] = originalPath;
             }
         }
         let relocatedFilesPath = (0, path_1.join)(this.root, '_relocated_files.json');
@@ -689,8 +688,7 @@ class AppBuilder {
         let emberENV = this.adapter.emberENV();
         let assets = this.gatherAssets(inputPaths);
         let finalAssets = await this.updateAssets(assets, appFiles, emberENV);
-        let templateCompiler = this.templateCompiler(emberENV);
-        let babelConfig = this.babelConfig(templateCompiler, appFiles);
+        let babelConfig = this.babelConfig(appFiles);
         this.addBabelConfig(babelConfig);
         let assetPaths = assets.map(asset => asset.relativePath);
         if (this.activeFastboot) {
@@ -735,24 +733,21 @@ class AppBuilder {
         pkgLayers.push({ keywords: ['ember-addon'], 'ember-addon': meta });
         return combinePackageJSON(...pkgLayers);
     }
-    templateCompiler(config) {
-        let plugins = this.adapter.htmlbarsPlugins();
-        if (!plugins.ast) {
-            plugins.ast = [];
-        }
-        let { plugins: macroPlugins, setConfig } = node_1.MacrosConfig.astPlugins();
+    etcOptions() {
+        let transforms = this.adapter.htmlbarsPlugins();
+        let { plugins: macroPlugins, setConfig } = node_1.MacrosConfig.transforms();
         setConfig(this.macrosConfig);
         for (let macroPlugin of macroPlugins) {
-            plugins.ast.push(macroPlugin);
+            transforms.push(macroPlugin);
+        }
+        let transform = this.adapter.resolverTransform();
+        if (transform) {
+            transforms.push(transform);
         }
-        const compilerPath = resolve_1.default.sync(this.adapter.templateCompilerPath(), { basedir: this.root });
-        const compilerChecksum = (0, load_ember_template_compiler_1.getEmberExports)(compilerPath).cacheKey;
         return {
-            plugins,
-            compilerPath,
-            compilerChecksum,
-            resolver: this.adapter.templateResolver(),
-            EmberENV: config,
+            transforms,
+            compilerPath: resolve_1.default.sync(this.adapter.templateCompilerPath(), { basedir: this.root }),
+            enableLegacyModules: ['ember-cli-htmlbars', 'ember-cli-htmlbars-inline-precompile', 'htmlbars-inline-precompile'],
         };
     }
     get portableHints() {
@@ -851,11 +846,7 @@ class AppBuilder {
     }
     get staticAppPathsPattern() {
         if (this.options.staticAppPaths.length > 0) {
-            return new RegExp('^(?:' +
-                this.options.staticAppPaths.map(staticAppPath => (0, escape_string_regexp_1.default)(staticAppPath.replace(/\//g, path_1.sep))).join('|') +
-                ')(?:$|' +
-                path_1.sep +
-                ')');
+            return new RegExp('^(?:' + this.options.staticAppPaths.map(staticAppPath => (0, escape_string_regexp_1.default)(staticAppPath)).join('|') + ')(?:$|/)');
         }
     }
     requiredOtherFiles(appFiles) {