create-flow-os 0.0.1-dev.1771669629 → 0.0.1-dev.1771670224

package/bin/index.js

@@ -794,10 +794,11 @@ function transformPackageJson(pkg, projectName, extraPackages = {}, useWorkspace
   const next = {};
   for (const [k3, v3] of Object.entries(deps)) {
     const isFlow = k3.startsWith("@flow.os/") || k3 === "@flow.os";
-    if (v3 === "workspace:*")
+    if (v3 === "workspace:*" || isFlow && typeof v3 === "string" && (v3.startsWith("file:./packages/") || v3.startsWith("file:../"))) {
       next[k3] = useWorkspace && isFlow ? "workspace:*" : "^0.0.1";
-    else
+    } else {
       next[k3] = v3;
+    }
   }
   for (const [k3, v3] of Object.entries(extraPackages)) {
     if (!(k3 in next))
@@ -921,9 +922,19 @@ function optsForProfile(config, profileId) {
 }
 async function main() {
   const devBadge = useDevTag ? c2.dim(" \xB7 dev") : "";
+  const CONTENT_W = 42;
+  const BORDER_W = 46;
+  const introLine = (content) => {
+    const plain = stripAnsi(content);
+    const pad = Math.max(0, CONTENT_W - plain.length);
+    return c2.dim("  \u2502  ") + content + " ".repeat(pad) + c2.dim("  \u2502");
+  };
+  const introBorder = (ch) => c2.dim("  " + (ch === "t" ? "\u256D" : "\u2570") + "\u2500".repeat(BORDER_W) + (ch === "t" ? "\u256E" : "\u256F"));
+  const singleLine = "Create " + c2.bold(c2.cyan("Flow OS")) + devBadge + " application";
   console.log(`
-` + c2.bold("Flow OS") + devBadge + `
-` + c2.dim("Create Flow OS application") + `
+` + introBorder("t") + `
+` + introLine(singleLine) + `
+` + introBorder("b") + `
 `);
   const config = await Bun.file(join2(DIR, "config.json")).json();
   const hasDeps = Object.values(config.packages).every((e2) => Array.isArray(e2.deps));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.1-dev.1771669629",
+  "version": "0.0.1-dev.1771670224",
   "type": "module",
   "bin": {
     "create-flow-os": "bin/index.js"

package/profiles/client/Dockerfile

@@ -1,10 +1,10 @@
-# DEV: packages/flow.os → workaround Bun workspace (doppio install).
+# DEV: packages/core → workaround Bun workspace (doppio install).
 # PROD: install → build → start (PORT da env)
 
 FROM oven/bun:1 AS builder
 WORKDIR /app
 COPY . .
-RUN if [ -d packages ] && [ -f packages/flow.os/package.json ]; then \
+RUN if [ -d packages ] && [ -f packages/core/package.json ]; then \
   bun install || true && bun install; \
 else \
   bun install --frozen-lockfile; \
@@ -17,7 +17,7 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENV PORT=3000
 COPY --from=builder /app/out/ ./
-RUN if [ -d packages ] && [ -f packages/flow.os/package.json ]; then \
+RUN if [ -d packages ] && [ -f packages/core/package.json ]; then \
   bun install --frozen-lockfile --production || true && bun install --frozen-lockfile --production; \
 else \
   bun install --frozen-lockfile --production; \

package/profiles/client/dev.ts

@@ -2,4 +2,4 @@
 import { pathToFileURL } from 'node:url';
 import { join } from 'node:path';
 
-await import(pathToFileURL(join(import.meta.dir, 'packages/client/start-dev.ts')).href);
+await import(pathToFileURL(join(import.meta.dir, 'node_modules/@flow.os/client/start-dev.ts')).href);

package/profiles/client/package.json

@@ -5,8 +5,8 @@
   "type": "module",
   "scripts": {
     "dev": "bun dev.ts",
-    "build": "tsc -b && bun packages/client/build.ts",
-    "preview": "bun packages/client/preview.ts",
+    "build": "tsc -b && bun node_modules/@flow.os/client/build.ts",
+    "preview": "bun node_modules/@flow.os/client/preview.ts",
     "start": "bun node_modules/@flow.os/server/start.ts",
     "lint": "oxlint .",
     "fmt": "oxfmt",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@flow.os/client": "file:./packages/client",
     "@flow.os/server": "^0.0.1",
-    "@flow.os/core": "file:./packages/flow.os",
+    "@flow.os/core": "file:./packages/core",
     "@flow.os/router": "file:./packages/router",
     "@flow.os/style": "file:./packages/style"
   },

package/profiles/client/packages/client/config.ts

@@ -43,7 +43,7 @@ function resolveAlias(): Record<string, string> {
       const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8')) as { name?: string };
       if (pkg.name?.startsWith('@flow.os/') || pkg.name === '@flow.os') alias[pkg.name] = abs;
     } catch {}
-    if (name !== 'flow.os') alias[`@flow.os/${name}`] = abs;
+    alias[`@flow.os/${name}`] = abs;
   }
   return alias;
 }

package/profiles/client/tsconfig.json

@@ -22,7 +22,7 @@
     "paths": {
       "~/*": ["client/*"],
       "~server/*": ["server/*"],
-      "@flow.os/core": ["packages/flow.os/index.ts"],
+      "@flow.os/core": ["packages/core/index.ts"],
       "@flow.os/*": ["packages/*"]
     }
   },

package/profiles/full/Dockerfile

@@ -1,10 +1,10 @@
-# DEV: packages/flow.os → workaround Bun workspace (doppio install).
+# DEV: packages/core → workaround Bun workspace (doppio install).
 # PROD: install → build → start (PORT da env)
 
 FROM oven/bun:1 AS builder
 WORKDIR /app
 COPY . .
-RUN if [ -d packages ] && [ -f packages/flow.os/package.json ]; then \
+RUN if [ -d packages ] && [ -f packages/core/package.json ]; then \
   bun install || true && bun install; \
 else \
   bun install --frozen-lockfile; \
@@ -17,7 +17,7 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENV PORT=3000
 COPY --from=builder /app/out/ ./
-RUN if [ -d packages ] && [ -f packages/flow.os/package.json ]; then \
+RUN if [ -d packages ] && [ -f packages/core/package.json ]; then \
   bun install --frozen-lockfile --production || true && bun install --frozen-lockfile --production; \
 else \
   bun install --frozen-lockfile --production; \

package/profiles/full/dev.ts

@@ -2,4 +2,4 @@
 import { pathToFileURL } from 'node:url';
 import { join } from 'node:path';
 
-await import(pathToFileURL(join(import.meta.dir, 'packages/client/start-dev.ts')).href);
+await import(pathToFileURL(join(import.meta.dir, 'node_modules/@flow.os/client/start-dev.ts')).href);

package/profiles/full/package.json

@@ -5,8 +5,8 @@
   "type": "module",
   "scripts": {
     "dev": "bun dev.ts",
-    "build": "tsc -b && bun packages/client/build.ts",
-    "preview": "bun packages/client/preview.ts",
+    "build": "tsc -b && bun node_modules/@flow.os/client/build.ts",
+    "preview": "bun node_modules/@flow.os/client/preview.ts",
     "start": "bun node_modules/@flow.os/server/start.ts",
     "lint": "oxlint .",
     "fmt": "oxfmt",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@flow.os/client": "file:./packages/client",
     "@flow.os/server": "file:./packages/server",
-    "@flow.os/core": "file:./packages/flow.os",
+    "@flow.os/core": "file:./packages/core",
     "@flow.os/router": "file:./packages/router",
     "@flow.os/style": "file:./packages/style"
   },

package/profiles/full/packages/client/config.ts

@@ -43,7 +43,7 @@ function resolveAlias(): Record<string, string> {
       const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8')) as { name?: string };
       if (pkg.name?.startsWith('@flow.os/') || pkg.name === '@flow.os') alias[pkg.name] = abs;
     } catch {}
-    if (name !== 'flow.os') alias[`@flow.os/${name}`] = abs;
+    alias[`@flow.os/${name}`] = abs;
   }
   return alias;
 }

