@simplysm/sd-cli 11.0.5 → 11.0.8

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.
@@ -68,7 +68,7 @@ else {
68
68
  }
69
69
  // [library] typescript
70
70
  else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
71
- await new SdCliTsLibBuilder(message.projConf, message.pkgPath, message.withLint)
71
+ await new SdCliTsLibBuilder(message.pkgPath, message.withLint)
72
72
  .on("change", () => {
73
73
  sendMessage({
74
74
  type: "change",
@@ -157,7 +157,7 @@ else {
157
157
  }
158
158
  // [library] typescript
159
159
  else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
160
- const result = await new SdCliTsLibBuilder(message.projConf, message.pkgPath, message.withLint).buildAsync();
160
+ const result = await new SdCliTsLibBuilder(message.pkgPath, message.withLint).buildAsync();
161
161
  sendMessage({
162
162
  type: "complete",
163
163
  result,
@@ -1 +1 @@
1
- {"version":3,"file":"build-cluster.js","sourceRoot":"","sources":["../src/build-cluster.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"build-cluster.js","sourceRoot":"","sources":["../src/build-cluster.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { ISdCliPackageBuildResult } from "../commons";
2
2
  import ts from "typescript";
3
3
  export declare class SdLinter {
4
- static lintAsync(filePaths: string[], program?: ts.Program): Promise<ISdCliPackageBuildResult[]>;
4
+ static lintAsync(filePaths: string[], programOrPkgPath?: ts.Program | string): Promise<ISdCliPackageBuildResult[]>;
5
5
  }
@@ -1,21 +1,31 @@
1
1
  import { ESLint } from "eslint";
2
+ import path from "path";
2
3
  export class SdLinter {
3
- static async lintAsync(filePaths, program) {
4
- const linter = new ESLint(program ? {
4
+ static async lintAsync(filePaths, programOrPkgPath) {
5
+ const linter = new ESLint(programOrPkgPath !== null ? {
5
6
  overrideConfig: {
6
7
  overrides: [
7
8
  {
8
9
  files: ["*.ts", "*.tsx"],
9
10
  parserOptions: {
10
- programs: [program],
11
- tsconfigRootDir: null,
12
- project: null
11
+ ...typeof programOrPkgPath === "string" ? {
12
+ tsconfigRootDir: programOrPkgPath,
13
+ project: "tsconfig.json"
14
+ } : {
15
+ programs: [programOrPkgPath],
16
+ tsconfigRootDir: null,
17
+ project: null
18
+ }
13
19
  },
14
20
  settings: {
15
21
  "import/resolver": {
16
22
  "typescript": {
17
- programs: [program],
18
- project: null
23
+ ...typeof programOrPkgPath === "string" ? {
24
+ project: path.resolve(programOrPkgPath, "tsconfig.json")
25
+ } : {
26
+ programs: [programOrPkgPath],
27
+ project: null
28
+ }
19
29
  }
20
30
  }
21
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"SdLinter.js","sourceRoot":"","sources":["../../src/build-tools/SdLinter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAG9B,MAAM,OAAO,QAAQ;IACZ,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAmB,EAAE,OAAoB;QACrE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAClC,cAAc,EAAE;gBACd,SAAS,EAAE;oBACT;wBACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;wBACxB,aAAa,EAAE;4BACb,QAAQ,EAAE,CAAC,OAAO,CAAC;4BACnB,eAAe,EAAE,IAAI;4BACrB,OAAO,EAAE,IAAI;yBACd;wBACD,QAAQ,EAAE;4BACR,iBAAiB,EAAE;gCACjB,YAAY,EAAE;oCACZ,QAAQ,EAAE,CAAC,OAAO,CAAC;oCACnB,OAAO,EAAE,IAAI;iCACd;6BACF;yBACF;qBACF;iBACF;aACF;SACF,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAEf,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAEtD,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3E,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,MAAM;YAChB,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAkB,CAAC,CAAC,CAAC,OAAgB;YACpE,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,OAAO;YACpE,IAAI,EAAE,MAAe;SACtB,CAAC,CAAC,CAAC,CAAC;IACP,CAAC;CACF"}
1
+ {"version":3,"file":"SdLinter.js","sourceRoot":"","sources":["../../src/build-tools/SdLinter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAE9B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,OAAO,QAAQ;IACZ,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAmB,EAAE,gBAAsC;QACvF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC;YACpD,cAAc,EAAE;gBACd,SAAS,EAAE;oBACT;wBACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;wBACxB,aAAa,EAAE;4BACb,GAAG,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC;gCACxC,eAAe,EAAE,gBAAgB;gCACjC,OAAO,EAAE,eAAe;6BACzB,CAAC,CAAC,CAAC;gCACF,QAAQ,EAAE,CAAC,gBAAgB,CAAC;gCAC5B,eAAe,EAAE,IAAI;gCACrB,OAAO,EAAE,IAAI;6BACd;yBACF;wBACD,QAAQ,EAAE;4BACR,iBAAiB,EAAE;gCACjB,YAAY,EAAE;oCACZ,GAAG,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC;wCACxC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,eAAe,CAAC;qCACzD,CAAC,CAAC,CAAC;wCACF,QAAQ,EAAE,CAAC,gBAAgB,CAAC;wCAC5B,OAAO,EAAE,IAAI;qCACd;iCACF;6BACF;yBACF;qBACF;iBACF;aACF;SACF,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAEf,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAEtD,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3E,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,MAAM;YAChB,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAkB,CAAC,CAAC,CAAC,OAAgB;YACpE,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,OAAO;YACpE,IAAI,EAAE,MAAe;SACtB,CAAC,CAAC,CAAC,CAAC;IACP,CAAC;CACF"}
@@ -14,6 +14,7 @@ export declare class SdNgBundler {
14
14
  removeCache(filePaths: string[]): void;
15
15
  bundleAsync(): Promise<{
16
16
  filePaths: string[];
17
+ affectedFilePaths: string[];
17
18
  results: ISdCliPackageBuildResult[];
18
19
  }>;
19
20
  private _getAppContextAsync;
@@ -54,15 +54,46 @@ export class SdNgBundler {
54
54
  type: "build"
55
55
  })) ?? []
56
56
  ];
57
+ const watchFilePaths = [
58
+ ...this._sourceFileCache.keys(),
59
+ ...this._sourceFileCache.babelFileCache.keys()
60
+ ].map((item) => path.resolve(item));
61
+ let affectedSourceFilePaths = watchFilePaths.filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
57
62
  if (bundlingResult.errors) {
58
63
  return {
59
- filePaths: [
60
- ...this._sourceFileCache.typeScriptFileCache.keys(),
61
- ...this._sourceFileCache.babelFileCache.keys()
62
- ],
64
+ filePaths: watchFilePaths,
65
+ affectedFilePaths: affectedSourceFilePaths,
63
66
  results
64
67
  };
65
68
  }
69
+ const depsMap = new Map();
70
+ for (const entry of Object.entries(bundlingResult.metafile.inputs)) {
71
+ for (const imp of entry[1].imports) {
72
+ const deps = depsMap.getOrCreate(path.resolve(this._opt.pkgPath, imp.path), new Set());
73
+ deps.add(path.resolve(this._opt.pkgPath, entry[0]));
74
+ }
75
+ }
76
+ const searchAffectedFiles = (filePath, prev) => {
77
+ const result = new Set(prev);
78
+ const importerPaths = depsMap.get(filePath);
79
+ if (!importerPaths)
80
+ return result;
81
+ for (const importerPath of importerPaths) {
82
+ if (result.has(importerPath))
83
+ continue;
84
+ result.adds(importerPath);
85
+ result.adds(...searchAffectedFiles(importerPath, result));
86
+ }
87
+ return result;
88
+ };
89
+ if (this._sourceFileCache.modifiedFiles.size > 0) {
90
+ const affectedFilePathSet = new Set();
91
+ for (const modFile of this._sourceFileCache.modifiedFiles) {
92
+ affectedFilePathSet.add(path.resolve(modFile));
93
+ affectedFilePathSet.adds(...searchAffectedFiles(path.resolve(modFile)));
94
+ }
95
+ affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
96
+ }
66
97
  const executionResult = new ExecutionResult(this._contexts, this._sourceFileCache);
67
98
  executionResult.outputFiles.push(...bundlingResult.outputFiles);
68
99
  //-- index
@@ -94,10 +125,8 @@ export class SdNgBundler {
94
125
  catch (error) {
95
126
  this._logger.error(error instanceof Error ? error.message : `${error}`);
96
127
  return {
97
- filePaths: [
98
- ...this._sourceFileCache.typeScriptFileCache.keys(),
99
- ...this._sourceFileCache.babelFileCache.keys()
100
- ],
128
+ filePaths: watchFilePaths,
129
+ affectedFilePaths: affectedSourceFilePaths,
101
130
  results
102
131
  };
103
132
  }
@@ -121,10 +150,8 @@ export class SdNgBundler {
121
150
  }
122
151
  }
123
152
  return {
124
- filePaths: [
125
- ...this._sourceFileCache.typeScriptFileCache.keys(),
126
- ...this._sourceFileCache.babelFileCache.keys()
127
- ],
153
+ filePaths: watchFilePaths,
154
+ affectedFilePaths: affectedSourceFilePaths,
128
155
  results
129
156
  };
130
157
  }
@@ -194,6 +221,7 @@ export class SdNgBundler {
194
221
  process: 'process',
195
222
  Buffer: 'Buffer',
196
223
  'process.env.SD_VERSION': JSON.stringify(pkgNpmConf.version),
224
+ "process.env.NODE_ENV": JSON.stringify(this._options.watch ? "development" : "production")
197
225
  },
198
226
  platform: 'browser',
199
227
  mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],
@@ -1 +1 @@
1
- {"version":3,"file":"SdNgBundler.js","sourceRoot":"","sources":["../../src/build-tools/SdNgBundler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SdNgBundler.js","sourceRoot":"","sources":["../../src/build-tools/SdNgBundler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,eAAe,EAChB,MAAM,yEAAyE,CAAC;AAEjF,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,WAAW,EAAC,MAAM,+DAA+D,CAAC;AAC1F,OAAO,EAAC,cAAc,EAAC,MAAM,iEAAiE,CAAC;AAE/F,OAAO,EAAC,2BAA2B,EAAC,MAAM,yEAAyE,CAAC;AACpH,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,EAAC,yBAAyB,EAAC,MAAM,uEAAuE,CAAC;AAChH,OAAO,EACL,+BAA+B,EAChC,MAAM,6EAA6E,CAAC;AACrF,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,uBAAuB,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAC,eAAe,EAAC,MAAM,0EAA0E,CAAC;AAEzG,OAAO,EAAC,iBAAiB,EAAC,MAAM,sEAAsE,CAAC;AACvG,OAAO,EAAC,UAAU,EAAC,MAAM,qDAAqD,CAAC;AAC/E,OAAO,EAAC,eAAe,EAAC,MAAM,mEAAmE,CAAC;AAClG,OAAO,EAAC,kCAAkC,EAAC,MAAM,wDAAwD,CAAC;AAC1G,OAAO,EAAC,+BAA+B,EAAC,MAAM,+DAA+D,CAAC;AAE9G,MAAM,OAAO,WAAW;IAUtB,YAAoC,IAA4D;QAA5D,SAAI,GAAJ,IAAI,CAAwD;QAT/E,YAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAEnE,qBAAgB,GAAG,IAAI,eAAe,EAAE,CAAC;QAKzC,iBAAY,GAAG,IAAI,GAAG,EAA2B,CAAC;QAGjE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAEM,WAAW,CAAC,SAAmB;QACpC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,WAAW;QAKtB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;SAC9C;QAED,UAAU;QACV,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtE,MAAM,OAAO,GAAG;YACd,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACxC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC7G,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI;gBACzB,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM;gBAC3B,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,SAAkB;gBAC5B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;gBAClD,IAAI,EAAE,OAAgB;aACvB,CAAC,CAAC;YACH,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACtC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC3G,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI;gBACxB,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC9E,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,OAAgB;gBAC1B,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;gBACzC,IAAI,EAAE,OAAgB;aACvB,CAAC,CAAC,IAAI,EAAE;SACV,CAAC;QACF,MAAM,cAAc,GAAG;YACrB,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE;YAC/B,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,EAAE;SAC/C,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACpC,IAAI,uBAAuB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7G,IAAI,cAAc,CAAC,MAAM,EAAE;YACzB,OAAO;gBACL,SAAS,EAAE,cAAc;gBACzB,iBAAiB,EAAE,uBAAuB;gBAC1C,OAAO;aACR,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAuB,CAAC;QAC/C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAClE,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;gBAClC,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,EAAU,CAAC,CAAC;gBAC/F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACrD;SACF;QAED,MAAM,mBAAmB,GAAG,CAAC,QAAgB,EAAE,IAAkB,EAAe,EAAE;YAChF,MAAM,MAAM,GAAG,IAAI,GAAG,CAAS,IAAI,CAAC,CAAC;YAErC,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,CAAC,aAAa;gBAAE,OAAO,MAAM,CAAC;YAElC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;gBACxC,IAAI,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;oBAAE,SAAS;gBACvC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;aAC3D;YAED,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,IAAI,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE;YAChD,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC9C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE;gBACzD,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC/C,mBAAmB,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;aACzE;YACD,uBAAuB,GAAG,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SACpI;QAED,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACnF,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;QAEhE,UAAU;QACV,IAAI,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE;YAClC,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAChD,cAAc,CAAC,YAAY,EAC3B,eAAe,EACf,IAAI,CAAC,QAAQ,CACd,CAAC;YACF,IAAI,kBAAkB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;aACnD;YACD,IAAI,kBAAkB,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;aACjD;YAED,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAiB,CAAC,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;SACnG;QAED,gBAAgB;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACxB,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAO,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SAChH;QAED,6BAA6B;QAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;YACjC,eAAe,CAAC,aAAa,CAAC,sBAAsB,EAAE,MAAM,eAAe,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;SACpI;QAED,mBAAmB;QACnB,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,KAAK,SAAS,EAAE;YAC7C,IAAI;gBACF,MAAM,mBAAmB,GAAG,MAAM,kCAAkC,CAClE,IAAI,CAAC,QAAQ,CAAC,aAAa,EAC3B,IAAI,CAAC,QAAQ,CAAC,aAAa,EAC3B,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,GAAG,EAC7B,eAAe,CAAC,WAAW,EAC3B,eAAe,CAAC,UAAU,CAC3B,CAAC;gBACF,eAAe,CAAC,aAAa,CAAC,WAAW,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;gBACzE,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;aACpE;YACD,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;gBAExE,OAAO;oBACL,SAAS,EAAE,cAAc;oBACzB,iBAAiB,EAAE,uBAAuB;oBAC1C,OAAO;iBACR,CAAC;aACH;SACF;QAED,UAAU;QAEV,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACrI,KAAK,MAAM,UAAU,IAAI,eAAe,CAAC,WAAW,EAAE;YACpD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;YAE7D,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACjD,IAAI,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAChE,MAAM,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAC/D,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;aAC1F;SACF;QACD,KAAK,MAAM,SAAS,IAAI,eAAe,CAAC,UAAU,EAAE;YAClD,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAC5D,IAAI,IAAI,KAAK,IAAI,EAAE;gBACjB,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;gBACxF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aAC/C;SACF;QAED,OAAO;YACL,SAAS,EAAE,cAAc;YACzB,iBAAiB,EAAE,uBAAuB;YAC1C,OAAO;SACR,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE3D,OAAO,IAAI,cAAc,CACvB,IAAI,CAAC,QAAQ,CAAC,aAAa,EAC3B,IAAI,EACJ,aAAa,CACd,CAAC;IACJ,CAAC;IAEO,gBAAgB;QACtB,MAAM,cAAc,GAAG,+BAA+B,CACpD,IAAI,CAAC,QAAQ,EACb;YACE,aAAa,EAAE,aAAa;YAC5B,WAAW,EAAE,WAAW;YACxB,cAAc,EAAE,cAAc;YAC9B,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,SAAS;YACpB,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;SAC3B,EACD,IAAI,EACJ,IAAI,CAAC,gBAAgB,CAAC,eAAe,CACtC,CAAC;QAEF,OAAO,IAAI,cAAc,CACvB,IAAI,CAAC,QAAQ,CAAC,aAAa,EAC3B,IAAI,EACJ,cAAe,EACf,GAAG,EAAE,CAAC,IAAI,CACX,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,uBAAuB;QACnC,MAAM,UAAU,GAAe,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;QAE1G,MAAM,EAAC,aAAa,EAAE,YAAY,EAAC,GAAG,2BAA2B,CAC/D,IAAI,CAAC,QAAQ,EACb;YACE,aAAa,EAAE,aAAa;YAC5B,WAAW,EAAE,WAAW;YACxB,cAAc,EAAE,cAAc;YAC9B,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,SAAS;YACpB,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;SAC3B,EACD,IAAI,CAAC,gBAAgB,CACtB,CAAC;QAEF,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa;YAC1C,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,KAAK;YACb,UAAU,EAAE,cAAc;YAC1B,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;YAC1C,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;YACjD,QAAQ,EAAE,IAAI;YACd,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;YACnD,QAAQ,EAAE,QAAQ;YAClB,iBAAiB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK;YACvC,YAAY,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK;YAClC,gBAAgB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK;YACtC,IAAI,EAAE,CAAC,YAAY,CAAC;YACpB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;YAChC,YAAY,EAAE,SAAS;YACvB,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK;YAC9B,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,cAAc;YAC1B,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ;YAChC,QAAQ,EAAE,EAAE;YACZ,KAAK,EAAE,KAAK;YACZ,gBAAgB,EAAE,KAAK;YACvB,MAAM,EAAE;gBACN,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAC,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC,CAAC,EAAE;gBACnD,SAAS,EAAE,OAAO;gBAClB,MAAM,EAAE,QAAQ;gBAChB,OAAO,EAAE,SAAS;gBAClB,MAAM,EAAE,QAAQ;gBAChB,wBAAwB,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC5D,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC;aAC3F;YACD,QAAQ,EAAE,SAAS;YACnB,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC;YAC7D,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE;gBACX,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW;gBAC5B,SAAS,EAAE,mBAAmB;aAC/B;YACD,MAAM,EAAE;gBACN,aAAa,EAAE,aAAa;gBAC5B,WAAW,EAAE,WAAW;gBACxB,cAAc,EAAE,cAAc;gBAC9B,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,SAAS;gBACpB,YAAY,EAAE,YAAY;gBAC1B,YAAY,EAAE,YAAY;gBAC1B,YAAY,EAAE,YAAY;gBAC1B,YAAY,EAAE,YAAY;aAC3B;YACD,SAAS,EAAE,EAAC,aAAa,EAAE,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAC;YAC9D,MAAM,EAAE;gBACN,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,QAAQ,EAAE,MAAM;gBAChB,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;aACf;YACD,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,OAAQ,CAAC,0CAA0C,CAAC,CAAC,CAAC,CAAC;YAC/G,OAAO,EAAE;gBACP,yBAAyB,CAAC;oBACxB,SAAS,EAAE,mBAAmB;oBAC9B,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;wBAClB,QAAQ,EAAE,8BAA8B;wBACxC,MAAM,EAAE,IAAI;wBACZ,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa;qBACxC,CAAC;iBACH,CAAmB;gBACpB,+BAA+B,EAAE;gBACjC,oBAAoB,CAClB,aAAa,EACb,YAAY,CACK;gBACnB,uBAAuB,CAAC,iBAAiB,CAAC;aAC3C;SACF,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,GAA2D;QAC7E,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACpE,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QACtE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAEjE,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE3C,OAAO;YACL,qBAAqB,EAAE,IAAI;YAC3B,2BAA2B,EAAE,EAAE;YAC/B,QAAQ,EAAE,IAAI,OAAO,GAAG;YACxB,YAAY,EAAE;gBACZ,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,aAAa;gBACvB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,WAAW,CAAC;aACnD;YACD,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,gBAAgB,EAAE,IAAI;YACtB,oBAAoB,EAAE,EAAE;YACxB,eAAe,EAAE,CAAC,GAAG,CAAC,GAAG;YACzB,mBAAmB,EAAE,MAAM;YAC3B,GAAG,EAAE,KAAK;YACV,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,CAAC,oBAAoB,CAAC;YACjC,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,IAAI;YACd,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YAC5C,gBAAgB,EAAE,KAAK;YACvB,wBAAwB,EAAE,EAAC,YAAY,EAAE,EAAE,EAAC;YAC5C,oBAAoB,EAAE,KAAK;YAC3B,gBAAgB,EAAE,SAAS;YAC3B,gBAAgB,EAAE,SAAS;YAC3B,eAAe,EAAE,SAAS;YAC1B,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,GAAG,CAAC,GAAG;YACd,aAAa,EAAE,GAAG,CAAC,OAAO;YAC1B,WAAW,EAAE,EAAC,IAAI,EAAE,YAAY,EAAC;YACjC,mBAAmB,EAAE;gBACnB,OAAO,EAAE,CAAC,GAAG,CAAC,GAAG;gBACjB,MAAM,EAAE,EAAC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,CAAC,GAAG,CAAC,GAAG,EAAC;gBACpD,KAAK,EAAE,EAAC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,EAAC;aAC1B;YACD,UAAU,EAAE,GAAG,CAAC,OAAO;YACvB,YAAY,EAAE,SAAS;YACvB,gBAAgB,EAAE,EAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,EAAC;YACnF,QAAQ,EAAE,gBAAgB;YAC1B,WAAW,EAAE,GAAG,CAAC,OAAO;YACxB,MAAM,EAAE;gBACN,EAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAC;gBAC/C,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAC;aACvD;YACD,WAAW,EAAE,EAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC;YACvD,gBAAgB,EAAE,SAAS;YAC3B,YAAY,EAAE,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;YAC3E,aAAa,EAAE,EAAE;YACjB,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;YACjE,gBAAgB,EAAE;gBAChB,KAAK,EAAE,iBAAiB;gBACxB,MAAM,EAAE,YAAY;gBACpB,cAAc,EAAE;oBACd,CAAC,SAAS,EAAE,IAAI,CAAC;oBACjB,CAAC,WAAW,EAAE,IAAI,CAAC;oBACnB,CAAC,QAAQ,EAAE,KAAK,CAAC;oBACjB,CAAC,QAAQ,EAAE,IAAI,CAAC;oBAChB,CAAC,MAAM,EAAE,IAAI,CAAC;iBACf;aACF;YACD,qBAAqB,EAAE,SAAS;SACjC,CAAC;IACJ,CAAC;CACF"}
@@ -7,7 +7,6 @@ export declare class SdTsBundler {
7
7
  dev: boolean;
8
8
  pkgPath: string;
9
9
  entryPoints: string[];
10
- external?: string[];
11
10
  });
12
11
  bundleAsync(): Promise<ISdCliPackageBuildResult[]>;
13
12
  getOptions(): esbuild.BuildOptions;
@@ -54,14 +54,15 @@ export class SdTsBundler {
54
54
  },
55
55
  platform: "node",
56
56
  logLevel: "silent",
57
- external: this._opt.external,
57
+ packages: "external",
58
+ // external: this._opt.external,
58
59
  banner: {
59
60
  js: `
60
61
  import __path__ from 'path';
61
62
  import { fileURLToPath as __fileURLToPath__ } from 'url';
62
- import { createRequire as __createRequire__ } from 'module';
63
-
64
- const require = __createRequire__(import.meta.url);
63
+ // import { createRequire as __createRequire__ } from 'module';
64
+ //
65
+ // const require = __createRequire__(import.meta.url);
65
66
  const __filename = __fileURLToPath__(import.meta.url);
66
67
  const __dirname = __path__.dirname(__filename);`.trim()
67
68
  },
@@ -1 +1 @@
1
- {"version":3,"file":"SdTsBundler.js","sourceRoot":"","sources":["../../src/build-tools/SdTsBundler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SdTsBundler.js","sourceRoot":"","sources":["../../src/build-tools/SdTsBundler.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,6 @@ export declare class SdCliClientBuilder extends EventEmitter {
7
7
  private readonly _logger;
8
8
  private readonly _pkgConf;
9
9
  private _builders?;
10
- private _checker?;
11
10
  constructor(_projConf: ISdCliConfig, _pkgPath: string);
12
11
  on(event: "change", listener: () => void): this;
13
12
  on(event: "complete", listener: (result: ISdCliBuilderResult) => void): this;
@@ -2,7 +2,6 @@ import { EventEmitter } from "events";
2
2
  import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
3
3
  import { FunctionQueue, Wait } from "@simplysm/sd-core-common";
4
4
  import path from "path";
5
- import { SdTsCompiler } from "../build-tools/SdTsCompiler";
6
5
  import { SdNgBundler } from "../build-tools/SdNgBundler";
7
6
  import { SdLinter } from "../build-tools/SdLinter";
8
7
  export class SdCliClientBuilder extends EventEmitter {
@@ -55,18 +54,13 @@ export class SdCliClientBuilder extends EventEmitter {
55
54
  builderType: builderType,
56
55
  pkgPath: this._pkgPath
57
56
  }));
58
- this._checker = this._checker ?? new SdTsCompiler({
59
- pkgPath: this._pkgPath,
60
- emit: false,
61
- emitDts: false,
62
- globalStyle: false
63
- });
64
- this._debug(`BUILD...`);
57
+ this._debug(`BUILD & CHECK...`);
65
58
  const buildResults = await Promise.all(this._builders.map((builder) => builder.bundleAsync()));
66
- this._debug("CHECK...");
67
- const checkResult = await this._checker.buildAsync();
59
+ const filePaths = buildResults.mapMany(item => item.filePaths).distinct();
60
+ const affectedFilePaths = buildResults.mapMany(item => item.affectedFilePaths).distinct();
61
+ const results = buildResults.mapMany((item) => item.results).distinct();
68
62
  this._debug(`LINT...`);
69
- const lintResults = await SdLinter.lintAsync(checkResult.affectedFilePaths, this._checker.program);
63
+ const lintResults = await SdLinter.lintAsync(affectedFilePaths, this._pkgPath);
70
64
  if (opt.genConf) {
71
65
  this._debug("GEN .config...");
72
66
  if (opt.dev && this._pkgConf.server !== undefined) {
@@ -80,14 +74,14 @@ export class SdCliClientBuilder extends EventEmitter {
80
74
  }
81
75
  const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {})
82
76
  .mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
83
- const watchFilePaths = buildResults.mapMany((item) => item.filePaths)
77
+ const watchFilePaths = filePaths
84
78
  .filter((item) => PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
85
79
  localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu)));
86
80
  this._debug(`빌드 완료`);
87
81
  return {
88
82
  watchFilePaths: watchFilePaths,
89
- affectedFilePaths: checkResult.affectedFilePaths,
90
- buildResults: [...buildResults.mapMany((item) => item.results), ...checkResult.results, ...lintResults]
83
+ affectedFilePaths: affectedFilePaths,
84
+ buildResults: [...results, ...lintResults]
91
85
  };
92
86
  }
93
87
  _debug(msg) {
@@ -1 +1 @@
1
- {"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../src/builders/SdCliClientBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../src/builders/SdCliClientBuilder.ts"],"names":[],"mappings":"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"}
@@ -12,6 +12,5 @@ export declare class SdCliServerBuilder extends EventEmitter {
12
12
  on(event: "complete", listener: (result: ISdCliBuilderResult) => void): this;
13
13
  watchAsync(): Promise<void>;
14
14
  buildAsync(): Promise<ISdCliBuilderResult>;
15
- private _getExternalModulesAsync;
16
15
  private _debug;
17
16
  }
@@ -3,7 +3,7 @@ import { FsUtil, Logger, SdFsWatcher } from "@simplysm/sd-core-node";
3
3
  import path from "path";
4
4
  import { SdTsCompiler } from "../build-tools/SdTsCompiler";
5
5
  import { SdLinter } from "../build-tools/SdLinter";
6
- import { FunctionQueue, ObjectUtil, StringUtil } from "@simplysm/sd-core-common";
6
+ import { FunctionQueue, ObjectUtil } from "@simplysm/sd-core-common";
7
7
  import { SdTsBundler } from "../build-tools/SdTsBundler";
8
8
  export class SdCliServerBuilder extends EventEmitter {
9
9
  constructor(_projConf, _pkgPath, _withLint) {
@@ -19,7 +19,7 @@ export class SdCliServerBuilder extends EventEmitter {
19
19
  return this;
20
20
  }
21
21
  async watchAsync() {
22
- const extModules = await this._getExternalModulesAsync();
22
+ // const extModules = await this._getExternalModulesAsync();
23
23
  this._debug("dist 초기화...");
24
24
  await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
25
25
  this._debug("GEN .config...");
@@ -32,7 +32,7 @@ export class SdCliServerBuilder extends EventEmitter {
32
32
  entryPoints: [
33
33
  path.resolve(this._pkgPath, "src/main.ts")
34
34
  ],
35
- external: extModules.map((item) => item.name)
35
+ // external: extModules.map((item) => item.name)
36
36
  });
37
37
  const checker = new SdTsCompiler({
38
38
  pkgPath: this._pkgPath,
@@ -58,7 +58,7 @@ export class SdCliServerBuilder extends EventEmitter {
58
58
  this._debug("CHECK...");
59
59
  const checkResult = await checker.buildAsync();
60
60
  this._debug(`LINT...`);
61
- const lintResults = await SdLinter.lintAsync(checkResult.affectedFilePaths, checker.program);
61
+ const lintResults = !this._withLint ? [] : await SdLinter.lintAsync(checkResult.affectedFilePaths, checker.program);
62
62
  this._debug(`빌드 완료`);
63
63
  this.emit("complete", {
64
64
  affectedFilePaths: checkResult.affectedFilePaths,
@@ -69,7 +69,7 @@ export class SdCliServerBuilder extends EventEmitter {
69
69
  }
70
70
  async buildAsync() {
71
71
  const npmConfig = (await FsUtil.readJsonAsync(path.resolve(this._pkgPath, "package.json")));
72
- const extModules = await this._getExternalModulesAsync();
72
+ // const extModules = await this._getExternalModulesAsync();
73
73
  this._debug("dist 초기화...");
74
74
  await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
75
75
  this._debug("GEN .config.json...");
@@ -77,12 +77,12 @@ export class SdCliServerBuilder extends EventEmitter {
77
77
  await FsUtil.writeFileAsync(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
78
78
  this._debug("GEN package.json...");
79
79
  {
80
- const deps = extModules.filter((item) => item.exists).map((item) => item.name);
80
+ // const deps = extModules.filter((item) => item.exists).map((item) => item.name);
81
81
  const distNpmConfig = ObjectUtil.clone(npmConfig);
82
- distNpmConfig.dependencies = {};
83
- for (const dep of deps) {
84
- distNpmConfig.dependencies[dep] = "*";
85
- }
82
+ // distNpmConfig.dependencies = {};
83
+ // for (const dep of deps) {
84
+ // distNpmConfig.dependencies[dep] = "*";
85
+ // }
86
86
  delete distNpmConfig.optionalDependencies;
87
87
  delete distNpmConfig.devDependencies;
88
88
  delete distNpmConfig.peerDependencies;
@@ -150,7 +150,7 @@ export class SdCliServerBuilder extends EventEmitter {
150
150
  entryPoints: [
151
151
  path.resolve(this._pkgPath, "src/main.ts")
152
152
  ],
153
- external: extModules.map((item) => item.name)
153
+ // external: extModules.map((item) => item.name)
154
154
  });
155
155
  const checker = new SdTsCompiler({
156
156
  pkgPath: this._pkgPath,
@@ -163,81 +163,100 @@ export class SdCliServerBuilder extends EventEmitter {
163
163
  this._debug("CHECK...");
164
164
  const checkResult = await checker.buildAsync();
165
165
  this._debug(`LINT...`);
166
- const lintResults = await SdLinter.lintAsync(checkResult.affectedFilePaths, checker.program);
166
+ const lintResults = !this._withLint ? [] : await SdLinter.lintAsync(checkResult.affectedFilePaths, checker.program);
167
167
  this._debug(`빌드 완료`);
168
168
  return {
169
169
  affectedFilePaths: checkResult.affectedFilePaths,
170
170
  buildResults: [...buildResults, ...checkResult.results, ...lintResults]
171
171
  };
172
172
  }
173
- async _getExternalModulesAsync() {
174
- const loadedModuleNames = [];
175
- const results = [];
176
- const npmConfigMap = new Map();
177
- const fn = async (currPath) => {
178
- const npmConfig = npmConfigMap.getOrCreate(currPath, await FsUtil.readJsonAsync(path.resolve(currPath, "package.json")));
179
- const deps = {
180
- defaults: [
181
- ...Object.keys(npmConfig.dependencies ?? {}),
182
- ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => !npmConfig.peerDependenciesMeta?.[item]?.optional)
183
- ].distinct(),
184
- optionals: [
185
- ...Object.keys(npmConfig.optionalDependencies ?? {}),
186
- ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => npmConfig.peerDependenciesMeta?.[item]?.optional)
187
- ].distinct()
188
- };
189
- for (const moduleName of deps.defaults) {
190
- if (loadedModuleNames.includes(moduleName))
191
- continue;
192
- loadedModuleNames.push(moduleName);
193
- const modulePath = FsUtil.findAllParentChildPaths("node_modules/" + moduleName, currPath, path.resolve(this._pkgPath, "../../")).first();
194
- if (StringUtil.isNullOrEmpty(modulePath)) {
195
- continue;
196
- }
197
- if (FsUtil.glob(path.resolve(modulePath, "**/binding.gyp")).length > 0) {
198
- results.push({
199
- name: moduleName,
200
- exists: true
201
- });
202
- }
203
- if (this._pkgConf.externals?.includes(moduleName)) {
204
- results.push({
205
- name: moduleName,
206
- exists: true
207
- });
208
- }
209
- await fn(modulePath);
210
- }
211
- for (const optModuleName of deps.optionals) {
212
- if (loadedModuleNames.includes(optModuleName))
213
- continue;
214
- loadedModuleNames.push(optModuleName);
215
- const optModulePath = FsUtil.findAllParentChildPaths("node_modules/" + optModuleName, currPath, path.resolve(this._pkgPath, "../../")).first();
216
- if (StringUtil.isNullOrEmpty(optModulePath)) {
217
- results.push({
218
- name: optModuleName,
219
- exists: false
220
- });
221
- continue;
222
- }
223
- if (FsUtil.glob(path.resolve(optModulePath, "**/binding.gyp")).length > 0) {
224
- results.push({
225
- name: optModuleName,
226
- exists: true
227
- });
228
- }
229
- if (this._pkgConf.externals?.includes(optModuleName)) {
230
- results.push({
231
- name: optModuleName,
232
- exists: true
233
- });
234
- }
235
- await fn(optModulePath);
236
- }
173
+ /*private async _getExternalModulesAsync(): Promise<{
174
+ name: string;
175
+ exists: boolean
176
+ }[]> {
177
+ const loadedModuleNames: string[] = [];
178
+ const results: {
179
+ name: string;
180
+ exists: boolean
181
+ }[] = [];
182
+
183
+ const npmConfigMap = new Map<string, INpmConfig>();
184
+
185
+ const fn = async (currPath: string): Promise<void> => {
186
+ const npmConfig = npmConfigMap.getOrCreate(currPath, await FsUtil.readJsonAsync(path.resolve(currPath, "package.json")));
187
+
188
+ const deps = {
189
+ defaults: [
190
+ ...Object.keys(npmConfig.dependencies ?? {}),
191
+ ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => !npmConfig.peerDependenciesMeta?.[item]?.optional)
192
+ ].distinct(),
193
+ optionals: [
194
+ ...Object.keys(npmConfig.optionalDependencies ?? {}),
195
+ ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => npmConfig.peerDependenciesMeta?.[item]?.optional)
196
+ ].distinct()
237
197
  };
238
- await fn(this._pkgPath);
239
- return results;
240
- }
198
+
199
+ for (const moduleName of deps.defaults) {
200
+ if (loadedModuleNames.includes(moduleName)) continue;
201
+ loadedModuleNames.push(moduleName);
202
+
203
+ const modulePath = FsUtil.findAllParentChildPaths("node_modules/" + moduleName, currPath, path.resolve(this._pkgPath, "../../")).first();
204
+ if (StringUtil.isNullOrEmpty(modulePath)) {
205
+ continue;
206
+ }
207
+
208
+ if (FsUtil.glob(path.resolve(modulePath, "**!/binding.gyp")).length > 0) {
209
+ results.push({
210
+ name: moduleName,
211
+ exists: true
212
+ });
213
+ }
214
+
215
+ if (this._pkgConf.externals?.includes(moduleName)) {
216
+ results.push({
217
+ name: moduleName,
218
+ exists: true
219
+ });
220
+ }
221
+
222
+ await fn(modulePath);
223
+ }
224
+
225
+ for (const optModuleName of deps.optionals) {
226
+ if (loadedModuleNames.includes(optModuleName)) continue;
227
+ loadedModuleNames.push(optModuleName);
228
+
229
+ const optModulePath = FsUtil.findAllParentChildPaths("node_modules/" + optModuleName, currPath, path.resolve(this._pkgPath, "../../")).first();
230
+ if (StringUtil.isNullOrEmpty(optModulePath)) {
231
+ results.push({
232
+ name: optModuleName,
233
+ exists: false
234
+ });
235
+ continue;
236
+ }
237
+
238
+ if (FsUtil.glob(path.resolve(optModulePath, "**!/binding.gyp")).length > 0) {
239
+ results.push({
240
+ name: optModuleName,
241
+ exists: true
242
+ });
243
+ }
244
+
245
+ if (this._pkgConf.externals?.includes(optModuleName)) {
246
+ results.push({
247
+ name: optModuleName,
248
+ exists: true
249
+ });
250
+ }
251
+
252
+ await fn(optModulePath);
253
+ }
254
+ };
255
+
256
+ await fn(this._pkgPath);
257
+
258
+ return results;
259
+ }*/
241
260
  _debug(msg) {
242
261
  this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
243
262
  }
@@ -1 +1 @@
1
- {"version":3,"file":"SdCliServerBuilder.js","sourceRoot":"","sources":["../../src/builders/SdCliServerBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SdCliServerBuilder.js","sourceRoot":"","sources":["../../src/builders/SdCliServerBuilder.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,11 @@
1
1
  /// <reference types="node" />
2
- import { ISdCliBuilderResult, ISdCliConfig } from "../commons";
2
+ import { ISdCliBuilderResult } from "../commons";
3
3
  import { EventEmitter } from "events";
4
4
  export declare class SdCliTsLibBuilder extends EventEmitter {
5
- private readonly _projConf;
6
5
  private readonly _pkgPath;
7
6
  private readonly _withLint;
8
7
  private readonly _logger;
9
- constructor(_projConf: ISdCliConfig, _pkgPath: string, _withLint: boolean);
8
+ constructor(_pkgPath: string, _withLint: boolean);
10
9
  on(event: "change", listener: () => void): this;
11
10
  on(event: "complete", listener: (result: ISdCliBuilderResult) => void): this;
12
11
  buildAsync(): Promise<ISdCliBuilderResult>;
@@ -5,9 +5,8 @@ import { SdTsCompiler } from "../build-tools/SdTsCompiler";
5
5
  import { SdLinter } from "../build-tools/SdLinter";
6
6
  import { FunctionQueue } from "@simplysm/sd-core-common";
7
7
  export class SdCliTsLibBuilder extends EventEmitter {
8
- constructor(_projConf, _pkgPath, _withLint) {
8
+ constructor(_pkgPath, _withLint) {
9
9
  super();
10
- this._projConf = _projConf;
11
10
  this._pkgPath = _pkgPath;
12
11
  this._withLint = _withLint;
13
12
  this._logger = Logger.get(["simplysm", "sd-cli", "SdCliTsLibBuilder"]);
@@ -1 +1 @@
1
- {"version":3,"file":"SdCliTsLibBuilder.js","sourceRoot":"","sources":["../../src/builders/SdCliTsLibBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SdCliTsLibBuilder.js","sourceRoot":"","sources":["../../src/builders/SdCliTsLibBuilder.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "11.0.5",
3
+ "version": "11.0.8",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -18,24 +18,24 @@
18
18
  },
19
19
  "dependencies": {
20
20
  "@angular-devkit/build-angular": "^16.2.6",
21
- "@angular/common": "^16.2.8",
22
- "@angular/compiler": "^16.2.8",
23
- "@angular/compiler-cli": "^16.2.8",
24
- "@angular/core": "^16.2.8",
21
+ "@angular/common": "^16.2.9",
22
+ "@angular/compiler": "^16.2.9",
23
+ "@angular/compiler-cli": "^16.2.9",
24
+ "@angular/core": "^16.2.9",
25
25
  "@electron/rebuild": "^3.3.0",
26
- "@simplysm/sd-core-common": "11.0.5",
27
- "@simplysm/sd-core-node": "11.0.5",
28
- "@simplysm/sd-service-server": "11.0.5",
29
- "@simplysm/sd-storage": "11.0.5",
26
+ "@simplysm/sd-core-common": "11.0.8",
27
+ "@simplysm/sd-core-node": "11.0.8",
28
+ "@simplysm/sd-service-server": "11.0.8",
29
+ "@simplysm/sd-storage": "11.0.8",
30
30
  "browserslist": "^4.22.1",
31
- "electron": "^26.3.0",
31
+ "electron": "^27.0.0",
32
32
  "electron-builder": "^24.7.0",
33
33
  "esbuild": "0.18.17",
34
34
  "esbuild-plugin-tsc": "^0.4.0",
35
35
  "eslint": "^8.51.0",
36
36
  "node-stdlib-browser": "^1.2.0",
37
37
  "rxjs": "^7.8.1",
38
- "sass": "^1.69.2",
38
+ "sass": "^1.69.3",
39
39
  "semver": "^7.5.4",
40
40
  "yargs": "^17.7.2",
41
41
  "zone.js": "~0.13.3"
@@ -77,7 +77,7 @@ else {
77
77
  }
78
78
  // [library] typescript
79
79
  else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
80
- await new SdCliTsLibBuilder(message.projConf, message.pkgPath, message.withLint)
80
+ await new SdCliTsLibBuilder(message.pkgPath, message.withLint)
81
81
  .on("change", () => {
82
82
  sendMessage({
83
83
  type: "change",
@@ -166,7 +166,7 @@ else {
166
166
  }
167
167
  // [library] typescript
168
168
  else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
169
- const result = await new SdCliTsLibBuilder(message.projConf, message.pkgPath, message.withLint).buildAsync();
169
+ const result = await new SdCliTsLibBuilder(message.pkgPath, message.withLint).buildAsync();
170
170
  sendMessage({
171
171
  type: "complete",
172
172
  result,
@@ -1,24 +1,34 @@
1
1
  import {ISdCliPackageBuildResult} from "../commons";
2
2
  import {ESLint} from "eslint";
3
3
  import ts from "typescript";
4
+ import path from "path";
4
5
 
5
6
  export class SdLinter {
6
- public static async lintAsync(filePaths: string[], program?: ts.Program): Promise<ISdCliPackageBuildResult[]> {
7
- const linter = new ESLint(program ? {
7
+ public static async lintAsync(filePaths: string[], programOrPkgPath?: ts.Program | string): Promise<ISdCliPackageBuildResult[]> {
8
+ const linter = new ESLint(programOrPkgPath !== null ? {
8
9
  overrideConfig: {
9
10
  overrides: [
10
11
  {
11
12
  files: ["*.ts", "*.tsx"],
12
13
  parserOptions: {
13
- programs: [program],
14
- tsconfigRootDir: null,
15
- project: null
14
+ ...typeof programOrPkgPath === "string" ? {
15
+ tsconfigRootDir: programOrPkgPath,
16
+ project: "tsconfig.json"
17
+ } : {
18
+ programs: [programOrPkgPath],
19
+ tsconfigRootDir: null,
20
+ project: null
21
+ }
16
22
  },
17
23
  settings: {
18
24
  "import/resolver": {
19
25
  "typescript": {
20
- programs: [program],
21
- project: null
26
+ ...typeof programOrPkgPath === "string" ? {
27
+ project: path.resolve(programOrPkgPath, "tsconfig.json")
28
+ } : {
29
+ programs: [programOrPkgPath],
30
+ project: null
31
+ }
22
32
  }
23
33
  }
24
34
  }
@@ -44,6 +44,7 @@ export class SdNgBundler {
44
44
 
45
45
  public async bundleAsync(): Promise<{
46
46
  filePaths: string[],
47
+ affectedFilePaths: string[],
47
48
  results: ISdCliPackageBuildResult[]
48
49
  }> {
49
50
  if (!this._contexts) {
@@ -75,16 +76,51 @@ export class SdNgBundler {
75
76
  type: "build" as const
76
77
  })) ?? []
77
78
  ];
79
+ const watchFilePaths = [
80
+ ...this._sourceFileCache.keys(),
81
+ ...this._sourceFileCache.babelFileCache.keys()
82
+ ].map((item) => path.resolve(item));
83
+ let affectedSourceFilePaths = watchFilePaths.filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
78
84
  if (bundlingResult.errors) {
79
85
  return {
80
- filePaths: [
81
- ...this._sourceFileCache.typeScriptFileCache.keys(),
82
- ...this._sourceFileCache.babelFileCache.keys()
83
- ],
86
+ filePaths: watchFilePaths,
87
+ affectedFilePaths: affectedSourceFilePaths,
84
88
  results
85
89
  };
86
90
  }
87
91
 
92
+ const depsMap = new Map<string, Set<string>>();
93
+ for (const entry of Object.entries(bundlingResult.metafile.inputs)) {
94
+ for (const imp of entry[1].imports) {
95
+ const deps = depsMap.getOrCreate(path.resolve(this._opt.pkgPath, imp.path), new Set<string>());
96
+ deps.add(path.resolve(this._opt.pkgPath, entry[0]));
97
+ }
98
+ }
99
+
100
+ const searchAffectedFiles = (filePath: string, prev?: Set<string>): Set<string> => {
101
+ const result = new Set<string>(prev);
102
+
103
+ const importerPaths = depsMap.get(filePath);
104
+ if (!importerPaths) return result;
105
+
106
+ for (const importerPath of importerPaths) {
107
+ if (result.has(importerPath)) continue;
108
+ result.adds(importerPath);
109
+ result.adds(...searchAffectedFiles(importerPath, result));
110
+ }
111
+
112
+ return result;
113
+ };
114
+
115
+ if (this._sourceFileCache.modifiedFiles.size > 0) {
116
+ const affectedFilePathSet = new Set<string>();
117
+ for (const modFile of this._sourceFileCache.modifiedFiles) {
118
+ affectedFilePathSet.add(path.resolve(modFile));
119
+ affectedFilePathSet.adds(...searchAffectedFiles(path.resolve(modFile)));
120
+ }
121
+ affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
122
+ }
123
+
88
124
  const executionResult = new ExecutionResult(this._contexts, this._sourceFileCache);
89
125
  executionResult.outputFiles.push(...bundlingResult.outputFiles);
90
126
 
@@ -132,10 +168,8 @@ export class SdNgBundler {
132
168
  this._logger.error(error instanceof Error ? error.message : `${error}`);
133
169
 
134
170
  return {
135
- filePaths: [
136
- ...this._sourceFileCache.typeScriptFileCache.keys(),
137
- ...this._sourceFileCache.babelFileCache.keys()
138
- ],
171
+ filePaths: watchFilePaths,
172
+ affectedFilePaths: affectedSourceFilePaths,
139
173
  results
140
174
  };
141
175
  }
@@ -163,10 +197,8 @@ export class SdNgBundler {
163
197
  }
164
198
 
165
199
  return {
166
- filePaths: [
167
- ...this._sourceFileCache.typeScriptFileCache.keys(),
168
- ...this._sourceFileCache.babelFileCache.keys()
169
- ],
200
+ filePaths: watchFilePaths,
201
+ affectedFilePaths: affectedSourceFilePaths,
170
202
  results
171
203
  };
172
204
  }
@@ -261,6 +293,7 @@ export class SdNgBundler {
261
293
  process: 'process',
262
294
  Buffer: 'Buffer',
263
295
  'process.env.SD_VERSION': JSON.stringify(pkgNpmConf.version),
296
+ "process.env.NODE_ENV": JSON.stringify(this._options.watch ? "development" : "production")
264
297
  },
265
298
  platform: 'browser',
266
299
  mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],
@@ -10,7 +10,7 @@ export class SdTsBundler {
10
10
  dev: boolean;
11
11
  pkgPath: string;
12
12
  entryPoints: string[];
13
- external?: string[];
13
+ // external?: string[];
14
14
  }) {
15
15
  }
16
16
 
@@ -64,14 +64,15 @@ export class SdTsBundler {
64
64
  },
65
65
  platform: "node",
66
66
  logLevel: "silent",
67
- external: this._opt.external,
67
+ packages: "external",
68
+ // external: this._opt.external,
68
69
  banner: {
69
70
  js: `
70
71
  import __path__ from 'path';
71
72
  import { fileURLToPath as __fileURLToPath__ } from 'url';
72
- import { createRequire as __createRequire__ } from 'module';
73
-
74
- const require = __createRequire__(import.meta.url);
73
+ // import { createRequire as __createRequire__ } from 'module';
74
+ //
75
+ // const require = __createRequire__(import.meta.url);
75
76
  const __filename = __fileURLToPath__(import.meta.url);
76
77
  const __dirname = __path__.dirname(__filename);`.trim()
77
78
  },
@@ -3,7 +3,6 @@ import {FsUtil, Logger, PathUtil, SdFsWatcher} from "@simplysm/sd-core-node";
3
3
  import {ISdCliBuilderResult, ISdCliClientPackageConfig, ISdCliConfig, ISdCliPackageBuildResult} from "../commons";
4
4
  import {FunctionQueue, Wait} from "@simplysm/sd-core-common";
5
5
  import path from "path";
6
- import {SdTsCompiler} from "../build-tools/SdTsCompiler";
7
6
  import {SdNgBundler} from "../build-tools/SdNgBundler";
8
7
  import {SdLinter} from "../build-tools/SdLinter";
9
8
 
@@ -11,7 +10,6 @@ export class SdCliClientBuilder extends EventEmitter {
11
10
  private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliClientBuilder"]);
12
11
  private readonly _pkgConf: ISdCliClientPackageConfig;
13
12
  private _builders?: SdNgBundler[];
14
- private _checker?: SdTsCompiler;
15
13
 
16
14
  public constructor(private readonly _projConf: ISdCliConfig,
17
15
  private readonly _pkgPath: string) {
@@ -81,21 +79,14 @@ export class SdCliClientBuilder extends EventEmitter {
81
79
  pkgPath: this._pkgPath
82
80
  }));
83
81
 
84
- this._checker = this._checker ?? new SdTsCompiler({
85
- pkgPath: this._pkgPath,
86
- emit: false,
87
- emitDts: false,
88
- globalStyle: false
89
- });
90
-
91
- this._debug(`BUILD...`);
82
+ this._debug(`BUILD & CHECK...`);
92
83
  const buildResults = await Promise.all(this._builders.map((builder) => builder.bundleAsync()));
93
-
94
- this._debug("CHECK...");
95
- const checkResult = await this._checker.buildAsync();
84
+ const filePaths = buildResults.mapMany(item => item.filePaths).distinct();
85
+ const affectedFilePaths = buildResults.mapMany(item => item.affectedFilePaths).distinct();
86
+ const results = buildResults.mapMany((item) => item.results).distinct();
96
87
 
97
88
  this._debug(`LINT...`);
98
- const lintResults = await SdLinter.lintAsync(checkResult.affectedFilePaths, this._checker.program);
89
+ const lintResults = await SdLinter.lintAsync(affectedFilePaths, this._pkgPath);
99
90
 
100
91
  if (opt.genConf) {
101
92
  this._debug("GEN .config...");
@@ -111,7 +102,7 @@ export class SdCliClientBuilder extends EventEmitter {
111
102
 
112
103
  const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {})
113
104
  .mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
114
- const watchFilePaths = buildResults.mapMany((item) => item.filePaths)
105
+ const watchFilePaths = filePaths
115
106
  .filter((item) =>
116
107
  PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
117
108
  localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu))
@@ -120,8 +111,8 @@ export class SdCliClientBuilder extends EventEmitter {
120
111
  this._debug(`빌드 완료`);
121
112
  return {
122
113
  watchFilePaths: watchFilePaths,
123
- affectedFilePaths: checkResult.affectedFilePaths,
124
- buildResults: [...buildResults.mapMany((item) => item.results), ...checkResult.results, ...lintResults]
114
+ affectedFilePaths: affectedFilePaths,
115
+ buildResults: [...results, ...lintResults]
125
116
  };
126
117
  }
127
118
 
@@ -4,7 +4,7 @@ import {INpmConfig, ISdCliBuilderResult, ISdCliConfig, ISdCliServerPackageConfig
4
4
  import path from "path";
5
5
  import {SdTsCompiler} from "../build-tools/SdTsCompiler";
6
6
  import {SdLinter} from "../build-tools/SdLinter";
7
- import {FunctionQueue, ObjectUtil, StringUtil} from "@simplysm/sd-core-common";
7
+ import {FunctionQueue, ObjectUtil} from "@simplysm/sd-core-common";
8
8
  import {SdTsBundler} from "../build-tools/SdTsBundler";
9
9
 
10
10
  export class SdCliServerBuilder extends EventEmitter {
@@ -26,7 +26,7 @@ export class SdCliServerBuilder extends EventEmitter {
26
26
  }
27
27
 
28
28
  public async watchAsync(): Promise<void> {
29
- const extModules = await this._getExternalModulesAsync();
29
+ // const extModules = await this._getExternalModulesAsync();
30
30
 
31
31
  this._debug("dist 초기화...");
32
32
  await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
@@ -42,7 +42,7 @@ export class SdCliServerBuilder extends EventEmitter {
42
42
  entryPoints: [
43
43
  path.resolve(this._pkgPath, "src/main.ts")
44
44
  ],
45
- external: extModules.map((item) => item.name)
45
+ // external: extModules.map((item) => item.name)
46
46
  });
47
47
 
48
48
  const checker = new SdTsCompiler({
@@ -73,7 +73,7 @@ export class SdCliServerBuilder extends EventEmitter {
73
73
  const checkResult = await checker.buildAsync();
74
74
 
75
75
  this._debug(`LINT...`);
76
- const lintResults = await SdLinter.lintAsync(checkResult.affectedFilePaths, checker.program);
76
+ const lintResults = !this._withLint ? [] : await SdLinter.lintAsync(checkResult.affectedFilePaths, checker.program);
77
77
 
78
78
  this._debug(`빌드 완료`);
79
79
  this.emit("complete", {
@@ -86,7 +86,7 @@ export class SdCliServerBuilder extends EventEmitter {
86
86
 
87
87
  public async buildAsync(): Promise<ISdCliBuilderResult> {
88
88
  const npmConfig = (await FsUtil.readJsonAsync(path.resolve(this._pkgPath, "package.json"))) as INpmConfig;
89
- const extModules = await this._getExternalModulesAsync();
89
+ // const extModules = await this._getExternalModulesAsync();
90
90
 
91
91
  this._debug("dist 초기화...");
92
92
  await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
@@ -97,13 +97,13 @@ export class SdCliServerBuilder extends EventEmitter {
97
97
 
98
98
  this._debug("GEN package.json...");
99
99
  {
100
- const deps = extModules.filter((item) => item.exists).map((item) => item.name);
100
+ // const deps = extModules.filter((item) => item.exists).map((item) => item.name);
101
101
 
102
102
  const distNpmConfig = ObjectUtil.clone(npmConfig);
103
- distNpmConfig.dependencies = {};
104
- for (const dep of deps) {
105
- distNpmConfig.dependencies[dep] = "*";
106
- }
103
+ // distNpmConfig.dependencies = {};
104
+ // for (const dep of deps) {
105
+ // distNpmConfig.dependencies[dep] = "*";
106
+ // }
107
107
  delete distNpmConfig.optionalDependencies;
108
108
  delete distNpmConfig.devDependencies;
109
109
  delete distNpmConfig.peerDependencies;
@@ -184,7 +184,7 @@ export class SdCliServerBuilder extends EventEmitter {
184
184
  entryPoints: [
185
185
  path.resolve(this._pkgPath, "src/main.ts")
186
186
  ],
187
- external: extModules.map((item) => item.name)
187
+ // external: extModules.map((item) => item.name)
188
188
  });
189
189
 
190
190
  const checker = new SdTsCompiler({
@@ -201,7 +201,7 @@ export class SdCliServerBuilder extends EventEmitter {
201
201
  const checkResult = await checker.buildAsync();
202
202
 
203
203
  this._debug(`LINT...`);
204
- const lintResults = await SdLinter.lintAsync(checkResult.affectedFilePaths, checker.program);
204
+ const lintResults = !this._withLint ? [] : await SdLinter.lintAsync(checkResult.affectedFilePaths, checker.program);
205
205
 
206
206
  this._debug(`빌드 완료`);
207
207
  return {
@@ -210,7 +210,7 @@ export class SdCliServerBuilder extends EventEmitter {
210
210
  };
211
211
  }
212
212
 
213
- private async _getExternalModulesAsync(): Promise<{
213
+ /*private async _getExternalModulesAsync(): Promise<{
214
214
  name: string;
215
215
  exists: boolean
216
216
  }[]> {
@@ -245,7 +245,7 @@ export class SdCliServerBuilder extends EventEmitter {
245
245
  continue;
246
246
  }
247
247
 
248
- if (FsUtil.glob(path.resolve(modulePath, "**/binding.gyp")).length > 0) {
248
+ if (FsUtil.glob(path.resolve(modulePath, "**!/binding.gyp")).length > 0) {
249
249
  results.push({
250
250
  name: moduleName,
251
251
  exists: true
@@ -275,7 +275,7 @@ export class SdCliServerBuilder extends EventEmitter {
275
275
  continue;
276
276
  }
277
277
 
278
- if (FsUtil.glob(path.resolve(optModulePath, "**/binding.gyp")).length > 0) {
278
+ if (FsUtil.glob(path.resolve(optModulePath, "**!/binding.gyp")).length > 0) {
279
279
  results.push({
280
280
  name: optModuleName,
281
281
  exists: true
@@ -296,7 +296,7 @@ export class SdCliServerBuilder extends EventEmitter {
296
296
  await fn(this._pkgPath);
297
297
 
298
298
  return results;
299
- }
299
+ }*/
300
300
 
301
301
  private _debug(msg: string): void {
302
302
  this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
@@ -1,6 +1,6 @@
1
1
  import {FsUtil, Logger, SdFsWatcher} from "@simplysm/sd-core-node";
2
2
  import path from "path";
3
- import {ISdCliBuilderResult, ISdCliConfig} from "../commons";
3
+ import {ISdCliBuilderResult} from "../commons";
4
4
  import {EventEmitter} from "events";
5
5
  import {SdTsCompiler} from "../build-tools/SdTsCompiler";
6
6
  import {SdLinter} from "../build-tools/SdLinter";
@@ -9,8 +9,7 @@ import {FunctionQueue} from "@simplysm/sd-core-common";
9
9
  export class SdCliTsLibBuilder extends EventEmitter {
10
10
  private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliTsLibBuilder"]);
11
11
 
12
- public constructor(private readonly _projConf: ISdCliConfig,
13
- private readonly _pkgPath: string,
12
+ public constructor(private readonly _pkgPath: string,
14
13
  private readonly _withLint: boolean) {
15
14
  super();
16
15
  }