create-waku 0.7.1 → 0.7.2

package/cli.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+
+// eslint-disable-next-line import/no-unresolved
+import './dist/index.js';

package/dist/index.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import{createRequire as t}from"module";var r={1706:t=>{
 /*!
  * @description Recursive object extending

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-waku",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "author": "Daishi Kato",
   "type": "module",
   "contributors": [
@@ -12,7 +12,7 @@
     "directory": "packages/create-waku"
   },
   "bin": {
-    "create-waku": "./dist/index.js"
+    "create-waku": "./cli.js"
   },
   "files": [
     "dist",

package/template/01_template/package.json

@@ -9,13 +9,13 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "autoprefixer": "10.4.17",
     "tailwindcss": "3.4.1",

package/template/01_template/tsconfig.json

@@ -11,7 +11,7 @@
     "types": ["react/experimental"],
     "jsx": "react-jsx",
     "paths": {
-      "~/*": ["./src/*"],
-    },
-  },
+      "~/*": ["./src/*"]
+    }
+  }
 }

package/template/02_demo/package.json

@@ -9,13 +9,13 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "autoprefixer": "10.4.17",
     "tailwindcss": "3.4.1",

package/template/02_demo/tsconfig.json

@@ -11,7 +11,7 @@
     "types": ["react/experimental"],
     "jsx": "react-jsx",
     "paths": {
-      "~/*": ["./src/*"],
-    },
-  },
+      "~/*": ["./src/*"]
+    }
+  }
 }

package/template/03_minimal/package.json

@@ -9,13 +9,13 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "typescript": "5.3.3"
   }

package/template/03_minimal/tsconfig.json

@@ -9,6 +9,6 @@
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "types": ["react/experimental"],
-    "jsx": "react-jsx",
-  },
+    "jsx": "react-jsx"
+  }
 }

package/template/04_promise/package.json

@@ -9,13 +9,13 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "typescript": "5.3.3"
   }

package/template/04_promise/tsconfig.json

@@ -9,6 +9,6 @@
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "types": ["react/experimental"],
-    "jsx": "react-jsx",
-  },
+    "jsx": "react-jsx"
+  }
 }

package/template/05_actions/package.json

@@ -9,14 +9,14 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
     "react-wrap-balancer": "1.1.0",
-    "waku": "0.19.1"
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "typescript": "5.3.3"
   }

package/template/05_actions/src/components/App.tsx

@@ -1,6 +1,6 @@
 import { Balancer } from 'react-wrap-balancer';
 
-import { Counter } from './Counter.js';
+import Counter from './Counter.js';
 import { greet, getCounter, increment } from './funcs.js';
 
 type ServerFunction<T> = T extends (...args: infer A) => infer R

package/template/05_actions/src/components/Counter.tsx

@@ -4,7 +4,7 @@ import { useState, useTransition } from 'react';
 
 import { TextBox } from './TextBox.js';
 
-export const Counter = ({
+const Counter = ({
   greet,
   increment,
 }: {
@@ -36,3 +36,5 @@ export const Counter = ({
     </div>
   );
 };
+
+export default Counter;

package/template/05_actions/tsconfig.json

@@ -9,6 +9,6 @@
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "types": ["react/experimental"],
-    "jsx": "react-jsx",
-  },
+    "jsx": "react-jsx"
+  }
 }

package/template/05_actions/vite.config.ts

@@ -0,0 +1,6 @@
+/** @type {import('vite').UserConfig} */
+export default {
+  ssr: {
+    noExternal: ['react-wrap-balancer'],
+  },
+};

package/template/06_nesting/package.json

@@ -9,13 +9,13 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "typescript": "5.3.3"
   }

package/template/06_nesting/tsconfig.json

@@ -9,6 +9,6 @@
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "types": ["react/experimental"],
-    "jsx": "react-jsx",
-  },
+    "jsx": "react-jsx"
+  }
 }

package/template/07_router/package.json

@@ -9,13 +9,13 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "server-only": "0.0.1",
     "typescript": "5.3.3"

package/template/07_router/tsconfig.json

@@ -9,6 +9,6 @@
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "types": ["react/experimental"],
-    "jsx": "react-jsx",
-  },
+    "jsx": "react-jsx"
+  }
 }

package/template/08_cookies/package.json

@@ -11,14 +11,14 @@
   "dependencies": {
     "cookie-parser": "1.4.6",
     "express": "4.18.2",
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/node": "20.11.5",
-    "@types/react": "18.2.48",
+    "@types/node": "20.11.16",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "typescript": "5.3.3"
   }

package/template/08_cookies/tsconfig.json

@@ -9,6 +9,6 @@
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "types": ["react/experimental", "node"],
-    "jsx": "react-jsx",
-  },
+    "jsx": "react-jsx"
+  }
 }

package/template/09_cssmodules/package.json

@@ -9,13 +9,13 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "typescript": "5.3.3"
   }

package/template/09_cssmodules/tsconfig.json

@@ -9,6 +9,6 @@
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "types": ["react/experimental"],
-    "jsx": "react-jsx",
-  },
+    "jsx": "react-jsx"
+  }
 }

package/template/10_dynamicroute/package.json

@@ -10,13 +10,13 @@
   },
   "dependencies": {
     "glob": "10.3.10",
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "typescript": "5.3.3"
   }

package/template/10_dynamicroute/src/entries.tsx

@@ -54,24 +54,27 @@ const getMappingAndItems = async (id: string) => {
   return { mapping, items };
 };
 
