Merge pull request #324 from vercel:fix/examples-ui-ts

Fix create-turbo ui typescript to support dynamic imports
vercel · Dec 16, 2021 · e0f1e9c · e0f1e9c · vercel · Dec 16, 2021
2 parents 8c443a3 + 8f1fc38
commit e0f1e9c
Show file tree

Hide file tree

Showing 59 changed files with 118 additions and 264 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -7,7 +7,4 @@ dist
 *.svg
 *.lock
 *.npmignore
-apps/docs/nextra-theme-turbo/
-app/node_modules/
-data
-examples
+examples/**
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,8 +1,9 @@
 module.exports = {
+  root: true,
   extends: ["next", "prettier"],
   settings: {
     next: {
-      rootDir: ["docs/"],
+      rootDir: ["docs/", "create-turbo/"],
     },
   },
 };
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,6 +5,7 @@
     { "language": "typescript", "autoFix": true },
     { "language": "typescriptreact", "autoFix": true }
   ],
+  "eslint.packageManager": "yarn",
   "debug.javascript.unmapMissingSources": true,
   "gopls": {
     "experimentalWorkspaceModule": true

diff --git a/create-turbo/.eslintrc.js b/create-turbo/.eslintrc.js
diff --git a/create-turbo/package.json b/create-turbo/package.json
@@ -17,7 +17,8 @@
   },
   "scripts": {
     "build": "tsup src/index.ts --format cjs",
-    "test": "jest"
+    "test": "jest",
+    "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
     "chalk": "2.4.2",

diff --git a/create-turbo/templates/_shared_ts/apps/docs/package.json b/create-turbo/templates/_shared_ts/apps/docs/package.json
@@ -20,6 +20,6 @@
     "next-transpile-modules": "9.0.0",
     "tsconfig": "*",
     "@types/react": "17.0.37",
-    "typescript": "4.5.2"
+    "typescript": "^4.5.3"
   }
 }
diff --git a/create-turbo/templates/_shared_ts/apps/web/package.json b/create-turbo/templates/_shared_ts/apps/web/package.json
@@ -20,6 +20,6 @@
     "next-transpile-modules": "9.0.0",
     "tsconfig": "*",
     "@types/react": "17.0.37",
-    "typescript": "4.5.2"
+    "typescript": "^4.5.3"
   }
 }
diff --git a/create-turbo/templates/_shared_ts/packages/config/eslint-preset.js b/create-turbo/templates/_shared_ts/packages/config/eslint-preset.js
@@ -2,13 +2,7 @@ module.exports = {
   extends: ["next", "prettier"],
   settings: {
     next: {
-      rootDir: [
-        "apps/docs/",
-        "apps/web/",
-        "packages/ui/",
-        "packages/config/",
-        "packages/tsconfig/",
-      ],
+      rootDir: ["apps/*/", "packages/*/"],
     },
   },
 };
diff --git a/create-turbo/templates/_shared_ts/packages/tsconfig/react-library.json b/create-turbo/templates/_shared_ts/packages/tsconfig/react-library.json
@@ -2,13 +2,10 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "display": "React Library",
   "extends": "./base.json",
-  "include": ["src"],
-  "exclude": ["node_modules"],
   "compilerOptions": {
     "lib": ["ES2015"],
     "module": "ESNext",
-    "rootDir": "src",
-    "outDir": "dist",
-    "jsx": "react"
+    "target": "ES6",
+    "jsx": "react-jsx"
   }
 }
diff --git a/create-turbo/templates/_shared_ts/packages/ui/package.json b/create-turbo/templates/_shared_ts/packages/ui/package.json
@@ -8,6 +8,6 @@
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",
     "tsconfig": "*",
-    "typescript": "^4.5.2"
+    "typescript": "^4.5.3"
   }
 }
diff --git a/create-turbo/templates/_shared_ts/packages/ui/tsconfig.json b/create-turbo/templates/_shared_ts/packages/ui/tsconfig.json
@@ -1,7 +1,5 @@
 {
   "extends": "tsconfig/react-library.json",
-  "compilerOptions": {
-    "jsx": "react-jsx"
-  },
-  "exclude": ["node_modules"]
+  "include": ["."],
+  "exclude": ["dist", "build", "node_modules"]
 }
diff --git a/examples/basic/.eslintrc.js b/examples/basic/.eslintrc.js
diff --git a/examples/basic/apps/docs/package.json b/examples/basic/apps/docs/package.json
@@ -9,18 +9,17 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "next": "12.0.3",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "next": "latest",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "ui": "*"
   },
   "devDependencies": {
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",
     "config": "*",
-    "eslint": "7.32.0",
     "next-transpile-modules": "^9.0.0",
     "tsconfig": "*",
-    "typescript": "^4.5.2"
+    "typescript": "^4.5.3"
   }
 }
diff --git a/examples/basic/apps/web/package.json b/examples/basic/apps/web/package.json
@@ -9,18 +9,17 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "next": "^12.0.7",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "next": "latest",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "ui": "*"
   },
   "devDependencies": {
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",
     "config": "*",
-    "eslint": "7.32.0",
     "next-transpile-modules": "^9.0.0",
     "tsconfig": "*",
-    "typescript": "^4.5.2"
+    "typescript": "^4.5.3"
   }
 }
diff --git a/examples/basic/packages/config/package.json b/examples/basic/packages/config/package.json
@@ -9,5 +9,8 @@
   "dependencies": {
     "eslint-config-next": "^12.0.3",
     "eslint-config-prettier": "^8.3.0"
+  },
+  "devDependencies": {
+    "typescript": "^4.5.3"
   }
 }
diff --git a/examples/basic/packages/tsconfig/react-library.json b/examples/basic/packages/tsconfig/react-library.json
@@ -2,13 +2,10 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "display": "React Library",
   "extends": "./base.json",
-  "include": ["src"],
-  "exclude": ["node_modules"],
   "compilerOptions": {
     "lib": ["ES2015"],
     "module": "ESNext",
-    "rootDir": "src",
-    "outDir": "dist",
-    "jsx": "react"
+    "target": "ES6",
+    "jsx": "react-jsx"
   }
 }
diff --git a/examples/basic/packages/ui/tsconfig.json b/examples/basic/packages/ui/tsconfig.json
@@ -1,7 +1,5 @@
 {
   "extends": "tsconfig/react-library.json",
-  "compilerOptions": {
-    "jsx": "react-jsx"
-  },
-  "exclude": ["node_modules"]
+  "include": ["."],
+  "exclude": ["dist", "build", "node_modules"]
 }
diff --git a/examples/design-system/.prettierignore b/examples/design-system/.prettierignore
diff --git a/examples/design-system/.prettierrc b/examples/design-system/.prettierrc
diff --git a/examples/design-system/package.json b/examples/design-system/package.json
@@ -11,7 +11,8 @@
     "dev": "turbo run dev --no-cache --parallel --continue",
     "lint": "turbo run lint",
     "test": "turbo run test",
-    "clean": "turbo run clean && rm -rf node_modules"
+    "clean": "turbo run clean && rm -rf node_modules",
+    "format": "prettier --write \"**/*.{ts,tsx,md}\""
   },
   "devDependencies": {
     "eslint": "^8.4.1",

diff --git a/examples/design-system/packages/acme-core/package.json b/examples/design-system/packages/acme-core/package.json
@@ -22,7 +22,7 @@
     "@types/react-dom": "^17.0.8",
     "react": "^17.0.2",
     "tsup": "^5.10.1",
-    "typescript": "^4.2.4"
+    "typescript": "^4.5.3"
   },
   "publishConfig": {
     "access": "public"

diff --git a/examples/design-system/packages/acme-core/tsconfig.json b/examples/design-system/packages/acme-core/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "lib": ["ES2015", "DOM"],
-    "target": "ES6",
-    "module": "ESNext",
-    "outDir": "./dist",
-    "rootDir": "./src"
-  },
-  "exclude": ["node_modules", "src/__test__/**/*"],
   "extends": "@acme/tsconfig/react-library.json",
