xhs-mp-pack 2.0.7 → 2.0.8

package/dist/Compilation.d.ts

@@ -17,7 +17,6 @@ import { Logger } from './base/logging/Logger';
 import { FileSystemInfo } from './FileSystemInfo';
 declare class Compilation {
     static PROCESS_ASSETS_STAGE_DEV_TOOLING: any;
-    _backCompat: boolean;
     hooks: any;
     chunks: any;
     name: undefined;
@@ -127,11 +126,11 @@ declare class Compilation {
     getCache(name: any): any;
     getLogger(name: any): Logger;
     addModule(module: any, callback: any): void;
-    _addModule(module: any, callback: any): any;
+    private _addModule;
     getModule(module: any): any;
     findModule(identifier: any): any;
     buildModule(module: any, callback: any): void;
-    _buildModule(module: any, callback: any): void;
+    private _buildModule;
     processModuleDependencies(module: any, callback: any): void;
     processModuleDependenciesNonRecursive(module: any): void;
     _processModuleDependencies(module: any, callback: any): any;
@@ -146,7 +145,7 @@ declare class Compilation {
         recursive?: boolean | undefined;
         connectOrigin?: any;
     }, callback: any): void;
-    _handleModuleBuildAndDependencies(originModule: any, module: any, recursive: any, callback: any): any;
+    private _handleModuleBuildAndDependencies;
     _factorizeModule({ currentProfile, factory, dependencies, originModule, factoryResult, contextInfo, context }: {
         currentProfile: any;
         factory: any;
@@ -164,9 +163,9 @@ declare class Compilation {
     }, callback: any): any;
     addEntry(context: string, entry: Dependency, optionsOrName: any, callback: any): void;
     addInclude(context: string, dependency: Dependency, options: any, callback: any): void;
-    _addEntryItem(context: any, entry: any, target: any, options: any, callback: any): any;
+    private _addEntryItem;
     rebuildModule(module: any, callback: any): void;
-    _rebuildModule(module: any, callback: any): void;
+    private _rebuildModule;
     _computeAffectedModules(modules: any): void;
     _computeAffectedModulesWithChunkGraph(): void;
     finish(callback: any): void;

package/dist/Compilation.js

@@ -123,7 +123,6 @@ const unsafeCacheDependencies = new WeakMap();
 const unsafeCacheData = new WeakMap();
 class Compilation {
     constructor(compiler, params) {
-        this._backCompat = false;
         const getNormalModuleLoader = () => deprecatedNormalModuleLoaderHook(this);
         const processAssetsHook = new tapable_1.AsyncSeriesHook(['assets']);
         let savedAssets = new Set();
@@ -226,7 +225,7 @@ class Compilation {
         });
         const afterProcessAssetsHook = new tapable_1.SyncHook(['assets']);
         const createProcessAssetsHook = (name, stage, getArgs, code) => {
-            if (!this._backCompat && code)
+            if (code)
                 return undefined;
             const errorMessage = reason => `Can't automatically convert plugin using Compilation.hooks.${name} to Compilation.hooks.processAssets because ${reason}.
 BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a single Compilation.hooks.processAssets hook.`;
@@ -643,8 +642,6 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
             }
             this._modules.set(identifier, module);
             this.modules.add(module);
-            if (this._backCompat)
-                ModuleGraph_1.default.setModuleGraphForModule(module, this.moduleGraph);
             if (currentProfile !== undefined) {
                 currentProfile.markIntegrationEnd();
             }
@@ -954,8 +951,6 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
         moduleGraph.setIssuerIfUnset(module, originModule !== undefined ? originModule : null);
         this._modules.set(module.identifier(), module);
         this.modules.add(module);
-        if (this._backCompat)
-            ModuleGraph_1.default.setModuleGraphForModule(module, this.moduleGraph);
         this._handleModuleBuildAndDependencies(originModule, module, true, callback);
     }
     _handleExistingModuleFromUnsafeCache(originModule, dependency, module) {
@@ -1738,11 +1733,6 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
         };
         const chunkGraph = new ChunkGraph_1.default(this.moduleGraph, this.outputOptions.hashFunction);
         this.chunkGraph = chunkGraph;
-        if (this._backCompat) {
-            for (const module of this.modules) {
-                ChunkGraph_1.default.setChunkGraphForModule(module, chunkGraph);
-            }
-        }
         this.hooks.seal.call();
         this.logger.time('optimize dependencies');
         while (this.hooks.optimizeDependencies.call(this.modules)) {
@@ -2255,9 +2245,6 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
         this.logger.timeEnd('runtime requirements.entries');
     }
     addRuntimeModule(chunk, module, chunkGraph = this.chunkGraph) {
-        // Deprecated ModuleGraph association
-        if (this._backCompat)
-            ModuleGraph_1.default.setModuleGraphForModule(module, this.moduleGraph);
         // add it to the list
         this.modules.add(module);
         this._modules.set(module.identifier(), module);
@@ -2359,10 +2346,8 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
                 return chunk;
             }
         }
-        const chunk = new Chunk_1.default(name, this._backCompat);
+        const chunk = new Chunk_1.default(name);
         this.chunks.add(chunk);
-        if (this._backCompat)
-            ChunkGraph_1.default.setChunkGraphForChunk(chunk, this.chunkGraph);
         if (name) {
             this.namedChunks.set(name, chunk);
         }
@@ -3202,7 +3187,7 @@ This prevents using hashes of each other and should be avoided.`);
             const runtime = 'build time';
             const { hashFunction, hashDigest, hashDigestLength } = this.outputOptions;
             const runtimeTemplate = this.runtimeTemplate;
-            const chunk = new Chunk_1.default('build time chunk', this._backCompat);
+            const chunk = new Chunk_1.default('build time chunk');
             chunk.id = chunk.name;
             chunk.ids = [chunk.id];
             chunk.runtime = runtime;

package/dist/MPPack.d.ts

@@ -10,7 +10,6 @@ export declare abstract class AbstractMPPack extends EventEmitter {
     abstract watch(config: any, callback?: any): any;
     abstract changeCompileOptions(config: any): any;
     abstract activatePkgs(compilePkgs: any): any;
-    abstract reCompilePkgs(config: any): any;
     abstract build(callback?: any): any;
     abstract close(callback: any): any;
 }
@@ -29,7 +28,6 @@ export declare class MPPack extends AbstractMPPack {
     watch(config: any, callback?: any): Promise<unknown>;
     changeCompileOptions(config: any): void;
     activatePkgs(compilePkgs: any): Promise<unknown>;
-    reCompilePkgs(config: any): Promise<unknown>;
     build(callback?: any): void;
     close(callback: any): void;
 }

package/dist/MPPack.js

@@ -170,19 +170,6 @@ class MPPack extends AbstractMPPack {
             this.callbacks.push(resolve);
         });
     }
-    reCompilePkgs(config) {
-        return new Promise(resolve => {
-            var _a;
-            if (!this.watcher) {
-                return;
-            }
-            if (config) {
-                this.changeCompileOptions(config);
-            }
-            (_a = this.watcher) === null || _a === void 0 ? void 0 : _a.invalidateWithReason(BUILD_REASON.RECOMPILE, () => { });
-            this.callbacks.push(resolve);
-        });
-    }
     build(callback) {
         this.compiler.run(callback);
     }

package/dist/chunk/Chunk.d.ts

@@ -23,7 +23,7 @@ declare class Chunk {
     renderedHash: any;
     chunkReason: any;
     extraAsync: boolean;
-    constructor(name: string, backCompat?: boolean);
+    constructor(name: string);
     get entryModule(): unknown;
     hasEntryModule(): boolean;
     addModule(module: any): boolean;

package/dist/chunk/Chunk.js

@@ -18,7 +18,7 @@ let debugId = 1000;
  * Chunks are "rendered" into bundles that get emitted when the build completes.
  */
 class Chunk {
-    constructor(name, backCompat = true) {
+    constructor(name) {
         this.id = null;
         this.ids = null;
         this.debugId = debugId++;
@@ -29,7 +29,7 @@ class Chunk {
         this.cssFilenameTemplate = undefined;
         this._groups = new SortableSet_1.default(undefined, comparators_1.compareChunkGroupsByIndex);
         this.runtime = undefined;
-        this.files = backCompat ? new ChunkFilesSet() : new Set();
+        this.files = new Set();
         this.auxiliaryFiles = new Set();
         this.rendered = false;
         this.hash = undefined;

package/dist/module/ModuleTypeConstants.d.ts

@@ -2,12 +2,6 @@ declare const JAVASCRIPT_MODULE_TYPE_AUTO = "javascript/auto";
 declare const JAVASCRIPT_MODULE_TYPE_DYNAMIC = "javascript/dynamic";
 declare const JAVASCRIPT_MODULE_TYPE_ESM = "javascript/esm";
 declare const JSON_MODULE_TYPE = "json";
-declare const WEBASSEMBLY_MODULE_TYPE_ASYNC = "webassembly/async";
-declare const WEBASSEMBLY_MODULE_TYPE_SYNC = "webassembly/sync";
-declare const CSS_MODULE_TYPE = "css";
-declare const CSS_MODULE_TYPE_GLOBAL = "css/global";
-declare const CSS_MODULE_TYPE_MODULE = "css/module";
-declare const CSS_MODULE_TYPE_AUTO = "css/auto";
 declare const ASSET_MODULE_TYPE = "asset";
 declare const ASSET_MODULE_TYPE_INLINE = "asset/inline";
 declare const ASSET_MODULE_TYPE_RESOURCE = "asset/resource";
@@ -19,4 +13,4 @@ declare const WEBPACK_MODULE_TYPE_REMOTE = "remote-module";
 declare const WEBPACK_MODULE_TYPE_PROVIDE = "provide-module";
 declare const WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE = "consume-shared-module";
 declare const WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY = "lazy-compilation-proxy";
-export { ASSET_MODULE_TYPE, ASSET_MODULE_TYPE_RAW_DATA_URL, ASSET_MODULE_TYPE_SOURCE, ASSET_MODULE_TYPE_RESOURCE, ASSET_MODULE_TYPE_INLINE, JAVASCRIPT_MODULE_TYPE_AUTO, JAVASCRIPT_MODULE_TYPE_DYNAMIC, JAVASCRIPT_MODULE_TYPE_ESM, JSON_MODULE_TYPE, WEBASSEMBLY_MODULE_TYPE_ASYNC, WEBASSEMBLY_MODULE_TYPE_SYNC, CSS_MODULE_TYPE, CSS_MODULE_TYPE_GLOBAL, CSS_MODULE_TYPE_MODULE, CSS_MODULE_TYPE_AUTO, WEBPACK_MODULE_TYPE_RUNTIME, WEBPACK_MODULE_TYPE_FALLBACK, WEBPACK_MODULE_TYPE_REMOTE, WEBPACK_MODULE_TYPE_PROVIDE, WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE, WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY, };
+export { ASSET_MODULE_TYPE, ASSET_MODULE_TYPE_RAW_DATA_URL, ASSET_MODULE_TYPE_SOURCE, ASSET_MODULE_TYPE_RESOURCE, ASSET_MODULE_TYPE_INLINE, JAVASCRIPT_MODULE_TYPE_AUTO, JAVASCRIPT_MODULE_TYPE_DYNAMIC, JAVASCRIPT_MODULE_TYPE_ESM, JSON_MODULE_TYPE, WEBPACK_MODULE_TYPE_RUNTIME, WEBPACK_MODULE_TYPE_FALLBACK, WEBPACK_MODULE_TYPE_REMOTE, WEBPACK_MODULE_TYPE_PROVIDE, WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE, WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY, };

package/dist/module/ModuleTypeConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY = exports.WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE = exports.WEBPACK_MODULE_TYPE_PROVIDE = exports.WEBPACK_MODULE_TYPE_REMOTE = exports.WEBPACK_MODULE_TYPE_FALLBACK = exports.WEBPACK_MODULE_TYPE_RUNTIME = exports.CSS_MODULE_TYPE_AUTO = exports.CSS_MODULE_TYPE_MODULE = exports.CSS_MODULE_TYPE_GLOBAL = exports.CSS_MODULE_TYPE = exports.WEBASSEMBLY_MODULE_TYPE_SYNC = exports.WEBASSEMBLY_MODULE_TYPE_ASYNC = exports.JSON_MODULE_TYPE = exports.JAVASCRIPT_MODULE_TYPE_ESM = exports.JAVASCRIPT_MODULE_TYPE_DYNAMIC = exports.JAVASCRIPT_MODULE_TYPE_AUTO = exports.ASSET_MODULE_TYPE_INLINE = exports.ASSET_MODULE_TYPE_RESOURCE = exports.ASSET_MODULE_TYPE_SOURCE = exports.ASSET_MODULE_TYPE_RAW_DATA_URL = exports.ASSET_MODULE_TYPE = void 0;
+exports.WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY = exports.WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE = exports.WEBPACK_MODULE_TYPE_PROVIDE = exports.WEBPACK_MODULE_TYPE_REMOTE = exports.WEBPACK_MODULE_TYPE_FALLBACK = exports.WEBPACK_MODULE_TYPE_RUNTIME = exports.JSON_MODULE_TYPE = exports.JAVASCRIPT_MODULE_TYPE_ESM = exports.JAVASCRIPT_MODULE_TYPE_DYNAMIC = exports.JAVASCRIPT_MODULE_TYPE_AUTO = exports.ASSET_MODULE_TYPE_INLINE = exports.ASSET_MODULE_TYPE_RESOURCE = exports.ASSET_MODULE_TYPE_SOURCE = exports.ASSET_MODULE_TYPE_RAW_DATA_URL = exports.ASSET_MODULE_TYPE = void 0;
 const JAVASCRIPT_MODULE_TYPE_AUTO = 'javascript/auto';
 exports.JAVASCRIPT_MODULE_TYPE_AUTO = JAVASCRIPT_MODULE_TYPE_AUTO;
 const JAVASCRIPT_MODULE_TYPE_DYNAMIC = 'javascript/dynamic';
@@ -9,18 +9,12 @@ const JAVASCRIPT_MODULE_TYPE_ESM = 'javascript/esm';
 exports.JAVASCRIPT_MODULE_TYPE_ESM = JAVASCRIPT_MODULE_TYPE_ESM;
 const JSON_MODULE_TYPE = 'json';
 exports.JSON_MODULE_TYPE = JSON_MODULE_TYPE;
-const WEBASSEMBLY_MODULE_TYPE_ASYNC = 'webassembly/async';
-exports.WEBASSEMBLY_MODULE_TYPE_ASYNC = WEBASSEMBLY_MODULE_TYPE_ASYNC;
-const WEBASSEMBLY_MODULE_TYPE_SYNC = 'webassembly/sync';
-exports.WEBASSEMBLY_MODULE_TYPE_SYNC = WEBASSEMBLY_MODULE_TYPE_SYNC;
-const CSS_MODULE_TYPE = 'css';
-exports.CSS_MODULE_TYPE = CSS_MODULE_TYPE;
-const CSS_MODULE_TYPE_GLOBAL = 'css/global';
-exports.CSS_MODULE_TYPE_GLOBAL = CSS_MODULE_TYPE_GLOBAL;
-const CSS_MODULE_TYPE_MODULE = 'css/module';
-exports.CSS_MODULE_TYPE_MODULE = CSS_MODULE_TYPE_MODULE;
-const CSS_MODULE_TYPE_AUTO = 'css/auto';
-exports.CSS_MODULE_TYPE_AUTO = CSS_MODULE_TYPE_AUTO;
+// const WEBASSEMBLY_MODULE_TYPE_ASYNC = 'webassembly/async'
+// const WEBASSEMBLY_MODULE_TYPE_SYNC = 'webassembly/sync'
+// const CSS_MODULE_TYPE = 'css'
+// const CSS_MODULE_TYPE_GLOBAL = 'css/global'
+// const CSS_MODULE_TYPE_MODULE = 'css/module'
+// const CSS_MODULE_TYPE_AUTO = 'css/auto'
 const ASSET_MODULE_TYPE = 'asset';
 exports.ASSET_MODULE_TYPE = ASSET_MODULE_TYPE;
 const ASSET_MODULE_TYPE_INLINE = 'asset/inline';

package/dist/plugins/optimize/ModuleConcatenationPlugin.js

@@ -234,10 +234,6 @@ class ModuleConcatenationPlugin {
                         });
                     };
                     const integrate = () => {
-                        // if (backCompat) {
-                        //   ChunkGraph.setChunkGraphForModule(newModule, chunkGraph)
-                        //   ModuleGraph.setModuleGraphForModule(newModule, moduleGraph)
-                        // }
                         for (const warning of concatConfiguration.getWarningsSorted()) {
                             moduleGraph
                                 .getOptimizationBailout(newModule)

package/dist/setupWriteToDisk.js

@@ -8,9 +8,9 @@ const path_1 = __importDefault(require("path"));
 function setupWriteToDisk(compiler, MPPackSetting) {
     compiler.hooks.emit.tap('DevMiddleware', () => {
         // @ts-ignore
-        if (compiler.hasDevMiddlewareAssetEmittedCallback) {
-            return;
-        }
+        // if (compiler.hasDevMiddlewareAssetEmittedCallback) {
+        //   return
+        // }
         compiler.hooks.assetEmitted.tapAsync('DevMiddleware', (file, info, callback) => {
             const { targetPath, content } = info;
             const { writeToDisk: filter } = MPPackSetting;
@@ -32,7 +32,7 @@ function setupWriteToDisk(compiler, MPPackSetting) {
             });
         });
         // @ts-ignore
-        compiler.hasDevMiddlewareAssetEmittedCallback = true;
+        // compiler.hasDevMiddlewareAssetEmittedCallback = true
     });
 }
 exports.default = setupWriteToDisk;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-pack",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "xhs mp compiler core.",
   "preferGlobal": true,
   "category": "esm",
@@ -55,9 +55,9 @@
     "watchpack": "^2.4.0",
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.3",
-    "xhs-mp-compiler-utils": "2.0.7",
-    "xhs-mp-project": "2.0.7",
-    "xhs-mp-shared-fs": "2.0.7"
+    "xhs-mp-compiler-utils": "2.0.8",
+    "xhs-mp-project": "2.0.8",
+    "xhs-mp-shared-fs": "2.0.8"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",