@simplysm/sd-cli 12.5.50 → 12.5.52

package/lib/postinstall.js

@@ -15,3 +15,16 @@ import fs from "node:fs";
   contents = contents.replace("console.error(err.message);", "console.error(err);");
   fs.writeFileSync(filePath, contents);
 }
+
+{
+  const filePath = fileURLToPath(import.meta.resolve("@angular/core"));
+  let contents = fs.readFileSync(filePath).toString();
+  contents = contents.replace(`
+            signalSetFn$1(node, newValue);
+            emitterRef.emit(newValue);`, `
+            if(emitterRef.listeners?.[0] == null){
+              signalSetFn$1(node, newValue);
+            }
+            emitterRef.emit(newValue);`);
+  fs.writeFileSync(filePath, contents);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "12.5.50",
+  "version": "12.5.52",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -18,17 +18,17 @@
   },
   "dependencies": {
     "@angular/build": "^18.2.11",
-    "@angular/compiler": "^18.2.10",
-    "@angular/compiler-cli": "^18.2.10",
+    "@angular/compiler": "^18.2.11",
+    "@angular/compiler-cli": "^18.2.11",
     "@electron/rebuild": "^3.7.0",
-    "@simplysm/sd-core-common": "12.5.50",
-    "@simplysm/sd-core-node": "12.5.50",
-    "@simplysm/sd-service-server": "12.5.50",
-    "@simplysm/sd-storage": "12.5.50",
+    "@simplysm/sd-core-common": "12.5.52",
+    "@simplysm/sd-core-node": "12.5.52",
+    "@simplysm/sd-service-server": "12.5.52",
+    "@simplysm/sd-storage": "12.5.52",
     "browserslist": "^4.24.2",
     "cordova": "^12.0.0",
     "css-has-pseudo": "^7.0.1",
-    "electron": "^33.0.2",
+    "electron": "^33.2.0",
     "electron-builder": "^25.1.8",
     "esbuild": "^0.24.0",
     "eslint": "^9.14.0",

package/src/entry/SdCliElectron.ts

@@ -34,10 +34,10 @@ export class SdCliElectron {
       main: "electron-main.js",
       ...(pkgConf.builder.electron.postInstallScript !== undefined
         ? {
-            scripts: {
-              postinstall: pkgConf.builder.electron.postInstallScript,
-            },
-          }
+          scripts: {
+            postinstall: pkgConf.builder.electron.postInstallScript,
+          },
+        }
         : {}),
       dependencies: reinstallPkgNames.toObject(
         (item) => item,
@@ -95,10 +95,10 @@ export class SdCliElectron {
       main: "electron-main.js",
       ...(pkgConf.builder.electron.postInstallScript !== undefined
         ? {
-            scripts: {
-              postinstall: pkgConf.builder.electron.postInstallScript,
-            },
-          }
+          scripts: {
+            postinstall: pkgConf.builder.electron.postInstallScript,
+          },
+        }
         : {}),
       dependencies: reinstallPkgNames.toObject(
         (item) => item,
@@ -138,8 +138,8 @@ export class SdCliElectron {
         },
         ...(pkgConf.builder.electron.installerIcon !== undefined
           ? {
-              icon: path.resolve(pkgPath, pkgConf.builder.electron.installerIcon),
-            }
+            icon: path.resolve(pkgPath, pkgConf.builder.electron.installerIcon),
+          }
           : {}),
         removePackageScripts: false,
       },
@@ -169,10 +169,10 @@ export class SdCliElectron {
       main: "electron-main.js",
       ...(opt.config.postInstallScript !== undefined
         ? {
-            scripts: {
-              postinstall: opt.config.postInstallScript,
-            },
-          }
+          scripts: {
+            postinstall: opt.config.postInstallScript,
+          },
+        }
         : {}),
       dependencies: reinstallPkgNames.toObject(
         (item) => item,
@@ -212,8 +212,8 @@ export class SdCliElectron {
         },
         ...(opt.config.installerIcon !== undefined
           ? {
-              icon: path.resolve(opt.pkgPath, opt.config.installerIcon),
-            }
+            icon: path.resolve(opt.pkgPath, opt.config.installerIcon),
+          }
           : {}),
         removePackageScripts: false,
       },
@@ -223,5 +223,10 @@ export class SdCliElectron {
       path.resolve(electronDistPath, `${npmConfig.description} Setup ${npmConfig.version}.exe`),
       path.resolve(opt.pkgPath, `dist/electron/${npmConfig.description}-latest.exe`),
     );
