@tarojs/webpack5-runner 4.2.1-beta.1 → 4.2.1-beta.2

package/dist/utils/asyncSubPackage.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAsyncCommonChunkName = exports.getSingleAsyncRootForModules = exports.getAsyncRootForModule = exports.getSourceRootForResource = exports.normalizePathForAsyncSubPackage = exports.getAsyncRootAssetNames = void 0;
+function getAsyncRootAssetNames(assets, asyncRoot) {
+    return Object.keys(assets).filter(name => name.startsWith(`${asyncRoot}/`) && name.endsWith('.js'));
+}
+exports.getAsyncRootAssetNames = getAsyncRootAssetNames;
+function normalizePathForAsyncSubPackage(value) {
+    return value.replace(/\\/g, '/');
+}
+exports.normalizePathForAsyncSubPackage = normalizePathForAsyncSubPackage;
+function getSourceRootForResource(resource, sourceDir, asyncRootMap) {
+    if (!resource)
+        return null;
+    const normalizedResource = normalizePathForAsyncSubPackage(resource);
+    const normalizedSourceDir = normalizePathForAsyncSubPackage(sourceDir).replace(/\/$/, '');
+    let relativeResource = normalizedResource;
+    if (normalizedResource.startsWith(`${normalizedSourceDir}/`)) {
+        relativeResource = normalizedResource.slice(normalizedSourceDir.length + 1);
+    }
+    const sourceRoots = Array.from(asyncRootMap.keys()).sort((a, b) => b.length - a.length);
+    for (const sourceRoot of sourceRoots) {
+        const normalizedSourceRoot = normalizePathForAsyncSubPackage(sourceRoot);
+        if (relativeResource === normalizedSourceRoot || relativeResource.startsWith(`${normalizedSourceRoot}/`) || relativeResource.startsWith(`${normalizedSourceRoot}.`)) {
+            return sourceRoot;
+        }
+    }
+    return null;
+}
+exports.getSourceRootForResource = getSourceRootForResource;
+function getAsyncRootForModule(module, sourceDir, asyncRootMap, moduleGraph, visited = new Set(), cache) {
+    var _a, _b, _c;
+    if (!module || visited.has(module))
+        return undefined;
+    if (cache === null || cache === void 0 ? void 0 : cache.has(module))
+        return cache.get(module);
+    visited.add(module);
+    const resource = module.resource || ((_a = module.nameForCondition) === null || _a === void 0 ? void 0 : _a.call(module));
+    const normalizedSourceDir = normalizePathForAsyncSubPackage(sourceDir).replace(/\/$/, '');
+    const normalizedResource = resource ? normalizePathForAsyncSubPackage(resource) : '';
+    const isProjectSource = normalizedResource.startsWith(`${normalizedSourceDir}/`);
+    const sourceRoot = getSourceRootForResource(resource, sourceDir, asyncRootMap);
+    if (sourceRoot) {
+        const asyncRoot = asyncRootMap.get(sourceRoot);
+        cache === null || cache === void 0 ? void 0 : cache.set(module, asyncRoot);
+        return asyncRoot;
+    }
+    const asyncRoots = new Set();
+    let hasBlockingProjectIssuer = false;
+    const issuerModules = new Set();
+    const incomingConnections = (_b = moduleGraph === null || moduleGraph === void 0 ? void 0 : moduleGraph.getIncomingConnections) === null || _b === void 0 ? void 0 : _b.call(moduleGraph, module);
+    if (incomingConnections) {
+        for (const connection of incomingConnections) {
+            if (connection === null || connection === void 0 ? void 0 : connection.originModule)
+                issuerModules.add(connection.originModule);
+        }
+    }
+    const issuer = (_c = moduleGraph === null || moduleGraph === void 0 ? void 0 : moduleGraph.getIssuer) === null || _c === void 0 ? void 0 : _c.call(moduleGraph, module);
+    if (issuer)
+        issuerModules.add(issuer);
+    for (const issuerModule of issuerModules) {
+        const asyncRoot = getAsyncRootForModule(issuerModule, sourceDir, asyncRootMap, moduleGraph, new Set(visited), cache);
+        if (asyncRoot === null) {
+            hasBlockingProjectIssuer = true;
+        }
+        else if (asyncRoot) {
+            asyncRoots.add(asyncRoot);
+        }
+    }
+    let result;
+    if (hasBlockingProjectIssuer || asyncRoots.size > 1) {
+        result = null;
+    }
+    else if (asyncRoots.size === 1) {
+        result = Array.from(asyncRoots)[0];
+    }
+    else {
+        result = isProjectSource ? null : undefined;
+    }
+    cache === null || cache === void 0 ? void 0 : cache.set(module, result);
+    return result;
+}
+exports.getAsyncRootForModule = getAsyncRootForModule;
+function getSingleAsyncRootForModules(modules, sourceDir, asyncRootMap, moduleGraph, cache) {
+    const asyncRoots = new Set();
+    for (const module of modules) {
+        const asyncRoot = getAsyncRootForModule(module, sourceDir, asyncRootMap, moduleGraph, undefined, cache);
+        if (asyncRoot === null)
+            return null;
+        if (asyncRoot) {
+            asyncRoots.add(asyncRoot);
+            if (asyncRoots.size > 1)
+                return null;
+        }
+    }
+    if (asyncRoots.size !== 1)
+        return null;
+    return Array.from(asyncRoots)[0];
+}
+exports.getSingleAsyncRootForModules = getSingleAsyncRootForModules;
+function createAsyncCommonChunkName(asyncRoot, chunkName) {
+    const safeChunkName = (chunkName || 'common').replace(/[^a-zA-Z0-9_/-]/g, '_').replace(/\//g, '_');
+    return `${asyncRoot}/async-${safeChunkName}`;
+}
+exports.createAsyncCommonChunkName = createAsyncCommonChunkName;
+//# sourceMappingURL=asyncSubPackage.js.map

package/dist/utils/asyncSubPackage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"asyncSubPackage.js","sourceRoot":"","sources":["../../src/utils/asyncSubPackage.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/webpack5-runner",
-  "version": "4.2.1-beta.1",
+  "version": "4.2.1-beta.2",
   "description": "Taro app runner",
   "author": "O2Team",
   "license": "MIT",
@@ -62,14 +62,14 @@
     "webpack-format-messages": "^3.0.1",
     "webpackbar": "^5.0.2",
     "webpack-virtual-modules": "^0.6.1",
-    "@tarojs/shared": "4.2.1-beta.1",
-    "@tarojs/runner-utils": "4.2.1-beta.1",
-    "@tarojs/helper": "4.2.1-beta.1",
-    "@tarojs/taro-loader": "4.2.1-beta.1",
-    "postcss-plugin-constparse": "4.2.1-beta.1",
-    "postcss-pxtransform": "4.2.1-beta.1",
-    "postcss-html-transform": "4.2.1-beta.1",
-    "@tarojs/webpack5-prebundle": "4.2.1-beta.1"
+    "@tarojs/helper": "4.2.1-beta.2",
+    "@tarojs/runner-utils": "4.2.1-beta.2",
+    "@tarojs/shared": "4.2.1-beta.2",
+    "@tarojs/webpack5-prebundle": "4.2.1-beta.2",
+    "postcss-html-transform": "4.2.1-beta.2",
+    "postcss-plugin-constparse": "4.2.1-beta.2",
+    "postcss-pxtransform": "4.2.1-beta.2",
+    "@tarojs/taro-loader": "4.2.1-beta.2"
   },
   "devDependencies": {
     "@babel/core": "^7.24.4",
@@ -80,8 +80,8 @@
     "stylus": "^0.63.0",
     "jest-transform-css": "^6.0.1",
     "webpack": "5.91.0",
-    "@tarojs/runtime": "4.2.1-beta.1",
-    "@tarojs/taro": "4.2.1-beta.1"
+    "@tarojs/taro": "4.2.1-beta.2",
+    "@tarojs/runtime": "4.2.1-beta.2"
   },
   "peerDependencies": {
     "@babel/core": "^7.12.0",
@@ -90,7 +90,7 @@
     "sass": "^1.3.0",
     "stylus": ">=0.52.4",
     "webpack": "5.91.0",
-    "@tarojs/runtime": "4.2.1-beta.1"
+    "@tarojs/runtime": "4.2.1-beta.2"
   },
   "peerDependenciesMeta": {
     "less": {