@woodsportal/hubspot-kit 1.0.34 → 1.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@woodsportal/hubspot-kit",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "WoodsCLI — HubSpot CMS dev kit by WoodsPortal. wp CLI, Vite presets, module-config overlay, and theme/module build pipelines.",
   "type": "module",
   "main": "./dist/index.js",
@@ -51,7 +51,7 @@
     "build": "tsup",
     "dev": "tsup --watch",
     "typecheck": "tsc --noEmit",
-    "test": "node --import tsx --test 'src/lib/**/*.test.ts' 'src/schema/**/*.test.ts' 'src/vite/**/*.test.ts' 'scripts/portal-build-id.test.mjs' && vitest run src/dev-module-config/__tests__/normalize-repeater-items.test.ts src/dev-module-config/__tests__/module-config-transform.test.ts src/dev-module-config/__tests__/flatten-visible-fields.test.ts",
+    "test": "node --import tsx --test 'src/lib/**/*.test.ts' 'src/schema/**/*.test.ts' 'src/vite/**/*.test.ts' 'scripts/portal-build-id.test.mjs' 'scripts/vite/ensure-dev-kit-shims.test.mjs' && vitest run src/dev-module-config/__tests__/normalize-repeater-items.test.ts src/dev-module-config/__tests__/module-config-transform.test.ts src/dev-module-config/__tests__/flatten-visible-fields.test.ts",
     "test:examples": "node examples/smoke/run-matrix.mjs --tier static",
     "lint": "eslint src",
     "verify": "npm run typecheck && npm run test && npm run test:examples && npm run build",

package/scripts/node-loader-interop.mjs

@@ -0,0 +1,20 @@
+/** Current Active LTS — update when Node release schedule changes. */
+export const NODE_LTS_RECOMMENDED = '24'
+
+/**
+ * @returns {string | null}
+ * @see https://github.com/nodejs/node/issues/59366
+ */
+export function nodeLoaderInteropWarning() {
+  const [major, minor] = process.versions.node.split('.').map(Number)
+
+  if (major === 22 && minor >= 18) {
+    return `Node 22.18+ can fail loading Vite config (getStatus). Upgrade to Node ${NODE_LTS_RECOMMENDED} LTS or the latest Node 22 patch.`
+  }
+
+  if (major === 23 && minor < 4) {
+    return `Node 23.0–23.3 can fail loading Vite config (getStatus). Upgrade to Node ${NODE_LTS_RECOMMENDED} LTS.`
+  }
+
+  return null
+}

package/scripts/run-dev.mjs

@@ -3,77 +3,92 @@
  * Local dev server — loads Vite and plugins from the consumer project's node_modules
  * (configFile: false) so the kit does not need its own vite install.
  */
-import { createRequire } from 'node:module'
-import { dirname, resolve } from 'node:path'
-import { pathToFileURL } from 'node:url'
+import { existsSync } from 'node:fs'
+import { resolve } from 'node:path'
 
+import { importConsumerDep } from './resolve-consumer-dep.mjs'
 import { findProjectRoot, getKitRoot } from './project-root.mjs'
 
 const projectRoot = findProjectRoot()
 const kitRoot = getKitRoot()
-const require = createRequire(pathToFileURL(resolve(projectRoot, 'package.json')))
-
 const port = Number(process.env.WP_HS_DEV_PORT ?? process.argv[2] ?? 3000)
 