+
+    FsUtil.copy(
+      path.resolve(electronDistPath, `${npmConfig.description} Setup ${npmConfig.version}.exe`),
+      path.resolve(opt.pkgPath, `dist/electron/updates/${npmConfig.version}.exe`),
+    );
   }
 }

package/src/index.ts

@@ -15,6 +15,7 @@ export * from "./pkg-builders/SdMultiBuildRunner";
 export * from "./pkg-builders/server/createSdServerPlugin";
 export * from "./pkg-builders/server/SdServerBuildRunner";
 export * from "./pkg-builders/server/SdServerBundler";
+import "./sd-cli";
 export * from "./ts-builder/SdTsCompiler";
 export * from "./types/build-plugin.type";
 export * from "./types/build-runner.type";
@@ -25,3 +26,6 @@ export * from "./types/ts-compiler.type";
 export * from "./types/workers.type";
 export * from "./utils/SdCliConvertMessageUtil";
 export * from "./utils/SdCliPerformanceTime";
+import "./workers/build-runner-worker";
+import "./workers/lint-worker";
+import "./workers/server-worker";

package/src/pkg-builders/client/SdClientBuildRunner.ts

@@ -29,7 +29,10 @@ export class SdClientBuildRunner extends EventEmitter {
       FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
     );
     this._watchScopePathSet = new Set(
-      [path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) => PathUtil.norm(item)),
+      [
+        path.resolve(this._pkgPath, "../"),
+        ...localUpdatePaths
+      ].map((item) => PathUtil.norm(item)),
     );
   }
 
