@chrisluyi/daas-cli 1.1.0 → 1.2.0

package/dist/index.js

@@ -2313,73 +2313,7 @@ async function runMain(cmd, opts = {}) {
 
 // src/commands/dev.ts
 import { createRsbuild } from "@rsbuild/core";
-
-// ../rsbuild-config/dist/index.js
-import { mergeRsbuildConfig } from "@rsbuild/core";
-
-// ../rsbuild-config/dist/defaults.js
-var SUPPORTED_CONFIG_VERSION = 1;
-function getDefaults(mode) {
-  return {
-    output: {
-      distPath: { root: "dist" },
-      cleanDistPath: mode === "production"
-    },
-    performance: mode === "production" ? { chunkSplit: { strategy: "split-by-experience" } } : undefined
-  };
-}
-
-// ../rsbuild-config/dist/plugins/react.js
-import { pluginReact } from "@rsbuild/plugin-react";
-function getReactPlugin() {
-  return pluginReact();
-}
-
-// ../rsbuild-config/dist/plugins/mf2.js
-import { pluginModuleFederation } from "@module-federation/rsbuild-plugin";
-function getMF2Plugin(manifest, remoteMeta) {
-  return pluginModuleFederation({
-    name: manifest.name,
-    filename: "remoteEntry.js",
-    exposes: manifest.exposes,
-    shared: buildShared(remoteMeta.shared)
-  });
-}
-function buildShared(shared) {
-  return Object.fromEntries(Object.entries(shared).map(([pkg, version]) => [
-    pkg,
-    {
-      singleton: true,
-      requiredVersion: version,
-      eager: pkg === "react" || pkg === "react-dom"
-    }
-  ]));
-}
-
-// ../rsbuild-config/dist/index.js
-function createConfig(manifest, remoteMeta, options) {
-  const { mode, port, target } = options;
-  return mergeRsbuildConfig(getDefaults(mode), {
-    server: port ? { port } : undefined,
-    plugins: [getReactPlugin(), getMF2Plugin(manifest, remoteMeta)],
-    source: target ? { alias: buildTargetAliases(target), define: buildTargetDefines(target) } : undefined
-  });
-}
-function buildTargetAliases(target) {
-  return {
-    "@region-config": `./src/config/regions/${target.region}`,
-    "@platform-config": `./src/config/platforms/${target.platform}`,
-    "@product-config": `./src/config/products/${target.product}`
-  };
-}
-function buildTargetDefines(target) {
-  return {
-    "process.env.DAAS_REGION": JSON.stringify(target.region),
-    "process.env.DAAS_ENVIRONMENT": JSON.stringify(target.environment),
-    "process.env.DAAS_PLATFORM": JSON.stringify(target.platform),
-    "process.env.DAAS_PRODUCT": JSON.stringify(target.product)
-  };
-}
+import { createConfig } from "@chrisluyi/rsbuild-config";
 
 // src/daas-config.ts
 import { readFileSync, existsSync } from "fs";
@@ -2404,7 +2338,8 @@ function readDaasConfig(cwd = process.cwd()) {
   return {
     configUrl: daas.configUrl,
     port: daas.port ?? 3000,
-    coverage: daas.coverage
+    coverage: daas.coverage,
+    setupFiles: daas.setupFiles
   };
 }
 
@@ -2451,6 +2386,9 @@ function normalizeManifest(raw, cwd) {
 function stripScope(name) {
   return name.replace(/^@[^/]+\//, "");
 }
+
+// src/remote-config.ts
+import { SUPPORTED_CONFIG_VERSION } from "@chrisluyi/rsbuild-config";
 // src/fallback-config.json
 var fallback_config_default = {
   version: "1.0.0",
@@ -2666,6 +2604,7 @@ function handleError(command, e2, json) {
 
 // src/commands/build.ts
 import { createRsbuild as createRsbuild2 } from "@rsbuild/core";
+import { createConfig as createConfig2 } from "@chrisluyi/rsbuild-config";
 var buildCommand = defineCommand({
   meta: { name: "build", description: "Build MFE for production" },
   args: {
@@ -2685,7 +2624,7 @@ var buildCommand = defineCommand({
       const target = args.target ? parseTarget(args.target) : undefined;
       if (target)
         generateTsconfigDaas(process.cwd(), target);
-      const config = createConfig(manifest, remoteMeta, { mode: "production", target });
+      const config = createConfig2(manifest, remoteMeta, { mode: "production", target });
       const rsbuild = await createRsbuild2({ rsbuildConfig: config });
       await rsbuild.build();
       if (json)
@@ -2730,27 +2669,7 @@ var buildCommand = defineCommand({
 
 // src/commands/test.ts
 import { startVitest } from "vitest/node";
-
-// ../rsbuild-config/dist/vitest.js
-import { resolve as resolve4, dirname } from "path";
-import { fileURLToPath } from "url";
-var __dirname2 = dirname(fileURLToPath(import.meta.url));
-function createVitestConfig(manifest, options = {}) {
-  return {
-    test: {
-      name: manifest.name,
-      environment: "happy-dom",
-      setupFiles: [resolve4(__dirname2, "test-setup.js")],
-      coverage: {
-        provider: "v8",
-        reporter: ["text", "lcov"],
-        thresholds: options.coverage ?? undefined
-      }
-    }
-  };
-}
-
-// src/commands/test.ts
+import { createVitestConfig } from "@chrisluyi/rsbuild-config/vitest";
 var testCommand = defineCommand({
   meta: { name: "test", description: "Run MFE tests" },
   args: {
@@ -2761,7 +2680,7 @@ var testCommand = defineCommand({
     try {
       const manifest = readManifest();
       const daasConfig = readDaasConfig();
-      const config = createVitestConfig(manifest, { coverage: daasConfig.coverage });
+      const config = createVitestConfig(manifest, { coverage: daasConfig.coverage, setupFiles: daasConfig.setupFiles });
       const vitest = await startVitest("test", [], config);
       const failed = vitest?.state.getFiles().some((f3) => f3.result?.state === "fail") ?? false;
       if (json) {
@@ -2782,17 +2701,17 @@ var testCommand = defineCommand({
 
 // src/init/monorepo.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
-import { resolve as resolve5, dirname as dirname2 } from "path";
+import { resolve as resolve4, dirname } from "path";
 function detectMonorepo(startDir) {
   let dir = startDir;
   for (let i2 = 0;i2 < 10; i2++) {
-    const parent = dirname2(dir);
+    const parent = dirname(dir);
     if (parent === dir)
       break;
     dir = parent;
-    if (existsSync3(resolve5(dir, "bun.lockb")))
+    if (existsSync3(resolve4(dir, "bun.lockb")))
       return true;
-    const pkgPath = resolve5(dir, "package.json");
+    const pkgPath = resolve4(dir, "package.json");
     if (existsSync3(pkgPath)) {
       try {
         const pkg = JSON.parse(readFileSync3(pkgPath, "utf8"));
@@ -2846,6 +2765,9 @@ var infoCommand = defineCommand({
   }
 });
 
+// src/commands/init.ts
+import { scaffold } from "@chrisluyi/template";
+
 // ../../node_modules/.bun/@clack+core@0.3.5/node_modules/@clack/core/dist/index.mjs
 var import_sisteransi = __toESM(require_src(), 1);
 var import_picocolors = __toESM(require_picocolors(), 1);
@@ -3337,15 +3259,15 @@ var de = () => {
 };
 
 // src/commands/init.ts
-import { writeFileSync as writeFileSync3, existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
-import { resolve as resolve7 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
+import { resolve as resolve6 } from "path";
 
 // src/init/copy-template.ts
 import { existsSync as existsSync4, copyFileSync, mkdirSync, readdirSync } from "fs";
-import { dirname as dirname3, join } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
-var __dirname3 = dirname3(fileURLToPath2(import.meta.url));
-var TEMPLATES_DIR = join(__dirname3, "../../templates/mfe");
+import { dirname as dirname2, join } from "path";
+import { fileURLToPath } from "url";
+var __dirname2 = dirname2(fileURLToPath(import.meta.url));
+var TEMPLATES_DIR = join(__dirname2, "../../templates/mfe");
 async function copyTemplate(destDir) {
   const files = readdirSync(TEMPLATES_DIR);
   const result = { copied: [], skipped: [] };
@@ -3372,9 +3294,9 @@ async function copyTemplate(destDir) {
 
 // src/init/package-json.ts
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, existsSync as existsSync5 } from "fs";
-import { resolve as resolve6 } from "path";
+import { resolve as resolve5 } from "path";
 function updatePackageJson(cwd, opts) {
-  const pkgPath = resolve6(cwd, "package.json");
+  const pkgPath = resolve5(cwd, "package.json");
   const pkg = existsSync5(pkgPath) ? JSON.parse(readFileSync4(pkgPath, "utf8")) : {};
   pkg.scripts = {
     ...pkg.scripts ?? {},
@@ -3394,19 +3316,22 @@ function updatePackageJson(cwd, opts) {
 }
 
 // src/commands/init.ts
+var KNOWN_TEMPLATES = ["default"];
 var initCommand = defineCommand({
   meta: { name: "init", description: "Scaffold a new MFE app" },
   args: {
-    template: { type: "string", description: "Template name (reserved for v2)" }
+    template: { type: "string", description: "Template name. Use 'default' for the full services/containers/components structure." }
   },
   async run({ args }) {
     if (!process.stdin.isTTY) {
       consola.fatal("daas init requires an interactive terminal. Cannot run in non-TTY mode.");
       process.exit(EXIT_CODES.CONFIG_ERROR);
     }
-    if (args.template) {
-      consola.warn("Template support is not yet available. Scaffolding with default template.");
+    const templateName = args.template;
+    if (templateName && !KNOWN_TEMPLATES.includes(templateName)) {
+      consola.warn(`Unknown template "${templateName}". Available: ${KNOWN_TEMPLATES.join(", ")}. Falling back to minimal scaffold.`);
     }
+    const useFullTemplate = templateName === "default";
     oe("daas-cli \u2014 scaffold new MFE");
     const configUrl = await te({
       message: "Remote config URL?",
@@ -3432,7 +3357,25 @@ var initCommand = defineCommand({
     s2.start(`Scaffolding ${appName}...`);
     const cwd = process.cwd();
     const isMonorepo = detectMonorepo(cwd);
-    const { copied, skipped } = await copyTemplate(cwd);
+    let copied;
+    let skipped;
+    if (useFullTemplate) {
+      const result = await scaffold(cwd, {
+        appName,
+        onConflict: async (relPath) => {
+          s2.stop("");
+          const overwrite = await se({ message: `${relPath} already exists. Overwrite?` });
+          s2.start(`Scaffolding ${appName}...`);
+          return overwrite;
+        }
+      });
+      copied = result.copied;
+      skipped = result.skipped;
+    } else {
+      const result = await copyTemplate(cwd);
+      copied = result.copied;
+      skipped = result.skipped;
+    }
     for (const f4 of copied)
       s2.message(`\u2713 Created ${f4}`);
     for (const f4 of skipped)
@@ -3441,7 +3384,7 @@ var initCommand = defineCommand({
     s2.message("\u2713 Updated package.json");
     if (hasExtraExposes) {
       const manifest = { name: appName, exposes: { "./App": "./src/App" } };
-      writeFileSync3(resolve7(cwd, "mf.manifest.json"), JSON.stringify(manifest, null, 2) + `
+      writeFileSync3(resolve6(cwd, "mf.manifest.json"), JSON.stringify(manifest, null, 2) + `
 `);
       s2.message("\u2713 Created mf.manifest.json (add extra exposes as needed)");
     }
@@ -3450,7 +3393,7 @@ var initCommand = defineCommand({
   }
 });
 function getPackageName(cwd) {
-  const pkgPath = resolve7(cwd, "package.json");
+  const pkgPath = resolve6(cwd, "package.json");
   if (!existsSync6(pkgPath))
     return "mfe-app";
   try {

package/dist/test.js

@@ -0,0 +1,3 @@
+// @bun
+// src/test.ts
+export * from "@chrisluyi/rsbuild-config/test";

package/package.json

@@ -1,23 +1,28 @@
 {
   "name": "@chrisluyi/daas-cli",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "bin": {
     "daas": "./dist/index.js"
   },
   "main": "./dist/index.js",
+  "exports": {
+    ".": "./dist/index.js",
+    "./test": "./dist/test.js"
+  },
   "files": [
     "dist",
     "templates",
     "skill.md"
   ],
   "scripts": {
-    "build": "bun build src/index.ts --outfile dist/index.js.tmp --target bun --external @rspack/core --external @rspack/lite-tapable --external @rsbuild/core --external @rsbuild/plugin-react --external @module-federation/rsbuild-plugin --external vitest --external @vitest/browser --external @vitest/ui --external tapable --external react-router-dom --external lightningcss && printf '%s\\n' '#!/usr/bin/env bun' | cat - dist/index.js.tmp > dist/index.js && rm dist/index.js.tmp && chmod +x dist/index.js",
+    "build": "bun build src/index.ts --outfile dist/index.js.tmp --target bun --external @rspack/core --external @rspack/lite-tapable --external @rsbuild/core --external @rsbuild/plugin-react --external @module-federation/rsbuild-plugin --external vitest --external @vitest/browser --external @vitest/ui --external tapable --external react-router-dom --external lightningcss --external @chrisluyi/template --external @chrisluyi/rsbuild-config && printf '%s\\n' '#!/usr/bin/env bun' | cat - dist/index.js.tmp > dist/index.js && rm dist/index.js.tmp && chmod +x dist/index.js && bun build src/test.ts --outfile dist/test.js --target bun --external vitest --external @testing-library/react --external @testing-library/user-event --external @chrisluyi/rsbuild-config",
     "test": "bun test --ignore 'templates/**'"
   },
   "dependencies": {
     "@clack/prompts": "^0.7.0",
     "@chrisluyi/rsbuild-config": "workspace:*",
+    "@chrisluyi/template": "workspace:*",
     "@rsbuild/core": "^1.0.0",
     "citty": "^0.1.6",
     "consola": "^3.2.3",

package/skill.md

@@ -15,7 +15,8 @@ MFE apps intentionally have NO `rsbuild.config.ts`, NO `vitest.config.ts`. The C
 
 | Command | Purpose |
 |---|---|
-| `daas init [--template <name>]` | Interactive scaffold: creates App.tsx, App.test.tsx, tsconfig.json, updates package.json |
+| `daas init` | Interactive scaffold (minimal): creates App.tsx, App.test.tsx, tsconfig.json, updates package.json |
+| `daas init --template default` | Full structure scaffold: creates services/containers/components/config layer folders |
 | `daas dev [--port <n>] [--json]` | Start rsbuild dev server |
 | `daas build [--json]` | Production build to ./dist |
 | `daas test [--json]` | Run Vitest tests |
@@ -83,7 +84,25 @@ Remote URLs are **not configured here** — they are resolved dynamically at run
 
 `daas-cli` is the only `devDependency` needed. It brings rsbuild, vitest, @testing-library/react, happy-dom, and all tooling as its own dependencies. Do not install these separately.
 
+## `--template default` Folder Structure
+
+When using `daas init --template default`, the scaffold creates:
+
+```
+App.tsx                         ← MF2 entry point (exposes ./App)
+App.test.tsx
+tsconfig.json
+src/
+  components/App.tsx            ← presentational component
+  containers/AppContainer.tsx   ← data/business logic wrapper
+  services/index.ts             ← data fetching / API calls
+  config/
+    regions/default.ts          ← region config layer
+    platforms/default.ts        ← platform config layer
+    products/default.ts         ← product config layer
+```
+
 ## Roadmap (do not suggest these — not yet implemented)
 
 - v1.5: `daas dev sg-foo-mb-dev` target strings for multi-region builds
-- v2: `@daas/template` with src/services, src/containers, src/components conventions
+- v2+: `daas lint` — validates project structure against template conventions