-const { createServer } = require('vite')
-const viteReact = require('@vitejs/plugin-react')
-const { TanStackRouterVite } = require('@tanstack/router-plugin/vite')
-const tailwindcss = require('@tailwindcss/vite')
+const [
+  { ensureDevKitShims },
+  { default: resolveFromProjectRoot },
+  { default: sdkLogBridge },
+  { default: moduleConfigStore },
+  { createDevReactPluginOptions },
+  { default: isPrefix },
+  { default: bootstrapShimResolver },
+  { readWoodsportalConfig },
+  { createServer },
+  viteReactMod,
+  tanstackMod,
+  tailwindcssMod,
+] = await Promise.all([
+  import('./vite/ensure-dev-kit-shims.js'),
+  import('./vite/resolve-from-project-root.js'),
+  import('./vite/sdk-log-bridge.js'),
+  import('./vite/module-config-store.js'),
+  import('./vite/react-dev-plugin-options.js'),
+  import('./tailwind/prefix.env.js'),
+  import('./vite/bootstrap-shim-resolver.js'),
+  import('./read-woodsportal-config.mjs'),
+  importConsumerDep('vite'),
+  importConsumerDep('@vitejs/plugin-react'),
+  importConsumerDep('@tanstack/router-plugin/vite'),
+  importConsumerDep('@tailwindcss/vite'),
+])
 