@@ -118,7 +121,7 @@ export class SdClientBuildRunner extends EventEmitter {
       | "web"
       | "electron"
       | "cordova"
-    )[];
+      )[];
     if (this._pkgConf.builder?.cordova && !this._cordova) {
       this._debug("CORDOVA 준비...");
       this._cordova = new SdCliCordova({

package/src/pkg-builders/client/SdNgBundler.ts

@@ -203,7 +203,8 @@ export class SdNgBundler {
           const serviceWorkerResult = await this._genServiceWorkerAsync(outputFiles, assetFiles);
           outputFiles.push(createOutputFile("ngsw.json", serviceWorkerResult.manifest, BuildOutputFileType.Root));
           assetFiles.push(...serviceWorkerResult.assetFiles);
-        } catch (err) {
+        }
+        catch (err) {
           results.push({
             filePath: undefined,
             line: undefined,
@@ -339,27 +340,27 @@ export class SdNgBundler {
         ...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
         ...(this._opt.dev && this._opt.builderType === "cordova"
           ? Object.keys(this._opt.cordovaConfig?.platform ?? { browser: {} }).mapMany((platform) => [
-              {
-                input: `.cordova/platforms/${platform}/platform_www/plugins`,
-                glob: "**/*",
-                output: `cordova-${platform}/plugins`,
-              },
-              {
-                input: `.cordova/platforms/${platform}/platform_www`,
-                glob: "cordova.js",
-                output: `cordova-${platform}`,
-              },
-              {
-                input: `.cordova/platforms/${platform}/platform_www`,
-                glob: "cordova_plugins.js",
-                output: `cordova-${platform}`,
-              },
-              {
-                input: `.cordova/platforms/${platform}/www`,
-                glob: "config.xml",
-                output: `cordova-${platform}`,
-              },
-            ])
+            {
+              input: `.cordova/platforms/${platform}/platform_www/plugins`,
+              glob: "**/*",
+              output: `cordova-${platform}/plugins`,
+            },
+            {
+              input: `.cordova/platforms/${platform}/platform_www`,
+              glob: "cordova.js",
+              output: `cordova-${platform}`,
+            },
+            {
+              input: `.cordova/platforms/${platform}/platform_www`,
+              glob: "cordova_plugins.js",
+              output: `cordova-${platform}`,
+            },
+            {
+              input: `.cordova/platforms/${platform}/www`,
+              glob: "config.xml",
+              output: `cordova-${platform}`,
+            },
+          ])
           : []),
       ],
       this._opt.pkgPath,
@@ -425,9 +426,9 @@ export class SdNgBundler {
         "process.env.NODE_ENV": JSON.stringify(this._opt.dev ? "development" : "production"),
         ...(this._opt.env
           ? Object.keys(this._opt.env).toObject(
-              (key) => `process.env.${key}`,
-              (key) => JSON.stringify(this._opt.env![key]),
-            )
+            (key) => `process.env.${key}`,
+            (key) => JSON.stringify(this._opt.env![key]),
+          )
           : {}),
       },
       mainFields: ["es2020", "es2015", "browser", "module", "main"],
@@ -439,11 +440,11 @@ export class SdNgBundler {
         polyfills: path.resolve(this._opt.pkgPath, "src/polyfills.ts"),
         ...(this._opt.builderType === "cordova"
           ? {
-              "cordova-entry": path.resolve(
-                path.dirname(fileURLToPath(import.meta.url)),
-                `../../../lib/cordova-entry.js`,
-              ),
-            }
+            "cordova-entry": path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              `../../../lib/cordova-entry.js`,
+            ),
+          }
           : {}),
 
         // TODO: Workers Bundler 분리
@@ -479,17 +480,17 @@ export class SdNgBundler {
       },
       ...(this._opt.builderType === "electron"
         ? {
-            platform: "node",
-            target: "node20",
-            external: ["electron", ...nodeModule.builtinModules, ...this._opt.external],
-          }
+          platform: "node",
+          target: "node20",
+          external: ["electron", ...nodeModule.builtinModules, ...this._opt.external],
+        }
         : {
-            platform: "browser",
-            target: this.#browserTarget,
-            format: "esm",
-            splitting: true,
-            inject: [PathUtil.posix(fileURLToPath(import.meta.resolve("node-stdlib-browser/helpers/esbuild/shim")))],
-          }),
+          platform: "browser",
+          target: this.#browserTarget,
+          format: "esm",
+          splitting: true,
+          inject: [PathUtil.posix(fileURLToPath(import.meta.resolve("node-stdlib-browser/helpers/esbuild/shim")))],
+        }),
       plugins: [
         /*...(this._opt.builderType === "cordova" && this._opt.cordovaConfig?.plugins
           ? [
@@ -630,9 +631,9 @@ export class SdNgBundler {
         "process.env.NODE_ENV": JSON.stringify(this._opt.dev ? "development" : "production"),
         ...(this._opt.env
           ? Object.keys(this._opt.env).toObject(
-              (key) => `process.env.${key}`,
-              (key) => JSON.stringify(this._opt.env![key]),
-            )
+            (key) => `process.env.${key}`,
+            (key) => JSON.stringify(this._opt.env![key]),
+          )
           : {}),
       },
       platform: "node",

package/src/pkg-builders/server/SdServerBundler.ts

@@ -7,6 +7,7 @@ import { ISdBuildMessage } from "../../types/build.type";
 import { createSdServerPlugin } from "./createSdServerPlugin";
 import { BuildOutputFile, BuildOutputFileType } from "@angular/build/src/tools/esbuild/bundler-context";
 import { convertOutputFile } from "@angular/build/src/tools/esbuild/utils";
+import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
 
 export class SdServerBundler {
   readonly #logger = Logger.get(["simplysm", "sd-cli", "SdServerBundler"]);
@@ -26,7 +27,8 @@ export class SdServerBundler {
       external?: string[];
       watchScopePaths: TNormPath[];
     },
-  ) {}
+  ) {
+  }
 
   async bundleAsync(modifiedFileSet?: Set<TNormPath>): Promise<{
     watchFileSet: Set<TNormPath>;
@@ -124,7 +126,27 @@ const __dirname = __path__.dirname(__filename);`.trim(),
           emitFileSet.add(distFilePath);
         }
       }
-    } catch (err) {
+
+      //-- copy assets
+      const assetFiles = await resolveAssets(
+        [
+          { input: "public", glob: "**/*", output: "." },
+          ...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
+        ],
+        this._opt.pkgPath,
+      );
+
+      for (const assetFile of assetFiles) {
+        const prev = this.#outputCache.get(PathUtil.norm(assetFile.source));
+        const curr = FsUtil.lstat(assetFile.source).mtime.getTime();
+        if (prev !== curr) {
+          FsUtil.copy(assetFile.source, path.resolve(this._opt.pkgPath, "dist", assetFile.destination));
+          this.#outputCache.set(PathUtil.norm(assetFile.source), curr);
+          emitFileSet.add(PathUtil.norm(assetFile.destination));
+        }
+      }
+    }
+    catch (err) {
       result = err;
       for (const e of err.errors) {
         if (e.detail != null) {