package/profiles/full/tsconfig.json

@@ -22,7 +22,7 @@
     "paths": {
       "~/*": ["client/*"],
       "~server/*": ["server/*"],
-      "@flow.os/core": ["packages/flow.os/index.ts"],
+      "@flow.os/core": ["packages/core/index.ts"],
       "@flow.os/*": ["packages/*"]
     }
   },

package/profiles/server/Dockerfile

@@ -1,10 +1,10 @@
-# DEV: packages/flow.os → workaround Bun workspace (doppio install).
+# DEV: packages/core → workaround Bun workspace (doppio install).
 # PROD: install → build → start (PORT da env)
 
 FROM oven/bun:1 AS builder
 WORKDIR /app
 COPY . .
-RUN if [ -d packages ] && [ -f packages/flow.os/package.json ]; then \
+RUN if [ -d packages ] && [ -f packages/core/package.json ]; then \
   bun install || true && bun install; \
 else \
   bun install --frozen-lockfile; \
@@ -17,7 +17,7 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENV PORT=3000
 COPY --from=builder /app/out/ ./
-RUN if [ -d packages ] && [ -f packages/flow.os/package.json ]; then \
+RUN if [ -d packages ] && [ -f packages/core/package.json ]; then \
   bun install --frozen-lockfile --production || true && bun install --frozen-lockfile --production; \
 else \
   bun install --frozen-lockfile --production; \

package/profiles/server/dev.ts

@@ -2,4 +2,4 @@
 import { pathToFileURL } from 'node:url';
 import { join } from 'node:path';
 
-await import(pathToFileURL(join(import.meta.dir, 'packages/client/start-dev.ts')).href);
+await import(pathToFileURL(join(import.meta.dir, 'node_modules/@flow.os/client/start-dev.ts')).href);

package/profiles/server/package.json

@@ -5,8 +5,8 @@
   "type": "module",
   "scripts": {
     "dev": "bun dev.ts",
-    "build": "tsc -b && bun packages/client/build.ts",
-    "preview": "bun packages/client/preview.ts",
+    "build": "tsc -b && bun node_modules/@flow.os/client/build.ts",
+    "preview": "bun node_modules/@flow.os/client/preview.ts",
     "start": "bun node_modules/@flow.os/server/start.ts",
     "lint": "oxlint .",
     "fmt": "oxfmt",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@flow.os/client": "^0.0.1",
     "@flow.os/server": "file:./packages/server",
-    "@flow.os/core": "file:./packages/flow.os",
+    "@flow.os/core": "file:./packages/core",
     "@flow.os/router": "file:./packages/router",
     "@flow.os/style": "file:./packages/style"
   },

package/profiles/server/tsconfig.json

@@ -22,7 +22,7 @@
     "paths": {
       "~/*": ["client/*"],
       "~server/*": ["server/*"],
-      "@flow.os/core": ["packages/flow.os/index.ts"],
+      "@flow.os/core": ["packages/core/index.ts"],
       "@flow.os/*": ["packages/*"]
     }
   },