Update to leverage turbo for build/prepublish (#37280)

* Update to leverage turbo for build/prepublish * update path * remove extra turbo config
vercel · May 31, 2022 · 1d1ffc8 · 1d1ffc8
1 parent 3d9c21b
commit 1d1ffc8
Show file tree

Hide file tree

Showing 25 changed files with 137 additions and 109 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -8,7 +8,7 @@ name: Build, test, and deploy
 
 env:
   NAPI_CLI_VERSION: 2.7.0
-  TURBO_VERSION: 1.2.9
+  TURBO_VERSION: 1.2.14
   RUST_TOOLCHAIN: nightly-2022-02-23
   PNPM_VERSION: 7.1.6
 

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -6,7 +6,7 @@ name: Generate Pull Request Stats
 
 env:
   NAPI_CLI_VERSION: 2.7.0
-  TURBO_VERSION: 1.2.9
+  TURBO_VERSION: 1.2.14
   RUST_TOOLCHAIN: nightly-2022-02-23
   PNPM_VERSION: 7.1.6
 

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "new-error": "plop error",
     "new-test": "plop test",
     "clean": "pnpm lerna clean -y && pnpm lerna bootstrap && pnpm lerna exec 'rm -rf ./dist'",
-    "build": "pnpm prepublishOnly",
+    "build": "turbo run build",
     "lerna": "lerna",
     "dev": "lerna run dev --stream --parallel",
     "test-types": "pnpm tsc",
@@ -31,8 +31,8 @@
     "prettier-check": "prettier --check .",
     "prettier-fix": "prettier --write .",
     "types": "lerna run types --stream",
-    "typescript": "lerna run typescript",
-    "prepublishOnly": "lerna run prepublishOnly",
+    "typescript": "turbo run typescript",
+    "prepublishOnly": "turbo run build",
     "publish-canary": "git checkout canary && git pull && lerna version prerelease --preid canary --force-publish && release --pre --skip-questions",
     "publish-stable": "lerna version --force-publish",
     "lint-staged": "lint-staged",
@@ -49,8 +49,8 @@
   "devDependencies": {
     "@babel/core": "7.15.0",
     "@babel/eslint-parser": "7.15.0",
-    "@babel/parser": "7.12.11",
     "@babel/generator": "7.15.0",
+    "@babel/parser": "7.12.11",
     "@babel/plugin-proposal-object-rest-spread": "7.14.7",
     "@babel/preset-flow": "7.14.5",
     "@babel/preset-react": "7.14.5",
@@ -189,7 +189,7 @@
     "taskr": "1.1.0",
     "tree-kill": "1.2.2",
     "tsec": "0.2.1",
-    "turbo": "1.2.9",
+    "turbo": "1.2.14",
     "typescript": "4.6.3",
     "wait-port": "0.2.2",
     "webpack": "link:./node_modules/webpack5",

diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -24,7 +24,8 @@
     "dev": "ncc build ./index.ts -w -o dist/",
     "prerelease": "rimraf ./dist/",
     "release": "ncc build ./index.ts -o ./dist/ --minify --no-cache --no-source-map-register",
-    "prepublishOnly": "pnpm release"
+    "prepublishOnly": "cd ../../ && turbo run build",
+    "build": "pnpm release"
   },
   "devDependencies": {
     "@types/async-retry": "1.4.2",

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -19,7 +19,8 @@
     "lib/cra-to-next/gitignore"
   ],
   "scripts": {
-    "prepublishOnly": "pnpm tsc -d -p tsconfig.json",
+    "build": "pnpm tsc -d -p tsconfig.json",
+    "prepublishOnly": "cd ../../ && turbo run build",
     "dev": "pnpm tsc -d -w -p tsconfig.json",
     "test": "jest"
   },

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -26,7 +26,8 @@
     "prerelease": "rimraf ./dist/",
     "types": "tsc index.ts --declaration --emitDeclarationOnly --declarationDir types --esModuleInterop",
     "release": "ncc build ./index.ts -o ./dist/ --minify --no-cache --no-source-map-register",
-    "prepublishOnly": "pnpm release && pnpm types"
+    "build": "pnpm release && pnpm types",
+    "prepublishOnly": "cd ../../ && turbo run build"
   },
   "devDependencies": {
     "@vercel/ncc": "0.33.4",

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -9,8 +9,8 @@
     "directory": "packages/next-polyfill-module"
   },
   "scripts": {
-    "prepublishOnly": "microbundle -i src/index.js -o dist/polyfill-module.js -f iife --no-sourcemap --external none --no-pkg-main",
-    "build": "microbundle watch -i src/index.js -o dist/polyfill-module.js -f iife --no-sourcemap --external none --no-pkg-main"
+    "build": "microbundle -i src/index.js -o dist/polyfill-module.js -f iife --no-sourcemap --external none --no-pkg-main",
+    "prepublishOnly": "cd ../../ && turbo run build"
   },
   "devDependencies": {
     "microbundle": "0.13.0"

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -9,8 +9,8 @@
     "directory": "packages/next-polyfill-nomodule"
   },
   "scripts": {
-    "prepublishOnly": "microbundle -i src/index.js -o dist/polyfill-nomodule.js -f iife --no-sourcemap --external none --no-pkg-main",
-    "build": "microbundle watch -i src/index.js -o dist/polyfill-nomodule.js -f iife --no-sourcemap --external none --no-pkg-main"
+    "build": "microbundle -i src/index.js -o dist/polyfill-nomodule.js -f iife --no-sourcemap --external none --no-pkg-main",
+    "prepublishOnly": "cd ../../ && turbo run build"
   },
   "devDependencies": {
     "core-js": "3.6.5",

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -1,4 +1,4 @@
-import ReactRefreshWebpackPlugin from 'next/dist/compiled/@next/react-refresh-utils/ReactRefreshWebpackPlugin'
+import ReactRefreshWebpackPlugin from 'next/dist/compiled/@next/react-refresh-utils/dist/ReactRefreshWebpackPlugin'
 import chalk from 'next/dist/compiled/chalk'
 import crypto from 'crypto'
 import { webpack } from 'next/dist/compiled/webpack/webpack'
@@ -155,7 +155,7 @@ export function attachReactRefresh(
 ) {
   let injections = 0
   const reactRefreshLoaderName =
-    'next/dist/compiled/@next/react-refresh-utils/loader'
+    'next/dist/compiled/@next/react-refresh-utils/dist/loader'
   const reactRefreshLoader = require.resolve(reactRefreshLoaderName)
   webpackConfig.module?.rules.forEach((rule) => {
     const curr = rule.use
@@ -548,7 +548,7 @@ export default async function getBaseWebpackConfig(
         ...(dev
           ? {
               [CLIENT_STATIC_FILES_RUNTIME_REACT_REFRESH]: require.resolve(
-                `next/dist/compiled/@next/react-refresh-utils/runtime`
+                `next/dist/compiled/@next/react-refresh-utils/dist/runtime`
               ),
               [CLIENT_STATIC_FILES_RUNTIME_AMP]:
                 `./` +
@@ -1322,7 +1322,7 @@ export default async function getBaseWebpackConfig(
                 dev && isClient
                   ? [
                       require.resolve(
-                        'next/dist/compiled/@next/react-refresh-utils/loader'
+                        'next/dist/compiled/@next/react-refresh-utils/dist/loader'
                       ),
                       defaultLoaders.babel,
                     ]

diff --git a/packages/next/build/webpack/plugins/wellknown-errors-plugin/parseNotFoundError.ts b/packages/next/build/webpack/plugins/wellknown-errors-plugin/parseNotFoundError.ts
@@ -1,6 +1,6 @@
 import Chalk from 'next/dist/compiled/chalk'
 import { SimpleWebpackError } from './simpleWebpackError'
-import { createOriginalStackFrame } from 'next/dist/compiled/@next/react-dev-overlay/middleware'
+import { createOriginalStackFrame } from 'next/dist/compiled/@next/react-dev-overlay/dist/middleware'
 import type { webpack5 } from 'next/dist/compiled/webpack/webpack'
 import {
   getNodeBuiltinModuleNotSupportedInEdgeRuntimeMessage,

diff --git a/packages/next/client/dev/error-overlay/hot-dev-client.js b/packages/next/client/dev/error-overlay/hot-dev-client.js
@@ -32,7 +32,7 @@ import {
   onBuildOk,
   onRefresh,
   onFullRefreshNeeded,
-} from 'next/dist/compiled/@next/react-dev-overlay/client'
+} from 'next/dist/compiled/@next/react-dev-overlay/dist/client'
 import stripAnsi from 'next/dist/compiled/strip-ansi'
 import { addMessageListener, sendMessage } from './websocket'
 import formatWebpackMessages from './format-webpack-messages'

diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
@@ -171,7 +171,7 @@ class Container extends React.Component<{
     } else {
       const {
         ReactDevOverlay,
-      } = require('next/dist/compiled/@next/react-dev-overlay/client')
+      } = require('next/dist/compiled/@next/react-dev-overlay/dist/client')
       return <ReactDevOverlay>{this.props.children}</ReactDevOverlay>
     }
   }
@@ -351,7 +351,7 @@ export async function hydrate(opts?: { beforeRender?: () => Promise<void> }) {
   if (process.env.NODE_ENV === 'development') {
     const {
       getNodeError,
-    } = require('next/dist/compiled/@next/react-dev-overlay/client')
+    } = require('next/dist/compiled/@next/react-dev-overlay/dist/client')
     // Server-side runtime errors need to be re-thrown on the client-side so
     // that the overlay is rendered.
     if (initialErr) {

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -57,7 +57,8 @@
   "scripts": {
     "dev": "taskr",
     "release": "taskr release",
-    "prepublishOnly": "pnpm release && pnpm types",
+    "build": "pnpm release && pnpm types",
+    "prepublishOnly": "cd ../../ && turbo run build",
     "types": "tsc --declaration --emitDeclarationOnly --declarationDir dist",
     "typescript": "tsec --noEmit",
     "ncc-compiled": "ncc cache clean && taskr ncc"

diff --git a/packages/next/server/dev/hot-reloader.ts b/packages/next/server/dev/hot-reloader.ts
@@ -1,4 +1,4 @@
-import { getOverlayMiddleware } from 'next/dist/compiled/@next/react-dev-overlay/middleware'
+import { getOverlayMiddleware } from 'next/dist/compiled/@next/react-dev-overlay/dist/middleware'
 import { IncomingMessage, ServerResponse } from 'http'
 import { WebpackHotMiddleware } from './hot-middleware'
 import { join, relative, isAbsolute } from 'path'

diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts
@@ -56,7 +56,7 @@ import {
   createOriginalStackFrame,
   getSourceById,
   parseStack,
-} from 'next/dist/compiled/@next/react-dev-overlay/middleware'
+} from 'next/dist/compiled/@next/react-dev-overlay/dist/middleware'
 import * as Log from '../../build/output/log'
 import isError, { getProperError } from '../../lib/is-error'
 import {
@@ -76,7 +76,7 @@ let ReactDevOverlayImpl: React.FunctionComponent
 const ReactDevOverlay = (props: any) => {
   if (ReactDevOverlayImpl === undefined) {
     ReactDevOverlayImpl =
-      require('next/dist/compiled/@next/react-dev-overlay/client').ReactDevOverlay
+      require('next/dist/compiled/@next/react-dev-overlay/dist/client').ReactDevOverlay
   }
   return ReactDevOverlayImpl(props)
 }

diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
@@ -192,7 +192,7 @@ export async function ncc_next__react_dev_overlay(task, opts) {
       opts.src ||
         relative(
           __dirname,
-          require.resolve('@next/react-dev-overlay/lib/middleware')
+          require.resolve('@next/react-dev-overlay/dist/middleware')
         )
     )
     .ncc({
@@ -201,14 +201,14 @@ export async function ncc_next__react_dev_overlay(task, opts) {
       externals: overlayExternals,
       target: 'es5',
     })
-    .target('dist/compiled/@next/react-dev-overlay')
+    .target('dist/compiled/@next/react-dev-overlay/dist')
 
   await task
     .source(
       opts.src ||
         relative(
           __dirname,
-          require.resolve('@next/react-dev-overlay/lib/client')
+          require.resolve('@next/react-dev-overlay/dist/client')
         )
     )
     .ncc({
@@ -217,11 +217,11 @@ export async function ncc_next__react_dev_overlay(task, opts) {
       externals: overlayExternals,
       target: 'es5',
     })
-    .target('dist/compiled/@next/react-dev-overlay')
+    .target('dist/compiled/@next/react-dev-overlay/dist')
 
   const clientFile = join(
     __dirname,
-    'dist/compiled/@next/react-dev-overlay/client.js'
+    'dist/compiled/@next/react-dev-overlay/dist/client.js'
   )
   const content = fs.readFileSync(clientFile, 'utf8')
   // remove AMD define branch as this forces the module to not
@@ -313,10 +313,14 @@ export async function ncc_react_refresh_utils(task, opts) {
     join(__dirname, 'dist/compiled/react-refresh')
   )
 
-  const srcDir = dirname(
-    require.resolve('@next/react-refresh-utils/package.json')
+  const srcDir = join(
+    dirname(require.resolve('@next/react-refresh-utils/package.json')),
+    'dist'
+  )
+  const destDir = join(
+    __dirname,
+    'dist/compiled/@next/react-refresh-utils/dist'
   )
-  const destDir = join(__dirname, 'dist/compiled/@next/react-refresh-utils')
   await fs.remove(destDir)
   await fs.ensureDir(destDir)
 

diff --git a/packages/next/types/misc.d.ts b/packages/next/types/misc.d.ts
@@ -5,15 +5,15 @@ declare module 'next/dist/compiled/react-server-dom-webpack'
 declare module 'next/dist/compiled/react-server-dom-webpack/writer.browser.server'
 declare module 'next/dist/compiled/browserslist'
 
-declare module 'next/dist/compiled/@next/react-dev-overlay/client' {
-  export * from '@next/react-dev-overlay/lib/client'
+declare module 'next/dist/compiled/@next/react-dev-overlay/dist/client' {
+  export * from '@next/react-dev-overlay/dist/client'
 }
 
-declare module 'next/dist/compiled/@next/react-dev-overlay/middleware' {
-  export * from '@next/react-dev-overlay/lib/middleware'
+declare module 'next/dist/compiled/@next/react-dev-overlay/dist/middleware' {
+  export * from '@next/react-dev-overlay/dist/middleware'
 }
 
-declare module 'next/dist/compiled/@next/react-refresh-utils/ReactRefreshWebpackPlugin' {
+declare module 'next/dist/compiled/@next/react-refresh-utils/dist/ReactRefreshWebpackPlugin' {
   import m from '@next/react-refresh-utils/ReactRefreshWebpackPlugin'
   export = m
 }

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -7,12 +7,13 @@
     "directory": "packages/react-dev-overlay"
   },
   "files": [
-    "lib/"
+    "dist"
   ],
   "author": "Joe Haddad <timer@vercel.com>",
   "license": "MIT",
   "scripts": {
-    "prepublishOnly": "tsc -d -p tsconfig.json",
+    "build": "rm -rf dist && tsc -d -p tsconfig.json",
+    "prepublishOnly": "cd ../../ && turbo run build",
     "dev": "tsc -d -w -p tsconfig.json",
     "typescript": "tsec --noEmit -p tsconfig.json"
   },

diff --git a/packages/react-dev-overlay/tsconfig.json b/packages/react-dev-overlay/tsconfig.json
@@ -8,7 +8,7 @@
     "lib": ["dom"],
     "downlevelIteration": true,
     "preserveWatchOutput": true,
-    "outDir": "lib",
+    "outDir": "dist",
     "jsx": "react",
     "noFallthroughCasesInSwitch": true,
     "skipLibCheck": true

diff --git a/packages/react-refresh-utils/README.md b/packages/react-refresh-utils/README.md
@@ -10,8 +10,8 @@ Its API is not stable as that of Next.js, nor does it follow semver rules.
 
 All entrypoints below must wired into your build tooling for this to work.
 
-### `@next/react-refresh-utils/loader`
+### `@next/react-refresh-utils/dist/loader`
 
-### `@next/react-refresh-utils/ReactRefreshWebpackPlugin`
+### `@next/react-refresh-utils/dist/ReactRefreshWebpackPlugin`
 
-### `@next/react-refresh-utils/runtime`
+### `@next/react-refresh-utils/dist/runtime`
diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -7,15 +7,13 @@
     "directory": "packages/react-refresh-utils"
   },
   "files": [
-    "internal/*.d.ts",
-    "internal/*.js",
-    "*.d.ts",
-    "*.js"
+    "dist"
   ],
   "author": "Joe Haddad <timer@vercel.com>",
   "license": "MIT",
   "scripts": {
-    "prepublishOnly": "tsc -d -p tsconfig.json",
+    "build": "rm -rf dist && tsc -d -p tsconfig.json",
+    "prepublishOnly": "cd ../../ && turbo run build",
     "dev": "tsc -d -w -p tsconfig.json"
   },
   "peerDependencies": {

diff --git a/packages/react-refresh-utils/tsconfig.json b/packages/react-refresh-utils/tsconfig.json
@@ -7,6 +7,7 @@
     "lib": ["dom"],
     "downlevelIteration": true,
     "preserveWatchOutput": true,
+    "outDir": "dist",
     "paths": {
       "webpack": ["../../node_modules/webpack5"]
     }