@simplysm/sd-cli 11.1.9 → 11.1.11

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.
Files changed (16) hide show
  1. package/dist/build-tools/SdNgBundler.js +12 -127
  2. package/dist/build-tools/SdNgBundler.js.map +1 -1
  3. package/dist/index.d.ts +0 -2
  4. package/dist/index.js +0 -2
  5. package/dist/index.js.map +1 -1
  6. package/package.json +16 -16
  7. package/src/build-tools/SdNgBundler.ts +19 -142
  8. package/src/index.ts +0 -2
  9. package/dist/utils/SdMemoryLoadResultCache.d.ts +0 -10
  10. package/dist/utils/SdMemoryLoadResultCache.js +0 -37
  11. package/dist/utils/SdMemoryLoadResultCache.js.map +0 -1
  12. package/dist/utils/SdSourceFileCache.d.ts +0 -6
  13. package/dist/utils/SdSourceFileCache.js +0 -22
  14. package/dist/utils/SdSourceFileCache.js.map +0 -1
  15. package/src/utils/SdMemoryLoadResultCache.ts +0 -43
  16. package/src/utils/SdSourceFileCache.ts +0 -21
package/dist/build-tools/SdNgBundler.js CHANGED
@@ -19,12 +19,12 @@ import { StylesheetPluginFactory } from "@angular-devkit/build-angular/src/tools
19
19
  import { IndexHtmlGenerator } from "@angular-devkit/build-angular/src/utils/index-file/index-html-generator";
20
20
  import { CrossOrigin } from "@angular-devkit/build-angular";
21
21
  import { InlineCriticalCssProcessor } from "@angular-devkit/build-angular/src/utils/index-file/inline-critical-css";
22
- import { SdSourceFileCache } from "../utils/SdSourceFileCache";
23
22
  import { SdNgBundlerContext } from "./SdNgBundlerContext";
