miniprogram-ci 2.1.29 → 2.1.31

package/dist/utils/packOptionsHelper.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});const tslib_1=require("tslib"),path=tslib_1.__importStar(require("path")),filerules_1=tslib_1.__importDefault(require("../utils/filerules")),tools_1=require("./tools"),config_1=require("../config/config");class PackOptionsHelper{constructor(){this.packOptionIgnores=[],this.packOptionIncludes=[],this.ignoreUploadUnusedFiles=!1,this.ignoreDevUnusedFiles=!1,this.unusedFiles=new Set,this.projectRoot="",this.extOpts={include:[],ignore:[]}}setExtOpts(e={}){this.extOpts.include=e.include||[],this.extOpts.ignore=e.ignore||[]}updateState(e){var s,i;this.packOptionIgnores=(null===(s=e.packOptions)||void 0===s?void 0:s.ignore)||[],this.packOptionIncludes=(null===(i=e.packOptions)||void 0===i?void 0:i.include)||[],this.projectRoot=e.miniprogramRoot||"",this.ignoreUploadUnusedFiles=!1,this.ignoreDevUnusedFiles=!1,e.type===config_1.COMPILE_TYPE.miniProgram&&(this.ignoreUploadUnusedFiles=Boolean(e.setting.ignoreUploadUnusedFiles),this.ignoreDevUnusedFiles=Boolean(e.setting.ignoreDevUnusedFiles)),(0,tools_1.isPluginType)(e)&&(this.projectRoot=e.pluginRoot||"")}isUnuserFilesEnable(e=!1){return e?!1!==this.ignoreUploadUnusedFiles:!0===this.ignoreDevUnusedFiles||!1!==this.ignoreDevUnusedFiles}filter(e,s=!1){return e.filter(e=>this.isNotIgnored(e,s))}isIgnored(e,s=!1){return this.isIgnoredByRules(e)||this.isIgnoreByUnusedFiles(e,s)}isNotIgnored(e,s=!1){return!this.isIgnored(e,s)}isIgnoredByRules(e,s={}){return!this.isFileIncluded(e,s.include)&&this.isFileIgnored(e,s.ignore)}relativePath(e){return path.posix.relative(this.projectRoot,e)}isFileIgnored(e,s){return s||(s=[...this.packOptionIgnores,...this.extOpts.ignore]),filerules_1.default.isFileIgnored(e,s)}isFileIncluded(e,s){return s||(s=[...this.packOptionIncludes,...this.extOpts.include]),filerules_1.default.isFileIncluded(e,s)}isIgnoreByUnusedFiles(e,s=!1){return!!this.isUnuserFilesEnable(s)&&(!this.isFileIncluded(e)&&this.unusedFiles.has((0,tools_1.sourcePathToTargetPath)(e)))}getUnusedFiles(){return this.unusedFiles}isScssOnlyImportedByFile(e){const s=path.extname(e.path);if("Wxss"===e.type&&[".scss",".sass",".less"].includes(s)&&e.parentDeps){let s=!0;return e.parentDeps.forEach(e=>{"file"!==e.from&&(s=!1)}),s}return!1}async initUnusedFiles(e,s,i=!1){if(this.updateState(e),this.isUnuserFilesEnable(i)&&s)try{await s.analyse();const i=s.fileHelper.getFileList("").filter(e=>(0,tools_1.isCodeFile)(path.posix.extname(e))),t=new Set;s.graph.modules.forEach(e=>{const s=i.find(s=>s===e.path);if(s){if(this.isScssOnlyImportedByFile(e))return;t.add((0,tools_1.sourcePathToTargetPath)(s))}});const n=new Set;i.forEach(s=>{const i=(0,tools_1.sourcePathToTargetPath)(s);t.has(i)||n.add(path.posix.join(e.miniprogramRoot,i))}),this.unusedFiles=n,console.error(this.unusedFiles)}catch(e){console.error("initUnusedFiles error",e)}}}exports.default=new PackOptionsHelper;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});const tslib_1=require("tslib"),path=tslib_1.__importStar(require("path")),filerules_1=tslib_1.__importDefault(require("../utils/filerules")),tools_1=require("./tools"),config_1=require("../config/config");class PackOptionsHelper{constructor(){this.packOptionIgnores=[],this.packOptionIncludes=[],this.ignoreUploadUnusedFiles=!1,this.ignoreDevUnusedFiles=!1,this.unusedFiles=new Set,this.projectRoot="",this.extOpts={include:[],ignore:[]}}setExtOpts(e={}){this.extOpts.include=e.include||[],this.extOpts.ignore=e.ignore||[]}updateState(e){var s,i;this.packOptionIgnores=(null===(s=e.packOptions)||void 0===s?void 0:s.ignore)||[],this.packOptionIncludes=(null===(i=e.packOptions)||void 0===i?void 0:i.include)||[],this.projectRoot=e.miniprogramRoot||"",this.ignoreUploadUnusedFiles=!1,this.ignoreDevUnusedFiles=!1,e.type===config_1.COMPILE_TYPE.miniProgram&&(this.ignoreUploadUnusedFiles=Boolean(e.setting.ignoreUploadUnusedFiles),this.ignoreDevUnusedFiles=Boolean(e.setting.ignoreDevUnusedFiles)),(0,tools_1.isPluginType)(e)&&(this.projectRoot=e.pluginRoot||"")}isUnuserFilesEnable(e=!1){return e?!1!==this.ignoreUploadUnusedFiles:!0===this.ignoreDevUnusedFiles||!1!==this.ignoreDevUnusedFiles}filter(e,s=!1){return e.filter(e=>this.isNotIgnored(e,s))}isIgnored(e,s=!1){return this.isIgnoredByRules(e)||this.isIgnoreByUnusedFiles(e,s)}isNotIgnored(e,s=!1){return!this.isIgnored(e,s)}isIgnoredByRules(e,s={}){return!this.isFileIncluded(e,s.include)&&this.isFileIgnored(e,s.ignore)}relativePath(e){return path.posix.relative(this.projectRoot,e)}isFileIgnored(e,s){return s||(s=[...this.packOptionIgnores,...this.extOpts.ignore]),filerules_1.default.isFileIgnored(e,s)}isFileIncluded(e,s){return s||(s=[...this.packOptionIncludes,...this.extOpts.include]),filerules_1.default.isFileIncluded(e,s)}isIgnoreByUnusedFiles(e,s=!1){return!!this.isUnuserFilesEnable(s)&&(!this.isFileIncluded(e)&&this.unusedFiles.has((0,tools_1.sourcePathToTargetPath)(e)))}getUnusedFiles(){return this.unusedFiles}isScssOnlyImportedByFile(e){const s=path.extname(e.path);if("Wxss"===e.type&&[".scss",".sass",".less"].includes(s)&&e.parentDeps){let s=!0;return e.parentDeps.forEach(e=>{"file"!==e.from&&(s=!1)}),s}return!1}clearUnusedFiles(){this.unusedFiles.clear()}async initUnusedFiles(e,s,i=!1){if(!(this.unusedFiles.size>0)&&(this.updateState(e),this.isUnuserFilesEnable(i)&&s))try{await s.analyse();const i=s.fileHelper.getFileList("").filter(e=>(0,tools_1.isCodeFile)(path.posix.extname(e))),t=new Set;s.graph.modules.forEach(e=>{const s=i.find(s=>s===e.path);if(s){if(this.isScssOnlyImportedByFile(e))return;t.add((0,tools_1.sourcePathToTargetPath)(s))}});const n=new Set;i.forEach(s=>{const i=(0,tools_1.sourcePathToTargetPath)(s);t.has(i)||n.add(path.posix.join(e.miniprogramRoot,i))}),this.unusedFiles=n}catch(e){console.error("initUnusedFiles error",e)}}}exports.default=new PackOptionsHelper;

