fix: wcc wcsc node_modules #30

.vscode/launch.json

@@ -8,20 +8,20 @@
       "type": "nwjs",
       "request": "launch",
       "name": "Launch NWjs",
-      "nwjsVersion": "0.47.0",
-      "webRoot": "${workspaceFolder}/package.nw",
+      "nwjsVersion": "0.49.3",
+      "webRoot": "${workspaceFolder}/compiler/test/package.nw",
       "reloadAfterAttached": true,
       "runtimeArgs": [
-        "--load-extension=${workspaceFolder}/tmp/data/WeappPlugin",
+        // "--load-extension=${workspaceFolder}/tmp/data/WeappPlugin",
         // "--custom-devtools-frontend=file://${workspaceFolder}/tmp/data/WeappPlugin/inspector/",
-        "--user-data-dir=${workspaceFolder}/tmp/data",
+        // "--user-data-dir=${workspaceFolder}/tmp/data",
         // "--remote-debugging-port=9999"
       ],
       "env": {
         "LANG": "zh_CN.UTF-8"
       },
       "userDataDir": false,
-      "runtimeExecutable": "${workspaceFolder}/nwjs/nw"
+      "runtimeExecutable": "${workspaceFolder}/cache/wechat_devtools_1.05.2203070_x64/wechatdevtools.exe"
     }
   ]
 }

compiler/test/node-modules/log.txt

@@ -0,0 +1,7 @@
+1 wcc  node
+2 wcc  node
+3 wcc  node
+4 wcsc node
+5 wcc  node
+6 wcsc node
+7 wcc  node

compiler/test/node-modules/wcsc_test.js

@@ -0,0 +1,18 @@
+
+const fs = require('fs')
+const path = require('path')
+
+const wcsc_options1 = {"pageCount":34,"files":["./packageComponent/pages/view/view/view.wxss","./packageComponent/pages/view/scroll-view/scroll-view.wxss","./packageComponent/pages/view/swiper/swiper.wxss","./packageComponent/pages/view/movable-view/movable-view.wxss","./packageComponent/pages/view/cover-view/cover-view.wxss","./packageComponent/pages/content/text/text.wxss","./packageComponent/pages/content/icon/icon.wxss","./packageComponent/pages/content/progress/progress.wxss","./packageComponent/pages/content/rich-text/rich-text.wxss","./packageComponent/pages/form/button/button.wxss","./packageComponent/pages/form/checkbox/checkbox.wxss","./packageComponent/pages/form/form/form.wxss","./packageComponent/pages/form/input/input.wxss","./packageComponent/pages/form/label/label.wxss","./packageComponent/pages/form/picker/picker.wxss","./packageComponent/pages/form/picker-view/picker-view.wxss","./packageComponent/pages/form/radio/radio.wxss","./packageComponent/pages/form/slider/slider.wxss","./packageComponent/pages/form/switch/switch.wxss","./packageComponent/pages/form/textarea/textarea.wxss","./packageComponent/pages/form/editor/editor.wxss","./packageComponent/pages/nav/navigator/navigator.wxss","./packageComponent/pages/media/image/image.wxss","./packageComponent/pages/media/video/video.wxss","./packageComponent/pages/media/camera/camera.wxss","./packageComponent/pages/media/live-pusher/live-pusher.wxss","./packageComponent/pages/media/live-player/live-player.wxss","./packageComponent/pages/map/map/map.wxss","./packageComponent/pages/canvas/canvas-2d/canvas-2d.wxss","./packageComponent/pages/canvas/webgl/webgl.wxss","./packageComponent/pages/open/ad/ad.wxss","./packageComponent/pages/open/open-data/open-data.wxss","./packageComponent/pages/open/web-view/web-view.wxss","./packageComponent/pages/obstacle-free/aria-component/aria-component.wxss","./app.wxss","./common/lib/weui.wxss","./miniprogram_npm/miniprogram-barrage/index.wxss","./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxss","./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxss","./miniprogram_npm/wxml-to-canvas/index.wxss","./page/API/index.wxss","./page/API/components/set-tab-bar/set-tab-bar.wxss","./page/cloud/index.wxss","./page/common/common.wxss","./page/common/index.wxss","./page/common/lib/weui.wxss","./page/component/index.wxss","./page/extend/index.wxss","./packageComponent/pages/form/editor/assets/iconfont.wxss"],"cwd":"/mnt/disk1/WeChatProjects/miniprogram-demo/miniprogram/","subPackage":"packageComponent/","replaceContent":{"./packageComponent/pages/camera-scan-code/camera-scan-code.wxss":"\n\ncamera {\n  height: 250px;\n}\n\n.btn-area {\n  margin-top: 0;\n}\n\nform {\n  margin-top: 15px;\n}\n\n.weui-cell__bd {\n  display: flex;\n  justify-content: flex-start;\n  align-items: center;\n  padding: 10px 0;\n  min-height: 30px;\n}"},"debug":true}
+const wcsc_options2 = {"pageCount":9,"files":["./page/component/index.wxss","./page/API/index.wxss","./page/cloud/index.wxss","./page/extend/index.wxss","./miniprogram_npm/miniprogram-barrage/index.wxss","./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxss","./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxss","./miniprogram_npm/wxml-to-canvas/index.wxss","./page/API/components/set-tab-bar/set-tab-bar.wxss","./app.wxss","./common/lib/weui.wxss","./page/common/common.wxss","./page/common/index.wxss","./page/common/lib/weui.wxss"],"cwd":"/mnt/disk1/WeChatProjects/miniprogram-demo/miniprogram/","replaceContent":{"./packageComponent/pages/camera-scan-code/camera-scan-code.wxss":"\n\ncamera {\n  height: 250px;\n}\n\n.btn-area {\n  margin-top: 0;\n}\n\nform {\n  margin-top: 15px;\n}\n\n.weui-cell__bd {\n  display: flex;\n  justify-content: flex-start;\n  align-items: center;\n  padding: 10px 0;\n  min-height: 30px;\n}"},"debug":true}
+// const wcc_options6 = 
+// const wcc_options7 = 
+const test = async (options, id) => {
+    console.log("============")
+    const wcsc = require("wcsc");
+    const wcsc_result = await wcsc(options);
+    fs.writeFileSync(path.resolve(__dirname, `wcsc_node${id}.txt`), JSON.stringify(wcsc_result, null, 4))
+    // const win_result = fs.readFileSync(path.resolve(__dirname, '../package.nw/win.txt'))
+    // console.log(wcsc_result == win_result)
+};
+test(wcsc_options1, 1);
+test(wcsc_options2, 2);

compiler/wcc_node/src/wcc.js

@@ -176,7 +176,7 @@ function wxmlToJS(options={}) {
   // const componentArgs = getComponentArgs(files), componentArgs.join(' ')
   let args = ['-d', '--split', options.wxmlCompileConfigSplit, type, options.wxmlCompileConfig]
     .concat(files)
-    .concat(['-gn', '$gwx'])
+    .concat(['-gn', options.genfuncname || '$gwx'])
 
   // wxs调试
   if(options.debugWXS)args.unshift('-ds')

compiler/wcsc_node/src/wcsc.js

@@ -81,7 +81,7 @@ async function wxssToJS(options) {
   // files = getAllFiles(rootPath, files)
 
   const args = ['-db', '-pc', String(options.pageCount)].concat(files)
-
+  options.subPackage && (args.push("--subpackage"), args.push(options.subPackage.replace(/\/$/, "")));
   const wxssParserPath = getWXSSParsePath()
   // console.warn('wcsc args: ', args)
   // const wcsc = spawnSync(wxssParserPath, args, { cwd: rootPath })