-  "include": ["src"]
+  "include": ["."],
+  "exclude": ["dist", "build", "node_modules"]
 }
diff --git a/examples/design-system/packages/acme-tsconfig/react-library.json b/examples/design-system/packages/acme-tsconfig/react-library.json
@@ -2,13 +2,10 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "display": "React Library",
   "extends": "./base.json",
-  "include": ["src"],
-  "exclude": ["node_modules"],
   "compilerOptions": {
     "lib": ["ES2015"],
     "module": "ESNext",
-    "rootDir": "src",
-    "outDir": "dist",
-    "jsx": "react"
+    "target": "ES6",
+    "jsx": "react-jsx"
   }
 }
diff --git a/examples/design-system/packages/acme-utils/package.json b/examples/design-system/packages/acme-utils/package.json
@@ -22,7 +22,7 @@
     "eslint-preset-acme": "*",
     "react": "^17.0.2",
     "tsup": "^5.10.1",
-    "typescript": "^4.2.4"
+    "typescript": "^4.5.3"
   },
   "publishConfig": {
     "access": "public"

diff --git a/examples/design-system/packages/acme-utils/tsconfig.json b/examples/design-system/packages/acme-utils/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "lib": ["ES2015", "DOM"],
-    "target": "ES6",
-    "module": "ESNext",
-    "outDir": "./dist",
-    "rootDir": "./src"
-  },
-  "exclude": ["node_modules", "src/__test__/**/*"],
-  "extends": "@acme/tsconfig/base.json",
-  "include": ["src"]
+  "extends": "@acme/tsconfig/react-library.json",
+  "include": ["."],
+  "exclude": ["dist", "build", "node_modules"]
 }