package/dist/utils/subprocess/processManager.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.SubProcessProxy=void 0;const processService_1=require("./processService"),customError_1=require("../customError"),singletontask_1=require("../singletontask"),debug_1=require("../debug");class SubProcessProxy{constructor(s,e,t,r,o=8891,i){this.project=s,this.entryPath=e,this.passData=t,this.initOptions=r,this.inspectPort=o,this.progressUpdate=i,this.taskMap=new Map,this.taskId=0,this.init=async()=>{this.process=await this.forkProcess()},this.onMessage=s=>{var e,t;if(this._cpPromise&&("ready"===s.type&&(clearTimeout(this._cpPromise.timer),null===(e=this._cpPromise)||void 0===e||e.resolve()),"noReady"===s.type&&this._cpPromise.reject(new Error(s.error.message))),"progress"===s.type){const e=this.taskMap.get(s.taskId);(null==e?void 0:e.progressUpdate)&&e.progressUpdate(s.id,s.status,s.message)}if("log"===s.type&&(null===(t=this.progressUpdate)||void 0===t||t.call(this,s.id||"",s.status,s.text)),"response"===s.type){const{id:e,data:t,error:r}=s;r?this.onResponse(e,void 0,r):this.onResponse(e,t,void 0)}}}async ready(){var s;return this._checkReadyTask||(this._checkReadyTask=new singletontask_1.SingletonTask(this.init)),await(null===(s=this._checkReadyTask)||void 0===s?void 0:s.getResult(!0))}async sendProcessMessage(s){await this.ready(),this.process.send(s)}destroy(){var s;null===(s=this.process)||void 0===s||s.kill("SIGTERM"),this.process=void 0,this._checkReadyTask=void 0}async forkProcess(){const s=await this.project.serialize(),e={type:"init",data:{passData:this.passData,projectInfo:s,options:this.initOptions}},t=await(0,debug_1.shouldRunInMainProcess)();if(t){const s=require("../../modules/corecompiler/processHandler");return await s.initHandler(e),s.onMessage(this.onMessage),{send:e=>{t&&s.messageHandler(e)},kill:e=>(s.destroy(),!0)}}return await(0,processService_1.forkProcess)(this,this.entryPath,this.project.projectPath,e,this.inspectPort)}onResponse(s,e,t){const r=this.taskMap.get(s);this.taskMap.delete(s),r?t?(t=new customError_1.CustomError(t),r.reject(t)):r.resolve(e):console.error(`child process task: ${s} not found`)}async sendEvent(s,e){this.sendProcessMessage({type:"event",name:s,data:e})}async runTask(s,e,t){return new Promise((r,o)=>{const i={name:s,data:e,resolve:r,reject:o,progressUpdate:t};this.taskId+=1,this.taskMap.set(this.taskId,i);this.sendProcessMessage({type:"request",id:this.taskId,name:s,data:e}).catch(s=>{o(s)})})}}exports.SubProcessProxy=SubProcessProxy;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.SubProcessProxy=void 0;const tslib_1=require("tslib"),processService_1=require("./processService"),path_1=tslib_1.__importDefault(require("path")),customError_1=require("../customError"),singletontask_1=require("../singletontask"),debug_1=require("../debug"),progressRecorder_1=require("../../utils/progressRecorder"),IN_PROCESS_HANDLER_MODULE_MAP={summerEntryProcess:"../../modules/corecompiler/processHandler",summerentryprocess:"../../modules/corecompiler/processHandler",nativeEntryProcess:"../../modules/nativecompiler/processHandler"};class SubProcessProxy{constructor(s,e,r,t,o=8891,i){this.project=s,this.entryPath=e,this.passData=r,this.initOptions=t,this.inspectPort=o,this.progressUpdate=i,this.taskMap=new Map,this.taskId=0,this.init=async()=>{this.process=await this.forkProcess()},this.onMessage=s=>{var e,r;if(this._cpPromise&&("ready"===s.type&&(clearTimeout(this._cpPromise.timer),null===(e=this._cpPromise)||void 0===e||e.resolve()),"noReady"===s.type&&this._cpPromise.reject(new Error(s.error.message))),"progress"===s.type){const e=this.taskMap.get(s.taskId);(null==e?void 0:e.progressUpdate)&&e.progressUpdate(s.id,s.status,s.message)}if("log"===s.type&&(null===(r=this.progressUpdate)||void 0===r||r.call(this,s.id||"",s.status,s.text)),"response"===s.type){const{id:e,data:r,error:t}=s;t?this.onResponse(e,void 0,t):this.onResponse(e,r,void 0)}}}async ready(){var s;return this._checkReadyTask||(this._checkReadyTask=new singletontask_1.SingletonTask(this.init)),await(null===(s=this._checkReadyTask)||void 0===s?void 0:s.getResult(!0))}async sendProcessMessage(s){await this.ready(),this.process.send(s)}destroy(){var s;null===(s=this.process)||void 0===s||s.kill("SIGTERM"),this.process=void 0,this._checkReadyTask=void 0}getInProcessHandler(){const s=path_1.default.parse(this.entryPath).name,e=IN_PROCESS_HANDLER_MODULE_MAP[s];if(!e)throw new Error("unsupported in-process entry handler: "+this.entryPath);return require(e)}async forkProcess(){console.warn(`[summer-compiler] forkProcess [${(0,progressRecorder_1.getPrintTime)()}]`);const s=await this.project.serialize();console.warn(`[summer-compiler] forkProcess serialize [${(0,progressRecorder_1.getPrintTime)()}]`);const e={type:"init",data:{passData:this.passData,projectInfo:s,options:this.initOptions}},r=await(0,debug_1.shouldRunInMainProcess)();if(r){const s=this.getInProcessHandler();return await s.initHandler(e),s.onMessage(this.onMessage),{send:e=>{r&&s.messageHandler(e)},kill:e=>(s.destroy(),!0)}}console.warn(`[summer-compiler] forkProcess start [${(0,progressRecorder_1.getPrintTime)()}]`);const t=await(0,processService_1.forkProcess)(this,this.entryPath,this.project.projectPath,e,this.inspectPort);return console.warn(`[summer-compiler] forkProcess done [${(0,progressRecorder_1.getPrintTime)()}]`),t}onResponse(s,e,r){const t=this.taskMap.get(s);this.taskMap.delete(s),t?r?(r=new customError_1.CustomError(r),t.reject(r)):t.resolve(e):console.error(`child process task: ${s} not found`)}async sendEvent(s,e){this.sendProcessMessage({type:"event",name:s,data:e})}async runTask(s,e,r){return new Promise((t,o)=>{const i={name:s,data:e,resolve:t,reject:o,progressUpdate:r};this.taskId+=1,this.taskMap.set(this.taskId,i);this.sendProcessMessage({type:"request",id:this.taskId,name:s,data:e}).catch(s=>{o(s)})})}}exports.SubProcessProxy=SubProcessProxy;

