@ykdz/template 0.0.3 → 0.0.5

package/dist/templates/vue-app/projection.js

@@ -2,13 +2,13 @@ import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { renderGeneratedPnpmWorkspaceYaml } from "../../src/dependency-catalog.js";
-import { nodePnpmDevcontainer } from "../../src/devcontainer.js";
+import { collectGeneratedManifestCatalogDependencies, renderGeneratedPnpmWorkspaceYaml, } from "../../src/dependency-catalog.js";
+import { browserTestToolLayer, checkedDockerfileFirstNodePnpmDevcontainer, nodePnpmToolLayer, } from "../../src/devcontainer.js";
 import { editorCustomizationForCapabilities } from "../../src/editor-customization.js";
 import { renderFixCommand, renderRootCheckCommand, } from "../../src/module-graph.js";
-import { projectCheckWorkflow, projectDependabotConfig, } from "../../src/project-github.js";
+import { PackageAdditionSupport } from "../../src/package-addition-support.js";
+import { packageTurboTasks } from "../../src/package-linking.js";
 import { renderNewProject } from "../../src/renderer.js";
-import { planNodeChecks, planNodeFixes } from "../projection-plans.js";
 const generatedBy = {
     packageName: "@ykdz/template",
     version: "0.0.0",
@@ -17,10 +17,11 @@ const generatedBy = {
 export const vueAppPresetMetadata = {
     name: "vue-app",
     title: "Vue app",
-    description: "Single-package Vue app with Vite, Tailwind, Pinia, and test tooling.",
+    description: "Vue app workspace with Vite, Tailwind, Pinia, and test tooling.",
     generation: "supported",
     supportedPackageManagers: ["pnpm"],
-    supportedProjectKinds: ["single-package"],
+    supportedProjectKinds: ["multi-package"],
+    packageAdditionSupport: PackageAdditionSupport.Supported,
     features: [
         "pnpm-catalog",
         "oxc-format-lint",
@@ -33,41 +34,159 @@ export const vueAppPresetMetadata = {
     ],
 };
 const dependencyMaintenancePolicy = {
-    ecosystems: ["npm", "github-actions"],
+    ecosystems: ["npm", "github-actions", "docker"],
     interval: "weekly",
 };
-export function vueAppBlueprint() {
+const webPackageBoundary = {
+    kind: "package-boundary",
+    path: ".",
+};
+const rootBoundary = {
+    kind: "workspace-orchestration",
+    path: ".",
+};
+const workspacePackageBoundary = {
+    kind: "package-boundary",
+    path: "apps/*",
+};
+const webWorkspaceBoundary = {
+    kind: "package-boundary",
+    path: "apps/web",
+};
+function planVueAppPackageChecks() {
+    return {
+        components: [
+            { kind: "oxc-format-check", owner: webPackageBoundary },
+            { kind: "oxc-lint", owner: webPackageBoundary },
+            { kind: "typescript-typecheck", owner: webPackageBoundary },
+            { kind: "build", owner: webPackageBoundary },
+            { kind: "unit-test", owner: webPackageBoundary },
+            { kind: "e2e-test", owner: webPackageBoundary },
+        ],
+        environmentNeeds: [],
+    };
+}
+function planVueAppRootChecks() {
+    return {
+        components: [
+            { kind: "oxc-format-check", owner: rootBoundary },
+            { kind: "oxc-lint", owner: rootBoundary },
+            { kind: "typescript-typecheck", owner: rootBoundary },
+            { kind: "turbo-package-typecheck", owner: workspacePackageBoundary },
+            { kind: "turbo-package-build", owner: workspacePackageBoundary },
+            { kind: "turbo-package-test", owner: workspacePackageBoundary },
+            { kind: "turbo-package-e2e-test", owner: workspacePackageBoundary },
+            { kind: "turbo-package-check", owner: workspacePackageBoundary },
+        ],
+        environmentNeeds: [
+            {
+                kind: "playwright-browser-assets",
+                browser: "chromium",
+                owner: webWorkspaceBoundary,
+            },
+        ],
+    };
+}
+function planVueAppPackageFixes() {
+    return {
+        components: [
+            { kind: "oxc-format-write", owner: webPackageBoundary },
+            { kind: "oxc-lint-fix", owner: webPackageBoundary },
+        ],
+    };
+}
+function planVueAppRootFixes() {
+    return {
+        components: [
+            { kind: "oxc-format-write", owner: rootBoundary },
+            { kind: "oxc-lint-fix", owner: rootBoundary },
+            { kind: "turbo-package-fix", owner: workspacePackageBoundary },
+        ],
+    };
+}
+function projectNameFromDir(targetDir) {
+    return path.basename(path.resolve(targetDir));
+}
+function packageScopeFromOptions(options) {
+    return options.scope ?? projectNameFromDir(options.targetDir);
+}
+function packageName(packageScope) {
+    return `@${packageScope}/web`;
+}
+export function vueAppBlueprint(options = { targetDir: process.cwd() }) {
+    const packageScope = packageScopeFromOptions(options);
     return {
         schemaVersion: 1,
         preset: "vue-app",
         packageManager: "pnpm",
-        projectKind: "single-package",
+        projectKind: "multi-package",
         features: [...vueAppPresetMetadata.features],
+        packages: [{ name: packageName(packageScope), path: "apps/web" }],
+    };
+}
+function projectVueAppRootPackageScripts() {
+    return {
+        check: renderRootCheckCommand(planVueAppRootChecks()),
+        fix: renderFixCommand(planVueAppRootFixes()),
+        "format:check": "oxfmt --check --config oxfmt.config.ts oxlint.config.ts oxfmt.config.ts",
+        "format:write": "oxfmt --write --config oxfmt.config.ts oxlint.config.ts oxfmt.config.ts",
+        lint: "oxlint --config oxlint.config.ts oxlint.config.ts oxfmt.config.ts --deny-warnings",
+        "lint:fix": "oxlint --config oxlint.config.ts oxlint.config.ts oxfmt.config.ts --fix --deny-warnings",
+        typecheck: "tsc -p tsconfig.config.json --noEmit",
     };
 }
 export function projectVueAppPackageScripts() {
     return {
         build: "vite build",
-        check: renderRootCheckCommand(planNodeChecks("vue-app")),
+        check: renderRootCheckCommand(planVueAppPackageChecks()),
         dev: "vite",
-        fix: renderFixCommand(planNodeFixes("vue-app")),
-        "format:check": "oxfmt --check .",
-        "format:write": "oxfmt --write .",
-        lint: "oxlint . --deny-warnings",
-        "lint:fix": "oxlint . --fix --deny-warnings",
+        fix: renderFixCommand(planVueAppPackageFixes()),
+        "format:check": "oxfmt --check --config ../../oxfmt.config.ts .",
+        "format:write": "oxfmt --write --config ../../oxfmt.config.ts .",
+        lint: "oxlint --config ../../oxlint.config.ts . --deny-warnings",
+        "lint:fix": "oxlint --config ../../oxlint.config.ts . --fix --deny-warnings",
         preview: "vite preview",
         test: "vitest run",
         "test:e2e": "pnpm run build && playwright test",
         typecheck: "vue-tsc --build --noEmit",
     };
 }
-function packageJson(context, packageScripts) {
+function rootPackageJson(context, packageScripts) {
     return {
         name: context.projectName.value,
         version: "0.0.0",
         private: true,
         type: "module",
         scripts: packageScripts,
+        devDependencies: {
+            oxfmt: "catalog:",
+            oxlint: "catalog:",
+            turbo: "catalog:",
+            typescript: "catalog:",
+        },
+        engines: {
+            node: context.toolchain.nodeLtsMajor.value,
+        },
+        packageManager: context.toolchain.packageManagerPin.value,
+    };
+}
+function webPackageName(context) {
+    const webPackage = context.blueprint.packages?.find((pkg) => pkg.path === "apps/web");
+    return webPackage?.name ?? packageName(context.projectName.value);
+}
+function webPackageJson(context) {
+    return {
+        name: webPackageName(context),
+        version: "0.0.0",
+        private: true,
+        type: "module",
+        imports: {
+            "#/*": {
+                default: "./src/*.ts",
+                types: "./src/*.ts",
+            },
+        },
+        scripts: projectVueAppPackageScripts(),
         dependencies: {
             "@vueuse/core": "catalog:",
             pinia: "catalog:",
@@ -91,7 +210,6 @@ function packageJson(context, packageScripts) {
         engines: {
             node: context.toolchain.nodeLtsMajor.value,
         },
-        packageManager: context.toolchain.packageManagerPin.value,
     };
 }
 function generationRecord(context) {
@@ -111,42 +229,94 @@ function operationsForVueApp(context, packageScripts, checkPlan) {
         "tailwind",
         "vitest",
     ]);
+    const developmentContainer = checkedDockerfileFirstNodePnpmDevcontainer({
+        name: context.projectName.value,
+        layer: nodePnpmToolLayer({
+            nodeVersion: context.toolchain.nodeLtsMajor.value,
+            packageManagerPin: context.toolchain.packageManagerPin.value,
+        }),
+        additionalLayers: [browserTestToolLayer()],
+        extensions: editorCustomization.extensions,
+        settings: editorCustomization.settings,
+    });
+    const rootManifest = rootPackageJson(context, packageScripts);
+    const webManifest = webPackageJson(context);
+    const turboTasks = packageTurboTasks({ dependencyBuildsRequired: false });
     return [
         {
             kind: "writeJson",
             to: "package.json",
-            value: packageJson(context, packageScripts),
+            value: rootManifest,
         },
         {
             kind: "writeText",
             to: "pnpm-workspace.yaml",
             text: renderGeneratedPnpmWorkspaceYaml({
-                dependencies: [
-                    "@playwright/test",
-                    "@tailwindcss/vite",
-                    "@types/node",
-                    "@types/web-bluetooth",
-                    "@vitejs/plugin-vue",
-                    "@vue/tsconfig",
-                    "@vueuse/core",
-                    "oxfmt",
-                    "oxlint",
-                    "pinia",
-                    "tailwindcss",
-                    "typescript",
-                    "vite",
-                    "vitest",
-                    "vue",
-                    "vue-tsc",
-                ],
+                packages: ["apps/*"],
+                dependencies: collectGeneratedManifestCatalogDependencies([
+                    rootManifest,
+                    webManifest,
+                ]),
                 allowBuilds: {
                     esbuild: true,
                 },
             }),
         },
+        {
+            kind: "writeJson",
+            to: "turbo.json",
+            value: {
+                tasks: {
+                    build: turboTasks.build,
+                    check: turboTasks.check,
+                    typecheck: turboTasks.typecheck,
+                    test: turboTasks.test,
+                    "test:e2e": turboTasks["test:e2e"],
+                    dev: {
+                        cache: false,
+                        persistent: true,
+                    },
+                    fix: {
+                        cache: false,
+                    },
+                },
+            },
+        },
         {
             kind: "writeJson",
             to: "tsconfig.json",
+            value: {
+                files: [],
+                references: [
+                    { path: "./apps/web/tsconfig.app.json" },
+                    { path: "./apps/web/tsconfig.test.json" },
+                    { path: "./apps/web/tsconfig.node.json" },
+                ],
+            },
+        },
+        {
+            kind: "writeJson",
+            to: "tsconfig.config.json",
+            value: {
+                compilerOptions: {
+                    module: "NodeNext",
+                    moduleResolution: "NodeNext",
+                    noEmitOnError: true,
+                    skipLibCheck: false,
+                    strict: true,
+                    target: "ES2022",
+                },
+                include: ["oxlint.config.ts", "oxfmt.config.ts"],
+            },
+        },
+        {
+            kind: "writeJson",
+            to: "apps/web/package.json",
+            value: webManifest,
+        },
+        {
+            kind: "writeJson",
+            to: "apps/web/tsconfig.json",
             value: {
                 files: [],
                 references: [
@@ -158,7 +328,7 @@ function operationsForVueApp(context, packageScripts, checkPlan) {
         },
         {
             kind: "writeJson",
-            to: "tsconfig.app.json",
+            to: "apps/web/tsconfig.app.json",
             value: {
                 extends: "@vue/tsconfig/tsconfig.dom.json",
                 compilerOptions: {
@@ -166,9 +336,6 @@ function operationsForVueApp(context, packageScripts, checkPlan) {
                     module: "ESNext",
                     moduleResolution: "Bundler",
                     noEmitOnError: true,
-                    paths: {
-                        "@/*": ["./src/*"],
-                    },
                     skipLibCheck: false,
                     strict: true,
                     target: "ES2022",
@@ -180,7 +347,7 @@ function operationsForVueApp(context, packageScripts, checkPlan) {
         },
         {
             kind: "writeJson",
-            to: "tsconfig.test.json",
+            to: "apps/web/tsconfig.test.json",
             value: {
                 extends: "./tsconfig.app.json",
                 compilerOptions: {
@@ -193,7 +360,7 @@ function operationsForVueApp(context, packageScripts, checkPlan) {
         },
         {
             kind: "writeJson",
-            to: "tsconfig.node.json",
+            to: "apps/web/tsconfig.node.json",
             value: {
                 compilerOptions: {
                     composite: true,
@@ -231,52 +398,59 @@ function operationsForVueApp(context, packageScripts, checkPlan) {
                 "playwright-report",
                 "test-results",
                 ".env",
+                ".template/",
+                ".pnpm-store/",
                 "",
             ].join("\n"),
         },
-        { kind: "copyFile", from: "env.d.ts", to: "env.d.ts" },
-        { kind: "copyFile", from: "index.html", to: "index.html" },
+        { kind: "copyFile", from: "env.d.ts", to: "apps/web/env.d.ts" },
+        { kind: "copyFile", from: "index.html", to: "apps/web/index.html" },
         {
             kind: "copyFile",
             from: "playwright.config.ts",
-            to: "playwright.config.ts",
+            to: "apps/web/playwright.config.ts",
         },
-        { kind: "copyFile", from: "vite.config.ts", to: "vite.config.ts" },
-        { kind: "copyFile", from: "vitest.config.ts", to: "vitest.config.ts" },
-        { kind: "copyFile", from: "src/App.vue", to: "src/App.vue" },
-        { kind: "copyFile", from: "src/main.ts", to: "src/main.ts" },
-        { kind: "copyFile", from: "src/style.css", to: "src/style.css" },
+        { kind: "copyFile", from: "vite.config.ts", to: "apps/web/vite.config.ts" },
+        {
+            kind: "copyFile",
+            from: "vitest.config.ts",
+            to: "apps/web/vitest.config.ts",
+        },
+        { kind: "copyFile", from: "src/App.vue", to: "apps/web/src/App.vue" },
+        { kind: "copyFile", from: "src/main.ts", to: "apps/web/src/main.ts" },
+        { kind: "copyFile", from: "src/style.css", to: "apps/web/src/style.css" },
         {
             kind: "copyFile",
             from: "src/stores/counter.ts",
-            to: "src/stores/counter.ts",
+            to: "apps/web/src/stores/counter.ts",
+        },
+        {
+            kind: "copyFile",
+            from: "test/app.test.ts",
+            to: "apps/web/test/app.test.ts",
         },
-        { kind: "copyFile", from: "test/app.test.ts", to: "test/app.test.ts" },
         {
             kind: "copyFile",
             from: "test/e2e/app.spec.ts",
-            to: "test/e2e/app.spec.ts",
+            to: "apps/web/test/e2e/app.spec.ts",
         },
         {
             kind: "writeJson",
-            to: ".project-kit/blueprint.json",
-            value: vueAppBlueprint(),
+            to: ".template/blueprint.json",
+            value: context.blueprint,
         },
         {
             kind: "writeJson",
-            to: ".project-kit/generated-by.json",
+            to: ".template/generated-by.json",
             value: generationRecord(context),
         },
         {
             kind: "writeJson",
             to: ".devcontainer/devcontainer.json",
-            value: nodePnpmDevcontainer({
-                name: `${context.projectName.value} Vue development`,
-                nodeVersion: context.toolchain.nodeLtsMajor.value,
-                packageManagerPin: context.toolchain.packageManagerPin.value,
-                extensions: editorCustomization.extensions,
-                settings: editorCustomization.settings,
-            }),
+            value: developmentContainer.devcontainer,
+        },
+        {
+            ...developmentContainer.dockerfileOperation,
         },
         {
             kind: "writeJson",
@@ -292,14 +466,14 @@ function operationsForVueApp(context, packageScripts, checkPlan) {
             value: editorCustomization.settings,
         },
         {
-            kind: "writeText",
+            kind: "copyFile",
+            from: ".github/workflows/check.yml",
             to: ".github/workflows/check.yml",
-            text: projectCheckWorkflow({ checkPlan }),
         },
         {
-            kind: "writeText",
+            kind: "copyFile",
+            from: ".github/dependabot.yml",
             to: ".github/dependabot.yml",
-            text: projectDependabotConfig(dependencyMaintenancePolicy),
         },
     ];
 }
@@ -373,6 +547,12 @@ function packageAdditionOperations(packagePath, packageName, nodeVersion) {
                 version: "0.0.0",
                 private: true,
                 type: "module",
+                imports: {
+                    "#/*": {
+                        default: "./src/*.ts",
+                        types: "./src/*.ts",
+                    },
+                },
                 scripts: projectVueAppPackageScripts(),
                 dependencies: {
                     "@vueuse/core": "catalog:",
@@ -421,9 +601,6 @@ function packageAdditionOperations(packagePath, packageName, nodeVersion) {
                     module: "ESNext",
                     moduleResolution: "Bundler",
                     noEmitOnError: true,
-                    paths: {
-                        "@/*": ["./src/*"],
-                    },
                     skipLibCheck: false,
                     strict: true,
                     target: "ES2022",
@@ -465,18 +642,6 @@ function packageAdditionOperations(packagePath, packageName, nodeVersion) {
                 include: ["playwright.config.ts", "vite.config.ts", "vitest.config.ts"],
             },
         },
-        {
-            kind: "copyFile",
-            sourceRoot: "sharedOxc",
-            from: "vue/oxlint.config.ts",
-            to: `${packagePath}/oxlint.config.ts`,
-        },
-        {
-            kind: "copyFile",
-            sourceRoot: "sharedOxc",
-            from: "oxfmt.config.ts",
-            to: `${packagePath}/oxfmt.config.ts`,
-        },
         { kind: "copyFile", from: "env.d.ts", to: `${packagePath}/env.d.ts` },
         { kind: "copyFile", from: "index.html", to: `${packagePath}/index.html` },
         {
@@ -518,17 +683,14 @@ function packageAdditionOperations(packagePath, packageName, nodeVersion) {
         },
     ];
 }
-async function packageAdditionPlan({ root, blueprint, packageLeafName, packageName, nodeVersion, }) {
-    const packagePath = `apps/${packageLeafName}`;
+async function packageAdditionPlan({ root, blueprint, packageName, packagePath, nodeVersion, }) {
+    const [workspaceCollection] = packagePath.split("/");
     const previewPort = await nextVuePreviewPort(root, blueprint);
     return {
         packagePath,
-        workspacePackageGlob: "apps/*",
-        rootTsconfigReferences: [
-            `./${packagePath}/tsconfig.app.json`,
-            `./${packagePath}/tsconfig.test.json`,
-            `./${packagePath}/tsconfig.node.json`,
-        ],
+        workspacePackageGlob: `${workspaceCollection}/*`,
+        packageRole: "runtime-service",
+        packageSourcePreset: "vue-app",
         sourceRoot: templateSourceRoot(),
         sourceRoots: { sharedOxc: sharedOxcSourceRoot() },
         operations: packageAdditionOperations(packagePath, packageName, nodeVersion),
@@ -554,6 +716,13 @@ function sharedOxcSourceRoot() {
         ? publishedSharedRoot
         : path.join(projectionDir, "..", "shared", "oxc");
 }
+function sharedDevcontainerSourceRoot() {
+    const projectionDir = path.dirname(fileURLToPath(import.meta.url));
+    const publishedSharedRoot = path.join(projectionDir, "..", "..", "..", "templates", "shared", "devcontainer");
+    return existsSync(path.join(publishedSharedRoot, "node-pnpm.Dockerfile"))
+        ? publishedSharedRoot
+        : path.join(projectionDir, "..", "shared", "devcontainer");
+}
 export const vueAppPresetProjection = {
     metadata: vueAppPresetMetadata,
     capabilities: {
@@ -563,12 +732,15 @@ export const vueAppPresetProjection = {
     },
     blueprint: vueAppBlueprint,
     project(context) {
-        const checkPlan = planNodeChecks("vue-app");
-        const fixPlan = planNodeFixes("vue-app");
-        const packageScripts = projectVueAppPackageScripts();
+        const checkPlan = planVueAppRootChecks();
+        const fixPlan = planVueAppRootFixes();
+        const packageScripts = projectVueAppRootPackageScripts();
         return {
             sourceRoot: templateSourceRoot(),
-            sourceRoots: { sharedOxc: sharedOxcSourceRoot() },
+            sourceRoots: {
+                sharedDevcontainer: sharedDevcontainerSourceRoot(),
+                sharedOxc: sharedOxcSourceRoot(),
+            },
             operations: operationsForVueApp(context, packageScripts, checkPlan),
             checkPlan,
             fixPlan,

package/dist/templates/vue-hono-app/projection.d.ts

@@ -6,4 +6,3 @@ export declare function projectVueHonoRootPackageScripts(): Record<string, strin
 export declare function projectVueHonoApiPackageScripts(): Record<string, string>;
 export declare function projectVueHonoWebPackageScripts(): Record<string, string>;
 export declare const vueHonoAppPresetProjection: PresetProjection;
-//# sourceMappingURL=projection.d.ts.map