@simplysm/sd-cli 12.13.37 → 12.13.39
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.
- package/dist/pkg-builders/SdBuildRunnerBase.d.ts +14 -0
- package/dist/pkg-builders/SdBuildRunnerBase.js +23 -0
- package/dist/pkg-builders/SdBuildRunnerBase.js.map +1 -0
- package/dist/pkg-builders/SdProjectBuildRunner.js +18 -14
- package/dist/pkg-builders/SdProjectBuildRunner.js.map +1 -1
- package/dist/pkg-builders/client/SdClientBuildRunner.d.ts +1 -1
- package/dist/pkg-builders/client/SdClientBuildRunner.js +17 -36
- package/dist/pkg-builders/client/SdClientBuildRunner.js.map +1 -1
- package/dist/pkg-builders/client/SdNgBundler.d.ts +10 -16
- package/dist/pkg-builders/client/SdNgBundler.js +59 -54
- package/dist/pkg-builders/client/SdNgBundler.js.map +1 -1
- package/dist/pkg-builders/client/createSdNgPlugin.d.ts +2 -11
- package/dist/pkg-builders/client/createSdNgPlugin.js +16 -25
- package/dist/pkg-builders/client/createSdNgPlugin.js.map +1 -1
- package/dist/pkg-builders/lib/SdJsLibBuildRunner.d.ts +1 -1
- package/dist/pkg-builders/lib/SdJsLibBuildRunner.js +5 -5
- package/dist/pkg-builders/lib/SdJsLibBuildRunner.js.map +1 -1
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.d.ts +1 -1
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.js +6 -6
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.js.map +1 -1
- package/dist/pkg-builders/lib/SdTsLibBuilder.d.ts +3 -3
- package/dist/pkg-builders/lib/SdTsLibBuilder.js +6 -15
- package/dist/pkg-builders/lib/SdTsLibBuilder.js.map +1 -1
- package/dist/pkg-builders/server/SdServerBuildRunner.d.ts +1 -1
- package/dist/pkg-builders/server/SdServerBuildRunner.js +25 -42
- package/dist/pkg-builders/server/SdServerBuildRunner.js.map +1 -1
- package/dist/pkg-builders/server/SdServerBundler.d.ts +4 -10
- package/dist/pkg-builders/server/SdServerBundler.js +15 -22
- package/dist/pkg-builders/server/SdServerBundler.js.map +1 -1
- package/dist/pkg-builders/server/createSdServerPlugin.d.ts +2 -11
- package/dist/pkg-builders/server/createSdServerPlugin.js +10 -19
- package/dist/pkg-builders/server/createSdServerPlugin.js.map +1 -1
- package/dist/sd-cli-entry.js +1 -1
- package/dist/sd-cli-entry.js.map +1 -1
- package/dist/ts-compiler/ScopePathSet.js.map +1 -0
- package/dist/ts-compiler/SdDepAnalyzer.d.ts +1 -1
- package/dist/ts-compiler/SdStyleBundler.d.ts +8 -5
- package/dist/ts-compiler/SdStyleBundler.js +30 -15
- package/dist/ts-compiler/SdStyleBundler.js.map +1 -1
- package/dist/ts-compiler/SdTsCompiler.d.ts +2 -1
- package/dist/ts-compiler/SdTsCompiler.js +68 -53
- package/dist/ts-compiler/SdTsCompiler.js.map +1 -1
- package/dist/types/build/ISdTsCompilerOptions.d.ts +6 -9
- package/dist/types/worker/ISdBuildRunnerWorkerType.d.ts +4 -7
- package/dist/workers/build-runner.worker.js +4 -5
- package/dist/workers/build-runner.worker.js.map +1 -1
- package/package.json +5 -5
- package/src/pkg-builders/SdBuildRunnerBase.ts +36 -0
- package/src/pkg-builders/SdProjectBuildRunner.ts +24 -16
- package/src/pkg-builders/client/SdClientBuildRunner.ts +25 -46
- package/src/pkg-builders/client/SdNgBundler.ts +69 -73
- package/src/pkg-builders/client/createSdNgPlugin.ts +21 -35
- package/src/pkg-builders/lib/SdJsLibBuildRunner.ts +5 -5
- package/src/pkg-builders/lib/SdTsLibBuildRunner.ts +9 -13
- package/src/pkg-builders/lib/SdTsLibBuilder.ts +7 -23
- package/src/pkg-builders/server/SdServerBuildRunner.ts +32 -50
- package/src/pkg-builders/server/SdServerBundler.ts +16 -32
- package/src/pkg-builders/server/createSdServerPlugin.ts +15 -29
- package/src/sd-cli-entry.ts +1 -1
- package/src/ts-compiler/SdDepAnalyzer.ts +1 -1
- package/src/ts-compiler/SdStyleBundler.ts +34 -15
- package/src/ts-compiler/SdTsCompiler.ts +75 -63
- package/src/types/build/ISdTsCompilerOptions.ts +6 -9
- package/src/types/worker/ISdBuildRunnerWorkerType.ts +4 -9
- package/src/workers/build-runner.worker.ts +7 -16
- package/dist/fix/convert-extends-sd-modal-base-to-interface.d.ts +0 -1
- package/dist/fix/convert-extends-sd-modal-base-to-interface.js +0 -289
- package/dist/fix/convert-extends-sd-modal-base-to-interface.js.map +0 -1
- package/dist/fix/convert-extends-sd-print-template-base-to-interface.d.ts +0 -1
- package/dist/fix/convert-extends-sd-print-template-base-to-interface.js +0 -179
- package/dist/fix/convert-extends-sd-print-template-base-to-interface.js.map +0 -1
- package/dist/fix/convert-flat-pages-to-flat-menus.d.ts +0 -1
- package/dist/fix/convert-flat-pages-to-flat-menus.js +0 -68
- package/dist/fix/convert-flat-pages-to-flat-menus.js.map +0 -1
- package/dist/fix/convert-get-menus-to-usable-menus.d.ts +0 -1
- package/dist/fix/convert-get-menus-to-usable-menus.js +0 -48
- package/dist/fix/convert-get-menus-to-usable-menus.js.map +0 -1
- package/dist/fix/convert-modal-show-params.d.ts +0 -1
- package/dist/fix/convert-modal-show-params.js +0 -29
- package/dist/fix/convert-modal-show-params.js.map +0 -1
- package/dist/fix/convert-print-params.d.ts +0 -1
- package/dist/fix/convert-print-params.js +0 -37
- package/dist/fix/convert-print-params.js.map +0 -1
- package/dist/fix/convert-sd-icon-to-fa-icon.d.ts +0 -1
- package/dist/fix/convert-sd-icon-to-fa-icon.js +0 -80
- package/dist/fix/convert-sd-icon-to-fa-icon.js.map +0 -1
- package/dist/fix/convert-sd-sheet-bindings-safety.d.ts +0 -1
- package/dist/fix/convert-sd-sheet-bindings-safety.js +0 -57
- package/dist/fix/convert-sd-sheet-bindings-safety.js.map +0 -1
- package/dist/fix/convert-select-modal-button-to-select-button.d.ts +0 -1
- package/dist/fix/convert-select-modal-button-to-select-button.js +0 -64
- package/dist/fix/convert-select-modal-button-to-select-button.js.map +0 -1
- package/dist/fix/convert-setup-cumulate-selected-keys-to-object-param.d.ts +0 -1
- package/dist/fix/convert-setup-cumulate-selected-keys-to-object-param.js +0 -38
- package/dist/fix/convert-setup-cumulate-selected-keys-to-object-param.js.map +0 -1
- package/dist/fix/convert-to-use-perms-signal.d.ts +0 -1
- package/dist/fix/convert-to-use-perms-signal.js +0 -99
- package/dist/fix/convert-to-use-perms-signal.js.map +0 -1
- package/dist/fix/core/remove-named-import.d.ts +0 -1
- package/dist/fix/core/remove-named-import.js +0 -14
- package/dist/fix/core/remove-named-import.js.map +0 -1
- package/dist/pkg-builders/commons/ScopePathSet.js.map +0 -1
- package/dist/pkg-builders/commons/SdBuildRunnerBase.d.ts +0 -20
- package/dist/pkg-builders/commons/SdBuildRunnerBase.js +0 -30
- package/dist/pkg-builders/commons/SdBuildRunnerBase.js.map +0 -1
- package/src/fix/convert-extends-sd-modal-base-to-interface.ts +0 -324
- package/src/fix/convert-extends-sd-print-template-base-to-interface.ts +0 -201
- package/src/fix/convert-flat-pages-to-flat-menus.ts +0 -83
- package/src/fix/convert-get-menus-to-usable-menus.ts +0 -60
- package/src/fix/convert-modal-show-params.ts +0 -37
- package/src/fix/convert-print-params.ts +0 -51
- package/src/fix/convert-sd-icon-to-fa-icon.ts +0 -95
- package/src/fix/convert-sd-sheet-bindings-safety.ts +0 -73
- package/src/fix/convert-select-modal-button-to-select-button.ts +0 -91
- package/src/fix/convert-setup-cumulate-selected-keys-to-object-param.ts +0 -44
- package/src/fix/convert-to-use-perms-signal.ts +0 -133
- package/src/fix/core/remove-named-import.ts +0 -14
- package/src/pkg-builders/commons/SdBuildRunnerBase.ts +0 -47
- /package/dist/{pkg-builders/commons → ts-compiler}/ScopePathSet.d.ts +0 -0
- /package/dist/{pkg-builders/commons → ts-compiler}/ScopePathSet.js +0 -0
- /package/src/{pkg-builders/commons → ts-compiler}/ScopePathSet.ts +0 -0
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { SdLogger, TNormPath } from "@simplysm/sd-core-node";
|
|
2
|
+
import { TSdPackageConfig } from "../types/config/ISdProjectConfig";
|
|
3
|
+
import { ISdBuildResult } from "../types/build/ISdBuildResult";
|
|
4
|
+
import { ISdTsCompilerOptions } from "../types/build/ISdTsCompilerOptions";
|
|
5
|
+
export declare abstract class SdBuildRunnerBase<T extends "server" | "library" | "client"> {
|
|
6
|
+
protected _opt: ISdTsCompilerOptions;
|
|
7
|
+
protected _pkgConf: TSdPackageConfig<T>;
|
|
8
|
+
protected abstract _logger: SdLogger;
|
|
9
|
+
protected _pkgName: string;
|
|
10
|
+
constructor(_opt: ISdTsCompilerOptions, _pkgConf: TSdPackageConfig<T>);
|
|
11
|
+
rebuildAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult>;
|
|
12
|
+
protected abstract _runAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult>;
|
|
13
|
+
protected _debug(msg: string): void;
|
|
14
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { FsUtils } from "@simplysm/sd-core-node";
|
|
2
|
+
import path from "path";
|
|
3
|
+
export class SdBuildRunnerBase {
|
|
4
|
+
constructor(_opt, _pkgConf) {
|
|
5
|
+
this._opt = _opt;
|
|
6
|
+
this._pkgConf = _pkgConf;
|
|
7
|
+
this._pkgName = path.basename(_opt.pkgPath);
|
|
8
|
+
}
|
|
9
|
+
async rebuildAsync(modifiedFileSet) {
|
|
10
|
+
if (!modifiedFileSet && !this._opt.watch?.noEmit) {
|
|
11
|
+
const distPath = path.resolve(this._opt.pkgPath, "dist");
|
|
12
|
+
if (FsUtils.exists(distPath)) {
|
|
13
|
+
this._debug("dist 초기화...");
|
|
14
|
+
FsUtils.remove(distPath);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
return await this._runAsync(modifiedFileSet);
|
|
18
|
+
}
|
|
19
|
+
_debug(msg) {
|
|
20
|
+
this._logger.debug(`[${path.basename(this._opt.pkgPath)}] ${msg}`);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=SdBuildRunnerBase.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SdBuildRunnerBase.js","sourceRoot":"","sources":["../../src/pkg-builders/SdBuildRunnerBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAuB,MAAM,wBAAwB,CAAC;AACtE,OAAO,IAAI,MAAM,MAAM,CAAC;AAKxB,MAAM,OAAgB,iBAAiB;IAKrC,YACY,IAA0B,EAC1B,QAA6B;QAD7B,SAAI,GAAJ,IAAI,CAAsB;QAC1B,aAAQ,GAAR,QAAQ,CAAqB;QAEvC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,eAAgC;QACjD,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACzD,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBAC3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IAIS,MAAM,CAAC,GAAW;QAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;IACrE,CAAC;CACF"}
|
|
@@ -18,7 +18,8 @@ export class SdProjectBuildRunner {
|
|
|
18
18
|
let buildInfo = this.#buildInfoMap.get(pkgPath);
|
|
19
19
|
if (!buildInfo)
|
|
20
20
|
return { pkgPath };
|
|
21
|
-
const modifiedFileSet = new Set(changeFiles.filter((item) => buildInfo.watchFileSet.has(item)
|
|
21
|
+
const modifiedFileSet = new Set(changeFiles.filter((item) => buildInfo.watchFileSet.has(item) ||
|
|
22
|
+
PathUtils.isChildPath(item, path.resolve(pkgPath, "src"))));
|
|
22
23
|
if (modifiedFileSet.size < 1)
|
|
23
24
|
return;
|
|
24
25
|
return { pkgPath, buildInfo: buildInfo, modifiedFileSet };
|
|
@@ -31,15 +32,20 @@ export class SdProjectBuildRunner {
|
|
|
31
32
|
const buildResults = await changedPkgInfos.parallelAsync(async (changedPkgInfo) => {
|
|
32
33
|
// 처음
|
|
33
34
|
if (!changedPkgInfo.buildInfo) {
|
|
35
|
+
const pkgConf = opt.projConf.packages[path.basename(changedPkgInfo.pkgPath)];
|
|
34
36
|
const buildWorker = new SdWorker(import.meta.resolve("../workers/build-runner.worker"));
|
|
35
37
|
await buildWorker.run("initialize", [
|
|
36
38
|
{
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
options: {
|
|
40
|
+
pkgPath: changedPkgInfo.pkgPath,
|
|
41
|
+
scopePathSet,
|
|
42
|
+
watch: {
|
|
43
|
+
dev: !pkgConf.forceProductionMode,
|
|
44
|
+
emitOnly: opt.emitOnly,
|
|
45
|
+
noEmit: opt.noEmit,
|
|
46
|
+
},
|
|
47
|
+
},
|
|
48
|
+
pkgConf,
|
|
43
49
|
},
|
|
44
50
|
]);
|
|
45
51
|
const result = await buildWorker.run("rebuild", []);
|
|
@@ -184,12 +190,12 @@ export class SdProjectBuildRunner {
|
|
|
184
190
|
static async buildAsync(opt) {
|
|
185
191
|
const scopePathSet = await this.#getScopePathSetAsync(opt.pkgPaths, Object.keys(opt.projConf.localUpdates ?? {}));
|
|
186
192
|
const buildResults = await opt.pkgPaths.parallelAsync(async (pkgPath) => {
|
|
193
|
+
const pkgConf = opt.projConf.packages[path.basename(pkgPath)];
|
|
187
194
|
const worker = new SdWorker(import.meta.resolve("../workers/build-runner.worker"));
|
|
188
195
|
await worker.run("initialize", [
|
|
189
196
|
{
|
|
190
|
-
pkgPath,
|
|
191
|
-
|
|
192
|
-
scopePathSet: scopePathSet,
|
|
197
|
+
options: { pkgPath, scopePathSet },
|
|
198
|
+
pkgConf,
|
|
193
199
|
},
|
|
194
200
|
]);
|
|
195
201
|
const result = await worker.run("rebuild", []);
|
|
@@ -205,11 +211,9 @@ export class SdProjectBuildRunner {
|
|
|
205
211
|
path.resolve(item, "src"),
|
|
206
212
|
path.resolve(item, "public"),
|
|
207
213
|
path.resolve(item, "public-dev"),
|
|
214
|
+
path.resolve(item, "scss"),
|
|
208
215
|
]);
|
|
209
|
-
const localUpdatePaths = (await localUpdateGlobs.mapManyAsync(async (
|
|
210
|
-
path.resolve(process.cwd(), "node_modules", key, "dist"),
|
|
211
|
-
path.resolve(process.cwd(), "node_modules", key, "src/**/*.scss"),
|
|
212
|
-
]);
|
|
216
|
+
const localUpdatePaths = (await localUpdateGlobs.mapManyAsync(async (glob) => await FsUtils.globAsync(path.resolve(process.cwd(), "node_modules", glob)))).mapMany((dir) => [path.resolve(dir, "dist"), path.resolve(dir, "scss")]);
|
|
213
217
|
return new Set([...workspacePaths, ...localUpdatePaths].map((item) => PathUtils.norm(item)));
|
|
214
218
|
}
|
|
215
219
|
static async #restartServerAsync(prevWorker, pkgPath, pkgConfOrPort) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdProjectBuildRunner.js","sourceRoot":"","sources":["../../src/pkg-builders/SdProjectBuildRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,SAAS,EACT,WAAW,EACX,QAAQ,EACR,QAAQ,GAET,MAAM,wBAAwB,CAAC;AAEhC,OAAO,IAAI,MAAM,MAAM,CAAC;AAMxB,MAAM,OAAO,oBAAoB;IAC/B,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAE9E,MAAM,CAAC,aAAa,GAAG,IAAI,GAAG,EAM3B,CAAC;IAEJ,MAAM,CAAC,cAAc,GAAG,IAAI,GAAG,EAa5B,CAAC;IAEJ,MAAM,CAAC,YAAY,GAAG,IAAI,GAAG,EAAgC,CAAC;IAE9D,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAOvB;QACC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CACnD,GAAG,CAAC,QAAQ,EACZ,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,CAC7C,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;YACrE,aAAa,EAAE,KAAK;SACrB,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;YACrD,gBAAgB;YAChB,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAEzE,MAAM,eAAe,GAAG,GAAG,CAAC,QAAQ;iBACjC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBACf,IAAI,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAChD,IAAI,CAAC,SAAS;oBAAE,OAAO,EAAE,OAAO,EAAE,CAAC;gBAEnC,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,WAAW,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"SdProjectBuildRunner.js","sourceRoot":"","sources":["../../src/pkg-builders/SdProjectBuildRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SdLogger, TNormPath } from "@simplysm/sd-core-node";
|
|
2
|
-
import { SdBuildRunnerBase } from "../
|
|
2
|
+
import { SdBuildRunnerBase } from "../SdBuildRunnerBase";
|
|
3
3
|
import { ISdBuildResult } from "../../types/build/ISdBuildResult";
|
|
4
4
|
export declare class SdClientBuildRunner extends SdBuildRunnerBase<"client"> {
|
|
5
5
|
#private;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { FsUtils,
|
|
1
|
+
import { FsUtils, SdLogger } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import { SdBuildRunnerBase } from "../
|
|
3
|
+
import { SdBuildRunnerBase } from "../SdBuildRunnerBase";
|
|
4
4
|
import { SdNgBundler } from "./SdNgBundler";
|
|
5
5
|
import { SdCliCordova } from "../../entry/SdCliCordova";
|
|
6
6
|
import { SdCliNgRoutesFileGenerator } from "./SdCliNgRoutesFileGenerator";
|
|
@@ -15,53 +15,34 @@ export class SdClientBuildRunner extends SdBuildRunnerBase {
|
|
|
15
15
|
async _runAsync(modifiedFileSet) {
|
|
16
16
|
// 최초 한번
|
|
17
17
|
if (!modifiedFileSet) {
|
|
18
|
-
if (!this.
|
|
18
|
+
if (!this._opt.watch?.noEmit) {
|
|
19
19
|
// config
|
|
20
20
|
this._debug("GEN .config...");
|
|
21
|
-
const confDistPath = path.resolve(this.
|
|
21
|
+
const confDistPath = path.resolve(this._opt.pkgPath, "dist/.config.json");
|
|
22
22
|
FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
|
|
23
23
|
// cordova
|
|
24
24
|
if (this._pkgConf.builder?.cordova) {
|
|
25
25
|
this._debug("CORDOVA 준비...");
|
|
26
26
|
this.#cordova = new SdCliCordova({
|
|
27
|
-
pkgPath: this.
|
|
27
|
+
pkgPath: this._opt.pkgPath,
|
|
28
28
|
config: this._pkgConf.builder.cordova,
|
|
29
29
|
});
|
|
30
30
|
await this.#cordova.initializeAsync();
|
|
31
31
|
}
|
|
32
32
|
// routes
|
|
33
|
-
const npmConf = FsUtils.readJson(path.resolve(this.
|
|
33
|
+
const npmConf = FsUtils.readJson(path.resolve(this._opt.pkgPath, "package.json"));
|
|
34
34
|
if ("@angular/router" in (npmConf.dependencies ?? {})) {
|
|
35
35
|
this._debug(`GEN routes.ts...`);
|
|
36
|
-
await new SdCliNgRoutesFileGenerator().watchAsync(this.
|
|
36
|
+
await new SdCliNgRoutesFileGenerator().watchAsync(this._opt.pkgPath, this._pkgConf.noLazyRoute);
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
// ng
|
|
40
40
|
this._debug(`BUILD 준비...`);
|
|
41
|
-
const
|
|
42
|
-
this.#ngBundlers =
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
noEmit: this._noEmit ?? false,
|
|
47
|
-
builderType: ngBundlerBuilderType,
|
|
48
|
-
pkgPath: this._pkgPath,
|
|
49
|
-
outputPath: ngBundlerBuilderType === "web"
|
|
50
|
-
? PathUtils.norm(this._pkgPath, "dist")
|
|
51
|
-
: ngBundlerBuilderType === "electron" && !this._dev
|
|
52
|
-
? PathUtils.norm(this._pkgPath, ".electron/src")
|
|
53
|
-
: ngBundlerBuilderType === "cordova" && !this._dev
|
|
54
|
-
? PathUtils.norm(this._pkgPath, ".cordova/www")
|
|
55
|
-
: PathUtils.norm(this._pkgPath, "dist", ngBundlerBuilderType),
|
|
56
|
-
env: {
|
|
57
|
-
...this._pkgConf.env,
|
|
58
|
-
...this._pkgConf.builder?.[ngBundlerBuilderType]?.env,
|
|
59
|
-
},
|
|
60
|
-
external: ngBundlerBuilderType === "electron"
|
|
61
|
-
? (this._pkgConf.builder?.electron?.reinstallDependencies ?? [])
|
|
62
|
-
: [],
|
|
63
|
-
cordovaConfig: ngBundlerBuilderType === "cordova" ? this._pkgConf.builder.cordova : undefined,
|
|
64
|
-
scopePathSet: this._scopePathSet,
|
|
41
|
+
const builderTypes = Object.keys(this._pkgConf.builder ?? { web: {} });
|
|
42
|
+
this.#ngBundlers = builderTypes.map((builderType) => new SdNgBundler(this._opt, {
|
|
43
|
+
builderType: builderType,
|
|
44
|
+
builderConfig: this._pkgConf.builder?.[builderType],
|
|
45
|
+
env: this._pkgConf.env,
|
|
65
46
|
}));
|
|
66
47
|
}
|
|
67
48
|
if (modifiedFileSet) {
|
|
@@ -69,7 +50,7 @@ export class SdClientBuildRunner extends SdBuildRunnerBase {
|
|
|
69
50
|
ngBundler.markForChanges(Array.from(modifiedFileSet));
|
|
70
51
|
}
|
|
71
52
|
}
|
|
72
|
-
if (this.
|
|
53
|
+
if (this._opt.watch?.noEmit) {
|
|
73
54
|
this._debug(`BUILD...`);
|
|
74
55
|
const buildResults = await Promise.all(this.#ngBundlers.map((builder) => builder.bundleAsync()));
|
|
75
56
|
const watchFileSet = new Set(buildResults.mapMany((item) => Array.from(item.watchFileSet)));
|
|
@@ -91,14 +72,14 @@ export class SdClientBuildRunner extends SdBuildRunnerBase {
|
|
|
91
72
|
const affectedFileSet = new Set(buildResults.mapMany((item) => Array.from(item.affectedFileSet)));
|
|
92
73
|
const emitFileSet = new Set(buildResults.mapMany((item) => Array.from(item.emitFileSet)));
|
|
93
74
|
const buildMessages = buildResults.mapMany((item) => item.buildMessages).distinct();
|
|
94
|
-
if (!this.
|
|
75
|
+
if (!this._opt.watch?.dev && this.#cordova) {
|
|
95
76
|
this._debug("CORDOVA BUILD...");
|
|
96
|
-
await this.#cordova.buildAsync(path.resolve(this.
|
|
77
|
+
await this.#cordova.buildAsync(path.resolve(this._opt.pkgPath, "dist"));
|
|
97
78
|
}
|
|
98
|
-
if (!this.
|
|
79
|
+
if (!this._opt.watch?.dev && this._pkgConf.builder?.electron) {
|
|
99
80
|
this._debug("ELECTRON BUILD...");
|
|
100
81
|
await SdCliElectron.buildAsync({
|
|
101
|
-
pkgPath: this.
|
|
82
|
+
pkgPath: this._opt.pkgPath,
|
|
102
83
|
electronConfig: this._pkgConf.builder.electron,
|
|
103
84
|
});
|
|
104
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdClientBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdClientBuildRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SdClientBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdClientBuildRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,17 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { ISdClientBuilderCordovaConfig } from "../../types/config/ISdProjectConfig";
|
|
3
|
-
import { ScopePathSet } from "../commons/ScopePathSet";
|
|
1
|
+
import { ISdClientPackageConfig } from "../../types/config/ISdProjectConfig";
|
|
4
2
|
import { ISdBuildResult } from "../../types/build/ISdBuildResult";
|
|
3
|
+
import { ISdTsCompilerOptions } from "../../types/build/ISdTsCompilerOptions";
|
|
5
4
|
export declare class SdNgBundler {
|
|
6
5
|
#private;
|
|
7
6
|
private readonly _opt;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
dev: boolean;
|
|
11
|
-
emitOnly: boolean;
|
|
12
|
-
noEmit: boolean;
|
|
13
|
-
outputPath: TNormPath;
|
|
14
|
-
pkgPath: TNormPath;
|
|
15
|
-
builderType: string;
|
|
16
|
-
env: Record<string, string> | undefined;
|
|
17
|
-
external: string[];
|
|
18
|
-
cordovaConfig: ISdClientBuilderCordovaConfig | undefined;
|
|
19
|
-
scopePathSet: ScopePathSet;
|
|
20
|
-
});
|
|
7
|
+
private readonly _conf;
|
|
8
|
+
constructor(_opt: ISdTsCompilerOptions, _conf: IConf<any>);
|
|
21
9
|
markForChanges(filePaths: string[]): void;
|
|
22
10
|
bundleAsync(): Promise<ISdBuildResult>;
|
|
23
11
|
}
|
|
12
|
+
interface IConf<T extends keyof NonNullable<ISdClientPackageConfig["builder"]>> {
|
|
13
|
+
builderType: T;
|
|
14
|
+
builderConfig: NonNullable<ISdClientPackageConfig["builder"]>[T];
|
|
15
|
+
env: Record<string, string> | undefined;
|
|
16
|
+
}
|
|
17
|
+
export {};
|
|
@@ -39,8 +39,10 @@ export class SdNgBundler {
|
|
|
39
39
|
#indexHtmlFilePath;
|
|
40
40
|
#pkgName;
|
|
41
41
|
#baseHref;
|
|
42
|
-
|
|
42
|
+
#outputPath;
|
|
43
|
+
constructor(_opt, _conf) {
|
|
43
44
|
this._opt = _opt;
|
|
45
|
+
this._conf = _conf;
|
|
44
46
|
this.#pkgNpmConf = FsUtils.readJson(path.resolve(this._opt.pkgPath, "package.json"));
|
|
45
47
|
this.#mainFilePath = path.resolve(this._opt.pkgPath, "src/main.ts");
|
|
46
48
|
this.#tsConfigFilePath = path.resolve(this._opt.pkgPath, "tsconfig.json");
|
|
@@ -49,11 +51,19 @@ export class SdNgBundler {
|
|
|
49
51
|
this.#indexHtmlFilePath = path.resolve(this._opt.pkgPath, "src/index.html");
|
|
50
52
|
this.#pkgName = path.basename(this._opt.pkgPath);
|
|
51
53
|
this.#baseHref =
|
|
52
|
-
this.
|
|
54
|
+
this._conf.builderType === "web"
|
|
53
55
|
? `/${this.#pkgName}/`
|
|
54
|
-
: this._opt.dev
|
|
55
|
-
? `/${this.#pkgName}/${this.
|
|
56
|
+
: this._opt.watch?.dev
|
|
57
|
+
? `/${this.#pkgName}/${this._conf.builderType}/`
|
|
56
58
|
: ``;
|
|
59
|
+
this.#outputPath =
|
|
60
|
+
this._conf.builderType === "web"
|
|
61
|
+
? PathUtils.norm(this._opt.pkgPath, "dist")
|
|
62
|
+
: this._conf.builderType === "electron" && !this._opt.watch?.dev
|
|
63
|
+
? PathUtils.norm(this._opt.pkgPath, ".electron/src")
|
|
64
|
+
: this._conf.builderType === "cordova" && !this._opt.watch?.dev
|
|
65
|
+
? PathUtils.norm(this._opt.pkgPath, ".cordova/www")
|
|
66
|
+
: PathUtils.norm(this._opt.pkgPath, "dist", this._conf.builderType);
|
|
57
67
|
}
|
|
58
68
|
markForChanges(filePaths) {
|
|
59
69
|
for (const filePath of filePaths) {
|
|
@@ -71,7 +81,7 @@ export class SdNgBundler {
|
|
|
71
81
|
...(FsUtils.exists(path.resolve(this._opt.pkgPath, "src/styles.scss"))
|
|
72
82
|
? [this.#getStyleContext()]
|
|
73
83
|
: []),
|
|
74
|
-
...(this.
|
|
84
|
+
...(this._conf.builderType === "electron" ? [this.#getElectronMainContext()] : []),
|
|
75
85
|
]);
|
|
76
86
|
}
|
|
77
87
|
this.#debug(`build...`);
|
|
@@ -80,7 +90,7 @@ export class SdNgBundler {
|
|
|
80
90
|
});
|
|
81
91
|
//-- results
|
|
82
92
|
const buildMessages = bundlingResults.mapMany((bundlingResult) => bundlingResult.results);
|
|
83
|
-
if (this._opt.noEmit) {
|
|
93
|
+
if (this._opt.watch?.noEmit) {
|
|
84
94
|
return {
|
|
85
95
|
watchFileSet: this.#ngResultCache.watchFileSet,
|
|
86
96
|
affectedFileSet: this.#ngResultCache.affectedFileSet,
|
|
@@ -137,7 +147,7 @@ export class SdNgBundler {
|
|
|
137
147
|
//-- copy assets
|
|
138
148
|
assetFiles.push(...(await this.#copyAssetsAsync()));
|
|
139
149
|
//-- extract 3rdpartylicenses
|
|
140
|
-
if (!this._opt.dev) {
|
|
150
|
+
if (!this._opt.watch?.dev) {
|
|
141
151
|
outputFiles.push(createOutputFile("3rdpartylicenses.txt", await extractLicenses(metafile, this._opt.pkgPath), BuildOutputFileType.Root));
|
|
142
152
|
}
|
|
143
153
|
});
|
|
@@ -168,7 +178,7 @@ export class SdNgBundler {
|
|
|
168
178
|
const emitFileSet = new Set();
|
|
169
179
|
perf.run("write output file", () => {
|
|
170
180
|
for (const outputFile of outputFiles) {
|
|
171
|
-
const distFilePath = PathUtils.norm(this
|
|
181
|
+
const distFilePath = PathUtils.norm(this.#outputPath, outputFile.path);
|
|
172
182
|
const prevHash = this.#outputHashCache.get(distFilePath);
|
|
173
183
|
const currHash = HashUtils.get(Buffer.from(outputFile.contents));
|
|
174
184
|
if (prevHash !== currHash) {
|
|
@@ -181,9 +191,9 @@ export class SdNgBundler {
|
|
|
181
191
|
const prevHash = this.#outputHashCache.get(PathUtils.norm(assetFile.source));
|
|
182
192
|
const currHash = HashUtils.get(FsUtils.readFileBuffer(assetFile.source));
|
|
183
193
|
if (prevHash !== currHash) {
|
|
184
|
-
FsUtils.copy(assetFile.source, path.resolve(this
|
|
194
|
+
FsUtils.copy(assetFile.source, path.resolve(this.#outputPath, assetFile.destination));
|
|
185
195
|
this.#outputHashCache.set(PathUtils.norm(assetFile.source), currHash);
|
|
186
|
-
emitFileSet.add(PathUtils.norm(this
|
|
196
|
+
emitFileSet.add(PathUtils.norm(this.#outputPath, assetFile.destination));
|
|
187
197
|
}
|
|
188
198
|
}
|
|
189
199
|
});
|
|
@@ -216,17 +226,17 @@ export class SdNgBundler {
|
|
|
216
226
|
["polyfills", true],
|
|
217
227
|
["styles", false],
|
|
218
228
|
["main", true],
|
|
219
|
-
...(this.
|
|
229
|
+
...(this._conf.builderType === "cordova" ? [["cordova-entry", true]] : []),
|
|
220
230
|
],
|
|
221
231
|
sri: false,
|
|
222
232
|
optimization: {
|
|
223
|
-
scripts: !this._opt.dev,
|
|
233
|
+
scripts: !this._opt.watch?.dev,
|
|
224
234
|
styles: {
|
|
225
|
-
minify: !this._opt.dev,
|
|
226
|
-
inlineCritical: !this._opt.dev,
|
|
227
|
-
removeSpecialComments: !this._opt.dev,
|
|
235
|
+
minify: !this._opt.watch?.dev,
|
|
236
|
+
inlineCritical: !this._opt.watch?.dev,
|
|
237
|
+
removeSpecialComments: !this._opt.watch?.dev,
|
|
228
238
|
},
|
|
229
|
-
fonts: { inline: !this._opt.dev },
|
|
239
|
+
fonts: { inline: !this._opt.watch?.dev },
|
|
230
240
|
},
|
|
231
241
|
crossOrigin: CrossOrigin.None,
|
|
232
242
|
generateDedicatedSSRContent: false,
|
|
@@ -234,7 +244,7 @@ export class SdNgBundler {
|
|
|
234
244
|
indexHtmlGenerator.readAsset = readAsset;
|
|
235
245
|
const modulePreloads = [];
|
|
236
246
|
const hints = [];
|
|
237
|
-
if (!this._opt.dev) {
|
|
247
|
+
if (!this._opt.watch?.dev) {
|
|
238
248
|
for (const [key, value] of initialFiles) {
|
|
239
249
|
if (value.entrypoint || value.serverFile) {
|
|
240
250
|
continue;
|
|
@@ -265,9 +275,9 @@ export class SdNgBundler {
|
|
|
265
275
|
async #copyAssetsAsync() {
|
|
266
276
|
return await resolveAssets([
|
|
267
277
|
{ input: "public", glob: "**/*", output: "." },
|
|
268
|
-
...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
|
|
269
|
-
...(this._opt.dev && this.
|
|
270
|
-
? Object.keys(this.
|
|
278
|
+
...(this._opt.watch?.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
|
|
279
|
+
...(this._opt.watch?.dev && this._conf.builderType === "cordova"
|
|
280
|
+
? Object.keys(this._conf.builderConfig?.platform ?? { browser: {} }).mapMany((platform) => [
|
|
271
281
|
{
|
|
272
282
|
input: `.cordova/platforms/${platform}/platform_www/plugins`,
|
|
273
283
|
glob: "**/*",
|
|
@@ -305,29 +315,29 @@ export class SdNgBundler {
|
|
|
305
315
|
conditions: ["es2020", "es2015", "module"],
|
|
306
316
|
resolveExtensions: [".js", ".mjs", ".cjs", ".ts"],
|
|
307
317
|
metafile: true,
|
|
308
|
-
legalComments: this._opt.dev ? "eof" : "none",
|
|
318
|
+
legalComments: this._opt.watch?.dev ? "eof" : "none",
|
|
309
319
|
logLevel: "silent",
|
|
310
|
-
minifyIdentifiers: !this._opt.dev,
|
|
311
|
-
minifySyntax: !this._opt.dev,
|
|
312
|
-
minifyWhitespace: !this._opt.dev,
|
|
320
|
+
minifyIdentifiers: !this._opt.watch?.dev,
|
|
321
|
+
minifySyntax: !this._opt.watch?.dev,
|
|
322
|
+
minifyWhitespace: !this._opt.watch?.dev,
|
|
313
323
|
pure: ["forwardRef"],
|
|
314
324
|
outdir: this._opt.pkgPath,
|
|
315
325
|
outExtension: undefined,
|
|
316
|
-
sourcemap: this._opt.dev,
|
|
326
|
+
sourcemap: !!this._opt.watch?.dev,
|
|
317
327
|
chunkNames: "[name]-[hash]",
|
|
318
328
|
tsconfig: this.#tsConfigFilePath,
|
|
319
329
|
write: false,
|
|
320
330
|
preserveSymlinks: false,
|
|
321
331
|
define: {
|
|
322
|
-
...(!this._opt.dev ? { ngDevMode: "false" } : {}),
|
|
332
|
+
...(!this._opt.watch?.dev ? { ngDevMode: "false" } : {}),
|
|
323
333
|
"ngJitMode": "false",
|
|
324
334
|
"global": "global",
|
|
325
335
|
"process": "process",
|
|
326
336
|
"Buffer": "Buffer",
|
|
327
337
|
"process.env.SD_VERSION": JSON.stringify(this.#pkgNpmConf.version),
|
|
328
|
-
"process.env.NODE_ENV": JSON.stringify(this._opt.dev ? "development" : "production"),
|
|
329
|
-
...(this.
|
|
330
|
-
? Object.keys(this.
|
|
338
|
+
"process.env.NODE_ENV": JSON.stringify(this._opt.watch?.dev ? "development" : "production"),
|
|
339
|
+
...(this._conf.env
|
|
340
|
+
? Object.keys(this._conf.env).toObject((key) => `process.env.${key}`, (key) => JSON.stringify(this._conf.env[key]))
|
|
331
341
|
: {}),
|
|
332
342
|
},
|
|
333
343
|
mainFields: ["es2020", "es2015", "browser", "module", "main"],
|
|
@@ -339,7 +349,7 @@ export class SdNgBundler {
|
|
|
339
349
|
polyfills: path.resolve(this._opt.pkgPath, "src/polyfills.ts"),
|
|
340
350
|
}
|
|
341
351
|
: {}),
|
|
342
|
-
...(this.
|
|
352
|
+
...(this._conf.builderType === "cordova"
|
|
343
353
|
? {
|
|
344
354
|
"cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../../lib/cordova-entry.js`),
|
|
345
355
|
}
|
|
@@ -374,11 +384,15 @@ export class SdNgBundler {
|
|
|
374
384
|
".mp3": "file",
|
|
375
385
|
".ogg": "file",
|
|
376
386
|
},
|
|
377
|
-
...(this.
|
|
387
|
+
...(this._conf.builderType === "electron"
|
|
378
388
|
? {
|
|
379
389
|
platform: "node",
|
|
380
390
|
target: "node20",
|
|
381
|
-
external: [
|
|
391
|
+
external: [
|
|
392
|
+
"electron",
|
|
393
|
+
...nodeModule.builtinModules,
|
|
394
|
+
...(this._conf.builderConfig?.reinstallDependencies ?? []),
|
|
395
|
+
],
|
|
382
396
|
}
|
|
383
397
|
: {
|
|
384
398
|
platform: "browser",
|
|
@@ -391,17 +405,8 @@ export class SdNgBundler {
|
|
|
391
405
|
}),
|
|
392
406
|
plugins: [
|
|
393
407
|
createSourcemapIgnorelistPlugin(),
|
|
394
|
-
createSdNgPlugin(
|
|
395
|
-
|
|
396
|
-
watch: this._opt.watch,
|
|
397
|
-
dev: this._opt.dev,
|
|
398
|
-
emitOnly: this._opt.emitOnly,
|
|
399
|
-
noEmit: this._opt.noEmit,
|
|
400
|
-
pkgPath: this._opt.pkgPath,
|
|
401
|
-
result: this.#ngResultCache,
|
|
402
|
-
scopePathSet: this._opt.scopePathSet,
|
|
403
|
-
}),
|
|
404
|
-
...(this._opt.builderType === "electron"
|
|
408
|
+
createSdNgPlugin(this._opt, this.#modifiedFileSet, this.#ngResultCache),
|
|
409
|
+
...(this._conf.builderType === "electron"
|
|
405
410
|
? []
|
|
406
411
|
: [nodeStdLibBrowserPlugin(nodeStdLibBrowser)]),
|
|
407
412
|
// {
|
|
@@ -420,7 +425,7 @@ export class SdNgBundler {
|
|
|
420
425
|
}
|
|
421
426
|
#getStyleContext() {
|
|
422
427
|
const pluginFactory = new StylesheetPluginFactory({
|
|
423
|
-
sourcemap: this._opt.dev,
|
|
428
|
+
sourcemap: !!this._opt.watch?.dev,
|
|
424
429
|
includePaths: [],
|
|
425
430
|
}, this.#styleLoadResultCache);
|
|
426
431
|
return new SdNgBundlerContext(this._opt.pkgPath, {
|
|
@@ -429,9 +434,9 @@ export class SdNgBundler {
|
|
|
429
434
|
entryNames: "[name]",
|
|
430
435
|
assetNames: "media/[name]",
|
|
431
436
|
logLevel: "silent",
|
|
432
|
-
minify: !this._opt.dev,
|
|
437
|
+
minify: !this._opt.watch?.dev,
|
|
433
438
|
metafile: true,
|
|
434
|
-
sourcemap: this._opt.dev,
|
|
439
|
+
sourcemap: !!this._opt.watch?.dev,
|
|
435
440
|
outdir: this._opt.pkgPath,
|
|
436
441
|
write: false,
|
|
437
442
|
platform: "browser",
|
|
@@ -440,7 +445,7 @@ export class SdNgBundler {
|
|
|
440
445
|
external: [],
|
|
441
446
|
conditions: ["style", "sass"],
|
|
442
447
|
mainFields: ["style", "sass"],
|
|
443
|
-
legalComments: !this._opt.dev ? "none" : "eof",
|
|
448
|
+
legalComments: !this._opt.watch?.dev ? "none" : "eof",
|
|
444
449
|
entryPoints: {
|
|
445
450
|
styles: path.resolve(this._opt.pkgPath, "src/styles.scss"),
|
|
446
451
|
},
|
|
@@ -460,21 +465,21 @@ export class SdNgBundler {
|
|
|
460
465
|
conditions: ["es2020", "es2015", "module"],
|
|
461
466
|
resolveExtensions: [".js", ".mjs", ".cjs", ".ts"],
|
|
462
467
|
metafile: true,
|
|
463
|
-
legalComments: this._opt.dev ? "eof" : "none",
|
|
468
|
+
legalComments: this._opt.watch?.dev ? "eof" : "none",
|
|
464
469
|
logLevel: "silent",
|
|
465
|
-
minify: !this._opt.dev,
|
|
470
|
+
minify: !this._opt.watch?.dev,
|
|
466
471
|
outdir: this._opt.pkgPath,
|
|
467
|
-
sourcemap: this._opt.dev,
|
|
472
|
+
sourcemap: !!this._opt.watch?.dev,
|
|
468
473
|
tsconfig: this.#tsConfigFilePath,
|
|
469
474
|
write: false,
|
|
470
475
|
preserveSymlinks: false,
|
|
471
476
|
external: ["electron"],
|
|
472
477
|
define: {
|
|
473
|
-
...(!this._opt.dev ? { ngDevMode: "false" } : {}),
|
|
478
|
+
...(!this._opt.watch?.dev ? { ngDevMode: "false" } : {}),
|
|
474
479
|
"process.env.SD_VERSION": JSON.stringify(this.#pkgNpmConf.version),
|
|
475
|
-
"process.env.NODE_ENV": JSON.stringify(this._opt.dev ? "development" : "production"),
|
|
476
|
-
...(this.
|
|
477
|
-
? Object.keys(this.
|
|
480
|
+
"process.env.NODE_ENV": JSON.stringify(this._opt.watch?.dev ? "development" : "production"),
|
|
481
|
+
...(this._conf.env
|
|
482
|
+
? Object.keys(this._conf.env).toObject((key) => `process.env.${key}`, (key) => JSON.stringify(this._conf.env[key]))
|
|
478
483
|
: {}),
|
|
479
484
|
},
|
|
480
485
|
platform: "node",
|