diff --git a/examples/design-system/packages/eslint-preset-acme/README.md b/examples/design-system/packages/eslint-preset-acme/README.md
diff --git a/examples/kitchen-sink/.prettierignore b/examples/kitchen-sink/.prettierignore
diff --git a/examples/kitchen-sink/.prettierrc b/examples/kitchen-sink/.prettierrc
diff --git a/examples/kitchen-sink/apps/admin/package.json b/examples/kitchen-sink/apps/admin/package.json
@@ -20,7 +20,7 @@
     "@vitejs/plugin-react-refresh": "^1.3.6",
     "scripts": "*",
     "tsconfig": "*",
-    "typescript": "^4.2.4",
+    "typescript": "^4.5.3",
     "vite": "^2.6.14"
   }
 }
diff --git a/examples/kitchen-sink/apps/api/package.json b/examples/kitchen-sink/apps/api/package.json
@@ -22,7 +22,7 @@
     "scripts": "*",
     "supertest": "^6.1.3",
     "tsconfig": "*",
-    "typescript": "^4.2.4"
+    "typescript": "^4.5.3"
   },
   "jest": {
     "preset": "scripts/jest/node"

diff --git a/examples/kitchen-sink/apps/blog/package.json b/examples/kitchen-sink/apps/blog/package.json
@@ -10,18 +10,18 @@
   },
   "dependencies": {
     "@remix-run/react": "^1.0.6",
+    "@remix-run/serve": "^1.0.6",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "remix": "^1.0.6",
-    "ui": "*",
-    "@remix-run/serve": "^1.0.6"
+    "ui": "*"
   },
   "devDependencies": {
     "@remix-run/dev": "^1.0.6",
     "@types/react": "^17.0.24",
     "@types/react-dom": "^17.0.9",
     "tsconfig": "*",
-    "typescript": "^4.2.4"
+    "typescript": "^4.5.3"
   },
   "engines": {
     "node": ">=14"

diff --git a/examples/kitchen-sink/apps/storefront/next-env.d.ts b/examples/kitchen-sink/apps/storefront/next-env.d.ts
@@ -1,3 +1,5 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <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/examples/kitchen-sink/apps/storefront/package.json b/examples/kitchen-sink/apps/storefront/package.json
@@ -11,18 +11,17 @@
   },
   "dependencies": {
     "logger": "*",
-    "next": "^11.0.1",
-    "next-transpile-modules": "^8.0.0",
+    "next": "latest",
+    "next-transpile-modules": "^9.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "ui": "*"
   },
   "devDependencies": {
-    "eslint-config-next": "^11.0.1",
     "@types/react": "^17.0.13",
     "@types/react-dom": "^17.0.8",
     "scripts": "*",
     "tsconfig": "*",
-    "typescript": "^4.2.4"
+    "typescript": "^4.5.3"
   }
 }
diff --git a/examples/kitchen-sink/package.json b/examples/kitchen-sink/package.json
@@ -11,9 +11,11 @@
     "dev": "turbo run dev --no-cache --parallel --continue",
     "lint": "turbo run lint",
     "test": "turbo run test",
-    "clean": "turbo run clean && rm -rf node_modules"
+    "clean": "turbo run clean && rm -rf node_modules",
+    "format": "prettier --write \"**/*.{ts,tsx,md}\""
   },
   "devDependencies": {
+    "prettier": "^2.5.1",
     "turbo": "latest"
   },
   "turbo": {
@@ -39,6 +41,9 @@
       },
       "dev": {
         "cache": false
+      },
+      "clean": {
+        "cache": false
       }
     }
   }