@simplysm/sd-cli 14.0.12 → 14.0.14

package/src/utils/vite-config.ts

@@ -3,6 +3,7 @@ import path from "path";
 import tsconfigPaths from "vite-tsconfig-paths";
 import browserslistToEsbuild from "browserslist-to-esbuild";
 import { sdAngularPlugin } from "../angular/vite-angular-plugin.js";
+import solidPlugin from "vite-plugin-solid";
 import {
   sdScopeWatchPlugin,
   type ScopeWatchReplaceDep,
@@ -14,6 +15,8 @@ import { generatePwaIcons } from "./generate-pwa-icons.js";
 
 /** createClientViteConfig 옵션 */
 export interface CreateClientViteConfigOptions {
+  /** 클라이언트 프레임워크 선택. 미지정 시 "angular" */
+  framework?: "angular" | "solid";
   /** 패키지 디렉토리 경로 */
   pkgDir: string;
   /** 패키지명 (예: "@scope/my-client") */
@@ -55,6 +58,10 @@ export interface CreateClientViteConfigOptions {
   exclude?: string[];
   /** watch 모드 (build.watch 활성화, emptyOutDir: false) */
   watch?: boolean;
+  /** 빌드 출력 경로 (미설정 시 pkgDir/dist) */
+  outDir?: string;
+  /** Vite base 경로 (미설정 시 /{pkgName}/) */
+  base?: string;
 }
 
 /**
@@ -77,7 +84,7 @@ export async function createClientViteConfig(
     esbuildTarget = browserslistToEsbuild(queries);
   }
 
-  // browserslist 정규화 (Angular 플러그인용)
+  // browserslist 정규화 (Angular 플러그인의 PostCSS 연동용)
   const normalizedBrowserslist =
     options.browserslist != null
       ? Array.isArray(options.browserslist)
@@ -96,22 +103,31 @@ export async function createClientViteConfig(
   // plugins
   const plugins: PluginOption[] = [
     tsconfigPaths({ projects: [options.tsconfigPath] }),
-    sdAngularPlugin({
-      tsconfig: options.tsconfigPath,
-      dev: options.mode === "dev",
-      onBuildStart: options.onBuildStart,
-      onBuild: options.onBuild,
-      enableLint: options.enableLint,
-      browserslist: normalizedBrowserslist,
-      postCssPlugins: options.postCssPlugins,
-    }),
   ];
 
-  // PostCSS inline plugin (라이브러리 JS 내 Angular @Component styles)
-  if (options.postCssPlugins != null && options.postCssPlugins.length > 0) {
+  if (options.framework === "solid") {
+    plugins.push(solidPlugin());
+  } else {
     plugins.push(
-      sdPostCssInlinePlugin({ postCssPlugins: options.postCssPlugins }),
+      sdAngularPlugin({
+        tsconfig: options.tsconfigPath,
+        dev: options.mode === "dev",
+        legacyModule: options.legacyModule,
+        sourcemap: options.mode === "dev" || options.watch === true,
+        onBuildStart: options.onBuildStart,
+        onBuild: options.onBuild,
+        enableLint: options.enableLint,
+        browserslist: normalizedBrowserslist,
+        postCssPlugins: options.postCssPlugins,
+      }),
     );
+
+    // PostCSS inline plugin (Angular @Component inline styles 전용)
+    if (options.postCssPlugins != null && options.postCssPlugins.length > 0) {
+      plugins.push(
+        sdPostCssInlinePlugin({ postCssPlugins: options.postCssPlugins }),
+      );
+    }
   }
 
   // replaceDeps HMR (dev 모드 또는 watch 모드)
@@ -153,7 +169,7 @@ export async function createClientViteConfig(
 
   const config: InlineConfig = {
     root: options.pkgDir,
-    base: `/${name}/`,
+    base: options.base ?? `/${name}/`,
     define: Object.keys(define).length > 0 ? define : undefined,
     plugins,
     server: serverConfig,
@@ -210,31 +226,57 @@ export async function createClientViteConfig(
     );
   }
 
-  // polyfills plugin (transformIndexHtml)
+  // polyfills plugin
   if (options.polyfills != null && options.polyfills.length > 0) {
     const polyfillImports = options.polyfills;
-    (config.plugins as PluginOption[]).push({
-      name: "sd-polyfills",
-      transformIndexHtml() {
-        return [
-          {
-            tag: "script",
-            attrs: { type: "module" },
-            children: polyfillImports.map((p) => `import "${p}";`).join("\n"),
-            injectTo: "head-prepend" as const,
-          },
-        ];
-      },
-    });
+    if (options.legacyModule === true) {
+      // legacyModule: 메인 엔트리의 transform에서 polyfill import를 상단에 주입한다.
+      // transformIndexHtml의 인라인 <script type="module">은 Vite 빌드에서 번들링되지 않으므로,
+      // Rollup이 처리할 수 있도록 소스 코드 레벨에서 주입한다.
+      const mainEntryPath = path.resolve(options.pkgDir, "src/main.ts");
+      (config.plugins as PluginOption[]).push({
+        name: "sd-polyfills",
+        transform(code, id) {
+          if (path.normalize(id) !== path.normalize(mainEntryPath)) return null;
+          // polyfillImports는 pkgDir 기준 상대경로 (예: "./src/polyfills.ts")
+          // main.ts는 src/ 안에 있으므로, main.ts 기준 상대경로로 변환한다
+          const mainDir = path.dirname(mainEntryPath);
+          const polyfillCode = polyfillImports
+            .map((p) => {
+              const abs = path.resolve(options.pkgDir, p);
+              this.addWatchFile(abs);
+              const rel = path.relative(mainDir, abs);
+              const posixRel = rel.replace(/\\/g, "/");
+              return "import \"./" + posixRel + "\";";
+            })
+            .join("\n");
+          return { code: polyfillCode + "\n" + code, map: null };
+        },
+      });
+    } else {
+      // dev 모드: transformIndexHtml로 인라인 스크립트 주입 (Vite dev server가 처리)
+      (config.plugins as PluginOption[]).push({
+        name: "sd-polyfills",
+        transformIndexHtml() {
+          return [
+            {
+              tag: "script",
+              attrs: { type: "module" },
+              children: polyfillImports.map((p) => `import "${p}";`).join("\n"),
+              injectTo: "head-prepend" as const,
+            },
+          ];
+        },
+      });
+    }
   }
 
-  // legacyModule: true → 코드 스플리팅 비활성화 + esbuild import.meta/import() 변환 활성화
+  // legacyModule: true → 코드 스플리팅 비활성화 + esbuild import.meta 변환 + 잔여 import() 제거
   if (options.legacyModule === true) {
     config.esbuild = {
       ...config.esbuild,
       supported: {
         "import-meta": false,
-        "dynamic-import": false,
       },
     };
     config.build = {
@@ -245,17 +287,38 @@ export async function createClientViteConfig(
         },
       },
     };
+
+    // Rollup이 인라인하지 못한 잔여 dynamic import()를 제거한다.
+    // inlineDynamicImports가 정적 경로를 모두 인라인한 후에도,
+    // @vite-ignore나 런타임 계산 경로의 import()가 남을 수 있다.
+    // Chrome 61은 import() 구문을 파싱하지 못하므로 no-op 함수로 치환한다.
+    (config.plugins as PluginOption[]).push({
+      name: "sd-legacy-strip-dynamic-import",
+      enforce: "post",
+      renderChunk(code) {
+        if (!code.includes("import(")) return null;
+        return {
+          code: code.replace(
+            /\bimport\s*\(/g,
+            "(function(){return Promise.reject(new Error(\"Dynamic import not supported\"))})(",
+          ),
+          map: null,
+        };
+      },
+    });
   }
 
-  // build 모드 설정
-  if (options.mode === "build") {
+  // build 모드 설정 (프로덕션 빌드 또는 legacyModule dev)
+  if (options.mode === "build" || options.legacyModule === true) {
     config.build = {
       ...config.build,
-      outDir: path.join(options.pkgDir, "dist"),
+      outDir: options.outDir ?? path.join(options.pkgDir, "dist"),
     };
     if (options.watch === true) {
       config.build.watch = {};
       config.build.emptyOutDir = false;
+      config.build.minify = false;
+      config.build.sourcemap = true;
     } else {
       config.logLevel = "silent";
       config.build.emptyOutDir = true;

package/src/workers/client.worker.ts

@@ -21,6 +21,8 @@ export interface ClientBuildInfo {
   name: string;
   cwd: string;
   pkgDir: string;
+  /** 클라이언트 프레임워크 선택 */
+  framework?: "angular" | "solid";
   /** Vite dev server 포트 (standalone clients with server: number) */
   port?: number;
   /** 빌드 시 치환할 환경변수 */
@@ -37,6 +39,10 @@ export interface ClientBuildInfo {
   enableLint?: boolean;
   /** Vite optimizeDeps.exclude에 전달할 패키지 목록 */
   exclude?: string[];
+  /** 빌드 출력 경로 (미설정 시 pkgDir/dist) */
+  outDir?: string;
+  /** Vite base 경로 (미설정 시 /{pkgName}/) */
+  base?: string;
 }
 
 /** Client 빌드 결과 */
@@ -199,6 +205,7 @@ async function startWatch(info: ClientBuildInfo): Promise<ClientBuildResult> {
     const polyfills = fs.existsSync(polyfillsPath) ? ["./src/polyfills.ts"] : undefined;
 
     const viteConfig = await createClientViteConfig({
+      framework: info.framework,
       pkgDir: info.pkgDir,
       pkgName,
       mode: "dev",
@@ -241,7 +248,7 @@ async function startWatch(info: ClientBuildInfo): Promise<ClientBuildResult> {
     sender.send("serverReady", { port: actualPort });
 
     // .config.json 생성
-    writeConfigJson(info.pkgDir, info.configs);
+    writeConfigJson(path.join(info.pkgDir, "dist"), info.configs);
 
     return { success: true };
   } catch (err) {
@@ -269,9 +276,10 @@ async function startLegacyWatch(info: ClientBuildInfo): Promise<ClientBuildResul
     const polyfills = fs.existsSync(polyfillsPath) ? ["./src/polyfills.ts"] : undefined;
 
     const viteConfig = await createClientViteConfig({
+      framework: info.framework,
       pkgDir: info.pkgDir,
       pkgName,
-      mode: "build",
+      mode: "dev",
       tsconfigPath,
       serverPort: 0,
       env: info.env,
@@ -293,7 +301,7 @@ async function startLegacyWatch(info: ClientBuildInfo): Promise<ClientBuildResul
     rollupWatcher = watcher;
 
     // .config.json 생성
-    writeConfigJson(info.pkgDir, info.configs);
+    writeConfigJson(path.join(info.pkgDir, "dist"), info.configs);
 
     // HTTP 정적 파일 서버 시작
     const name = pkgName.replace(/^@[^/]+\//, "");
@@ -398,6 +406,7 @@ async function build(info: ClientBuildInfo): Promise<ClientBuildResult> {
     let lintResult: LintWithProgramResult | undefined;
 
     const viteConfig = await createClientViteConfig({
+      framework: info.framework,
       pkgDir: info.pkgDir,
       pkgName,
       mode: "build",
@@ -416,12 +425,14 @@ async function build(info: ClientBuildInfo): Promise<ClientBuildResult> {
       polyfills,
       pwa: info.pwa,
       exclude: info.exclude,
+      outDir: info.outDir,
+      base: info.base,
     });
 
     await viteBuild(viteConfig);
 
-    // .config.json 생성
-    writeConfigJson(info.pkgDir, info.configs);
+    // .config.json 생성 (항상 dist/에 기록 — outDir과 무관)
+    writeConfigJson(path.join(info.pkgDir, "dist"), info.configs);
 
     logger.debug(`[${info.name}] client worker build 완료`);
     return { success: true, lint: lintResult };
@@ -432,12 +443,11 @@ async function build(info: ClientBuildInfo): Promise<ClientBuildResult> {
   }
 }
 
-/** dist/.config.json 생성 */
+/** .config.json 생성 */
 function writeConfigJson(
-  pkgDir: string,
+  distDir: string,
   configs?: Record<string, unknown>,
 ): void {
-  const distDir = path.join(pkgDir, "dist");
   fs.mkdirSync(distDir, { recursive: true });
   fs.writeFileSync(
     path.join(distDir, ".config.json"),

package/tests/capacitor/capacitor-build.spec.ts

@@ -93,6 +93,19 @@ vi.mock("consola", () => ({
 
 const PKG_PATH = "/fake/pkg";
 
+/** Gradle 실행 명령을 찾는다 (Windows: cmd /c gradlew.bat, 그 외: gradlew) */
+function findGradleCall(calls: { command: string; args: string[] }[]) {
+  return calls.find(
+    (c) => c.command.includes("gradlew") || (c.command === "cmd" && c.args.includes("gradlew.bat")),
+  );
+}
+
+function findGradleCallIndex(calls: { command: string; args: string[] }[]) {
+  return calls.findIndex(
+    (c) => c.command.includes("gradlew") || (c.command === "cmd" && c.args.includes("gradlew.bat")),
+  );
+}
+
 function setupDefaultMocks() {
   mockFsxExists.mockResolvedValue(true);
 
@@ -181,7 +194,7 @@ describe("Capacitor 빌드", () => {
 
       await cap.build("/fake/out");
 
-      const gradleCmd = execaCalls.find((c) => c.command.includes("gradlew"));
+      const gradleCmd = findGradleCall(execaCalls);
       expect(gradleCmd).toBeDefined();
       expect(gradleCmd!.args).toContain("bundleRelease");
     });
@@ -197,7 +210,7 @@ describe("Capacitor 빌드", () => {
 
       await cap.build("/fake/out");
 
-      const gradleCmd = execaCalls.find((c) => c.command.includes("gradlew"));
+      const gradleCmd = findGradleCall(execaCalls);
       expect(gradleCmd).toBeDefined();
       expect(gradleCmd!.args).toContain("assembleRelease");
     });
@@ -214,7 +227,7 @@ describe("Capacitor 빌드", () => {
 
       await cap.build("/fake/out");
 
-      const gradleCmd = execaCalls.find((c) => c.command.includes("gradlew"));
+      const gradleCmd = findGradleCall(execaCalls);
       expect(gradleCmd).toBeDefined();
       expect(gradleCmd!.args).toContain("assembleDebug");
     });
@@ -274,12 +287,12 @@ describe("Capacitor 빌드", () => {
       const capCopyIndex = execaCalls.findIndex(
         (c) => c.command === "pnpm" && c.args.includes("cap") && c.args.includes("copy"),
       );
-      const gradlewIndex = execaCalls.findIndex((c) => c.command.includes("gradlew"));
+      const gradlewIndex = findGradleCallIndex(execaCalls);
       expect(capCopyIndex).toBeGreaterThanOrEqual(0);
       expect(gradlewIndex).toBeGreaterThan(capCopyIndex);
     });
 
-    it("Windows에서 gradlew.bat을 사용한다", async () => {
+    it("Windows에서 cmd /c gradlew.bat으로 Gradle을 실행한다", async () => {
       const originalPlatform = process.platform;
       Object.defineProperty(process, "platform", { value: "win32" });
 
@@ -294,8 +307,37 @@ describe("Capacitor 빌드", () => {
 
         await cap.build("/fake/out");
 
-        const gradleCmd = execaCalls.find((c) => c.command.includes("gradlew"));
-        expect(gradleCmd!.command).toContain("gradlew.bat");
+        const gradleCmd = execaCalls.find((c) => c.command === "cmd");
+        expect(gradleCmd).toBeDefined();
+        expect(gradleCmd!.args[0]).toBe("/c");
+        expect(gradleCmd!.args[1]).toBe("gradlew.bat");
+        expect(gradleCmd!.args).toContain("assembleRelease");
+        expect(gradleCmd!.args).toContain("--no-daemon");
+      } finally {
+        Object.defineProperty(process, "platform", { value: originalPlatform });
+      }
+    });
+
+    it("Linux/macOS에서 gradlew를 직접 실행한다", async () => {
+      const originalPlatform = process.platform;
+      Object.defineProperty(process, "platform", { value: "linux" });
+
+      try {
+        const { Capacitor } = await import("../../src/capacitor/capacitor.js");
+
+        const cap = await Capacitor.create(PKG_PATH, {
+          appId: "com.test.app",
+          appName: "Test App",
+          platform: { android: {} },
+        });
+
+        await cap.build("/fake/out");
+
+        const gradleCmd = findGradleCall(execaCalls);
+        expect(gradleCmd).toBeDefined();
+        expect(gradleCmd!.command).toContain("gradlew");
+        expect(gradleCmd!.command).not.toContain("gradlew.bat");
+        expect(gradleCmd!.args).toContain("assembleRelease");
       } finally {
         Object.defineProperty(process, "platform", { value: originalPlatform });
       }
@@ -377,6 +419,44 @@ describe("Capacitor 빌드", () => {
       await expect(cap.build("/fake/out")).rejects.toThrow("keystore");
     });
 
+    it("비밀번호에 $, \\, ' 등 특수문자가 있으면 Groovy 이스케이프하여 build.gradle에 기록한다", async () => {
+      const { Capacitor } = await import("../../src/capacitor/capacitor.js");
+      mockFsxExists.mockResolvedValue(true);
+
+      const cap = await Capacitor.create(PKG_PATH, {
+        appId: "com.test.app",
+        appName: "Test App",
+        platform: {
+          android: {
+            sign: {
+              keystore: "my-release.keystore",
+              storePassword: "12tlavmf#$",
+              alias: "my-key",
+              password: "pass\\'word",
+            },
+          },
+        },
+      });
+
+      await cap.build("/fake/out");
+
+      const writeCalls = mockFsxWrite.mock.calls;
+      const gradleWrite = writeCalls.find(
+        (call) =>
+          typeof call[0] === "string" &&
+          call[0].includes("build.gradle") &&
+          typeof call[1] === "string" &&
+          call[1].includes("signingConfigs"),
+      );
+      expect(gradleWrite).toBeDefined();
+
+      const gradleContent = gradleWrite![1] as string;
+      // $ 는 Groovy single-quoted string에서 그대로 유지
+      expect(gradleContent).toContain("storePassword '12tlavmf#$'");
+      // \ → \\, ' → \' 이스케이프
+      expect(gradleContent).toContain("keyPassword 'pass\\\\\\'word'");
+    });
+
     it("signed 빌드 산출물이 unsigned 접미사 없이 복사된다", async () => {
       const { Capacitor } = await import("../../src/capacitor/capacitor.js");
 

package/tests/capacitor/capacitor-init.spec.ts

@@ -549,7 +549,7 @@ describe("Android 네이티브 설정", () => {
     expect(manifestWrite).toBeDefined();
   });
 
-  it("styles.xml의 Theme.SplashScreen parent를 Theme.AppCompat.DayNight.NoActionBar로 변경한다", async () => {
+  it("styles.xml의 Theme.SplashScreen parent를 변경하고 android:background를 android:windowBackground로 변경한다", async () => {
     const { Capacitor } = await import("../../src/capacitor/capacitor.js");
     const cap = await Capacitor.create(PKG_PATH, {
       appId: "com.test.app",
@@ -567,10 +567,14 @@ describe("Android 네이티브 설정", () => {
         call[1].includes('parent="Theme.AppCompat.DayNight.NoActionBar"'),
     );
     expect(stylesWrite).toBeDefined();
-    // android:background는 유지
-    expect((stylesWrite![1] as string)).toContain("@drawable/splash");
+    const content = stylesWrite![1] as string;
+    // @drawable/splash는 유지
+    expect(content).toContain("@drawable/splash");
     // Theme.SplashScreen은 제거됨
-    expect((stylesWrite![1] as string)).not.toContain('parent="Theme.SplashScreen"');
+    expect(content).not.toContain('parent="Theme.SplashScreen"');
+    // android:background → android:windowBackground로 변경됨
+    expect(content).toContain('"android:windowBackground">@drawable/splash');
+    expect(content).not.toContain('"android:background">@drawable/splash');
   });
 
   it("이미 변경된 styles.xml은 재변경하지 않는다", async () => {
@@ -579,7 +583,7 @@ describe("Android 네이티브 설정", () => {
         return `<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="AppTheme.NoActionBarLaunch" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:background">@drawable/splash</item>
+        <item name="android:windowBackground">@drawable/splash</item>
     </style>
 </resources>`;
       }