Add with-app-dir integration test

martpie · Nov 1, 2022 · b224849 · b224849
1 parent 61c1745
commit b224849
Show file tree

Hide file tree

Showing 18 changed files with 565 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,6 +64,9 @@ jobs:
       - name: Install tests apps dependencies (swc)
         run: yarn --frozen-lockfile --cwd src/__tests__/__apps__/swc
 
+      - name: Install tests apps dependencies (with-app-dir)
+        run: yarn --frozen-lockfile --cwd src/__tests__/__apps__/with-app-dir
+
       - name: Build test apps
         run: npm run test:prepare
 

diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js
@@ -3,6 +3,7 @@ const yarnWorkspacesAppPath = 'src/__tests__/__apps__/yarn-workspaces/app';
 const yarnWorkspacesSymlinksAppPath = 'src/__tests__/__apps__/yarn-workspaces-symlinks/app';
 const pnpmAppPath = 'src/__tests__/__apps__/pnpm';
 const swcAppPath = 'src/__tests__/__apps__/swc/app';
+const withAppDirAppPath = 'src/__tests__/__apps__/with-app-dir/app';
 
 module.exports = {
   launch: {
@@ -36,5 +37,10 @@ module.exports = {
       launchTimeout: 20000,
       port: 3506,
     },
+    {
+      command: `yarn --cwd ${withAppDirAppPath} run start --port 3507`,
+      launchTimeout: 20000,
+      port: 3507,
+    },
   ],
 };
diff --git a/package.json b/package.json
@@ -26,7 +26,8 @@
     "test:prepare:yarn-workspaces-symlinks": "yarn --cwd src/__tests__/__apps__/yarn-workspaces-symlinks/app run build",
     "test:prepare:pnpm": "npm run build --prefix=src/__tests__/__apps__/pnpm",
     "test:prepare:swc": "yarn --cwd src/__tests__/__apps__/swc/app run build",
-    "test:prepare": "npm run test:prepare:npm-basic && npm run test:prepare:yarn-workspaces && npm run test:prepare:yarn-workspaces-symlinks && npm run test:prepare:pnpm && npm run test:prepare:swc"
+    "test:prepare:with-app-dir": "yarn --cwd src/__tests__/__apps__/with-app-dir/app run build",
+    "test:prepare": "npm run test:prepare:npm-basic && npm run test:prepare:yarn-workspaces && npm run test:prepare:yarn-workspaces-symlinks && npm run test:prepare:pnpm && npm run test:prepare:swc && npm run test:prepare:with-app-dir"
   },
   "repository": {
     "type": "git",

diff --git a/scripts/next-update.sh b/scripts/next-update.sh
@@ -18,3 +18,6 @@ yarn --cwd "$ROOT/src/__tests__/__apps__/yarn-workspaces-symlinks/app" add "next
 
 echo "==================== SWC ===================="
 yarn --cwd "$ROOT/src/__tests__/__apps__/swc/app" add "next@$NEXT_VERSION"
+
+echo "==================== WITH-APP-DIR ===================="
+yarn --cwd "$ROOT/src/__tests__/__apps__/with-app-dir/app" add "next@$NEXT_VERSION"
diff --git a/src/__tests__/.gitignore b/src/__tests__/.gitignore
@@ -7,6 +7,9 @@ __apps__/yarn-workspaces-symlinks/shared-ui
 __apps__/swc/shared
 __apps__/swc/shared-ts
 __apps__/swc/shared-ui
+__apps__/with-app-dir/shared
+__apps__/with-app-dir/shared-ts
+__apps__/with-app-dir/shared-ui
 __apps__/shared
 __apps__/shared-ts
 __apps__/shared-ui
@@ -40,3 +43,9 @@ __apps__/swc/app/components
 __apps__/swc/app/pages
 !__apps__/swc/app/pages/.keep
 __apps__/swc/app/next-transpile-modules.js
+
+__apps__/with-app-dir/app/components
+!__apps__/with-app-dir/app/components/.keep
+__apps__/with-app-dir/app/pages
+!__apps__/with-app-dir/app/pages/.keep
+__apps__/with-app-dir/app/next-transpile-modules.js
diff --git a/src/__tests__/__apps__/pnpm/package.json b/src/__tests__/__apps__/pnpm/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "test-npm-basic",
+  "name": "test-pnpm",
   "version": "1.0.0",
   "description": "",
   "private": "true",

diff --git a/src/__tests__/__apps__/with-app-dir/app/.gitignore b/src/__tests__/__apps__/with-app-dir/app/.gitignore
@@ -0,0 +1 @@
+.vscode
diff --git a/src/__tests__/__apps__/with-app-dir/app/app/layout.tsx b/src/__tests__/__apps__/with-app-dir/app/app/layout.tsx
@@ -0,0 +1,12 @@
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  return (
+    <html>
+      <head></head>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/src/__tests__/__apps__/with-app-dir/app/app/page.tsx b/src/__tests__/__apps__/with-app-dir/app/app/page.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { add } from 'shared-ts/utils/calc';
+import { Subtitle } from 'shared-ts/components/Subtitle';
+
+const HomePage: React.FC = () => {
+  return (
+    <>
+      <h1>The answer is {add(40, 3)}</h1>
+      <Subtitle underlined>And this is a subtitle</Subtitle>
+    </>
+  );
+};
+
+export default HomePage;
diff --git a/src/__tests__/__apps__/with-app-dir/app/next-env.d.ts b/src/__tests__/__apps__/with-app-dir/app/next-env.d.ts
@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/src/__tests__/__apps__/with-app-dir/app/next.config.js b/src/__tests__/__apps__/with-app-dir/app/next.config.js
@@ -0,0 +1,10 @@
+const withTM = require('./next-transpile-modules')(['shared', 'shared-ts', 'shared-ui', 'lodash-es'], { debug: true });
+
+module.exports = withTM({
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
+  experimental: {
+    appDir: true,
+  },
+});
diff --git a/src/__tests__/__apps__/with-app-dir/app/package.json b/src/__tests__/__apps__/with-app-dir/app/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "test-yarn-workspaces",
+  "version": "1.0.0",
+  "description": "",
+  "private": "true",
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "author": "Pierre de la Martinière <pierre.de.la.martiniere@gmail.com>",
+  "license": "MIT",
+  "dependencies": {
+    "lodash-es": "^4.17.21",
+    "next": "13.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "sass": "^1.43.4",
+    "shared": "^1.0.0",
+    "shared-ts": "^1.0.0",
+    "shared-ui": "^1.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^18.11.7",
+    "@types/react": "^18.0.24",
+    "@types/react-dom": "^18.0.8",
+    "typescript": "^4.8.4"
+  }
+}
diff --git a/src/__tests__/__apps__/with-app-dir/app/tsconfig.json b/src/__tests__/__apps__/with-app-dir/app/tsconfig.json
@@ -0,0 +1,36 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ]
+  },
+  "exclude": [
+    "node_modules"
+  ],
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts"
+  ]
+}
diff --git a/src/__tests__/__apps__/with-app-dir/package.json b/src/__tests__/__apps__/with-app-dir/package.json
@@ -0,0 +1,9 @@
+{
+  "private": true,
+  "workspaces": [
+    "shared",
+    "shared-ts",
+    "shared-ui",
+    "app"
+  ]
+}