step 4 for middleware architecture (#565)

* remove old cli and with-ssr option * overlooked * fix tests * clean up unused code
dai-shi · Mar 5, 2024 · ad84f50 · ad84f50
1 parent f9111ed
commit ad84f50
Show file tree

Hide file tree

Showing 41 changed files with 82 additions and 744 deletions.
diff --git a/README.md b/README.md
@@ -644,7 +644,7 @@ Adding the `--with-vercel-static` flag to the build script will produce static s
 ```
 {
   "scripts": {
-    "build": "waku build --with-ssr --with-vercel-static"
+    "build": "waku build --with-vercel-static"
   }
 }
 ```
@@ -665,7 +665,7 @@ Adding the `--with-netlify-static` flag to the build script will produce static
 ```
 {
   "scripts": {
-    "build": "waku build --with-ssr --with-netlify-static"
+    "build": "waku build --with-netlify-static"
   }
 }
 ```

diff --git a/docs/builder/aws-lambda.mdx b/docs/builder/aws-lambda.mdx
@@ -59,7 +59,7 @@ custom:
     # add custom hooks
     hooks:
       before:package:createDeploymentArtifacts:
-        - pnpm waku build --with-ssr --with-aws-lambda
+        - pnpm waku build --with-aws-lambda
 ```
 
 This configuration will include all files from the `./private` directory in the final deployment.
@@ -196,7 +196,7 @@ export class WakuStack extends cdk.Stack {
             tryBundle(outputDir) {
               spawnSync(
                 'pnpm',
-                ['exec', 'waku', 'build', '--with-ssr', '--with-aws-lambda'],
+                ['exec', 'waku', 'build', '--with-aws-lambda'],
                 { stdio: 'inherit' },
               );
               cpSync('dist', outputDir, { recursive: true, dereference: true });

diff --git a/e2e/07_router_standalone.spec.ts b/e2e/07_router_standalone.spec.ts
@@ -69,15 +69,15 @@ test.describe('07_router standalone', () => {
     test(`should prod work ${withSSR ? 'with SSR' : ''}`, async ({ page }) => {
       test.fixme(withSSR, 'SSR is not working in standalone');
       execSync(
-        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} build${withSSR ? ' --with-ssr' : ''}`,
+        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} build`,
         {
           cwd: standaloneDir,
           stdio: 'inherit',
         },
       );
       const port = await getFreePort();
       const cp = exec(
-        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} start${withSSR ? ' --with-ssr' : ''}`,
+        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} start`,
         {
           cwd: standaloneDir,
           env: {
@@ -95,7 +95,7 @@ test.describe('07_router standalone', () => {
       test.fixme(withSSR, 'SSR is not working in standalone');
       const port = await getFreePort();
       const cp = exec(
-        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} dev${withSSR ? ' --with-ssr' : ''}`,
+        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} dev`,
         {
           cwd: standaloneDir,
           env: {

diff --git a/e2e/examples-smoke.spec.ts b/e2e/examples-smoke.spec.ts
@@ -23,33 +23,19 @@ const commands = [
   {
     command: 'dev',
   },
-  {
-    command: 'dev --with-ssr',
-  },
   {
     build: 'build',
     command: 'start',
   },
-  {
-    build: 'build --with-ssr',
-    command: 'start --with-ssr',
-  },
 ];
 
 const specialExamples = [
   {
     name: '08_cookies',
     commands: [
-      {
-        command: 'node dev.js --with-ssr',
-      },
       {
         command: 'node dev.js',
       },
-      {
-        build: 'waku build --with-ssr',
-        command: 'node start.js --with-ssr',
-      },
       {
         build: 'waku build',
         command: 'node start.js',

diff --git a/e2e/fixtures/ssr-basic/package.json b/e2e/fixtures/ssr-basic/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/e2e/fixtures/ssr-swr/package.json b/e2e/fixtures/ssr-swr/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/e2e/fixtures/ssr-target-bundle/package.json b/e2e/fixtures/ssr-target-bundle/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/e2e/ssr-basic.spec.ts b/e2e/ssr-basic.spec.ts
@@ -11,11 +11,11 @@ const waku = fileURLToPath(
 
 const commands = [
   {
-    command: 'dev --with-ssr',
+    command: 'dev',
   },
   {
-    build: 'build --with-ssr',
-    command: 'start --with-ssr',
+    build: 'build',
+    command: 'start',
   },
 ];
 

diff --git a/e2e/ssr-swr.spec.ts b/e2e/ssr-swr.spec.ts
@@ -11,11 +11,11 @@ const waku = fileURLToPath(
 
 const commands = [
   {
-    command: 'dev --with-ssr',
+    command: 'dev',
   },
   {
-    build: 'build --with-ssr',
-    command: 'start --with-ssr',
+    build: 'build',
+    command: 'start',
   },
 ];
 

diff --git a/e2e/ssr-target-bundle.spec.ts b/e2e/ssr-target-bundle.spec.ts
@@ -12,11 +12,11 @@ const waku = fileURLToPath(
 
 const commands = [
   {
-    command: 'dev --with-ssr',
+    command: 'dev',
   },
   {
-    build: 'build --with-ssr',
-    command: 'start --with-ssr',
+    build: 'build',
+    command: 'start',
   },
 ];
 
@@ -65,7 +65,7 @@ for (const { build, command } of commands) {
     });
 
     test('image exists in folder public/assets', async () => {
-      test.skip(command.startsWith('dev '));
+      test.skip(command.startsWith('dev'));
       const imagePath = path.join(cwd, 'dist', 'public', 'assets');
       const files = await readdir(imagePath);
       const imageExists = files.some((file) =>
@@ -75,7 +75,7 @@ for (const { build, command } of commands) {
     });
 
     test('json public linked exists in folder public/assets', async () => {
-      test.skip(command.startsWith('dev '));
+      test.skip(command.startsWith('dev'));
       const imagePath = path.join(cwd, 'dist', 'public', 'assets');
       const files = await readdir(imagePath);
       const imageExists = files.some((file) =>
@@ -85,7 +85,7 @@ for (const { build, command } of commands) {
     });
 
     test('json private NOT exists in folder public/assets', async () => {
-      test.skip(command.startsWith('dev '));
+      test.skip(command.startsWith('dev'));
       const imagePath = path.join(cwd, 'dist', 'public', 'assets');
       const files = await readdir(imagePath);
       const imageExists = files.some((file) =>

diff --git a/examples/01_template/package.json b/examples/01_template/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/examples/02_demo/package.json b/examples/02_demo/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/examples/03_minimal/package.json b/examples/03_minimal/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/examples/04_promise/package.json b/examples/04_promise/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/examples/05_actions/package.json b/examples/05_actions/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/examples/06_nesting/package.json b/examples/06_nesting/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/examples/07_router/package.json b/examples/07_router/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/examples/08_cookies/package.json b/examples/08_cookies/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "cookie": "0.6.0",

diff --git a/examples/09_cssmodules/package.json b/examples/09_cssmodules/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/examples/10_fs-router/package.json b/examples/10_fs-router/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "glob": "10.3.10",

diff --git a/examples/11_form/package.json b/examples/11_form/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/examples/12_css/package.json b/examples/12_css/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "@stylexjs/stylex": "0.5.1",

diff --git a/examples/13_path-alias/package.json b/examples/13_path-alias/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",

diff --git a/examples/14_react-tweet/package.json b/examples/14_react-tweet/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",