fix: 将 store 与 compilation 进行绑定

searchfe · Aug 16, 2021 · e3ec2c9 · e3ec2c9
1 parent b400975
commit e3ec2c9
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/src/plugin.ts b/src/plugin.ts
@@ -1,4 +1,4 @@
-import {styleStore, templateStore} from './store';
+import {Store} from './store';
 import type {Compiler, RuleSetRule} from 'webpack';
 import {promises as fsPromise} from 'fs';
 import {parseComponent} from './lib/parseComponent';
@@ -67,7 +67,14 @@ export default class SanSSRLoaderPlugin {
         }
 
         compiler.hooks.compilation.tap(id, compilation => {
-            styleStore.clear();
+            // @ts-ignore
+            compilation._styleStore = new Store();
+            // @ts-ignore
+            compilation._templateStore = new Store();
+            // @ts-ignore
+            const styleStore = compilation._styleStore;
+            // @ts-ignore
+            const templateStore = compilation._templateStore;
 
             const reportError = (err: Error) => compilation.errors.push(err);
 

diff --git a/src/san-loader.ts b/src/san-loader.ts
@@ -1,10 +1,12 @@
-import {styleStore, templateStore, TemplateResult} from './store';
+import {StyleStore, TemplateResult, TemplateStore} from './store';
 import {noop, extractRequire, getFileLoaderExportPromise} from './lib/utils';
 
 import type {loader} from 'webpack';
 import ___HTML_LOADER_GET_URL_IMPORT___ from 'html-loader/dist/runtime/getUrl';
 
 export default function (this: loader.LoaderContext, content: string) {
+    const styleStore = this._compilation._styleStore as StyleStore;
+    const templateStore = this._compilation._templateStore as TemplateStore;
     styleStore.set(this.resourcePath);
 
     const callback = this.async();

diff --git a/src/store.ts b/src/store.ts
@@ -1,6 +1,6 @@
-import type {ExtractedCssResult} from './types';
+import {ExtractedCssResult} from './types';
 
-class Store<T> {
+export class Store<T> {
     store: Map<string, T[]>;
     isArray: boolean = false;
 
@@ -28,6 +28,6 @@ class Store<T> {
 }
 
 export type TemplateResult = string;
+export type StyleStore = Store<ExtractedCssResult>;
+export type TemplateStore = Store<TemplateResult>;
 
-export const styleStore = new Store<ExtractedCssResult>();
-export const templateStore = new Store<TemplateResult>();
diff --git a/src/style-loader.ts b/src/style-loader.ts
@@ -1,4 +1,4 @@
-import {styleStore} from './store';
+import {StyleStore} from './store';
 
 import type {loader} from 'webpack';
 import ___CSS_LOADER_GET_URL_IMPORT___ from 'css-loader/dist/runtime/getUrl';
@@ -16,6 +16,7 @@ export default function (this: loader.LoaderContext, content: string) {
     checkIsAfterCssLoader(this);
 
     extractCssResult(content, this, cssRes => {
+        const styleStore = this._compilation._styleStore as StyleStore;
         styleStore.set(this.resourcePath, {
             locals: cssRes.exports.locals,
             cssCode: cssRes.exports[0][1],

diff --git a/src/types/global.d.ts b/src/types/global.d.ts
@@ -2,4 +2,4 @@ declare module 'de-indent';
 declare module 'san-loader/lib/plugin';
 declare module 'webpack/lib/RuleSet';
 declare module 'css-loader/dist/runtime/getUrl';
-declare module 'html-loader/dist/runtime/getUrl';
+declare module 'html-loader/dist/runtime/getUrl';
diff --git a/test/san-loader.test.ts b/test/san-loader.test.ts
@@ -1,17 +1,20 @@
 import sanLoader from '../src/san-loader';
-import {styleStore} from '../src/store';
+import {Store, StyleStore, TemplateStore} from '../src/store';
 import type {loader} from 'webpack';
 
 test('styleStore', async () => {
     const mockAsyncCallback = jest.fn();
     const env = {
         async: () => (...args: any[]) => mockAsyncCallback(...args),
         resourcePath: '/mock/path',
+        _compilation: {
+            _styleStore: new Store() as StyleStore
+        }
     };
 
     sanLoader.call(env as unknown as loader.LoaderContext, 'mock content');
 
-    expect(styleStore.get('/mock/path')).toStrictEqual([]);
+    expect(env._compilation._styleStore.get('/mock/path')).toStrictEqual([]);
 
     expect(mockAsyncCallback).toHaveBeenCalledTimes(1);
     expect(mockAsyncCallback.mock.calls[0][1]).toBe('mock content');
@@ -25,6 +28,10 @@ test('templateStore', () => {
         async: jest.fn(),
         resourcePath: '/path/to/foo.san',
         loadModule: (...args: any[]) => mockLoadModule(...args),
+        _compilation: {
+            _templateStore: new Store() as TemplateStore,
+            _styleStore: new Store() as StyleStore
+        }
     } as unknown as loader.LoaderContext;
 
     sanLoader.call(mockLoaderContext, `

diff --git a/test/store.test.ts b/test/store.test.ts
@@ -1,7 +1,7 @@
-import {styleStore} from '../src/store';
+import {Store, StyleStore} from '../src/store';
 
 test('styleStore', async () => {
-
+    const styleStore = new Store() as StyleStore;
 
     styleStore.set('styleA', {
         cssCode: 'aaa',