feat(core)!: default resolver cache (#2920)

wix · Oct 25, 2023 · 4fb2746 · 4fb2746
1 parent 9a0d08a
commit 4fb2746
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 11 deletions.
diff --git a/packages/core/src/stylable.ts b/packages/core/src/stylable.ts
@@ -122,7 +122,7 @@ export class Stylable {
         this.resolveNamespace = config.resolveNamespace;
         this.moduleResolver = this.initModuleResolver(config);
         this.cssParser = config.cssParser || cssParse;
-        this.resolverCache = config.resolverCache; // ToDo: v5 default to `new Map()`
+        this.resolverCache = config.resolverCache || new Map();
         this.fileProcessorCache = config.fileProcessorCache;
         this.fileProcessor = createStylableFileProcessor({
             fileSystem: this.fileSystem,

diff --git a/packages/core/test/stylable-resolver.spec.ts b/packages/core/test/stylable-resolver.spec.ts
@@ -381,7 +381,6 @@ describe('stylable-resolver', () => {
             {},
             {
                 stylableConfig: {
-                    resolverCache: new Map(),
                     resolveModule: () => {
                         resolverHits++;
                         return '';

diff --git a/packages/core/test/stylable-transformer/transformer.unit.spec.ts b/packages/core/test/stylable-transformer/transformer.unit.spec.ts
@@ -36,7 +36,6 @@ describe('Transformer', () => {
             {
                 stylableConfig: {
                     resolveModule: onResolve,
-                    resolverCache: new Map(), // ToDo: v5 this should be default : remove
                 },
             }
         );

diff --git a/packages/esbuild/src/stylable-esbuild-plugin.ts b/packages/esbuild/src/stylable-esbuild-plugin.ts
@@ -119,7 +119,6 @@ export const stylablePlugin = (initialPluginOptions: ESBuildOptions = {}): Plugi
                 projectRoot,
                 fileSystem: fs,
                 optimizer: new StylableOptimizer(),
-                resolverCache: new Map(),
                 requireModule,
                 resolveNamespace:
                     configFromFile?.config?.defaultConfig?.resolveNamespace ?? resolveNamespaceNode,

diff --git a/packages/eslint-plugin-stylable/src/stylable-es-lint.ts b/packages/eslint-plugin-stylable/src/stylable-es-lint.ts
@@ -29,7 +29,6 @@ export default createRule({
             projectRoot: process.cwd(),
             resolveModule: moduleResolver,
             requireModule: require,
-            resolverCache: new Map(),
             cssParser: safeParse,
         });
 

diff --git a/packages/experimental-loader/src/cached-stylable-factory.ts b/packages/experimental-loader/src/cached-stylable-factory.ts
@@ -20,7 +20,7 @@ export function getStylable(compiler: Compiler, initialConfig: StylableConfig):
             return require(id);
         };
 
-        stylable = new Stylable({ ...initialConfig, requireModule, resolverCache: new Map() });
+        stylable = new Stylable({ ...initialConfig, requireModule });
         compiler.hooks.done.tap('StylableLoader stylable.initCache', () => {
             stylable!.initCache();
             for (const id of requireModuleCache) {

diff --git a/packages/node/src/loader.ts b/packages/node/src/loader.ts
@@ -22,7 +22,6 @@ async function initiateModuleFactory() {
             ...(defaultConfig?.config || {}),
             projectRoot: '/',
             fileSystem: fs,
-            resolverCache: new Map(),
         },
         {
             moduleType: 'esm',

diff --git a/packages/node/src/require-hook.ts b/packages/node/src/require-hook.ts
@@ -47,7 +47,6 @@ export function attachHook({
             fileSystem: fs,
             requireModule: require,
             resolveNamespace,
-            resolverCache: new Map(),
             ...options,
         },
         { runtimePath }

diff --git a/packages/rollup-plugin/src/index.ts b/packages/rollup-plugin/src/index.ts
@@ -115,7 +115,6 @@ export function stylableRollupPlugin({
                 const stConfig = stylableConfig({
                     fileSystem: fs,
                     optimizer: new StylableOptimizer(),
-                    resolverCache: new Map(),
                     requireModule,
                     mode: mode || getDefaultMode(),
                     projectRoot: projectRoot || process.cwd(),

diff --git a/packages/webpack-extensions/src/stylable-manifest-plugin.ts b/packages/webpack-extensions/src/stylable-manifest-plugin.ts
@@ -57,7 +57,7 @@ export class StylableManifestPlugin {
     }
     public apply(compiler: Compiler) {
         const resolveModule = createWebpackResolver(compiler.inputFileSystem as any, {
-            ...compiler.options.resolve as any,
+            ...(compiler.options.resolve as any),
             extensions: [],
         });
         const stylable = new Stylable({
@@ -68,7 +68,6 @@ export class StylableManifestPlugin {
             },
             mode: compiler.options.mode === 'development' ? 'development' : 'production',
             resolveModule,
-            resolverCache: new Map(),
             resolveNamespace: this.options.resolveNamespace,
         });
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,6 @@ describe('Transformer', () => { @@
                 {
                     stylableConfig: {
                         resolveModule: onResolve,
-                        resolverCache: new Map(), // ToDo: v5 this should be default : remove
                     },
                 }
             );
@@ Expand Down @@