@simplysm/sd-cli 7.1.37 → 7.1.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -126,7 +126,7 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
126
126
|
if (this._config.pm2 === undefined || this._config.pm2 === false)
|
|
127
127
|
return;
|
|
128
128
|
const npmConfig = this._getNpmConfig(this._rootPath);
|
|
129
|
-
const pm2DistPath = path.resolve(this._parsedTsconfig.options.outDir, "pm2.json");
|
|
129
|
+
const pm2DistPath = path.resolve(this._parsedTsconfig.options.outDir, typeof this._config.pm2 !== "boolean" ? this._config.pm2.fileName ?? "pm2.json" : "pm2.json");
|
|
130
130
|
await FsUtil.writeFileAsync(pm2DistPath, JSON.stringify(ObjectUtil.merge({
|
|
131
131
|
"name": npmConfig.name.replace(/@/g, "").replace(/\//g, "-"),
|
|
132
132
|
"script": path.basename(path.resolve(this._parsedTsconfig.options.outDir, "main.js")),
|
|
@@ -139,14 +139,16 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
139
139
|
"node_modules",
|
|
140
140
|
"www"
|
|
141
141
|
].distinct(),
|
|
142
|
-
|
|
142
|
+
...typeof this._config.pm2 !== "boolean" && this._config.pm2.noInterpreter ? {} : {
|
|
143
|
+
"interpreter": "node@" + process.versions.node,
|
|
144
|
+
},
|
|
143
145
|
"env": {
|
|
144
146
|
NODE_ENV: "production",
|
|
145
147
|
SD_VERSION: npmConfig.version,
|
|
146
148
|
TZ: "Asia/Seoul",
|
|
147
149
|
...this._config.env ? this._config.env : {}
|
|
148
150
|
}
|
|
149
|
-
}, (typeof this._config.pm2 !== "boolean") ? this._config.pm2 : {}, {
|
|
151
|
+
}, (typeof this._config.pm2 !== "boolean") ? this._config.pm2.config : {}, {
|
|
150
152
|
arrayProcess: "concat",
|
|
151
153
|
useDelTargetNull: true
|
|
152
154
|
}), undefined, 2));
|
|
@@ -190,7 +192,7 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
190
192
|
delete distNpmConfig.optionalDependencies;
|
|
191
193
|
delete distNpmConfig.devDependencies;
|
|
192
194
|
delete distNpmConfig.peerDependencies;
|
|
193
|
-
if (this._config.pm2 !== undefined) {
|
|
195
|
+
if (this._config.pm2 !== undefined && (typeof this._config.pm2 === "boolean" || !this._config.pm2.noStartScript)) {
|
|
194
196
|
distNpmConfig.scripts = { "start": "pm2 start pm2.json" };
|
|
195
197
|
}
|
|
196
198
|
await FsUtil.writeFileAsync(path.resolve(this._parsedTsconfig.options.outDir, "package.json"), JSON.stringify(distNpmConfig, undefined, 2));
|
|
@@ -476,4 +478,4 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
476
478
|
return this._npmConfigMap.get(pkgPath);
|
|
477
479
|
}
|
|
478
480
|
}
|
|
479
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliServerBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliServerBuilder.ts"],"names":[],"mappings":"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"}
|
|
481
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliServerBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliServerBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,YAAY,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAGpC,MAAM,OAAO,kBAAmB,SAAQ,YAAY;IAUlD,YAAoC,SAAiB,EACjB,OAAkC,EAClC,aAAqB;QACvD,KAAK,EAAE,CAAC;QAH0B,cAAS,GAAT,SAAS,CAAQ;QACjB,YAAO,GAAP,OAAO,CAA2B;QAClC,kBAAa,GAAb,aAAa,CAAQ;QAXxC,YAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAKpE,kBAAa,GAAG,IAAI,GAAG,EAAsB,CAAC;QAE9C,mBAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAOvE,WAAW;QACX,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QAC7E,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACzD,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/F,CAAC;IAIe,EAAE,CAAC,KAAsB,EAAE,QAAkC;QAC3E,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,KAAc;QAC3C,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC;QAErG,6DAA6D;QAE7D,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC;aACnC,MAAM,CAAC,kBAAkB,CAAC;aAC1B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;aACpD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACpC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;aACxB,MAAM,CAAC,KAAK,CAAC,CAAC;QACjB,IACE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC,YAAY;eACtE,CACD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;gBAC3D,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,KAAK,WAAW,CACzF,CAAC,iBAAiB;UACnB;YACA,QAAQ;YACR,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;SAC7D;QACD,OAAO;QACP,MAAM,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,EAAE,WAAW,CAAC,CAAC;IACzF,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,WAAW;QACX,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAO,CAAC,CAAC;QAE/D,OAAO;QACP,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAElC,QAAQ;QACR,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC9C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QACxC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;gBACzE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACpB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBACvC,QAAQ,EAAE,CAAC;YACb,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;gBACtC,IAAI,GAAG,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,EAAE;oBAChC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;4BACrB,QAAQ,EAAE,SAAS;4BACnB,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,SAAS;4BACf,QAAQ,EAAE,OAAO;4BACjB,OAAO,EAAE,GAAG,EAAE,KAAK,IAAI,wBAAwB;yBAChD,CAAC,CAAC,CAAC;oBACJ,MAAM,CAAC,GAAG,CAAC,CAAC;oBACZ,OAAO;iBACR;gBAED,qBAAqB;gBACrB,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAEvC,QAAQ;gBACR,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACpC,MAAM,OAAO,GAAG,oBAAoB,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBACpE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAC/B,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,WAAW;QACX,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAO,CAAC,CAAC;QAE/D,KAAK;QACL,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC9C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QACxC,MAAM,YAAY,GAAG,MAAM,IAAI,OAAO,CAA6B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrF,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC1B,IAAI,GAAG,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,EAAE;oBAChC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACZ,OAAO;iBACR;gBAED,QAAQ;gBACR,MAAM,OAAO,GAAG,oBAAoB,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBACpE,OAAO,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,qBAAqB;QACrB,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAEvC,iBAAiB;QACjB,MAAM,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAE1C,uBAAuB;QACvB,MAAM,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAE1C,yBAAyB;QACzB,MAAM,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE3G,MAAM;QACN,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACpC,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,yBAAyB;QACrC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAO,EAAE,cAAc,CAAC,CAAC;QAC1F,MAAM,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IACxG,CAAC;IAEO,KAAK,CAAC,4BAA4B;QACxC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,KAAK;YAAE,OAAO;QAEzE,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAE,CAAC;QACtD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAO,EAAE,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACrK,MAAM,MAAM,CAAC,cAAc,CACzB,WAAW,EACX,IAAI,CAAC,SAAS,CACZ,UAAU,CAAC,KAAK,CACd;YACE,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;YAC5D,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAO,EAAE,SAAS,CAAC,CAAC;YACtF,WAAW,EAAE,2BAA2B;YACxC,2FAA2F;YAC3F,8FAA8F;YAC9F,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;YACnB,cAAc,EAAE;gBACd,cAAc;gBACd,KAAK;aACN,CAAC,QAAQ,EAAE;YACZ,GAAG,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAChF,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI;aAC/C;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,YAAY;gBACtB,UAAU,EAAE,SAAS,CAAC,OAAO;gBAC7B,EAAE,EAAE,YAAY;gBAChB,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;aAC5C;SACF,EACD,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EACtE;YACE,YAAY,EAAE,QAAQ;YACtB,gBAAgB,EAAE,IAAI;SACvB,CAAC,EACJ,SAAS,EACT,CAAC,CACF,CACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,4BAA4B;QACxC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,KAAK;YAAE,OAAO;QAEzE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAO,EAAE,YAAY,CAAC,CAAC;QACrF,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,IAAI,IAAI,mBAAmB,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;YAC9F,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,qCAAqC,CAAC;YAC/E,CAAC,CAAC,qCAAqC,CAAC;QAC1C,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE;;;;;;uCAMN,iBAAiB;;;;;;;;;;;;;;;CAevD,CAAC,IAAI,EAAE,CAAC,CAAC;IACR,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,IAAc;QACvD,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAE,CAAC;QAC5E,aAAa,CAAC,YAAY,GAAG,EAAE,CAAC;QAChC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;SACvC;QACD,OAAO,aAAa,CAAC,oBAAoB,CAAC;QAC1C,OAAO,aAAa,CAAC,eAAe,CAAC;QACrC,OAAO,aAAa,CAAC,gBAAgB,CAAC;QAEtC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,SAAS,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;YAChH,aAAa,CAAC,OAAO,GAAG,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC;SAC3D;QAED,MAAM,MAAM,CAAC,cAAc,CACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAO,EAAE,cAAc,CAAC,EAClE,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC,CAC5C,CAAC;IACJ,CAAC;IAEO,4BAA4B,CAAC,QAAgB;QACnD,OAAO;YACL,GAAG,MAAM,CAAC,0BAA0B,CAAC,6BAA6B,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC;YACvG,GAAG,MAAM,CAAC,0BAA0B,CAAC,6BAA6B,QAAQ,kBAAkB,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC;SAClI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,KAAc,EAAE,UAA+C;QAClG,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAE,CAAC;QAC9D,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC;QAEpC,MAAM,wBAAwB,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEjG,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAE,CAAC;QACtD,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAG,CAAC;QACjD,wCAAwC;QAExC,MAAM,OAAO,GAA6B;YACxC,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;SACpD,CAAC;QACF,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;YACxB,KAAK,MAAM,gBAAgB,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;gBACnD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC5F,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;aAC/E;SACF;QAED,IAAI,mBAAmB,GAAG,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY;YAC1C,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;YAC1B,OAAO,EAAE,KAAK;YACd,OAAO,EAAE;gBACP,KAAK,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;gBACvB,UAAU,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC;gBAC1C,QAAQ,EAAE,IAAI;gBACd,OAAO,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC;gBAC7C,UAAU,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC;gBACnD,cAAc,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;aAClC;YACD,aAAa,EAAE;gBACb,QAAQ,EAAE,IAAI;aACf;YACD,OAAO,EAAE,IAAI,CAAC,aAAa;YAC3B,KAAK,EAAE,OAAO;YACd,MAAM,EAAE;gBACN,UAAU,EAAE,MAAM;gBAClB,YAAY,EAAE,UAAU;gBACxB,KAAK,EAAE,IAAI;gBACX,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM;gBACzC,QAAQ,EAAE,WAAW;gBACrB,aAAa,EAAE,WAAW;gBAC1B,0BAA0B;gBAC1B,+BAA+B;gBAC/B,mBAAmB,EAAE,wBAAwB;gBAC7C,aAAa,EAAE,WAAW;gBAC1B,aAAa;gBACb,mBAAmB;gBACnB,KAAK;gBACL,eAAe;aAChB;YACD;;gBAEI;YACJ,KAAK,EAAE,KAAK;YACZ,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE;YACrD,WAAW,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;YAC7B,qBAAqB,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;YACzC,KAAK,EAAE,iBAAiB;YACxB,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;YACvF,wIAAwI;YACxI,+FAA+F;YAC/F,KAAK,EAAE;gBACL,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK;gBAClC,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,oBAAoB,EAAE,CAAC;gBACvB,IAAI,EAAE,SAAS;aAChB;YACD,QAAQ,EAAE;gBACR,cAAc,EAAE,wBAAwB;gBACxC,YAAY,EAAE,wBAAwB;aACvC;YACD,IAAI,EAAE,KAAK;YACX,YAAY,EAAE;gBACZ,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBACtB,IAAI,YAAY,CAAC;wBACf,eAAe,EAAE,KAAK;wBACtB,aAAa,EAAE;4BACb,QAAQ,EAAE,IAAI;4BACd,IAAI,EAAE,IAAI;4BACV,SAAS,EAAE,KAAK;4BAChB,eAAe,EAAE,IAAI;4BACrB,WAAW,EAAE,IAAI;4BACjB,GAAG,EAAE,KAAK;4BACV,QAAQ,EAAE,KAAK;4BACf,gBAAgB;4BAChB,MAAM,EAAE;gCACN,QAAQ,EAAE,KAAK;6BAChB;yBACF;qBACF,CAAC;iBACH;gBACD,SAAS,EAAE,eAAe;gBAC1B,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;gBAC3C,YAAY,EAAE,KAAK;aACpB;YACD,MAAM,EAAE;gBACN,oBAAoB,EAAE,IAAI;gBAC1B,MAAM,EAAE;oBACN,UAAU,EAAE;wBACV,UAAU,EAAE,KAAK;qBAClB;iBACF;gBACD,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,iBAAiB;wBACvB,OAAO,EAAE;4BACP,cAAc,EAAE,KAAK;yBACtB;qBACF;oBACD,GAAG,KAAK,CAAC,CAAC,CAAC;wBACT;4BACE,IAAI,EAAE,cAAc;4BACpB,OAAO,EAAE,KAAc;4BACvB,MAAM,EAAE,aAAa,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,OAAQ,CAAC,mBAAmB,CAAC,CAAC;4BACtE,OAAO,EAAE;gCACP,sBAAsB,EAAE,CAAC,MAAc,EAAE,YAAoB,EAAE,EAAE;oCAC/D,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,uBAAuB,QAAQ,SAAS,CAAC,CAAC;oCACvE,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC;2CACxC,CAAC,iCAAiC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;2CACtD,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gCACpC,CAAC;6BACF;yBACF;qBACF,CAAC,CAAC,CAAC,EAAE;oBACN;wBACE,IAAI,EAAE,cAAc;wBACpB,OAAO,EAAE,cAAc;wBACvB,MAAM,EAAE,aAAa,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,OAAQ,CAAC,WAAW,CAAC,CAAC;wBAC9D,OAAO,EAAE;4BACP,UAAU,EAAE,IAAI,CAAC,iBAAiB;4BAClC,cAAc,EAAE,CAAC,GAAc,EAAE,EAAE;gCACjC,OAAO,oBAAoB,CAAC,UAAU,CAAC;oCACrC,QAAQ,EAAE,GAAG,CAAC,IAAI;oCAClB,IAAI,EAAE,GAAG,CAAC,IAAI;oCACd,IAAI,EAAE,GAAG,CAAC,SAAS;oCACnB,IAAI,EAAE,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;oCAChC,QAAQ,EAAE,GAAG,CAAC,QAAQ;oCACtB,OAAO,EAAE,GAAG,CAAC,OAAO;iCACrB,CAAC,CAAC;4BACL,CAAC;yBACF;qBACF;oBACD;wBACE,IAAI,EAAE,qFAAqF;wBAC3F,IAAI,EAAE,gBAAgB;qBACvB;iBACF;aACF;YACD,OAAO,EAAE;gBACP,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBACd,IAAI,oBAAoB,CAAC;wBACvB,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;wBACzC,cAAc,EAAE,KAAK;wBACrB,cAAc,EAAE,wBAAwB;wBACxC,kBAAkB,EAAE,IAAI;qBACzB,CAAQ;iBACV;gBACD,IAAI,iBAAiB,CAAC;oBACpB,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;wBACnC,OAAO,EAAE,IAAI,CAAC,SAAS;wBACvB,EAAE,EAAE,IAAI;wBACR,IAAI,EAAE,OAAO,IAAI,EAAE;wBACnB,gBAAgB,EAAE,IAAI;wBACtB,KAAK,EAAE,IAAI;wBACX,WAAW,EAAE;4BACX,GAAG,EAAE,IAAI;4BACT,mBAAmB,EAAE,KAAK;4BAC1B,MAAM,EAAE;gCACN,UAAU;gCACV,cAAc;gCACd,cAAc;6BACf,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;yBAChD;wBACD,QAAQ,EAAE,CAAC;qBACZ,CAAC,CAAC;iBACJ,CAAC;gBACF,IAAI,OAAO,CAAC,iBAAiB,CAAC;oBAC5B,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAE,CAAC,OAAO;oBACvD,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG;iBACpB,CAAC;gBACF,IAAI,mBAAmB,CAAC;oBACtB,OAAO,EAAE,IAAI,CAAC,SAAS;oBACvB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,EAAE,QAAQ,CAAC;oBACtE,OAAO,EAAE,CAAC,cAAc,CAAC;oBACzB,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC;oBACtC,GAAG,EAAE,KAAK;oBACV,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,CAAC,OAAqB,EAAE,EAAE;wBACnC,MAAM,cAAc,GAAa,EAAE,CAAC;wBACpC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;4BAC5B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE;gCACjC,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;gCAC3F,IAAI,QAAQ,KAAK,SAAS;oCAAE,SAAS;gCAErC,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC;oCAClD,QAAQ,EAAE,MAAM,CAAC,QAAQ;oCACzB,IAAI,EAAE,GAAG,CAAC,IAAI;oCACd,IAAI,EAAE,GAAG,CAAC,MAAM;oCAChB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE;oCAC5B,QAAQ;oCACR,OAAO,EAAE,GAAG,CAAC,OAAO;iCACrB,CAAC,CAAC,CAAC;6BACL;yBACF;wBACD,OAAO,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;oBACrC,CAAC;iBACF,CAAC;gBACF,IAAI,OAAO,CAAC,cAAc,CAAC;oBACzB,OAAO,EAAE,CAAC,GAAW,EAAE,GAAW,EAAE,GAAG,IAAc,EAAE,EAAE;wBACvD,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;wBACxE,MAAM,eAAe,GAAG,qBAAqB,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,SAAS,GAAG,QAAQ,EAAE,CAAC;wBAC9F,IAAI,eAAe,KAAK,mBAAmB,EAAE;4BAC3C,mBAAmB,GAAG,eAAe,CAAC;4BACtC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;yBACrC;oBACH,CAAC;iBACF,CAAC;aACH;SACF,CAAC;IACJ,CAAC;IAEO,mBAAmB;QACzB,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,MAAM,OAAO,GAAwC,EAAE,CAAC;QAExD,MAAM,EAAE,GAAG,CAAC,QAAgB,EAAQ,EAAE;YACpC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC/C,IAAI,CAAC,SAAS;gBAAE,OAAO;YAEvB,MAAM,IAAI,GAAG,kBAAkB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAC3D,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACtC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAAE,SAAS;gBACrD,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAEnC,MAAM,UAAU,GAAG,MAAM,CAAC,0BAA0B,CAAC,eAAe,GAAG,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAAC;gBACzH,IAAI,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;oBACxC,SAAS;iBACV;gBAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;iBAClD;gBAED,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE;oBAC1D,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;iBAClD;gBAED,EAAE,CAAC,UAAU,CAAC,CAAC;aAChB;YAED,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,SAAS,EAAE;gBAC1C,IAAI,iBAAiB,CAAC,QAAQ,CAAC,aAAa,CAAC;oBAAE,SAAS;gBACxD,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAEtC,MAAM,aAAa,GAAG,MAAM,CAAC,0BAA0B,CAAC,eAAe,GAAG,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAAC;gBAC/H,IAAI,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE;oBAC3C,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;oBACrD,SAAS;iBACV;gBAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBACzE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;iBACrD;gBAED,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE;oBAC7D,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;iBACrD;gBAED,EAAE,CAAC,aAAa,CAAC,CAAC;aACnB;QACH,CAAC,CAAC;QAEF,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEnB,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,aAAa,CAAC,OAAe;QACnC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACpC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;SACzF;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;CACF"}
|
package/dist/commons.d.ts
CHANGED
|
@@ -62,7 +62,12 @@ export interface ISdCliServerPackageConfig {
|
|
|
62
62
|
type: "server";
|
|
63
63
|
env?: Record<string, string>;
|
|
64
64
|
configs?: Record<string, any>;
|
|
65
|
-
pm2?:
|
|
65
|
+
pm2?: {
|
|
66
|
+
fileName?: string;
|
|
67
|
+
noInterpreter?: boolean;
|
|
68
|
+
noStartScript?: boolean;
|
|
69
|
+
config: Record<string, any>;
|
|
70
|
+
} | boolean;
|
|
66
71
|
iis?: boolean | {
|
|
67
72
|
serverExeFilePath?: string;
|
|
68
73
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "7.1.
|
|
3
|
+
"version": "7.1.38",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"**/*"
|
|
21
21
|
],
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@angular-devkit/build-angular": "^14.2.
|
|
23
|
+
"@angular-devkit/build-angular": "^14.2.11",
|
|
24
24
|
"@angular/common": "^14.3.0",
|
|
25
25
|
"@angular/compiler": "^14.3.0",
|
|
26
26
|
"@angular/compiler-cli": "^14.3.0",
|
|
@@ -28,12 +28,12 @@
|
|
|
28
28
|
"@babel/parser": "^7.21.3",
|
|
29
29
|
"@babel/types": "^7.21.3",
|
|
30
30
|
"@compodoc/compodoc": "^1.1.19",
|
|
31
|
-
"@ngtools/webpack": "^14.2.
|
|
32
|
-
"@simplysm/sd-core-common": "7.1.
|
|
33
|
-
"@simplysm/sd-core-node": "7.1.
|
|
34
|
-
"@simplysm/sd-service-common": "7.1.
|
|
35
|
-
"@simplysm/sd-service-server": "7.1.
|
|
36
|
-
"@simplysm/sd-storage": "7.1.
|
|
31
|
+
"@ngtools/webpack": "^14.2.11",
|
|
32
|
+
"@simplysm/sd-core-common": "7.1.38",
|
|
33
|
+
"@simplysm/sd-core-node": "7.1.38",
|
|
34
|
+
"@simplysm/sd-service-common": "7.1.38",
|
|
35
|
+
"@simplysm/sd-service-server": "7.1.38",
|
|
36
|
+
"@simplysm/sd-storage": "7.1.38",
|
|
37
37
|
"browserslist": "^4.21.5",
|
|
38
38
|
"chokidar": "^3.5.3",
|
|
39
39
|
"connect": "^3.7.0",
|
|
@@ -49,18 +49,18 @@
|
|
|
49
49
|
"jszip": "^3.10.1",
|
|
50
50
|
"license-webpack-plugin": "^4.0.2",
|
|
51
51
|
"mime": "^3.0.0",
|
|
52
|
-
"mini-css-extract-plugin": "^2.7.
|
|
52
|
+
"mini-css-extract-plugin": "^2.7.5",
|
|
53
53
|
"node-polyfill-webpack-plugin": "^2.0.1",
|
|
54
54
|
"resolve-url-loader": "^5.0.0",
|
|
55
55
|
"rxjs": "^7.8.0",
|
|
56
56
|
"sass": "^1.59.3",
|
|
57
|
-
"sass-loader": "^13.2.
|
|
57
|
+
"sass-loader": "^13.2.1",
|
|
58
58
|
"semver": "^7.3.8",
|
|
59
59
|
"source-map-loader": "^4.0.1",
|
|
60
60
|
"source-map-support": "^0.5.21",
|
|
61
61
|
"terser-webpack-plugin": "^5.3.7",
|
|
62
62
|
"ts-loader": "^9.4.2",
|
|
63
|
-
"typedoc": "^0.23.
|
|
63
|
+
"typedoc": "^0.23.28",
|
|
64
64
|
"typescript": "~4.8.4",
|
|
65
65
|
"webpack": "^5.76.2",
|
|
66
66
|
"xml2js": "^0.4.23",
|
|
@@ -74,6 +74,6 @@
|
|
|
74
74
|
"@types/semver": "^7.3.13",
|
|
75
75
|
"@types/source-map-support": "^0.5.6",
|
|
76
76
|
"@types/xml2js": "^0.4.11",
|
|
77
|
-
"@types/yargs": "^17.0.
|
|
77
|
+
"@types/yargs": "^17.0.23"
|
|
78
78
|
}
|
|
79
79
|
}
|
|
@@ -162,7 +162,7 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
162
162
|
if (this._config.pm2 === undefined || this._config.pm2 === false) return;
|
|
163
163
|
|
|
164
164
|
const npmConfig = this._getNpmConfig(this._rootPath)!;
|
|
165
|
-
const pm2DistPath = path.resolve(this._parsedTsconfig.options.outDir!, "pm2.json");
|
|
165
|
+
const pm2DistPath = path.resolve(this._parsedTsconfig.options.outDir!, typeof this._config.pm2 !== "boolean" ? this._config.pm2.fileName ?? "pm2.json" : "pm2.json");
|
|
166
166
|
await FsUtil.writeFileAsync(
|
|
167
167
|
pm2DistPath,
|
|
168
168
|
JSON.stringify(
|
|
@@ -179,7 +179,9 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
179
179
|
"node_modules",
|
|
180
180
|
"www"
|
|
181
181
|
].distinct(),
|
|
182
|
-
|
|
182
|
+
...typeof this._config.pm2 !== "boolean" && this._config.pm2.noInterpreter ? {} : {
|
|
183
|
+
"interpreter": "node@" + process.versions.node,
|
|
184
|
+
},
|
|
183
185
|
"env": {
|
|
184
186
|
NODE_ENV: "production",
|
|
185
187
|
SD_VERSION: npmConfig.version,
|
|
@@ -187,7 +189,7 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
187
189
|
...this._config.env ? this._config.env : {}
|
|
188
190
|
}
|
|
189
191
|
},
|
|
190
|
-
(typeof this._config.pm2 !== "boolean") ? this._config.pm2 : {},
|
|
192
|
+
(typeof this._config.pm2 !== "boolean") ? this._config.pm2.config : {},
|
|
191
193
|
{
|
|
192
194
|
arrayProcess: "concat",
|
|
193
195
|
useDelTargetNull: true
|
|
@@ -239,7 +241,7 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
239
241
|
delete distNpmConfig.devDependencies;
|
|
240
242
|
delete distNpmConfig.peerDependencies;
|
|
241
243
|
|
|
242
|
-
if (this._config.pm2 !== undefined) {
|
|
244
|
+
if (this._config.pm2 !== undefined && (typeof this._config.pm2 === "boolean" || !this._config.pm2.noStartScript)) {
|
|
243
245
|
distNpmConfig.scripts = { "start": "pm2 start pm2.json" };
|
|
244
246
|
}
|
|
245
247
|
|
package/src/commons.ts
CHANGED
|
@@ -67,7 +67,12 @@ export interface ISdCliServerPackageConfig {
|
|
|
67
67
|
type: "server";
|
|
68
68
|
env?: Record<string, string>;
|
|
69
69
|
configs?: Record<string, any>;
|
|
70
|
-
pm2?:
|
|
70
|
+
pm2?: {
|
|
71
|
+
fileName?: string;
|
|
72
|
+
noInterpreter?: boolean;
|
|
73
|
+
noStartScript?: boolean;
|
|
74
|
+
config: Record<string, any>;
|
|
75
|
+
} | boolean;
|
|
71
76
|
iis?: boolean | { serverExeFilePath?: string };
|
|
72
77
|
externalNodeModules?: string[];
|
|
73
78
|
publish?: TSdCliPublishConfig;
|