package/dist/utils/subprocess/processService.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.forkProcess=void 0;const tslib_1=require("tslib"),child_process_1=require("child_process"),debug_1=require("../debug"),path_1=tslib_1.__importDefault(require("path")),env_1=require("../env"),PROCESS_READY_TIMEOUT=2e4;async function forkProcess(e,s,o,r,t=8891){const c=s,i={stdio:["pipe","pipe","pipe","ipc"],cwd:o,env:Object.assign(Object.assign({},process.env),{cpprocessEnv:"childprocess",nativeProcess:"1",timeout:global.TEST_COMPILER_PROCESS_TIMEOUT})};if(await(0,debug_1.shouldInspectCompiler)()&&(i.execArgv=["--inspect-brk="+t],i.env.__MINIPROGRAM_CI_TEST__="true"),i.env.isDevtools=env_1.isDevtools,env_1.isDevtools){let e=path_1.default.join(path_1.default.dirname(process.execPath),"node");"darwin"!==process.platform&&(e+=".exe"),i.execPath=e}return new Promise((s,o)=>{const t=(0,child_process_1.fork)(c,["--expose-gc"],i),n=setTimeout(()=>{e.destroy(),o(new Error("fork process timeout"))},2e4);return e._cpPromise={timer:n,resolve:()=>{s(t)},reject:o},t.stdout.setEncoding("utf8"),t.stdout.on("data",e=>{console.log("child process stdout: "+e)}),t.stderr.on("data",e=>{console.error("child process stderr: "+e)}),t.on("exit",(s,r)=>{e.process=void 0,e._checkReadyTask=void 0,env_1.isDevtools&&console.error(`child process exit: code(${s}), signal(${r})`),0!==s&&o(new Error(`native child process exit: code(${s}), signal(${r})`))}),t.on("message",e.onMessage),t.unref(),e.taskId+=1,t.send(r),t})}exports.forkProcess=forkProcess;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.forkProcess=void 0;const tslib_1=require("tslib"),child_process_1=require("child_process"),debug_1=require("../debug"),path_1=tslib_1.__importDefault(require("path")),env_1=require("../env"),PROCESS_READY_TIMEOUT=2e4;async function forkProcess(e,s,o,r,t=8891){const c=s,i={stdio:["pipe","pipe","pipe","ipc"],cwd:o,env:Object.assign(Object.assign({},process.env),{cpprocessEnv:"childprocess",nativeProcess:"1",timeout:global.TEST_COMPILER_PROCESS_TIMEOUT})};if(await(0,debug_1.shouldInspectCompiler)()&&(i.execArgv=["--inspect="+t],(0,env_1.isElectron)()&&i.execArgv.push("--expose-gc"),i.env.__MINIPROGRAM_CI_TEST__="true"),i.env.isDevtools=env_1.isDevtools,env_1.isDevtools){let e=path_1.default.join(path_1.default.dirname(process.execPath),"node");"darwin"!==process.platform&&(e+=".exe"),i.execPath=e}return new Promise((s,o)=>{const t=(0,child_process_1.fork)(c,["--expose-gc"],i),n=setTimeout(()=>{e.destroy(),o(new Error("fork process timeout"))},2e4);return e._cpPromise={timer:n,resolve:()=>{s(t)},reject:o},t.stdout.setEncoding("utf8"),t.stdout.on("data",e=>{console.log("child process stdout: "+e)}),t.stderr.on("data",e=>{console.error("child process stderr: "+e)}),t.on("exit",(s,r)=>{e.process=void 0,e._checkReadyTask=void 0,env_1.isDevtools&&console.error(`child process exit: code(${s}), signal(${r})`),0!==s&&o(new Error(`native child process exit: code(${s}), signal(${r})`))}),t.on("message",e.onMessage),t.unref(),e.taskId+=1,t.send(r),t})}exports.forkProcess=forkProcess;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miniprogram-ci",
-  "version": "2.1.29",
+  "version": "2.1.31",
   "description": "Module that build miniprogram project for web or app extracted from WeChatDevtools.",
   "homepage": "https://developers.weixin.qq.com/community/homepage",
   "main": "dist/index.js",
