@simplysm/sd-cli 13.0.96 → 13.0.98

package/src/utils/vite-config.ts

@@ -293,6 +293,12 @@ export interface ViteConfigOptions {
   replaceDeps?: string[];
   /** Callback when replaceDeps package dist changes */
   onScopeRebuild?: () => void;
+  /** Override build.outDir (e.g. ".capacitor/www" for Capacitor builds) */
+  outDir?: string;
+  /** Override base path (e.g. "./" for Capacitor builds) */
+  base?: string;
+  /** Packages to exclude from Vite optimizeDeps pre-bundling */
+  exclude?: string[];
 }
 
 /**
@@ -319,7 +325,7 @@ export function createViteConfig(options: ViteConfigOptions): ViteUserConfig {
 
   const config: ViteUserConfig = {
     root: pkgDir,
-    base: `/${name}/`,
+    base: options.base ?? `/${name}/`,
     plugins: [
       tsconfigPaths({ projects: [tsconfigPath] }),
       solidPlugin(),
@@ -358,6 +364,14 @@ export function createViteConfig(options: ViteConfigOptions): ViteUserConfig {
   // Process.env substitution (applied to both build and dev modes)
   config.define = envDefine;
 
+  if (options.outDir != null) {
+    config.build = { outDir: options.outDir };
+  }
+
+  if (options.exclude != null && options.exclude.length > 0) {
+    config.optimizeDeps = { exclude: options.exclude };
+  }
+
   if (mode === "build") {
     config.logLevel = "silent";
   } else {

package/src/workers/client.worker.ts

@@ -126,6 +126,11 @@ async function build(info: ClientBuildInfo): Promise<ClientBuildResult> {
     );
 
     // Create Vite configuration and build
+    const isCapacitor = info.config.capacitor != null;
+    const outDir = isCapacitor
+      ? path.join(info.pkgDir, ".capacitor", "www")
+      : undefined;
+
     const viteConfig = createViteConfig({
       pkgDir: info.pkgDir,
       name: info.name,
@@ -133,12 +138,16 @@ async function build(info: ClientBuildInfo): Promise<ClientBuildResult> {
       compilerOptions,
       env: info.config.env,
       mode: "build",
+      outDir,
+      base: isCapacitor ? "./" : undefined,
+      exclude: info.config.exclude,
     });
 
     await viteBuild(viteConfig);
 
     // Generate .config.json
-    const confDistPath = path.join(info.pkgDir, "dist", ".config.json");
+    const confDistDir = outDir ?? path.join(info.pkgDir, "dist");
+    const confDistPath = path.join(confDistDir, ".config.json");
     fs.writeFileSync(confDistPath, JSON.stringify(info.config.configs ?? {}, undefined, 2));
 
     return { success: true };
@@ -190,6 +199,7 @@ async function startWatch(info: ClientWatchInfo): Promise<void> {
       serverPort,
       replaceDeps,
       onScopeRebuild: () => sender.send("scopeRebuild", {}),
+      exclude: info.config.exclude,
     });
 
     // Start Vite dev server

package/templates/init/.gitignore.hbs

@@ -1,6 +1,5 @@
 .tmp
-.tasks
-.playwright
+.playwright-cli
 .coverage
 __pycache__
 .claude/worktrees

package/templates/init/package.json.hbs

@@ -16,19 +16,18 @@
     "check": "sd-cli check",
     "test": "vitest run",
     "test:e2e": "vitest run -c vitest-e2e.config.ts",
-    "postinstall": "playwright install && playwright-cli install --skills"
+    "postinstall": "playwright-cli install --skills"
   },
   "devDependencies": {
-    "@simplysm/lint": "~13.0.96",
-    "@simplysm/sd-cli": "~13.0.96",
-    "@simplysm/sd-claude": "~13.0.96",
+    "@simplysm/lint": "~13.0.98",
+    "@simplysm/sd-cli": "~13.0.98",
+    "@simplysm/sd-claude": "~13.0.98",
+    "@playwright/cli": "^0.1.1",
     "@types/node": "^20.19.37",
     "eslint": "^9.39.4",
     "prettier": "^3.8.1",
     "typescript": "^5.9.3",
     "vite-tsconfig-paths": "^6.1.1",
     "vitest": "^4.1.0",
-    "@playwright/cli": "^0.1.1",
-    "playwright": "^1.58.2"
   }
 }

package/templates/init/packages/client-admin/package.json.hbs

@@ -6,13 +6,13 @@
   "private": true,
   "dependencies": {
     "@{{projectName}}/db-main": "workspace:*",
-    "@simplysm/core-browser": "~13.0.96",
-    "@simplysm/core-common": "~13.0.96",
-    "@simplysm/excel": "~13.0.96",
-    "@simplysm/orm-common": "~13.0.96",
-    "@simplysm/service-client": "~13.0.96",
-    "@simplysm/service-common": "~13.0.96",
-    "@simplysm/solid": "~13.0.96",
+    "@simplysm/core-browser": "~13.0.98",
+    "@simplysm/core-common": "~13.0.98",
+    "@simplysm/excel": "~13.0.98",
+    "@simplysm/orm-common": "~13.0.98",
+    "@simplysm/service-client": "~13.0.98",
+    "@simplysm/service-common": "~13.0.98",
+    "@simplysm/solid": "~13.0.98",
     "@solid-primitives/event-listener": "^2.4.5",
     "@solidjs/router": "^0.15.4",
     "@tabler/icons-solidjs": "^3.40.0",

package/templates/init/packages/db-main/package.json.hbs

@@ -7,7 +7,7 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@simplysm/core-common": "~13.0.96",
-    "@simplysm/orm-common": "~13.0.96"
+    "@simplysm/core-common": "~13.0.98",
+    "@simplysm/orm-common": "~13.0.98"
   }
 }

package/templates/init/packages/server/package.json.hbs

@@ -5,11 +5,11 @@
   "private": true,
   "dependencies": {
     "@{{projectName}}/db-main": "workspace:*",
-    "@simplysm/core-common": "~13.0.96",
-    "@simplysm/excel": "~13.0.96",
-    "@simplysm/orm-common": "~13.0.96",
-    "@simplysm/orm-node": "~13.0.96",
-    "@simplysm/service-server": "~13.0.96",
+    "@simplysm/core-common": "~13.0.98",
+    "@simplysm/excel": "~13.0.98",
+    "@simplysm/orm-common": "~13.0.98",
+    "@simplysm/orm-node": "~13.0.98",
+    "@simplysm/service-server": "~13.0.98",
     "bcrypt": "^6.0.0",
     "pg": "^8.20.0",
     "pg-copy-streams": "^7.0.0"

package/templates/init/tests-e2e/package.json.hbs

@@ -6,7 +6,7 @@
   "private": true,
   "dependencies": {
     "@{{projectName}}/db-main": "workspace:*",
-    "@simplysm/orm-node": "~13.0.96",
+    "@simplysm/orm-node": "~13.0.98",
     "bcrypt": "^6.0.0",
     "playwright": "^1.58.2"
   },

package/tests/capacitor-exclude.spec.ts

@@ -0,0 +1,78 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const { mockWriteJson, mockReadJson, mockExists } = vi.hoisted(() => ({
+  mockWriteJson: vi.fn().mockResolvedValue(undefined),
+  mockReadJson: vi.fn(),
+  mockExists: vi.fn(),
+}));
+
+vi.mock("@simplysm/core-node", () => ({
+  fsx: {
+    readJson: mockReadJson,
+    exists: mockExists,
+    mkdir: vi.fn().mockResolvedValue(undefined),
+    writeJson: mockWriteJson,
+    write: vi.fn().mockResolvedValue(undefined),
+  },
+}));
+
+vi.mock("consola", () => {
+  const withTag = () => ({ debug: vi.fn(), warn: vi.fn() });
+  const consola = { withTag };
+  return { default: consola, consola };
+});
+
+vi.mock("sharp", () => ({ default: vi.fn() }));
+vi.mock("execa", () => ({ execa: vi.fn() }));
+
+import { Capacitor } from "../src/capacitor/capacitor";
+
+describe("Capacitor exclude packages", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockReadJson.mockImplementation((filePath: string) => {
+      if (filePath.includes(".capacitor")) {
+        return Promise.resolve({ name: "", version: "", dependencies: {} });
+      }
+      return Promise.resolve({
+        name: "@test/app",
+        version: "1.0.0",
+        dependencies: { "jeep-sqlite": "^0.0.1" },
+      });
+    });
+    mockExists.mockImplementation((filePath: string) => {
+      if (filePath.endsWith("package.json")) return Promise.resolve(true);
+      return Promise.resolve(false);
+    });
+  });
+
+  it("exclude 패키지가 .capacitor/package.json dependencies에 추가된다", async () => {
+    const cap = await Capacitor.create("/test/packages/app", {
+      appId: "com.test.app",
+      appName: "Test App",
+    }, ["jeep-sqlite"]);
+
+    await (cap as unknown as { _setupNpmConf(): Promise<boolean> })._setupNpmConf();
+
+    expect(mockWriteJson).toHaveBeenCalled();
+    const writtenConfig = mockWriteJson.mock.calls[0][1] as {
+      dependencies: Record<string, string>;
+    };
+    expect(writtenConfig.dependencies["jeep-sqlite"]).toBe("^0.0.1");
+  });
+
+  it("exclude 없이 생성해도 정상 동작한다", async () => {
+    const cap = await Capacitor.create("/test/packages/app", {
+      appId: "com.test.app",
+      appName: "Test App",
+    });
+
+    await (cap as unknown as { _setupNpmConf(): Promise<boolean> })._setupNpmConf();
+
+    expect(mockWriteJson).toHaveBeenCalled();
+    const writtenConfig = mockWriteJson.mock.calls[0][1] as {
+      dependencies: Record<string, string>;
+    };
+    expect(writtenConfig.dependencies["jeep-sqlite"]).toBeUndefined();
+  });
+});

package/tests/electron-exclude.spec.ts

@@ -0,0 +1,61 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const { mockWriteJson, mockReadJson } = vi.hoisted(() => ({
+  mockWriteJson: vi.fn().mockResolvedValue(undefined),
+  mockReadJson: vi.fn(),
+}));
+
+vi.mock("@simplysm/core-node", () => ({
+  fsx: {
+    readJson: mockReadJson,
+    mkdir: vi.fn().mockResolvedValue(undefined),
+    writeJson: mockWriteJson,
+  },
+}));
+
+vi.mock("consola", () => {
+  const withTag = () => ({ debug: vi.fn(), warn: vi.fn() });
+  const consola = { withTag };
+  return { default: consola, consola };
+});
+
+import { Electron } from "../src/electron/electron";
+
+describe("Electron exclude packages", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockReadJson.mockResolvedValue({
+      name: "@test/app",
+      version: "1.0.0",
+      dependencies: { "jeep-sqlite": "^0.0.1" },
+    });
+  });
+
+  it("exclude 패키지가 .electron/src/package.json dependencies에 추가된다", async () => {
+    const electron = await Electron.create("/test/packages/app", {
+      appId: "com.test.app",
+    }, ["jeep-sqlite"]);
+
+    await (electron as unknown as { _setupPackageJson(p: string): Promise<void> })._setupPackageJson("/test/packages/app/.electron/src");
+
+    expect(mockWriteJson).toHaveBeenCalled();
+    const writtenConfig = mockWriteJson.mock.calls[0][1] as {
+      dependencies: Record<string, string>;
+    };
+    expect(writtenConfig.dependencies["jeep-sqlite"]).toBe("^0.0.1");
+  });
+
+  it("exclude 없이 생성해도 정상 동작한다", async () => {
+    const electron = await Electron.create("/test/packages/app", {
+      appId: "com.test.app",
+    });
+
+    await (electron as unknown as { _setupPackageJson(p: string): Promise<void> })._setupPackageJson("/test/packages/app/.electron/src");
+
+    expect(mockWriteJson).toHaveBeenCalled();
+    const writtenConfig = mockWriteJson.mock.calls[0][1] as {
+      dependencies: Record<string, string>;
+    };
+    expect(writtenConfig.dependencies["jeep-sqlite"]).toBeUndefined();
+  });
+});

package/tests/run-watch.spec.ts

@@ -38,4 +38,39 @@ describe("filterPackagesByTargets", () => {
     expect(result["core-node"]).toEqual({ target: "node" });
   });
 
+  it("includes scripts target when watch option is present", () => {
+    const packagesWithWatch: Record<string, SdPackageConfig | undefined> = {
+      ...mockPackages,
+      "claude-with-watch": {
+        target: "scripts",
+        watch: {
+          target: ["../../.claude/rules/sd-*"],
+          cmd: "node",
+          args: ["scripts/sync.mjs"],
+        },
+      },
+    };
+    const result = filterPackagesByTargets(packagesWithWatch, []);
+
+    expect(result["claude-with-watch"]).toBeDefined();
+    expect(result["claude"]).toBeUndefined(); // scripts without watch still excluded
+  });
+
+  it("includes scripts+watch target when specified in targets", () => {
+    const packagesWithWatch: Record<string, SdPackageConfig | undefined> = {
+      ...mockPackages,
+      "claude-with-watch": {
+        target: "scripts",
+        watch: {
+          target: ["../../.claude/rules/sd-*"],
+          cmd: "node",
+        },
+      },
+    };
+    const result = filterPackagesByTargets(packagesWithWatch, ["claude-with-watch"]);
+
+    expect(Object.keys(result)).toHaveLength(1);
+    expect(result["claude-with-watch"]).toBeDefined();
+  });
+
 });

package/tests/vite-config-exclude.spec.ts

@@ -0,0 +1,35 @@
+import { describe, expect, it } from "vitest";
+import { createViteConfig } from "../src/utils/vite-config";
+import path from "path";
+
+describe("createViteConfig exclude option", () => {
+  const baseOptions = {
+    pkgDir: path.resolve(__dirname, ".."),
+    name: "test-app",
+    tsconfigPath: path.resolve(__dirname, "../../..", "tsconfig.json"),
+    compilerOptions: {},
+    mode: "build" as const,
+  };
+
+  it("should set optimizeDeps.exclude when exclude option is provided", () => {
+    const config = createViteConfig({ ...baseOptions, exclude: ["jeep-sqlite"] });
+
+    expect(config.optimizeDeps?.exclude).toContain("jeep-sqlite");
+  });
+
+  it("should not set optimizeDeps.exclude when exclude option is not provided", () => {
+    const config = createViteConfig(baseOptions);
+
+    expect(config.optimizeDeps?.exclude).toBeUndefined();
+  });
+
+  it("should handle multiple exclude packages", () => {
+    const config = createViteConfig({
+      ...baseOptions,
+      exclude: ["jeep-sqlite", "electron"],
+    });
+
+    expect(config.optimizeDeps?.exclude).toContain("jeep-sqlite");
+    expect(config.optimizeDeps?.exclude).toContain("electron");
+  });
+});

package/tests/vite-config-outdir.spec.ts

@@ -0,0 +1,38 @@
+import { describe, expect, it } from "vitest";
+import { createViteConfig } from "../src/utils/vite-config";
+import path from "path";
+
+describe("createViteConfig capacitor overrides", () => {
+  const baseOptions = {
+    pkgDir: path.resolve(__dirname, ".."),
+    name: "test-app",
+    tsconfigPath: path.resolve(__dirname, "../../..", "tsconfig.json"),
+    compilerOptions: {},
+    mode: "build" as const,
+  };
+
+  it("should set build.outDir when outDir option is provided", () => {
+    const outDir = path.join(baseOptions.pkgDir, ".capacitor", "www");
+    const config = createViteConfig({ ...baseOptions, outDir });
+
+    expect(config.build?.outDir).toBe(outDir);
+  });
+
+  it("should not set build.outDir when outDir option is not provided", () => {
+    const config = createViteConfig(baseOptions);
+
+    expect(config.build?.outDir).toBeUndefined();
+  });
+
+  it("should override base when base option is provided", () => {
+    const config = createViteConfig({ ...baseOptions, base: "./" });
+
+    expect(config.base).toBe("./");
+  });
+
+  it("should use /{name}/ as base when base option is not provided", () => {
+    const config = createViteConfig(baseOptions);
+
+    expect(config.base).toBe("/test-app/");
+  });
+});