hw-weapp-compiler 1.0.15 → 1.0.16

package/build/utils/isNodeModulesUsingComponent.js

@@ -1,14 +1,52 @@
+const { compatiblePath } = require('./compatiblePath');
+
 const nodeModulesUsingComponent = [];
+const nodeModulesUsingComponentDirs = [];
 
-function isNodeModulesUsingComponent(name) {
-  const key = name.replace(/\.(js|wxml|wxss|json|wxs)$/g, '');
+function normalizeComponentKey(name) {
+  const key = compatiblePath(name).replace(/\.(js|wxml|wxss|json|wxs|less|css)$/gi, '');
   const nmIndex = key.indexOf('node_modules/');
-  const searchKey = nmIndex !== -1 ? key.substring(nmIndex + 'node_modules/'.length) : key;
-  return nodeModulesUsingComponent.indexOf(searchKey) !== -1;
+
+  if (nmIndex !== -1) {
+    return key.substring(nmIndex + 'node_modules/'.length);
+  }
+
+  return key;
+}
+
+function getComponentDir(key) {
+  const segments = key.split('/');
+
+  if ((key.indexOf('@') === 0 && segments.length <= 2) || segments.length <= 1) {
+    return `${key}/`;
+  }
+
+  return `${segments.slice(0, -1).join('/')}/`;
+}
+
+function addUnique(list, item) {
+  if (list.indexOf(item) === -1) {
+    list.push(item);
+  }
+}
+
+function isNodeModulesUsingComponent(name) {
+  const searchKey = normalizeComponentKey(name);
+
+  if (nodeModulesUsingComponent.indexOf(searchKey) !== -1) {
+    return true;
+  }
+
+  return nodeModulesUsingComponentDirs.some((componentDir) => {
+    return searchKey.indexOf(componentDir) === 0;
+  });
 }
 
 function addNodeModulesUsingComponent(item) {
-  nodeModulesUsingComponent.push(item);
+  const key = normalizeComponentKey(item);
+
+  addUnique(nodeModulesUsingComponent, key);
+  addUnique(nodeModulesUsingComponentDirs, getComponentDir(key));
 }
 
 module.exports = {

package/build/webpack.config.js

@@ -13,6 +13,7 @@ const { getBuildEnv } = require('./utils/buildEnv');
 const { getConfig } = require('./config/getConfig');
 const { getEntries } = require('./config/getEntries');
 const { getAppConfig } = require('./config/getAppConfig');
+const { isNodeModulesUsingComponent } = require('./utils/isNodeModulesUsingComponent');
 
 const { isSubpackage } = require('./utils/isSubpackage');
 const { compatiblePath } = require('./utils/compatiblePath');
@@ -72,7 +73,18 @@ module.exports = async (options, { analyzer, quiet } = {}) => {
     return resource;
   };
 
+  const isNodeModulesComponentStyle = (resource) => {
+    return (
+      resource &&
+      PATTERNS.NODE_MODULES.test(resource) &&
+      PATTERNS.STYLE_EXTS.test(resource) &&
+      isNodeModulesUsingComponent(resource)
+    );
+  };
+
   const cacheGroups = {
+    default: false,
+    defaultVendors: false,
     vendors: {
       minChunks: 1,
       test(module) {
@@ -81,7 +93,7 @@ module.exports = async (options, { analyzer, quiet } = {}) => {
         if (resource === false) {
           return true;
         }
-        if (PATTERNS.WXSS_EXT.test(resource)) {
+        if (PATTERNS.STYLE_EXTS.test(resource)) {
           return false;
         }
 
@@ -96,7 +108,23 @@ module.exports = async (options, { analyzer, quiet } = {}) => {
     },
     vendors_wxss: {
       minChunks: 2,
-      test: PATTERNS.NODE_MODULES,
+      test(module) {
+        const resource = getResource(module);
+
+        if (resource === false) {
+          return false;
+        }
+
+        if (!PATTERNS.STYLE_EXTS.test(resource)) {
+          return false;
+        }
+
+        if (isNodeModulesComponentStyle(resource)) {
+          return false;
+        }
+
+        return PATTERNS.NODE_MODULES.test(resource);
+      },
       name: 'vendors_wxss',
       reuseExistingChunk: true,
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hw-weapp-compiler",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "基于 webpack5 的小程序构建工具，兼容 Node.js 14~24",
   "main": "index.js",
   "bin": {