flatten the package caches

embroider-build · Mar 21, 2023 · d7c17fe · d7c17fe
1 parent bcd0756
commit d7c17fe
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 377 deletions.
diff --git a/packages/compat/src/compat-addons.ts b/packages/compat/src/compat-addons.ts
@@ -47,7 +47,7 @@ export default class CompatAddons implements Stage {
     await this.deferReady.promise;
     return {
       outputPath: this.destDir,
-      packageCache: PackageCache.shared('embroider-stage1', this.inputPath),
+      packageCache: PackageCache.shared('embroider-unified', this.inputPath),
     };
   }
 

diff --git a/packages/compat/src/compat-app.ts b/packages/compat/src/compat-app.ts
@@ -66,7 +66,8 @@ function setup(legacyEmberAppInstance: object, options: Required<Options>) {
     appBootTree,
   };
 
-  let instantiate = async (root: string, appSrcDir: string, packageCache: PackageCache) => {
+  let instantiate = async (root: string, appSrcDir: string) => {
+    let packageCache = PackageCache.shared('embroider-unified', appSrcDir);
     let appPackage = packageCache.get(appSrcDir);
     let adapter = new CompatAppAdapter(
       root,

diff --git a/packages/compat/src/moved-package-cache.ts b/packages/compat/src/moved-package-cache.ts
diff --git a/packages/compat/src/standalone-addon-build.ts b/packages/compat/src/standalone-addon-build.ts
@@ -11,7 +11,7 @@ import type { Node } from 'broccoli-node-api';
 export function convertLegacyAddons(emberApp: EmberAppInstance, maybeOptions?: Options) {
   let options = optionsWithDefaults(maybeOptions);
   let instanceCache = V1InstanceCache.forApp(emberApp, options);
-  let packageCache = PackageCache.shared('embroider-stage1', instanceCache.app.root);
+  let packageCache = PackageCache.shared('embroider-unified', instanceCache.app.root);
   let v1Addons = findV1Addons(packageCache.get(instanceCache.app.root));
 
   let addonIndex = Object.create(null);

diff --git a/packages/compat/src/v1-app.ts b/packages/compat/src/v1-app.ts
@@ -15,12 +15,13 @@ import {
   OutputFileToInputFileMap,
   PackageInfo,
   AddonInstance,
+  PackageCache,
 } from '@embroider/core';
 import { writeJSONSync, ensureDirSync, copySync, readdirSync, pathExistsSync, existsSync } from 'fs-extra';
 import AddToTree from './add-to-tree';
 import DummyPackage, { OwningAddon } from './dummy-package';
 import { TransformOptions } from '@babel/core';
-import { isEmbroiderMacrosPlugin, MacrosConfig } from '@embroider/macros/src/node';
+import { isEmbroiderMacrosPlugin } from '@embroider/macros/src/node';
 import resolvePackagePath from 'resolve-package-path';
 import Concat from 'broccoli-concat';
 import mapKeys from 'lodash/mapKeys';
@@ -30,7 +31,6 @@ import prepHtmlbarsAstPluginsForUnwrap from './prepare-htmlbars-ast-plugins';
 import { readFileSync } from 'fs';
 import type { Options as HTMLBarsOptions } from 'ember-cli-htmlbars';
 import semver from 'semver';
-import { MovablePackageCache } from './moved-package-cache';
 
 import type { Transform } from 'babel-plugin-ember-template-compilation';
 
@@ -64,10 +64,10 @@ export default class V1App {
   private _implicitScripts: string[] = [];
   private _implicitStyles: string[] = [];
 
-  packageCache: MovablePackageCache;
+  packageCache: PackageCache;
 
   protected constructor(protected app: EmberAppInstance) {
-    this.packageCache = new MovablePackageCache(MacrosConfig.for(app, this.root), this.root);
+    this.packageCache = PackageCache.shared('embroider-unified', this.root);
   }
 
   // always the name from package.json. Not the one that apps may have weirdly