@mondaydotcomorg/z2h-cli 0.24.1 → 0.25.0

package/dist/commands/create-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../src/commands/create-workspace.ts"],"names":[],"mappings":"AASA,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CA0C5D"}
+{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAaA,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAuC5D"}

package/dist/commands/create-workspace.js

@@ -13,37 +13,35 @@ const _interopDefault = e => e && e.__esModule ? e : { default: e };
 
 const path__default = /*#__PURE__*/_interopDefault(path);
 
+async function isPopulated(dir) {
+    return (await fs.pathExists(dir)) && (await fs.readdir(dir)).length > 0;
+}
 async function createWorkspaceCommand() {
     const home = util_workspace.getWorkspaceHome();
     const templatesDir = util_templates.getTemplatesDir();
     const wsTemplatesDir = path__default.default.join(templatesDir, 'workspace');
-    if (await fs.pathExists(home)) {
-        const entries = await fs.readdir(home);
-        if (entries.length > 0) {
-            util_logger.output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
-                ok: true,
-                workspace: home,
-            });
-            return;
-        }
+    await fs.ensureDir(home);
+    const scaffolded = await util_workspace.isZ2hWorkspace(home);
+    if (!scaffolded) {
+        util_logger.info(`setting up your Z2H workspace`);
+        const pkgRaw = await promises.readFile(path__default.default.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
+        await Promise.all([
+            fs.writeFile(path__default.default.join(home, 'package.json'), pkgRaw),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'gitignore'), path__default.default.join(home, '.gitignore')),
+            fs.writeFile(path__default.default.join(home, '.yarnrc.yml'), util_npm_brokerConfig.workspaceYarnrcContents()),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'nx.json'), path__default.default.join(home, 'nx.json')),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'yarnlock'), path__default.default.join(home, 'yarn.lock')),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'nvmrc'), path__default.default.join(home, '.nvmrc')),
+            fs.writeFile(path__default.default.join(home, '.npmrc'), util_npm_brokerConfig.workspaceNpmrcContents()),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'README.md'), path__default.default.join(home, 'README.md')),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'), path__default.default.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')),
+        ]);
     }
