Merge branch 'main' into next

scripts/build/config.js

@@ -635,17 +635,6 @@ const nodejsFiles = [
     external: ["benchmark"],
     replaceModule: [replaceDiffPackageEntry("lib/patch/create.js")],
   },
-  {
-    input: "src/common/mockable.js",
-    outputBaseName: "internal/internal",
-    replaceModule: [
-      {
-        module: require.resolve("lilconfig"),
-        find: "exports.lilconfigSync = lilconfigSync;",
-        replacement: "",
-      },
-    ],
-  },
 ].flatMap((file) => {
   let { input, output, outputBaseName, ...buildOptions } = file;
 

scripts/build/modify-typescript-module.js

@@ -198,6 +198,13 @@ function modifyTypescriptModule(text) {
     }
   }
 
+  // server
+  for (const module of source.modules) {
+    if (module.path.startsWith("src/server/")) {
+      source.removeModule(module);
+    }
+  }
+
   // `transformers`
   source.removeModule("src/compiler/transformer.ts");
   for (const module of source.modules) {
@@ -268,6 +275,9 @@ function modifyTypescriptModule(text) {
     `,
   );
 
+  // `pnp`
+  source.removeModule("src/compiler/pnp.ts");
+
   /* spell-checker: disable */
   // `ts.createParenthesizerRules`
   source.replaceAlignedCode({