-const tailwindPrefixPlugin = (
-  await import(pathToFileURL(resolve(kitRoot, 'scripts/tailwind/prefix-plugin.js')).href)
-).default
-const TailwindContentPlugin = (
-  await import(pathToFileURL(resolve(kitRoot, 'scripts/tailwind/tailwind-content-plugin.js')).href)
-).default
-const sdkLogBridge = (
-  await import(pathToFileURL(resolve(kitRoot, 'scripts/vite/sdk-log-bridge.js')).href)
-).default
-const moduleConfigStore = (
-  await import(pathToFileURL(resolve(kitRoot, 'scripts/vite/module-config-store.js')).href)
-).default
-const resolveFromProjectRoot = (
-  await import(pathToFileURL(resolve(kitRoot, 'scripts/vite/resolve-from-project-root.js')).href)
-).default
-const { createDevReactPluginOptions } = await import(
-  pathToFileURL(resolve(kitRoot, 'scripts/vite/react-dev-plugin-options.js')).href
-)
-const { ensureDevKitShims } = await import(
-  pathToFileURL(resolve(kitRoot, 'scripts/vite/ensure-dev-kit-shims.js')).href
+const viteReact = viteReactMod.default ?? viteReactMod
+const { TanStackRouterVite } = tanstackMod
+const tailwindcss = tailwindcssMod.default ?? tailwindcssMod
+
+const { moduleConfigRoot, bootstrapShim, bootstrapGreenfieldShim } = ensureDevKitShims(
+  projectRoot,
+  kitRoot,
 )
-const isPrefix = (await import(pathToFileURL(resolve(kitRoot, 'scripts/tailwind/prefix.env.js')).href))
-  .default
+const { config } = readWoodsportalConfig(projectRoot)
+const routesDir = resolve(projectRoot, 'src/routes')
+const hasTanStackRoutes = existsSync(routesDir)
 
-const { moduleConfigRoot, bootstrapShim } = ensureDevKitShims(projectRoot, kitRoot)
+const prefixPlugins = isPrefix('dev')
+  ? [
+      (await import('./tailwind/prefix-plugin.js')).default(),
+      (await import('./tailwind/tailwind-content-plugin.js')).default(),
+    ]
+  : []
 
 const server = await createServer({
   root: projectRoot,
   configFile: false,
   mode: 'dev',
   plugins: [
+    bootstrapShimResolver({ bootstrapShim, bootstrapGreenfieldShim, kitRoot }),
     resolveFromProjectRoot(projectRoot, kitRoot),
     sdkLogBridge(),
     moduleConfigStore(projectRoot),
-    TanStackRouterVite({ autoCodeSplitting: false }),
-    viteReact.default?.(createDevReactPluginOptions()) ?? viteReact(createDevReactPluginOptions()),
-    tailwindcss.default?.() ?? tailwindcss(),
-    ...(isPrefix('dev') ? [tailwindPrefixPlugin(), TailwindContentPlugin()] : []),
+    ...(hasTanStackRoutes ? [TanStackRouterVite({ autoCodeSplitting: false })] : []),
+    viteReact(createDevReactPluginOptions()),
+    tailwindcss(),
+    ...prefixPlugins,
   ],
   resolve: {
     preserveSymlinks: true,
+    dedupe: ['react', 'react-dom'],
     alias: {
       '@/dev/module-config': moduleConfigRoot,
+      '@wphs/bootstrap': bootstrapShim,
+      '@wphs/bootstrap-greenfield': bootstrapGreenfieldShim,
       '@woodsportal/hubspot-kit/dev/bootstrap': bootstrapShim,
+      '@woodsportal/hubspot-kit/dev/bootstrap-greenfield': bootstrapGreenfieldShim,
+      '@wphs/adapter': resolve(projectRoot, config?.dev?.adapter ?? './wphs.adapter.ts'),
       '@': resolve(projectRoot, './src'),
     },
   },
   optimizeDeps: {
-    include: [
-      'react/compiler-runtime',
-      'react/jsx-dev-runtime',
-      'react/jsx-runtime',
-      'react-dom/client',
-    ],
+    include: ['react', 'react-dom', 'react/jsx-dev-runtime', 'react/jsx-runtime'],
     exclude: ['woodsportal-client-sdk', 'woodsportal-client-sdk/auth', 'woodsportal-client-sdk/crm'],
   },
   define: {

package/scripts/vite/ensure-dev-kit-shims.js

@@ -1,23 +1,48 @@
-import { existsSync, lstatSync, mkdirSync, rmSync, symlinkSync } from 'node:fs'
-import { resolve } from 'node:path'
+import { cpSync, existsSync, lstatSync, mkdirSync, rmSync, symlinkSync } from 'node:fs'
+import { dirname, resolve } from 'node:path'
+import { platform } from 'node:os'
 
 import { moduleConfigPaths } from '../module-config-dir.mjs'
 
-function ensureSymlink(shimPath, target, { directory }) {
+const isWin = platform() === 'win32'
+
+/**
+ * Link or copy kit dev sources into `.wphs/` so Vite serves them in-project.
+ * Windows: directory junctions (no admin) and file copy fallback — symlinks often fail with EPERM.
+ */
+export function ensureKitShim(shimPath, target, { directory }) {
+  const targetAbs = resolve(target)
+  const shimAbs = resolve(shimPath)
+
   try {
-    if (existsSync(shimPath)) {
-      const stat = lstatSync(shimPath)
+    if (existsSync(shimAbs)) {
+      const stat = lstatSync(shimAbs)
       if (stat.isSymbolicLink()) {
-        return shimPath
+        return shimAbs
       }
-      rmSync(shimPath, { recursive: !directory, force: true })
+      rmSync(shimAbs, { recursive: directory, force: true })
     }
 
-    mkdirSync(resolve(shimPath, '..'), { recursive: true })
-    symlinkSync(target, shimPath, directory ? 'dir' : 'file')
-    return shimPath
+    mkdirSync(dirname(shimAbs), { recursive: true })
+
+    if (isWin && directory) {
+      symlinkSync(targetAbs, shimAbs, 'junction')
+      return shimAbs
+    }
+
+    symlinkSync(targetAbs, shimAbs, directory ? 'dir' : 'file')
+    return shimAbs
   } catch {
-    return target
+    try {
+      if (existsSync(shimAbs)) {
+        rmSync(shimAbs, { recursive: directory, force: true })
+      }
+      mkdirSync(dirname(shimAbs), { recursive: true })
+      cpSync(targetAbs, shimAbs, { recursive: directory, force: true })
+      return shimAbs
+    } catch {
+      return targetAbs
+    }
   }
 }
 
@@ -28,19 +53,19 @@ function ensureSymlink(shimPath, target, { directory }) {
 export function ensureDevKitShims(projectRoot, kitRoot) {
   const { devDir } = moduleConfigPaths(projectRoot)
 
-  const moduleConfigRoot = ensureSymlink(
+  const moduleConfigRoot = ensureKitShim(
     resolve(devDir, '.kit-module-config'),
     resolve(kitRoot, 'src/dev-module-config'),
     { directory: true },
   )
 
-  const bootstrapShim = ensureSymlink(
+  const bootstrapShim = ensureKitShim(
     resolve(devDir, '.kit-bootstrap.tsx'),
     resolve(kitRoot, 'src/dev/bootstrap.tsx'),
     { directory: false },
   )
 
-  const bootstrapGreenfieldShim = ensureSymlink(
+  const bootstrapGreenfieldShim = ensureKitShim(
     resolve(devDir, '.kit-bootstrap-greenfield.tsx'),
     resolve(kitRoot, 'src/dev/bootstrap-greenfield.tsx'),
     { directory: false },

package/scripts/vite/ensure-dev-kit-shims.test.mjs

@@ -0,0 +1,47 @@
+import assert from 'node:assert/strict'
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join, resolve } from 'node:path'
+import { describe, it } from 'node:test'
+
+import { ensureKitShim } from './ensure-dev-kit-shims.js'
+
+describe('ensureKitShim', () => {
+  it('creates a file shim inside the consumer workspace', () => {
+    const root = mkdtempSync(join(tmpdir(), 'wp-kit-shim-file-'))
+    try {
+      const targetDir = join(root, 'kit', 'src', 'dev')
+      mkdirSync(targetDir, { recursive: true })
+      const target = join(targetDir, 'bootstrap.tsx')
+      writeFileSync(target, 'export {}')
+
+      const shim = join(root, 'project', '.wphs', '.kit-bootstrap.tsx')
+      const result = ensureKitShim(shim, target, { directory: false })
+
+      assert.equal(result, resolve(shim))
+      assert.equal(readFileSync(shim, 'utf8'), 'export {}')
+    } finally {
+      rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  it('creates a directory shim inside the consumer workspace', () => {
+    const root = mkdtempSync(join(tmpdir(), 'wp-kit-shim-dir-'))
+    try {
+      const targetDir = join(root, 'kit', 'src', 'dev-module-config', 'ui')
+      mkdirSync(targetDir, { recursive: true })
+      const targetFile = join(targetDir, 'HsFieldLabel.tsx')
+      writeFileSync(targetFile, 'export {}')
+
+      const shim = join(root, 'project', '.wphs', '.kit-module-config')
+      const result = ensureKitShim(shim, join(root, 'kit', 'src', 'dev-module-config'), {
+        directory: true,
+      })
+
+      assert.equal(result, resolve(shim))
+      assert.equal(readFileSync(join(shim, 'ui', 'HsFieldLabel.tsx'), 'utf8'), 'export {}')
+    } finally {
+      rmSync(root, { recursive: true, force: true })
+    }
+  })
+})

package/scripts/vite/react-dev-plugin-options.js

@@ -4,7 +4,7 @@
  * but still use the React plugin's Babel JSX pipeline — do not use plugin `exclude`.
  */
 const DEV_KIT_UI_RE =
-  /[/\\]dev-module-config[/\\]|[/\\]\.kit-bootstrap(?:-greenfield)?\.tsx$|[/\\]dev[/\\]bootstrap(?:-greenfield)?\.tsx$/
+  /[/\\](?:dev-module-config|\.kit-module-config)[/\\]|[/\\]\.kit-bootstrap(?:-greenfield)?\.tsx$|[/\\]dev[/\\]bootstrap(?:-greenfield)?\.tsx$/
 
 export function createDevReactPluginOptions() {
   return {

package/vite/vite.config.dev.mjs

@@ -1,29 +1,43 @@
-import { existsSync } from 'node:fs'
-import { resolve } from 'node:path'
-
 import { importConsumerDep } from '../scripts/resolve-consumer-dep.mjs'
-import tailwindPrefixPlugin from '../scripts/tailwind/prefix-plugin.js'
-import TailwindContentPlugin from '../scripts/tailwind/tailwind-content-plugin.js'
-import sdkLogBridge from '../scripts/vite/sdk-log-bridge.js'
-import moduleConfigStore from '../scripts/vite/module-config-store.js'
-import resolveFromProjectRoot from '../scripts/vite/resolve-from-project-root.js'
-import bootstrapShimResolver from '../scripts/vite/bootstrap-shim-resolver.js'
-import { createDevReactPluginOptions } from '../scripts/vite/react-dev-plugin-options.js'
-import { ensureDevKitShims } from '../scripts/vite/ensure-dev-kit-shims.js'
-import isPrefix from '../scripts/tailwind/prefix.env.js'
-import { findProjectRoot, getKitRoot } from '../scripts/project-root.mjs'
-import { readWoodsportalConfig } from '../scripts/read-woodsportal-config.mjs'
-
-const kitRoot = getKitRoot()
-const projectRoot = findProjectRoot()
-const { moduleConfigRoot, bootstrapShim, bootstrapGreenfieldShim } = ensureDevKitShims(projectRoot, kitRoot)
-const { config } = readWoodsportalConfig(projectRoot)
-const routesDir = resolve(projectRoot, 'src/routes')
-const hasTanStackRoutes = existsSync(routesDir)
 
 export default loadDevViteConfig()
 
 async function loadDevViteConfig() {
+  const [
+    { findProjectRoot, getKitRoot },
+    { readWoodsportalConfig },
+    { ensureDevKitShims },
+    { default: bootstrapShimResolver },
+    { default: resolveFromProjectRoot },
+    { default: sdkLogBridge },
+    { default: moduleConfigStore },
+    { createDevReactPluginOptions },
+    { default: isPrefix },
+  ] = await Promise.all([
+    import('../scripts/project-root.mjs'),
+    import('../scripts/read-woodsportal-config.mjs'),
+    import('../scripts/vite/ensure-dev-kit-shims.js'),
+    import('../scripts/vite/bootstrap-shim-resolver.js'),
+    import('../scripts/vite/resolve-from-project-root.js'),
+    import('../scripts/vite/sdk-log-bridge.js'),
+    import('../scripts/vite/module-config-store.js'),
+    import('../scripts/vite/react-dev-plugin-options.js'),
+    import('../scripts/tailwind/prefix.env.js'),
+  ])
+
+  const { existsSync } = await import('node:fs')
+  const { resolve } = await import('node:path')
+
+  const kitRoot = getKitRoot()
+  const projectRoot = findProjectRoot()
+  const { moduleConfigRoot, bootstrapShim, bootstrapGreenfieldShim } = ensureDevKitShims(
+    projectRoot,
+    kitRoot,
+  )
+  const { config } = readWoodsportalConfig(projectRoot)
+  const routesDir = resolve(projectRoot, 'src/routes')
+  const hasTanStackRoutes = existsSync(routesDir)
+
   // Load vite before plugins: parallel import of vite + @vitejs/plugin-react breaks on Node 20+ (CJS/ESM interop).
   const { defineConfig } = await importConsumerDep('vite')
   const [{ default: viteReact }, { TanStackRouterVite }, { default: tailwindcss }] = await Promise.all([
@@ -32,51 +46,62 @@ async function loadDevViteConfig() {
     importConsumerDep('@tailwindcss/vite'),
   ])
 
-  return defineConfig(({ mode, command }) => ({
-    root: projectRoot,
-    plugins: [
-      bootstrapShimResolver({ bootstrapShim, bootstrapGreenfieldShim, kitRoot }),
-      resolveFromProjectRoot(projectRoot, kitRoot),
-      ...(command === 'serve' && mode === 'dev'
-        ? [sdkLogBridge(), moduleConfigStore(projectRoot)]
-        : []),
-      ...(hasTanStackRoutes ? [TanStackRouterVite({ autoCodeSplitting: false })] : []),
-      viteReact(createDevReactPluginOptions()),
-      tailwindcss(),
-      ...(isPrefix(mode) ? [tailwindPrefixPlugin(), TailwindContentPlugin()] : []),
-    ],
-    resolve: {
-      preserveSymlinks: true,
-      alias: {
-        '@/dev/module-config': moduleConfigRoot,
-        '@wphs/bootstrap': bootstrapShim,
-        '@wphs/bootstrap-greenfield': bootstrapGreenfieldShim,
-        '@woodsportal/hubspot-kit/dev/bootstrap': bootstrapShim,
-        '@woodsportal/hubspot-kit/dev/bootstrap-greenfield': bootstrapGreenfieldShim,
-        '@wphs/adapter': resolve(projectRoot, config?.dev?.adapter ?? './wphs.adapter.ts'),
-        '@': resolve(projectRoot, './src'),
-      },
-    },
-    optimizeDeps: {
-      exclude: [
-        'woodsportal-client-sdk',
-        'woodsportal-client-sdk/auth',
-        'woodsportal-client-sdk/crm',
+  return defineConfig(async ({ mode, command }) => {
+    const prefixPlugins = isPrefix(mode)
+      ? [
+          (await import('../scripts/tailwind/prefix-plugin.js')).default(),
+          (await import('../scripts/tailwind/tailwind-content-plugin.js')).default(),
+        ]
+      : []
+
+    return {
+      root: projectRoot,
+      plugins: [
+        bootstrapShimResolver({ bootstrapShim, bootstrapGreenfieldShim, kitRoot }),
+        resolveFromProjectRoot(projectRoot, kitRoot),
+        ...(command === 'serve' && mode === 'dev'
+          ? [sdkLogBridge(), moduleConfigStore(projectRoot)]
+          : []),
+        ...(hasTanStackRoutes ? [TanStackRouterVite({ autoCodeSplitting: false })] : []),
+        viteReact(createDevReactPluginOptions()),
+        tailwindcss(),
+        ...prefixPlugins,
       ],
-    },
-    define: {
-      'import.meta.env.VITE_WPHS_MODULE_NAME': JSON.stringify(
-        config?.module?.name ?? config?.theme?.name ?? 'module',
-      ),
-      'process.env.NODE_ENV': JSON.stringify(mode === 'dev' ? 'development' : 'production'),
-      'process.env': {},
-      process: JSON.stringify({ env: {} }),
-    },
-    server: {
-      port: 3000,
-      fs: {
-        allow: [projectRoot, kitRoot],
+      resolve: {
+        preserveSymlinks: true,
+        dedupe: ['react', 'react-dom'],
+        alias: {
+          '@/dev/module-config': moduleConfigRoot,
+          '@wphs/bootstrap': bootstrapShim,
+          '@wphs/bootstrap-greenfield': bootstrapGreenfieldShim,
+          '@woodsportal/hubspot-kit/dev/bootstrap': bootstrapShim,
+          '@woodsportal/hubspot-kit/dev/bootstrap-greenfield': bootstrapGreenfieldShim,
+          '@wphs/adapter': resolve(projectRoot, config?.dev?.adapter ?? './wphs.adapter.ts'),
+          '@': resolve(projectRoot, './src'),
+        },
+      },
+      optimizeDeps: {
+        include: ['react', 'react-dom', 'react/jsx-dev-runtime', 'react/jsx-runtime'],
+        exclude: [
+          'woodsportal-client-sdk',
+          'woodsportal-client-sdk/auth',
+          'woodsportal-client-sdk/crm',
+        ],
+      },
+      define: {
+        'import.meta.env.VITE_WPHS_MODULE_NAME': JSON.stringify(
+          config?.module?.name ?? config?.theme?.name ?? 'module',
+        ),
+        'process.env.NODE_ENV': JSON.stringify(mode === 'dev' ? 'development' : 'production'),
+        'process.env': {},
+        process: JSON.stringify({ env: {} }),
+      },
+      server: {
+        port: 3000,
+        fs: {
+          allow: [projectRoot, kitRoot],
+        },
       },
-    },
-  }))
+    }
+  })
 }