From 8d210ed7435550aeafdb377e6851321a37ff7c99 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 1 Sep 2023 14:15:16 +0200 Subject: [PATCH 1/3] windows fixes --- packages/third-parties/package.json | 5 +++-- pnpm-lock.yaml | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/third-parties/package.json b/packages/third-parties/package.json index b3755cc9be19..bf6f5aacfa10 100644 --- a/packages/third-parties/package.json +++ b/packages/third-parties/package.json @@ -14,7 +14,7 @@ ], "license": "MIT", "scripts": { - "build": "rm -rf dist && tsc -d -p tsconfig.json", + "build": "rimraf dist && tsc -d -p tsconfig.json", "prepublishOnly": "cd ../../ && turbo run build", "dev": "tsc -d -w -p tsconfig.json", "typescript": "tsec --noEmit -p tsconfig.json" @@ -25,7 +25,8 @@ "devDependencies": { "next": "13.4.20-canary.37", "outdent": "0.8.0", - "prettier": "2.5.1" + "prettier": "2.5.1", + "rimraf": "^3.0.2" }, "peerDependencies": { "next": "^13.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4650506c3021..33d73f33f586 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1699,6 +1699,9 @@ importers: prettier: specifier: 2.5.1 version: 2.5.1 + rimraf: + specifier: ^3.0.2 + version: 3.0.2 packages: From 16b97d4610a9b3809db07b270dcbdce1dfd6d77d Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Mon, 18 Sep 2023 20:51:27 +0200 Subject: [PATCH 2/3] windows fixes for the webpack build --- packages/next/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next/webpack.config.js b/packages/next/webpack.config.js index d03ff0cfb52e..f4cbfe61a54f 100644 --- a/packages/next/webpack.config.js +++ b/packages/next/webpack.config.js @@ -191,7 +191,7 @@ module.exports = ({ dev, turbo, bundleType, experimental }) => { module: { rules: [ { - include: /vendored\/rsc\/entrypoints/, + include: /vendored[\\\/]rsc[\\\/]entrypoints/, resolve: { conditionNames: ['react-server', '...'], alias: { From 9eec8d38177f4cc1c8d936dacdf5257263e1aabc Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Mon, 18 Sep 2023 13:57:52 -0500 Subject: [PATCH 3/3] fix lint --- packages/next/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next/webpack.config.js b/packages/next/webpack.config.js index f4cbfe61a54f..f4c69f9cc17c 100644 --- a/packages/next/webpack.config.js +++ b/packages/next/webpack.config.js @@ -191,7 +191,7 @@ module.exports = ({ dev, turbo, bundleType, experimental }) => { module: { rules: [ { - include: /vendored[\\\/]rsc[\\\/]entrypoints/, + include: /vendored[\\/]rsc[\\/]entrypoints/, resolve: { conditionNames: ['react-server', '...'], alias: {