23
+ import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
24
24
  export class SdNgBundler {
25
25
  constructor(_opt) {
26
26
  this._opt = _opt;
27
- this._sourceFileCache = new SdSourceFileCache(path.resolve(this._opt.pkgPath, ".cache"));
27
+ this._sourceFileCache = new SourceFileCache(path.resolve(this._opt.pkgPath, ".cache"));
28
28
  this._outputCache = new Map();
29
29
  this._pkgNpmConf = FsUtil.readJson(path.resolve(this._opt.pkgPath, "package.json"));
30
30
  this._mainFilePath = path.resolve(this._opt.pkgPath, "src/main.ts");
@@ -40,61 +40,30 @@ export class SdNgBundler {
40
40
  }
41
41
  async bundleAsync() {
42
42
  if (!this._contexts) {
43
- this._contexts = [];
44
- this._contexts.push(await this._getAppContextAsync());
45
- this._contexts.push(this._getStyleContext());
43
+ this._contexts = [
44
+ await this._getAppContextAsync(),
45
+ this._getStyleContext()
46
+ ];
46
47
  }
47
48
  //-- build
48
49
  const bundlingResults = await this._contexts.mapAsync(async (ctx) => await ctx.bundleAsync());
50
+ //-- results
49
51
  const results = bundlingResults.mapMany(bundlingResult => bundlingResult.results);
52
+ //-- watchFilePaths
50
53
  const watchFilePaths = [
51
- ...Array.from(this._sourceFileCache.typeScriptFileCache.keys()).map(item => fileURLToPath(item)),
54
+ ...this._sourceFileCache.typeScriptFileCache.keys(),
52
55
  ...this._sourceFileCache.referencedFiles ?? [],
53
- ...this._sourceFileCache.babelFileCache.keys(),
54
56
  ...this._sourceFileCache.loadResultCache.watchFiles
55
57
  ].map((item) => path.resolve(item)).distinct();
58
+ //-- affectedSourceFilePaths
56
59
  let affectedSourceFilePaths = watchFilePaths.filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
57
60
  if (this._sourceFileCache.modifiedFiles.size > 0) {
58
61
  affectedSourceFilePaths = Array.from(this._sourceFileCache.modifiedFiles)
59
62
  .filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath))
60
63
  .map((item) => path.resolve(item))
61
64
  .distinct();
62
- /*const depMap = new Map<string, Set<string>>();
63
- for (const bundlingResult of bundlingResults) {
64
- for (const [k, v] of bundlingResult.dependencyMap) {
65
- const currSet = depMap.getOrCreate(k, new Set<string>());
66
- currSet.adds(...v);
67
- }
68
- }
69
- for (const [k, v] of this._sourceFileCache.loadResultCache.fileDependencies) {
70
- const currSet = depMap.getOrCreate(k, new Set<string>());
71
- currSet.adds(...Array.from(v).map((item) => item.startsWith("file:") ? fileURLToPath(item) : undefined).filterExists());
72
- }
73
-
74
- const searchAffectedFiles = (filePath: string, prev?: Set<string>): Set<string> => {
75
- const result = new Set<string>(prev);
76
-
77
- const importerPaths = depMap.get(filePath);
78
- if (!importerPaths) return result;
79
-
80
- for (const importerPath of importerPaths) {
81
- if (result.has(importerPath)) continue;
82
- result.adds(importerPath);
83
- result.adds(...searchAffectedFiles(importerPath, result));
84
- }
85
-
86
- return result;
87
- };
88
-
89
- const affectedFilePathSet = new Set<string>();
90
- for (const modFile of this._sourceFileCache.modifiedFiles) {
91
- affectedFilePathSet.add(path.resolve(modFile));
92
- affectedFilePathSet.adds(...searchAffectedFiles(path.resolve(modFile)));
93
- }
94
- affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));*/
95
65
  }
96
- /*const executionResult = new ExecutionResult(this._contexts, this._sourceFileCache);
97
- executionResult.outputFiles.push(...bundlingResult.outputFiles);*/
66
+ //-- executionResult
98
67
  const outputFiles = bundlingResults.mapMany(item => item.outputFiles?.map(file => convertOutputFile(file, BuildOutputFileType.Root)) ?? []);
99
68
  const initialFiles = new Map();
100
69
  const metafile = {
@@ -107,21 +76,6 @@ export class SdNgBundler {
107
76
  metafile.outputs = { ...metafile.outputs, ...bundlingResult.metafile?.outputs };
108
77
  }
109
78
  const assetFiles = [];
110
- //-- Check commonjs
111
- // if (!this._opt.dev) {
112
- // const messages = checkCommonJSModules(bundlingResult.metafile, []);
113
- // for (const msg of messages) {
114
- // results.push({
115
- // filePath: msg.location?.file,
116
- // line: msg.location?.line,
117
- // char: msg.location?.column,
118
- // code: msg.pluginName,
119
- // severity: "warning",
120
- // message: msg.text ?? "",
121
- // type: "build"
122
- // });
123
- // }
124
- // }
125
79
  //-- cordova empty
126
80
  if (this._opt.cordovaConfig?.plugins) {
127
81
  outputFiles.push(createOutputFileFromText("cordova-empty.js", "export default {};", BuildOutputFileType.Root));
@@ -326,9 +280,6 @@ export class SdNgBundler {
326
280
  splitting: true,
327
281
  chunkNames: 'chunk-[hash]',
328
282
  tsconfig: this._tsConfigFilePath,
329
- /*external: [
330
- ...this._opt.cordovaConfig?.plugins ?? []
331
- ],*/
332
283
  write: false,
333
284
  preserveSymlinks: false,
334
285
  define: {
@@ -379,71 +330,6 @@ export class SdNgBundler {
379
330
  },
380
331
  inject: [PathUtil.posix(fileURLToPath(await import.meta.resolve("node-stdlib-browser/helpers/esbuild/shim")))],
381
332
  plugins: [
382
- /*{
383
- name: "sd-worker",
384
- setup: ({onLoad}) => {
385
- onLoad({filter: /\.ts$/}, async args => {
386
- if (args.path.endsWith(".d.ts")) return;
387
-
388
- // ts sourefile 로 Worker사용여부 확인 (URL, import.meta.url)
389
- let contents = this._sourceFileCache.typeScriptFileCache.get(pathToFileURL(args.path).toString());
390
- if (typeof contents !== "string") return;
391
-
392
- const regexp = /new Worker\(new URL\("(.*\.ts)", import\.meta\.url\)/;
393
- const matches = contents.match(new RegExp(regexp, "g"));
394
- if (!matches) return;
395
-
396
- for (const match of matches) {
397
- const urlPath = match.match(regexp)![1];
398
-
399
- // 해당 URL의 파일을 esbuild로 빌드
400
- const outFileName = path.basename(urlPath, path.extname(urlPath)) + ".js";
401
- await esbuild.build({
402
- entryPoints: [path.resolve(path.dirname(args.path), urlPath)],
403
- outfile: path.resolve(this._opt.pkgPath, "dist", outFileName),
404
- target: this._browserTarget,
405
- format: "esm",
406
- bundle: true,
407
- keepNames: true,
408
- minifyIdentifiers: !this._opt.dev,
409
- minifySyntax: !this._opt.dev,
410
- minifyWhitespace: !this._opt.dev,
411
- sourcemap: this._opt.dev,
412
- platform: 'browser',
413
- conditions: ['es2020', 'es2015', 'module'],
414
- mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],
415
- resolveExtensions: ['.ts', '.tsx', '.mjs', '.js'],
416
- tsconfig: this._tsConfigFilePath,
417
- preserveSymlinks: false,
418
- define: {
419
- ...!this._opt.dev ? {ngDevMode: 'false'} : {},
420
- ngJitMode: 'false',
421
- global: 'global',
422
- process: 'process',
423
- Buffer: 'Buffer',
424
- 'process.env.SD_VERSION': JSON.stringify(this._pkgNpmConf.version),
425
- "process.env.NODE_ENV": JSON.stringify(this._opt.dev ? "development" : "production"),
426
- ...this._opt.env ? Object.keys(this._opt.env).toObject(
427
- key => `process.env.${key}`,
428
- key => JSON.stringify(this._opt.env![key])
429
- ) : {}
430
- },
431
- inject: [PathUtil.posix(fileURLToPath(await import.meta.resolve!("node-stdlib-browser/helpers/esbuild/shim")))],
432
- });
433
-
434
- // 빌드된 파일을 가리키도록 URL변경
435
- contents = contents.replace(urlPath, "./" + outFileName);
436
-
437
- const currSet = this._customDepsCache.getOrCreate(path.resolve(path.dirname(args.path), urlPath), new Set());
438
- currSet.add(path.resolve(args.path));
439
- }
440
-
441
- this._sourceFileCache.typeScriptFileCache.set(pathToFileURL(args.path).toString(), contents);
442
-
443
- return undefined;
444
- });
445
- }
446
- },*/
447
333
  ...this._opt.cordovaConfig?.plugins ? [{
448
334
  name: "cordova:plugin-empty",
449
335
  setup: ({ onResolve }) => {
@@ -491,7 +377,6 @@ export class SdNgBundler {
491
377
  });
492
378
  }
493
379
  _getStyleContext() {
494
- const browserTarget = transformSupportedBrowsersToTargets(browserslist("defaults and fully supports es6-module"));
495
380
  const pluginFactory = new StylesheetPluginFactory({
496
381
  sourcemap: this._opt.dev,
497
382
  includePaths: []
@@ -508,7 +393,7 @@ export class SdNgBundler {
508
393
  outdir: this._opt.pkgPath,
509
394
  write: false,
510
395
  platform: 'browser',
511
- target: browserTarget,
396
+ target: this._browserTarget,
512
397
  preserveSymlinks: false,
513
398
  external: [],
514
399
  conditions: ['style', 'sass'],
package/dist/build-tools/SdNgBundler.js.map CHANGED
@@ -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":"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"}
package/dist/index.d.ts CHANGED
@@ -15,5 +15,3 @@ export * from "./entry/SdCliElectron";
15
15
  export * from "./entry/SdCliLocalUpdate";
16
16
  export * from "./entry/SdCliProject";
17
17
  export * from "./utils/SdCliBuildResultUtil";
18
- export * from "./utils/SdMemoryLoadResultCache";
19
- export * from "./utils/SdSourceFileCache";
package/dist/index.js CHANGED
@@ -15,6 +15,4 @@ export * from "./entry/SdCliElectron";
15
15
  export * from "./entry/SdCliLocalUpdate";
16
16
  export * from "./entry/SdCliProject";
17
17
  export * from "./utils/SdCliBuildResultUtil";
18
- export * from "./utils/SdMemoryLoadResultCache";
19
- export * from "./utils/SdSourceFileCache";
20
18
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uCAAuC,CAAC;AACtD,cAAc,0CAA0C,CAAC;AACzD,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,WAAW,CAAC;AAC1B,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uCAAuC,CAAC;AACtD,cAAc,0CAA0C,CAAC;AACzD,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,WAAW,CAAC;AAC1B,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "11.1.9",
3
+ "version": "11.1.11",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -17,23 +17,23 @@
17
17
  "node": "^18"
18
18
  },
19
19
  "dependencies": {
20
- "@angular-devkit/build-angular": "^17.0.1",
21
- "@angular/common": "^17.0.3",
22
- "@angular/compiler": "^17.0.3",
23
- "@angular/compiler-cli": "^17.0.3",
24
- "@angular/core": "^17.0.3",
25
- "@electron/rebuild": "^3.3.0",
26
- "@simplysm/sd-core-common": "11.1.9",
27
- "@simplysm/sd-core-node": "11.1.9",
28
- "@simplysm/sd-service-server": "11.1.9",
29
- "@simplysm/sd-storage": "11.1.9",
20
+ "@angular-devkit/build-angular": "^17.0.3",
21
+ "@angular/common": "^17.0.4",
22
+ "@angular/compiler": "^17.0.4",
23
+ "@angular/compiler-cli": "^17.0.4",
24
+ "@angular/core": "^17.0.4",
25
+ "@electron/rebuild": "^3.3.1",
26
+ "@simplysm/sd-core-common": "11.1.11",
27
+ "@simplysm/sd-core-node": "11.1.11",
28
+ "@simplysm/sd-service-server": "11.1.11",
29
+ "@simplysm/sd-storage": "11.1.11",
30
30
  "browserslist": "^4.22.1",
31
31
  "cordova": "^12.0.0",
32
- "electron": "^27.1.0",
33
- "electron-builder": "^24.9.0",
34
- "esbuild": "^0.19.5",
32
+ "electron": "^27.1.2",
33
+ "electron-builder": "^24.9.2",
34
+ "esbuild": "^0.19.8",
35
35
  "esbuild-plugin-tsc": "^0.4.0",
36
- "eslint": "^8.53.0",
36
+ "eslint": "^8.54.0",
37
37
  "jszip": "^3.10.1",
38
38
  "node-stdlib-browser": "^1.2.0",
39
39
  "rxjs": "^7.8.1",
@@ -46,7 +46,7 @@
46
46
  "devDependencies": {
47
47
  "@types/eslint": "^8.44.7",
48
48
  "@types/xml2js": "^0.4.14",
49
- "@types/yargs": "^17.0.31"
49
+ "@types/yargs": "^17.0.32"
50
50
  },
51
51
  "peerDependencies": {
52
52
  "typescript": "~5.2.2"
package/src/build-tools/SdNgBundler.ts CHANGED
@@ -38,11 +38,11 @@ import {
38
38
  import {Entrypoint} from "@angular-devkit/build-angular/src/utils/index-file/augment-index-html";
39
39
  import {CrossOrigin} from "@angular-devkit/build-angular";
40
40
  import {InlineCriticalCssProcessor} from "@angular-devkit/build-angular/src/utils/index-file/inline-critical-css";
41
- import {SdSourceFileCache} from "../utils/SdSourceFileCache";
42
41
  import {SdNgBundlerContext} from "./SdNgBundlerContext";
42
+ import {SourceFileCache} from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
43
43
 
44
44
  export class SdNgBundler {
45
- private readonly _sourceFileCache = new SdSourceFileCache(
45
+ private readonly _sourceFileCache = new SourceFileCache(
46
46
  path.resolve(this._opt.pkgPath, ".cache")
47
47
  );
48
48
 
@@ -87,69 +87,35 @@ export class SdNgBundler {
87
87
  results: ISdCliPackageBuildResult[]
88
88
  }> {
89
89
  if (!this._contexts) {
90
- this._contexts = [];
91
- this._contexts.push(await this._getAppContextAsync());
92
- this._contexts.push(this._getStyleContext());
90
+ this._contexts = [
91
+ await this._getAppContextAsync(),
92
+ this._getStyleContext()
93
+ ];
93
94
  }
94
95
 
95
96
  //-- build
96
97
  const bundlingResults = await this._contexts.mapAsync(async ctx => await ctx.bundleAsync());
97
98
 
99
+ //-- results
98
100
  const results = bundlingResults.mapMany(bundlingResult => bundlingResult.results);
99
101
 
102
+ //-- watchFilePaths
100
103
  const watchFilePaths = [
101
- ...Array.from(this._sourceFileCache.typeScriptFileCache.keys()).map(item => fileURLToPath(item)),
104
+ ...this._sourceFileCache.typeScriptFileCache.keys(),
102
105
  ...this._sourceFileCache.referencedFiles ?? [],
103
- ...this._sourceFileCache.babelFileCache.keys(),
104
106
  ...this._sourceFileCache.loadResultCache.watchFiles
105
107
  ].map((item) => path.resolve(item)).distinct();
106
108
 
109
+ //-- affectedSourceFilePaths
107
110
  let affectedSourceFilePaths = watchFilePaths.filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
108
-
109
111
  if (this._sourceFileCache.modifiedFiles.size > 0) {
110
112
  affectedSourceFilePaths = Array.from(this._sourceFileCache.modifiedFiles)
111
113
  .filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath))
112
114
  .map((item) => path.resolve(item))
113
115
  .distinct();
114
-
115
- /*const depMap = new Map<string, Set<string>>();
116
- for (const bundlingResult of bundlingResults) {
117
- for (const [k, v] of bundlingResult.dependencyMap) {
118
- const currSet = depMap.getOrCreate(k, new Set<string>());
119
- currSet.adds(...v);
120
- }
121
- }
122
- for (const [k, v] of this._sourceFileCache.loadResultCache.fileDependencies) {
123
- const currSet = depMap.getOrCreate(k, new Set<string>());
124
- currSet.adds(...Array.from(v).map((item) => item.startsWith("file:") ? fileURLToPath(item) : undefined).filterExists());
125
- }
126
-
127
- const searchAffectedFiles = (filePath: string, prev?: Set<string>): Set<string> => {
128
- const result = new Set<string>(prev);
129
-
130
- const importerPaths = depMap.get(filePath);
131
- if (!importerPaths) return result;
132
-
133
- for (const importerPath of importerPaths) {
134
- if (result.has(importerPath)) continue;
135
- result.adds(importerPath);
136
- result.adds(...searchAffectedFiles(importerPath, result));
137
- }
138
-
139
- return result;
140
- };
141
-
142
- const affectedFilePathSet = new Set<string>();
143
- for (const modFile of this._sourceFileCache.modifiedFiles) {
144
- affectedFilePathSet.add(path.resolve(modFile));
145
- affectedFilePathSet.adds(...searchAffectedFiles(path.resolve(modFile)));
146
- }
147
- affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));*/
148
116
  }
149
117
 
150
- /*const executionResult = new ExecutionResult(this._contexts, this._sourceFileCache);
151
- executionResult.outputFiles.push(...bundlingResult.outputFiles);*/
152
-
118
+ //-- executionResult
153
119
  const outputFiles: BuildOutputFile[] = bundlingResults.mapMany(item => item.outputFiles?.map(file => convertOutputFile(file, BuildOutputFileType.Root)) ?? []);
154
120
  const initialFiles = new Map<string, InitialFileRecord>();
155
121
  const metafile: {
@@ -166,22 +132,6 @@ export class SdNgBundler {
166
132
  }
167
133
  const assetFiles: { source: string; destination: string }[] = [];
168
134
 
169
- //-- Check commonjs
170
- // if (!this._opt.dev) {
171
- // const messages = checkCommonJSModules(bundlingResult.metafile, []);
172
- // for (const msg of messages) {
173
- // results.push({
174
- // filePath: msg.location?.file,
175
- // line: msg.location?.line,
176
- // char: msg.location?.column,
177
- // code: msg.pluginName,
178
- // severity: "warning",
179
- // message: msg.text ?? "",
180
- // type: "build"
181
- // });
182
- // }
183
- // }
184
-
185
135
  //-- cordova empty
186
136
  if (this._opt.cordovaConfig?.plugins) {
187
137
  outputFiles.push(createOutputFileFromText("cordova-empty.js", "export default {};", BuildOutputFileType.Root));
@@ -228,8 +178,7 @@ export class SdNgBundler {
228
178
  const serviceWorkerResult = await this._genServiceWorkerAsync(outputFiles, assetFiles);
229
179
  outputFiles.push(createOutputFileFromText('ngsw.json', serviceWorkerResult.manifest, BuildOutputFileType.Root));
230
180
  assetFiles.push(...serviceWorkerResult.assetFiles);
231
- }
232
- catch (err) {
181
+ } catch (err) {
233
182
  results.push({
234
183
  filePath: undefined,
235
184
  line: undefined,
@@ -314,8 +263,7 @@ export class SdNgBundler {
314
263
 
315
264
  if (value.type === 'script') {
316
265
  hints.push({url: key, mode: 'modulepreload' as const});
317
- }
318
- else if (value.type === 'style') {
266
+ } else if (value.type === 'style') {
319
267
  hints.push({url: key, mode: 'preload' as const, as: 'style'});
320
268
  }
321
269
  }
@@ -335,8 +283,7 @@ export class SdNgBundler {
335
283
 
336
284
  if (this._opt.dev) {
337
285
  return transformResult;
338
- }
339
- else {
286
+ } else {
340
287
  const inlineCriticalCssProcessor = new InlineCriticalCssProcessor({
341
288
  minify: false,
342
289
  readAsset,
@@ -431,9 +378,6 @@ export class SdNgBundler {
431
378
  splitting: true,
432
379
  chunkNames: 'chunk-[hash]',
433
380
  tsconfig: this._tsConfigFilePath,
434
- /*external: [
435
- ...this._opt.cordovaConfig?.plugins ?? []
436
- ],*/
437
381
  write: false,
438
382
  preserveSymlinks: false,
439
383
  define: {
@@ -487,71 +431,6 @@ export class SdNgBundler {
487
431
  },
488
432
  inject: [PathUtil.posix(fileURLToPath(await import.meta.resolve!("node-stdlib-browser/helpers/esbuild/shim")))],
489
433
  plugins: [
490
- /*{
491
- name: "sd-worker",
492
- setup: ({onLoad}) => {
493
- onLoad({filter: /\.ts$/}, async args => {
494
- if (args.path.endsWith(".d.ts")) return;
495
-
496
- // ts sourefile 로 Worker사용여부 확인 (URL, import.meta.url)
497
- let contents = this._sourceFileCache.typeScriptFileCache.get(pathToFileURL(args.path).toString());
498
- if (typeof contents !== "string") return;
499
-
500
- const regexp = /new Worker\(new URL\("(.*\.ts)", import\.meta\.url\)/;
501
- const matches = contents.match(new RegExp(regexp, "g"));
502
- if (!matches) return;
503
-
504
- for (const match of matches) {
505
- const urlPath = match.match(regexp)![1];
506
-
507
- // 해당 URL의 파일을 esbuild로 빌드
508
- const outFileName = path.basename(urlPath, path.extname(urlPath)) + ".js";
509
- await esbuild.build({
510
- entryPoints: [path.resolve(path.dirname(args.path), urlPath)],
511
- outfile: path.resolve(this._opt.pkgPath, "dist", outFileName),
512
- target: this._browserTarget,
513
- format: "esm",
514
- bundle: true,
515
- keepNames: true,
516
- minifyIdentifiers: !this._opt.dev,
517
- minifySyntax: !this._opt.dev,
518
- minifyWhitespace: !this._opt.dev,
519
- sourcemap: this._opt.dev,
520
- platform: 'browser',
521
- conditions: ['es2020', 'es2015', 'module'],
522
- mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],
523
- resolveExtensions: ['.ts', '.tsx', '.mjs', '.js'],
524
- tsconfig: this._tsConfigFilePath,
525
- preserveSymlinks: false,
526
- define: {
527
- ...!this._opt.dev ? {ngDevMode: 'false'} : {},
528
- ngJitMode: 'false',
529
- global: 'global',
530
- process: 'process',
531
- Buffer: 'Buffer',
532
- 'process.env.SD_VERSION': JSON.stringify(this._pkgNpmConf.version),
533
- "process.env.NODE_ENV": JSON.stringify(this._opt.dev ? "development" : "production"),
534
- ...this._opt.env ? Object.keys(this._opt.env).toObject(
535
- key => `process.env.${key}`,
536
- key => JSON.stringify(this._opt.env![key])
537
- ) : {}
538
- },
539
- inject: [PathUtil.posix(fileURLToPath(await import.meta.resolve!("node-stdlib-browser/helpers/esbuild/shim")))],
540
- });
541
-
542
- // 빌드된 파일을 가리키도록 URL변경
543
- contents = contents.replace(urlPath, "./" + outFileName);
544
-
545
- const currSet = this._customDepsCache.getOrCreate(path.resolve(path.dirname(args.path), urlPath), new Set());
546
- currSet.add(path.resolve(args.path));
547
- }
548
-
549
- this._sourceFileCache.typeScriptFileCache.set(pathToFileURL(args.path).toString(), contents);
550
-
551
- return undefined;
552
- });
553
- }
554
- },*/
555
434
  ...this._opt.cordovaConfig?.plugins ? [{
556
435
  name: "cordova:plugin-empty",
557
436
  setup: ({onResolve}) => {
@@ -600,8 +479,6 @@ export class SdNgBundler {
600
479
  }
601
480
 
602
481
  private _getStyleContext(): SdNgBundlerContext {
603
- const browserTarget = transformSupportedBrowsersToTargets(browserslist("defaults and fully supports es6-module"));
604
-
605
482
  const pluginFactory = new StylesheetPluginFactory(
606
483
  {
607
484
  sourcemap: this._opt.dev,
@@ -622,7 +499,7 @@ export class SdNgBundler {
622
499
  outdir: this._opt.pkgPath,
623
500
  write: false,
624
501
  platform: 'browser',
625
- target: browserTarget,
502
+ target: this._browserTarget,
626
503
  preserveSymlinks: false,
627
504
  external: [],
628
505
  conditions: ['style', 'sass'],
@@ -638,10 +515,10 @@ export class SdNgBundler {
638
515
  loader: 'css',
639
516
  resolveDir: this._opt.pkgPath
640
517
  }),
641
- }),
642
- pluginFactory.create(SassStylesheetLanguage),
643
- pluginFactory.create(CssStylesheetLanguage),
644
- createCssResourcePlugin(this._sourceFileCache.loadResultCache),
518
+ }) as esbuild.Plugin,
519
+ pluginFactory.create(SassStylesheetLanguage) as esbuild.Plugin,
520
+ pluginFactory.create(CssStylesheetLanguage) as esbuild.Plugin,
521
+ createCssResourcePlugin(this._sourceFileCache.loadResultCache) as esbuild.Plugin,
645
522
  ],
646
523
  });
647
524
  }
package/src/index.ts CHANGED
@@ -15,5 +15,3 @@ export * from "./entry/SdCliElectron";
15
15
  export * from "./entry/SdCliLocalUpdate";
16
16
  export * from "./entry/SdCliProject";
17
17
  export * from "./utils/SdCliBuildResultUtil";
18
- export * from "./utils/SdMemoryLoadResultCache";
19
- export * from "./utils/SdSourceFileCache";
package/dist/utils/SdMemoryLoadResultCache.d.ts DELETED
@@ -1,10 +0,0 @@
1
- import { MemoryLoadResultCache } from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
2
- import { OnLoadResult } from 'esbuild';
3
- export declare class SdMemoryLoadResultCache extends MemoryLoadResultCache {
4
- loadResults: Map<string, OnLoadResult>;
5
- fileDependencies: Map<string, Set<string>>;
6
- get(getPath: string): OnLoadResult | undefined;
7
- put(putPath: string, result: OnLoadResult): Promise<void>;
8
- invalidate(invalidatePath: string): boolean;
9
- get watchFiles(): string[];
10
- }
package/dist/utils/SdMemoryLoadResultCache.js DELETED
@@ -1,37 +0,0 @@
1
- import { MemoryLoadResultCache } from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
2
- import path from "path";
3
- export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
4
- constructor() {
5
- super(...arguments);
6
- this.loadResults = new Map();
7
- this.fileDependencies = new Map();
8
- }
9
- get(getPath) {
10
- return this.loadResults.get(getPath);
11
- }
12
- put(putPath, result) {
13
- this.loadResults.set(putPath, result);
14
- if (result.watchFiles) {
15
- for (const watchFile of result.watchFiles) {
16
- const watchFilePath = path.resolve(watchFile);
17
- let affected = this.fileDependencies.getOrCreate(watchFilePath, new Set());
18
- affected.add(putPath);
19
- }
20
- }
21
- return Promise.resolve();
22
- }
23
- invalidate(invalidatePath) {
24
- const affected = this.fileDependencies.get(invalidatePath);
25
- let found = false;
26
- if (affected) {
27
- affected.forEach((a) => (found ||= this.loadResults.delete(a)));
28
- this.fileDependencies.delete(invalidatePath);
29
- }
30
- found ||= this.loadResults.delete(invalidatePath);
31
- return found;
32
- }
33
- get watchFiles() {
34
- return [...this.loadResults.keys(), ...this.fileDependencies.keys()];
35
- }
36
- }
37
- //# sourceMappingURL=SdMemoryLoadResultCache.js.map
package/dist/utils/SdMemoryLoadResultCache.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"SdMemoryLoadResultCache.js","sourceRoot":"","sources":["../../src/utils/SdMemoryLoadResultCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAC,MAAM,mEAAmE,CAAC;AAExG,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,OAAO,uBAAwB,SAAQ,qBAAqB;IAAlE;;QACE,gBAAW,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC9C,qBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAoCpD,CAAC;IAlCU,GAAG,CAAC,OAAe;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAEQ,GAAG,CAAC,OAAe,EAAE,MAAoB;QAChD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE;gBACzC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC9C,IAAI,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBAC3E,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACvB;SACF;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEQ,UAAU,CAAC,cAAsB;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC9C;QAED,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAElD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAa,UAAU;QACrB,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;CACF"}
package/dist/utils/SdSourceFileCache.d.ts DELETED
@@ -1,6 +0,0 @@
1
- import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
2
- import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
3
- export declare class SdSourceFileCache extends SourceFileCache {
4
- readonly loadResultCache: SdMemoryLoadResultCache;
5
- invalidate(files: Iterable<string>): void;
6
- }
package/dist/utils/SdSourceFileCache.js DELETED
@@ -1,22 +0,0 @@
1
- import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
2
- import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
3
- import { pathToFileURL } from "url";
4
- export class SdSourceFileCache extends SourceFileCache {
5
- constructor() {
6
- super(...arguments);
7
- this.loadResultCache = new SdMemoryLoadResultCache();
8
- }
9
- invalidate(files) {
10
- if (files !== this.modifiedFiles) {
11
- this.modifiedFiles.clear();
12
- }
13
- for (let file of files) {
14
- this.babelFileCache.delete(file);
15
- this.typeScriptFileCache.delete(pathToFileURL(file).href);
16
- this.loadResultCache.invalidate(file);
17
- this.delete(file);
18
- this.modifiedFiles.add(file);
19
- }
20
- }
21
- }
22
- //# sourceMappingURL=SdSourceFileCache.js.map
package/dist/utils/SdSourceFileCache.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"SdSourceFileCache.js","sourceRoot":"","sources":["../../src/utils/SdSourceFileCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,2EAA2E,CAAC;AAC1G,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAElC,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAAtD;;QACoB,oBAAe,GAAG,IAAI,uBAAuB,EAAE,CAAC;IAepE,CAAC;IAbU,UAAU,CAAC,KAAuB;QACzC,IAAI,KAAK,KAAK,IAAI,CAAC,aAAa,EAAE;YAChC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;SAC5B;QACD,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC9B;IACH,CAAC;CACF"}
package/src/utils/SdMemoryLoadResultCache.ts DELETED
@@ -1,43 +0,0 @@
1
- import {MemoryLoadResultCache} from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
2
- import {OnLoadResult} from 'esbuild';
3
- import path from "path";
4
-
5
- export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
6
- loadResults = new Map<string, OnLoadResult>();
7
- fileDependencies = new Map<string, Set<string>>();
8
-
9
- override get(getPath: string): OnLoadResult | undefined {
10
- return this.loadResults.get(getPath);
11
- }
12
-
13
- override put(putPath: string, result: OnLoadResult): Promise<void> {
14
- this.loadResults.set(putPath, result);
15
- if (result.watchFiles) {
16
- for (const watchFile of result.watchFiles) {
17
- const watchFilePath = path.resolve(watchFile);
18
- let affected = this.fileDependencies.getOrCreate(watchFilePath, new Set());
19
- affected.add(putPath);
20
- }
21
- }
22
-
23
- return Promise.resolve();
24
- }
25
-
26
- override invalidate(invalidatePath: string): boolean {
27
- const affected = this.fileDependencies.get(invalidatePath);
28
- let found = false;
29
-
30
- if (affected) {
31
- affected.forEach((a) => (found ||= this.loadResults.delete(a)));
32
- this.fileDependencies.delete(invalidatePath);
33
- }
34
-
35
- found ||= this.loadResults.delete(invalidatePath);
36
-
37
- return found;
38
- }
39
-
40
- override get watchFiles(): string[] {
41
- return [...this.loadResults.keys(), ...this.fileDependencies.keys()];
42
- }
43
- }
package/src/utils/SdSourceFileCache.ts DELETED
@@ -1,21 +0,0 @@
1
- import {SdMemoryLoadResultCache} from "./SdMemoryLoadResultCache";
2
- import {SourceFileCache} from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
3
- import {pathToFileURL} from "url";
4
-
5
- export class SdSourceFileCache extends SourceFileCache {
6
- override readonly loadResultCache = new SdMemoryLoadResultCache();
7
-
8
- override invalidate(files: Iterable<string>): void {
9
- if (files !== this.modifiedFiles) {
10
- this.modifiedFiles.clear();
11
- }
12
- for (let file of files) {
13
- this.babelFileCache.delete(file);
14
- this.typeScriptFileCache.delete(pathToFileURL(file).href);
15
- this.loadResultCache.invalidate(file);
16
-
17
- this.delete(file);
18
- this.modifiedFiles.add(file);
19
- }
20
- }
21
- }