-    else {
-        await fs.ensureDir(home);
+    const hasWorkspaceNodeModules = await isPopulated(path__default.default.join(home, 'node_modules'));
+    if (!scaffolded || !hasWorkspaceNodeModules) {
+        util_logger.info(`installing workspace dependencies — this may take a minute`);
+        await util_npm_install.runYarnInstall({ cwd: home });
     }
-    const pkgRaw = await promises.readFile(path__default.default.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
-    await Promise.all([
-        fs.writeFile(path__default.default.join(home, 'package.json'), pkgRaw),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'gitignore'), path__default.default.join(home, '.gitignore')),
-        fs.writeFile(path__default.default.join(home, '.yarnrc.yml'), util_npm_brokerConfig.workspaceYarnrcContents()),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'nx.json'), path__default.default.join(home, 'nx.json')),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'yarnlock'), path__default.default.join(home, 'yarn.lock')),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'nvmrc'), path__default.default.join(home, '.nvmrc')),
-        fs.writeFile(path__default.default.join(home, '.npmrc'), util_npm_brokerConfig.workspaceNpmrcContents()),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'README.md'), path__default.default.join(home, 'README.md')),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'), path__default.default.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')),
-    ]);
-    util_logger.info(`setting up your Z2H workspace — this may take a minute...`);
-    await util_npm_install.runYarnInstall({ cwd: home });
     util_logger.output(`Your workspace is ready! 🚀 Apps will live at ${home}`, {
         ok: true,
         workspace: home,

package/dist/esm/commands/create-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../../src/commands/create-workspace.ts"],"names":[],"mappings":"AASA,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CA0C5D"}
+{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAaA,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAuC5D"}

package/dist/esm/commands/create-workspace.mjs

@@ -1,43 +1,41 @@
 import path from 'node:path';
 import { readFile } from 'node:fs/promises';
-import { pathExists, readdir, ensureDir, writeFile, copy } from 'fs-extra';
-import { output, info } from '../util/logger.mjs';
-import { getWorkspaceHome } from '../util/workspace.mjs';
+import { ensureDir, writeFile, copy, pathExists, readdir } from 'fs-extra';
+import { info, output } from '../util/logger.mjs';
+import { getWorkspaceHome, isZ2hWorkspace } from '../util/workspace.mjs';
 import { getTemplatesDir } from '../util/templates.mjs';
 import { runYarnInstall } from '../util/npm/install.mjs';
 import { workspaceYarnrcContents, workspaceNpmrcContents } from '../util/npm/broker-config.mjs';
 
+async function isPopulated(dir) {
+    return (await pathExists(dir)) && (await readdir(dir)).length > 0;
+}
 async function createWorkspaceCommand() {
     const home = getWorkspaceHome();
     const templatesDir = getTemplatesDir();
     const wsTemplatesDir = path.join(templatesDir, 'workspace');
-    if (await pathExists(home)) {
-        const entries = await readdir(home);
-        if (entries.length > 0) {
-            output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
-                ok: true,
-                workspace: home,
-            });
-            return;
-        }
+    await ensureDir(home);
+    const scaffolded = await isZ2hWorkspace(home);
+    if (!scaffolded) {
+        info(`setting up your Z2H workspace`);
+        const pkgRaw = await readFile(path.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
+        await Promise.all([
+            writeFile(path.join(home, 'package.json'), pkgRaw),
+            copy(path.join(wsTemplatesDir, 'gitignore'), path.join(home, '.gitignore')),
+            writeFile(path.join(home, '.yarnrc.yml'), workspaceYarnrcContents()),
+            copy(path.join(wsTemplatesDir, 'nx.json'), path.join(home, 'nx.json')),
+            copy(path.join(wsTemplatesDir, 'yarnlock'), path.join(home, 'yarn.lock')),
+            copy(path.join(wsTemplatesDir, 'nvmrc'), path.join(home, '.nvmrc')),
+            writeFile(path.join(home, '.npmrc'), workspaceNpmrcContents()),
+            copy(path.join(wsTemplatesDir, 'README.md'), path.join(home, 'README.md')),
+            copy(path.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'), path.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')),
+        ]);
     }
-    else {
-        await ensureDir(home);
+    const hasWorkspaceNodeModules = await isPopulated(path.join(home, 'node_modules'));
+    if (!scaffolded || !hasWorkspaceNodeModules) {
+        info(`installing workspace dependencies — this may take a minute`);
+        await runYarnInstall({ cwd: home });
     }
-    const pkgRaw = await readFile(path.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
-    await Promise.all([
-        writeFile(path.join(home, 'package.json'), pkgRaw),
-        copy(path.join(wsTemplatesDir, 'gitignore'), path.join(home, '.gitignore')),
-        writeFile(path.join(home, '.yarnrc.yml'), workspaceYarnrcContents()),
-        copy(path.join(wsTemplatesDir, 'nx.json'), path.join(home, 'nx.json')),
-        copy(path.join(wsTemplatesDir, 'yarnlock'), path.join(home, 'yarn.lock')),
-        copy(path.join(wsTemplatesDir, 'nvmrc'), path.join(home, '.nvmrc')),
-        writeFile(path.join(home, '.npmrc'), workspaceNpmrcContents()),
-        copy(path.join(wsTemplatesDir, 'README.md'), path.join(home, 'README.md')),
-        copy(path.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'), path.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')),
-    ]);
-    info(`setting up your Z2H workspace — this may take a minute...`);
-    await runYarnInstall({ cwd: home });
     output(`Your workspace is ready! 🚀 Apps will live at ${home}`, {
         ok: true,
         workspace: home,

package/dist/esm/shadow/scaffold.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../src/shadow/scaffold.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AA0G9C;;;GAGG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYvG"}
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../src/shadow/scaffold.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYvG"}

package/dist/esm/shadow/scaffold.mjs

@@ -1,104 +1,7 @@
 import path from 'node:path';
 import { ensureDir, writeFile, writeJson } from 'fs-extra';
+import { WRAPPER_TEMPLATE, tridentrcTemplate, dtsFileTemplate, TSCONFIG_TEMPLATE } from '@mondaydotcomorg/z2h-shared-utils/mf-scaffold';
 
-const WRAPPER_TEMPLATE = `import '@vibe/core/tokens';
-import ConsumerApp from '../../src/index';
-import React from 'react';
-import * as ReactDOM from 'react-dom/client';
-import { ErrorBoundary } from 'react-error-boundary';
-
-const roots = new Map<HTMLElement, ReactDOM.Root>();
-
-export function init() {}
-
-export function render(element: HTMLElement) {
-  const root = ReactDOM.createRoot(element);
-  root.render(
-    <ErrorBoundary fallback={<div style={{ padding: 16 }}>This app crashed.</div>}>
-      <ConsumerApp />
-    </ErrorBoundary>,
-  );
-  roots.set(element, root);
-}
-
-export function unmount({ element }: { element: HTMLElement }) {
-  const root = roots.get(element);
-  if (root) {
-    root.unmount();
-    roots.delete(element);
-  }
-}
-`;
-const tridentrcTemplate = (appName, port) => `/** @type {import("@mondaydotcomorg/trident-user-config").MicroFrontendConfig} */
-const config = {
-  appName: '${appName}',
-  port: ${port},
-};
-
-module.exports = config;
-`;
-const dtsFileTemplate = () => `
-declare module '*.module.css' {
-  const classNames: {
-    [className: string]: string;
-  };
-  export = classNames;
-}
-
-declare module '*.module.scss' {
-  const classNames: {
-    [className: string]: string;
-  };
-  export = classNames;
-}
-
-declare module '*.jpg' {
-  const e: string;
-  export default e;
-}
-declare module '*.jpeg' {
-  const e: string;
-  export default e;
-}
-declare module '*.png' {
-  const e: string;
-  export default e;
-}
-declare module '*.riv' {
-  const e: string;
-  export default e;
-}
-
-declare module '*.wasm' {
-  const e: string;
-  export default e;
-}
-
-declare module '*.html?url' {
-  const src: string;
-  export default src;
-}
-`;
-const TSCONFIG_TEMPLATE = {
-    compilerOptions: {
-        target: 'es5',
-        lib: ['dom', 'dom.iterable', 'esnext'],
-        allowJs: false,
-        skipLibCheck: true,
-        esModuleInterop: true,
-        allowSyntheticDefaultImports: true,
-        strict: false,
-        module: 'esnext',
-        moduleResolution: 'bundler',
-        resolveJsonModule: true,
-        noImplicitAny: false,
-        isolatedModules: true,
-        baseUrl: 'src',
-        noEmit: true,
-        jsx: 'react-jsx',
-    },
-    include: ['src', '../src'],
-};
 /**
  * Write every generated file under .zth/. Overwrites on every run so the
  * shadow dir is a deterministic function of the CLI version — no drift.

package/dist/shadow/scaffold.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../src/shadow/scaffold.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AA0G9C;;;GAGG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYvG"}
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../src/shadow/scaffold.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYvG"}

package/dist/shadow/scaffold.js

@@ -2,120 +2,23 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const path = require('node:path');
 const fs = require('fs-extra');
+const mfScaffold = require('@mondaydotcomorg/z2h-shared-utils/mf-scaffold');
 
 const _interopDefault = e => e && e.__esModule ? e : { default: e };
 
 const path__default = /*#__PURE__*/_interopDefault(path);
 
-const WRAPPER_TEMPLATE = `import '@vibe/core/tokens';
-import ConsumerApp from '../../src/index';
-import React from 'react';
-import * as ReactDOM from 'react-dom/client';
-import { ErrorBoundary } from 'react-error-boundary';
-
-const roots = new Map<HTMLElement, ReactDOM.Root>();
-
-export function init() {}
-
-export function render(element: HTMLElement) {
-  const root = ReactDOM.createRoot(element);
-  root.render(
-    <ErrorBoundary fallback={<div style={{ padding: 16 }}>This app crashed.</div>}>
-      <ConsumerApp />
-    </ErrorBoundary>,
-  );
-  roots.set(element, root);
-}
-
-export function unmount({ element }: { element: HTMLElement }) {
-  const root = roots.get(element);
-  if (root) {
-    root.unmount();
-    roots.delete(element);
-  }
-}
-`;
-const tridentrcTemplate = (appName, port) => `/** @type {import("@mondaydotcomorg/trident-user-config").MicroFrontendConfig} */
-const config = {
-  appName: '${appName}',
-  port: ${port},
-};
-
-module.exports = config;
-`;
-const dtsFileTemplate = () => `
-declare module '*.module.css' {
-  const classNames: {
-    [className: string]: string;
-  };
-  export = classNames;
-}
-
-declare module '*.module.scss' {
-  const classNames: {
-    [className: string]: string;
-  };
-  export = classNames;
-}
-
-declare module '*.jpg' {
-  const e: string;
-  export default e;
-}
-declare module '*.jpeg' {
-  const e: string;
-  export default e;
-}
-declare module '*.png' {
-  const e: string;
-  export default e;
-}
-declare module '*.riv' {
-  const e: string;
-  export default e;
-}
-
-declare module '*.wasm' {
-  const e: string;
-  export default e;
-}
-
-declare module '*.html?url' {
-  const src: string;
-  export default src;
-}
-`;
-const TSCONFIG_TEMPLATE = {
-    compilerOptions: {
-        target: 'es5',
-        lib: ['dom', 'dom.iterable', 'esnext'],
-        allowJs: false,
-        skipLibCheck: true,
-        esModuleInterop: true,
-        allowSyntheticDefaultImports: true,
-        strict: false,
-        module: 'esnext',
-        moduleResolution: 'bundler',
-        resolveJsonModule: true,
-        noImplicitAny: false,
-        isolatedModules: true,
-        baseUrl: 'src',
-        noEmit: true,
-        jsx: 'react-jsx',
-    },
-    include: ['src', '../src'],
-};
 /**
  * Write every generated file under .zth/. Overwrites on every run so the
  * shadow dir is a deterministic function of the CLI version — no drift.
  */
 async function scaffoldShadow(paths, appName, port) {
     await fs.ensureDir(paths.shadowSrc);
-    await fs.writeFile(paths.shadowWrapper, WRAPPER_TEMPLATE);
-    await fs.writeFile(paths.shadowTridentrc, tridentrcTemplate(appName, port));
+    await fs.writeFile(paths.shadowWrapper, mfScaffold.WRAPPER_TEMPLATE);
+    await fs.writeFile(paths.shadowTridentrc, mfScaffold.tridentrcTemplate(appName, port));
     await fs.writeFile(paths.shadowNvmrc, `${process.version}\n`);
-    await fs.writeFile(paths.shadowDts, dtsFileTemplate());
-    await fs.writeJson(paths.shadowTsconfig, TSCONFIG_TEMPLATE, { spaces: 2 });
+    await fs.writeFile(paths.shadowDts, mfScaffold.dtsFileTemplate());
+    await fs.writeJson(paths.shadowTsconfig, mfScaffold.TSCONFIG_TEMPLATE, { spaces: 2 });
     // Drop a stub README so contributors who open .zth/ know what they're looking at.
     await fs.writeFile(path__default.default.join(paths.shadowDir, 'README.md'), '# .zth/\nGenerated by z2h-cli. Do not edit — run `z2h-cli build` or `z2h-cli dev` to refresh.\n');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondaydotcomorg/z2h-cli",
-  "version": "0.24.1",
+  "version": "0.25.0",
   "bin": "./bin/z2h-cli.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -51,6 +51,7 @@
   ],
   "dependencies": {
     "@aws-sdk/client-s3": "^3.706.0",
+    "@mondaydotcomorg/z2h-shared-utils": "^0.3.0",
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
     "cors": "^2.8.6",

package/src/commands/__tests__/create-workspace.test.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import os from 'node:os';
-import { mkdtemp, rm, writeJson, readJson, ensureDir, pathExists } from 'fs-extra';
+import { mkdtemp, rm, outputJson, readJson, ensureDir, pathExists } from 'fs-extra';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { runYarnInstall } from '../../util/npm/install';
@@ -51,14 +51,35 @@ describe('create-workspace', () => {
     expect(runYarnInstall).toHaveBeenCalledWith(expect.objectContaining({ cwd: tmp }));
   });
 
-  it('skips gracefully if the target dir is non-empty', async () => {
+  it('scaffolds and installs even if the target dir has unrelated files (e.g. a mounted empty node_modules)', async () => {
     await ensureDir(tmp);
-    await writeJson(path.join(tmp, 'somefile.json'), { hello: 'world' });
+    await ensureDir(path.join(tmp, 'node_modules'));
+
+    await createWorkspaceCommand();
+
+    expect(await pathExists(path.join(tmp, 'package.json'))).toBe(true);
+    expect(runYarnInstall).toHaveBeenCalledWith(expect.objectContaining({ cwd: tmp }));
+  });
+
+  it('skips install if package.json exists and node_modules is populated', async () => {
+    await createWorkspaceCommand();
+    vi.mocked(runYarnInstall).mockClear();
+    await outputJson(path.join(tmp, 'node_modules', 'some-dep', 'package.json'), { name: 'some-dep' });
+
+    await createWorkspaceCommand();
 
-    await expect(createWorkspaceCommand()).resolves.toBeUndefined();
     expect(runYarnInstall).not.toHaveBeenCalled();
   });
 
+  it('reinstalls if package.json exists but node_modules is empty (e.g. wiped by an ephemeral mount)', async () => {
+    await createWorkspaceCommand();
+    vi.mocked(runYarnInstall).mockClear();
+
+    await createWorkspaceCommand();
+
+    expect(runYarnInstall).toHaveBeenCalledWith(expect.objectContaining({ cwd: tmp }));
+  });
+
   it('does not include z2h-cli in workspace devDeps (managed globally)', async () => {
     await createWorkspaceCommand();
 

package/src/commands/create-workspace.ts

@@ -2,48 +2,49 @@ import path from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { ensureDir, writeFile, pathExists, readdir, copy } from 'fs-extra';
 import { info, output } from '../util/logger';
-import { getWorkspaceHome } from '../util/workspace';
+import { getWorkspaceHome, isZ2hWorkspace } from '../util/workspace';
 import { getTemplatesDir } from '../util/templates';
 import { runYarnInstall } from '../util/npm/install';
 import { workspaceNpmrcContents, workspaceYarnrcContents } from '../util/npm/broker-config';
 
+async function isPopulated(dir: string): Promise<boolean> {
+  return (await pathExists(dir)) && (await readdir(dir)).length > 0;
+}
+
 export async function createWorkspaceCommand(): Promise<void> {
   const home = getWorkspaceHome();
   const templatesDir = getTemplatesDir();
   const wsTemplatesDir = path.join(templatesDir, 'workspace');
 
-  if (await pathExists(home)) {
-    const entries = await readdir(home);
-    if (entries.length > 0) {
-      output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
-        ok: true,
-        workspace: home,
-      });
-      return;
-    }
-  } else {
-    await ensureDir(home);
+  await ensureDir(home);
+
+  const scaffolded = await isZ2hWorkspace(home);
+
+  if (!scaffolded) {
+    info(`setting up your Z2H workspace`);
+    const pkgRaw = await readFile(path.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
+
+    await Promise.all([
+      writeFile(path.join(home, 'package.json'), pkgRaw),
+      copy(path.join(wsTemplatesDir, 'gitignore'), path.join(home, '.gitignore')),
+      writeFile(path.join(home, '.yarnrc.yml'), workspaceYarnrcContents()),
+      copy(path.join(wsTemplatesDir, 'nx.json'), path.join(home, 'nx.json')),
+      copy(path.join(wsTemplatesDir, 'yarnlock'), path.join(home, 'yarn.lock')),
+      copy(path.join(wsTemplatesDir, 'nvmrc'), path.join(home, '.nvmrc')),
+      writeFile(path.join(home, '.npmrc'), workspaceNpmrcContents()),
+      copy(path.join(wsTemplatesDir, 'README.md'), path.join(home, 'README.md')),
+      copy(
+        path.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'),
+        path.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')
+      ),
+    ]);
   }
 
-  const pkgRaw = await readFile(path.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
-
-  await Promise.all([
-    writeFile(path.join(home, 'package.json'), pkgRaw),
-    copy(path.join(wsTemplatesDir, 'gitignore'), path.join(home, '.gitignore')),
-    writeFile(path.join(home, '.yarnrc.yml'), workspaceYarnrcContents()),
-    copy(path.join(wsTemplatesDir, 'nx.json'), path.join(home, 'nx.json')),
-    copy(path.join(wsTemplatesDir, 'yarnlock'), path.join(home, 'yarn.lock')),
-    copy(path.join(wsTemplatesDir, 'nvmrc'), path.join(home, '.nvmrc')),
-    writeFile(path.join(home, '.npmrc'), workspaceNpmrcContents()),
-    copy(path.join(wsTemplatesDir, 'README.md'), path.join(home, 'README.md')),
-    copy(
-      path.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'),
-      path.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')
-    ),
-  ]);
-
-  info(`setting up your Z2H workspace — this may take a minute...`);
-  await runYarnInstall({ cwd: home });
+  const hasWorkspaceNodeModules = await isPopulated(path.join(home, 'node_modules'));
+  if (!scaffolded || !hasWorkspaceNodeModules) {
+    info(`installing workspace dependencies — this may take a minute`);
+    await runYarnInstall({ cwd: home });
+  }
 
   output(`Your workspace is ready! 🚀 Apps will live at ${home}`, {
     ok: true,

package/src/shadow/scaffold.ts

@@ -1,111 +1,13 @@
 import path from 'node:path';
 import { ensureDir, writeFile, writeJson } from 'fs-extra';
+import {
+  WRAPPER_TEMPLATE,
+  tridentrcTemplate,
+  dtsFileTemplate,
+  TSCONFIG_TEMPLATE,
+} from '@mondaydotcomorg/z2h-shared-utils/mf-scaffold';
 import type { ConsumerPaths } from '../types';
 
-const WRAPPER_TEMPLATE = `import '@vibe/core/tokens';
-import ConsumerApp from '../../src/index';
-import React from 'react';
-import * as ReactDOM from 'react-dom/client';
-import { ErrorBoundary } from 'react-error-boundary';
-
-const roots = new Map<HTMLElement, ReactDOM.Root>();
-
-export function init() {}
-
-export function render(element: HTMLElement) {
-  const root = ReactDOM.createRoot(element);
-  root.render(
-    <ErrorBoundary fallback={<div style={{ padding: 16 }}>This app crashed.</div>}>
-      <ConsumerApp />
-    </ErrorBoundary>,
-  );
-  roots.set(element, root);
-}
-
-export function unmount({ element }: { element: HTMLElement }) {
-  const root = roots.get(element);
-  if (root) {
-    root.unmount();
-    roots.delete(element);
-  }
-}
-`;
-
-const tridentrcTemplate = (appName: string, port: number): string =>
-  `/** @type {import("@mondaydotcomorg/trident-user-config").MicroFrontendConfig} */
-const config = {
-  appName: '${appName}',
-  port: ${port},
-};
-
-module.exports = config;
-`;
-
-const dtsFileTemplate = (): string =>
-  `
-declare module '*.module.css' {
-  const classNames: {
-    [className: string]: string;
-  };
-  export = classNames;
-}
-
-declare module '*.module.scss' {
-  const classNames: {
-    [className: string]: string;
-  };
-  export = classNames;
-}
-
-declare module '*.jpg' {
-  const e: string;
-  export default e;
-}
-declare module '*.jpeg' {
-  const e: string;
-  export default e;
-}
-declare module '*.png' {
-  const e: string;
-  export default e;
-}
-declare module '*.riv' {
-  const e: string;
-  export default e;
-}
-
-declare module '*.wasm' {
-  const e: string;
-  export default e;
-}
-
-declare module '*.html?url' {
-  const src: string;
-  export default src;
-}
-`;
-
-const TSCONFIG_TEMPLATE = {
-  compilerOptions: {
-    target: 'es5',
-    lib: ['dom', 'dom.iterable', 'esnext'],
-    allowJs: false,
-    skipLibCheck: true,
-    esModuleInterop: true,
-    allowSyntheticDefaultImports: true,
-    strict: false,
-    module: 'esnext',
-    moduleResolution: 'bundler',
-    resolveJsonModule: true,
-    noImplicitAny: false,
-    isolatedModules: true,
-    baseUrl: 'src',
-    noEmit: true,
-    jsx: 'react-jsx',
-  },
-  include: ['src', '../src'],
-};
-
 /**
  * Write every generated file under .zth/. Overwrites on every run so the
  * shadow dir is a deterministic function of the CLI version — no drift.