chore: fix typecheck

Author: sapphi-red

packages/vite/src/node/nodeResolve.ts

@@ -33,6 +33,7 @@ export function nodeResolveWithVite(
     dedupe: [],
     extensions: DEFAULT_EXTENSIONS,
     preserveSymlinks: false,
+    tsconfigPaths: false,
     // Intentionally disable package cache for now as consumers don't need it
     packageCache: undefined,
     isRequire: options.isRequire,

packages/vite/src/node/plugins/completeAmdWrap.ts

@@ -4,27 +4,27 @@ import type { Plugin } from '../plugin'
  * ensure amd bundles request `require` to be injected
  */
 export function completeAmdWrapPlugin(): Plugin {
-  const AmdWrapRE =
-    /\bdefine\((?:\s*\[([^\]]*)\],)?\s*(?:\(\s*)?function\s*\(([^)]*)\)\s*\{/g
+  // const AmdWrapRE =
+  //   /\bdefine\((?:\s*\[([^\]]*)\],)?\s*(?:\(\s*)?function\s*\(([^)]*)\)\s*\{/g
 
   return {
     name: 'vite:force-amd-wrap-require',
-    renderChunk(code, _chunk, opts) {
-      if (opts.format !== 'amd') return
+    // renderChunk(code, _chunk, opts) {
+    //   if (opts.format !== 'amd') return
 
-      return {
-        code: code.replace(AmdWrapRE, (_, deps, params) => {
-          if (deps?.includes(`"require"`) || deps?.includes(`'require'`)) {
-            return `define([${deps}], (function(${params}) {`
-          }
+    //   return {
+    //     code: code.replace(AmdWrapRE, (_, deps, params) => {
+    //       if (deps?.includes(`"require"`) || deps?.includes(`'require'`)) {
+    //         return `define([${deps}], (function(${params}) {`
+    //       }
 
-          const newDeps = deps ? `"require", ${deps}` : '"require"'
-          const newParams = params.trim() ? `require, ${params}` : 'require'
+    //       const newDeps = deps ? `"require", ${deps}` : '"require"'
+    //       const newParams = params.trim() ? `require, ${params}` : 'require'
 
-          return `define([${newDeps}], (function(${newParams}) {`
-        }),
-        map: null, // no need to generate sourcemap as no mapping exists for the wrapper
-      }
-    },
+    //       return `define([${newDeps}], (function(${newParams}) {`
+    //     }),
+    //     map: null, // no need to generate sourcemap as no mapping exists for the wrapper
+    //   }
+    // },
   }
 }

playground/amd/vite.config.ts

@@ -12,6 +12,7 @@ export default defineConfig({
         plugin: path.resolve(import.meta.dirname, './index.ts'),
       },
       output: {
+        // @ts-expect-error AMD is not supported (https://github.com/rolldown/rolldown/issues/2528)
         format: 'amd',
         entryFileNames: 'assets/[name].js',
       },

playground/backend-integration/__tests__/backend-integration.spec.ts

@@ -78,9 +78,7 @@ describe.runIf(isBuild)('build', () => {
     expect(dirFooAssetEntry).not.toBeUndefined() // '\\' should not be used even on windows
     // use the entry name
     expect(dirFooAssetEntry.file).toMatch('assets/bar-')
-    if (process.env._VITE_TEST_JS_PLUGIN) {
-      expect(dirFooAssetEntry.names).toStrictEqual(['bar.css'])
-    }
+    expect(dirFooAssetEntry.name).toStrictEqual('bar.css')
     expect(customNameAssetEntry.name).toStrictEqual('bar.custom')
     expect(iconEntrypointEntry?.file).not.toBeUndefined()
     expect(waterContainerEntry?.file).not.toBeUndefined()