@@ -15,7 +15,8 @@
     "beta": "npm run init && rm -rf dist && tsc && gulp copy && node ./task/afterbuild.js && npm run test",
     "build": "rm -rf dist && npm run eslint -- --fix && npm run bb",
     "prebuild-ci": "npm run buildandroidtoolkit",
-    "build-ci": "rm -rf dist && rm -rf ci-src && npm run build && gulp pre-build-ci && rm -rf dist && gulp removeForCi && npm run ci-tsc && gulp build-ci",
+    "build-ci": "rm -rf dist && rm -rf ci-src && npm run build && gulp pre-build-ci && rm -rf dist && gulp removeForCi && npm run ci-tsc && gulp build-ci && npm run genCiDist",
+    "genCiDist": "node ./task/genCiDist.js",
     "ci-tsc": "gulp ci-tsc",
     "ci-tsc-dev": "gulp ci-tsc-dev",
     "bb": "npm run init && gulp inc-version && gulp tsc && gulp build && node ./task/afterbuild.js ",
@@ -53,56 +54,6 @@
   "overrides": {
     "graceful-fs": "4.2.11"
   },
-  "devDependencies": {
-    "@swc/helpers": "0.5.9",
-    "@tencent/eslint-config-extends": "git+https://git.woa.com/devtools/eslint-config-extends.git",
-    "@tencent/eslint-config-tencent": "^1.0.4",
-    "@tencent/wxa-runtime-browser": "^0.2.0",
-    "@types/babel__core": "^7.1.17",
-    "@types/babel-code-frame": "^6.20.2",
-    "@types/babel-core": "^6.25.6",
-    "@types/cssnano": "^4.0.1",
-    "@types/estree": "0.0.47",
-    "@types/fs-extra": "^8.0.0",
-    "@types/glob": "^7.2.0",
-    "@types/html-minifier": "^3.5.3",
-    "@types/jest": "^26.0.20",
-    "@types/less": "^3.0.3",
-    "@types/lodash": "^4.14.178",
-    "@types/node": "^13.13.52",
-    "@types/read-package-tree": "^5.2.0",
-    "@types/request": "^2.48.3",
-    "@types/rimraf": "^3.0.0",
-    "@types/sass": "^1.43.1",
-    "@types/terminal-kit": "^1.34.0",
-    "@types/uglify-js": "^3.0.4",
-    "@types/uuid": "^3.1.0",
-    "@types/yargs": "^13.0.3",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
-    "dependency-tree": "^10.0.9",
-    "eslint": "^7.16.0",
-    "eslint-plugin-import": "2.22.1",
-    "eslint-plugin-react": "7.22.0",
-    "eslint-plugin-unused-imports": "^1.1.1",
-    "eslint-plugin-weixin-devtools": "git+https://git.woa.com/devtools/eslint-plugin-weixin-devtools.git#master",
-    "gulp": "^4.0.2",
-    "gulp-clean": "^0.4.0",
-    "gulp-if": "^3.0.0",
-    "gulp-preprocess": "^5.0.0",
-    "gulp-terser": "^1.2.0",
-    "gulp-tsc": "^1.3.2",
-    "gulp-typescript": "5.0.1",
-    "jest": "^26.6.3",
-    "mocha": "^6.2.2",
-    "mochawesome": "^4.1.0",
-    "nyc": "^14.1.1",
-    "ts-jest": "^26.5.2",
-    "typescript": "^4.9.5",
-    "typescript-json-schema": "^0.41.0"
-  },
   "dependencies": {
     "@babel/code-frame": "7.22.10",
     "@babel/compat-data": "7.22.9",
@@ -257,7 +208,7 @@
     "js-base64": "^3.7.2",
     "jsonschema": "^1.2.5",
     "jszip": "^3.4.0",
-    "less": "^4.1.2",
+    "less": "4.5.1",
     "licia": "^1.31.1",
     "lodash": "^4.17.15",
     "memory-fs": "^0.5.0",
@@ -290,4 +241,4 @@
   "engines": {
     "node": ">=16.1.0"
   }
-}
+}