-const getStaticPaths = async () => {
+const getPathConfig = async () => {
   const files = await glob('**/page.{tsx,js}', { cwd: routesDir });
-  return files
-    .filter((file) => !/(^|\/)(\[\w+\]|_\w+_)\//.test(file))
-    .map((file) => '/' + file.slice(0, Math.max(0, file.lastIndexOf('/'))));
+  return files.map((file) => {
+    const names = file.split('/').filter(Boolean).slice(0, -1);
+    const pathSpec = names.map((name) => {
+      const match = name.match(/^(\[\w+\]|_\w+_)$/);
+      if (match) {
+        return { type: 'group', name: match[1]!.slice(1, -1) } as const;
+      }
+      return { type: 'literal', name } as const;
+    });
+    return {
+      path: pathSpec,
+      isStatic: pathSpec.every(({ type }) => type === 'literal'),
+    };
+  });
 };
 
 export default defineRouter(
-  // existsPath
-  async (path: string) => {
-    if ((await getStaticPaths()).includes(path)) {
-      return 'static';
-    }
-    if ((await getMappingAndItems(path + '/page')) !== null) {
-      return 'dynamic';
-    }
-    return null;
-  },
+  // getPathConfig
+  () => getPathConfig(),
   // getComponent (id is "**/layout" or "**/page")
   async (id, unstable_setShouldSkip) => {
     unstable_setShouldSkip({}); // always skip if possible
@@ -86,6 +89,4 @@ export default defineRouter(
     );
     return Component;
   },
-  // getPathsForBuild
-  () => getStaticPaths(),
 );

package/template/10_dynamicroute/tsconfig.json

@@ -9,6 +9,6 @@
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "types": ["react/experimental"],
-    "jsx": "react-jsx",
-  },
+    "jsx": "react-jsx"
+  }
 }

package/template/10_dynamicroute/vite.config.ts

@@ -7,9 +7,6 @@ const routeFiles = glob.sync('routes/**/*.{tsx,js}', { cwd: rootDir });
 
 /** @type {import('vite').UserConfig} */
 export default {
-  ssr: {
-    external: ['glob'],
-  },
   build: {
     rollupOptions: {
       input: Object.fromEntries(

package/template/11_form/package.json

@@ -9,13 +9,13 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "typescript": "5.3.3"
   }

package/template/11_form/tsconfig.json

@@ -9,6 +9,6 @@
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "types": ["react/experimental"],
-    "jsx": "react-jsx",
-  },
+    "jsx": "react-jsx"
+  }
 }

package/template/12_css/package.json

@@ -9,20 +9,20 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "@stylexjs/stylex": "0.4.1",
-    "@vanilla-extract/css": "1.14.0",
+    "@stylexjs/stylex": "0.5.1",
+    "@vanilla-extract/css": "1.14.1",
     "classnames": "2.3.2",
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
-    "@vanilla-extract/vite-plugin": "3.9.4",
+    "@vanilla-extract/vite-plugin": "3.9.5",
     "typescript": "5.3.3",
     "vite": "5.0.12",
-    "vite-plugin-stylex-dev": "0.2.4"
+    "vite-plugin-stylex-dev": "0.3.0"
   }
 }

package/template/12_css/tsconfig.json

@@ -9,6 +9,6 @@
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "types": ["react/experimental"],
-    "jsx": "react-jsx",
-  },
+    "jsx": "react-jsx"
+  }
 }

package/template/12_css/vite.config.ts

@@ -1,12 +1,7 @@
-import { defineConfig } from 'vite';
 import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
 import { stylexPlugin } from 'vite-plugin-stylex-dev';
 
-export default defineConfig(({ mode }) => ({
-  ...(mode === 'development' && {
-    ssr: {
-      external: ['@stylexjs/stylex', 'classnames'],
-    },
-  }),
+/** @type {import('vite').UserConfig} */
+export default {
   plugins: [vanillaExtractPlugin({ emitCssInSsr: true }), stylexPlugin()],
-}));
+};

package/template/13_path-alias/package.json

@@ -9,16 +9,16 @@
     "start": "waku start --with-ssr"
   },
   "dependencies": {
-    "react": "18.3.0-canary-b30030471-20240117",
-    "react-dom": "18.3.0-canary-b30030471-20240117",
-    "react-server-dom-webpack": "18.3.0-canary-b30030471-20240117",
-    "waku": "0.19.1"
+    "react": "18.3.0-canary-4b2a1115a-20240202",
+    "react-dom": "18.3.0-canary-4b2a1115a-20240202",
+    "react-server-dom-webpack": "18.3.0-canary-4b2a1115a-20240202",
+    "waku": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.2.48",
+    "@types/react": "18.2.54",
     "@types/react-dom": "18.2.18",
     "typescript": "5.3.3",
     "vite": "5.0.12",
-    "vite-tsconfig-paths": "4.2.3"
+    "vite-tsconfig-paths": "4.3.1"
   }
 }

package/template/13_path-alias/tsconfig.json

@@ -11,7 +11,7 @@
     "types": ["react/experimental"],
     "jsx": "react-jsx",
     "paths": {
-      "@/*": ["./src/*"],
-    },
-  },
+      "@/*": ["./src/*"]
+    }
+  }
 }

package/template/13_path-alias/vite.config.ts

@@ -1,6 +1,11 @@
-import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
+import { fileURLToPath } from 'node:url';
 
-export default defineConfig({
-  plugins: [tsconfigPaths()],
-});
+/** @type {import('vite').UserConfig} */
+export default {
+  plugins: [
+    tsconfigPaths({
+      root: fileURLToPath(new URL('.', import.meta.url)),
+    }),
+  ],
+};