Merge branch 'main' into add-base-url

packages/vite/src/esbuild-request.ts

@@ -110,7 +110,14 @@ export class EsBuildRequestAdapter implements RequestAdapter<Resolution<OnResolv
         // and non-strict handlebars (which resolves
         // components/helpers/modifiers against the app's global pool).
         let pkg = this.packageCache.ownerOfFile(result.path);
-        if (pkg?.root === this.packageCache.appRoot) {
+        if (
+          pkg?.root === this.packageCache.appRoot &&
+          // vite provides node built-in polyfills under a custom namespace and we dont 
+          // want to interrupt that. We'd prefer they get bundled in the dep optimizer normally,
+          // rather than getting deferred to the app build (which also works, but means they didn't
+          // get pre-optimized).
+          (result.namespace === 'file' || result.namespace.startsWith('embroider-'))
+        ) {
           let externalizedName = request.specifier;
           if (!packageName(externalizedName)) {
             // the request was a relative path. This won't remain valid once

packages/vite/src/resolver.ts

@@ -41,6 +41,20 @@ export function resolver(): Plugin {
           }
         }
       });
+      return () => {
+        server.middlewares.use((req, _res, next) => {
+          const base = server.config.base || '/';
+          const originalUrl = req.originalUrl!.slice(base.length - 1);
+          if (originalUrl && originalUrl.length > 1) {
+            if (originalUrl?.match(/^\/tests($|\?)/)) {
+              req.originalUrl = `${base}tests/index.html`;
+              (req as any).url = `${base}tests/index.html`;
+              return next();
+            }
+          }
+          return next();
+        });
+      };
     },
 
     async resolveId(source, importer, options) {

test-packages/support/testem-proxy.ts

@@ -27,7 +27,7 @@ export function testemProxy(targetURL: string, base = '/') {
         req.url = req.url.replace(base, '/');
         return next();
       }
-      let m = /^(\/\d+).*\/tests\/index.html/.exec(url);
+      let m = /^(\/\d+).*\/tests($|.)+/.exec(url);
       if (m) {
         url = url.slice(m[1].length);
       }

tests/scenarios/vite-internals-test.ts

@@ -27,7 +27,7 @@ function buildViteInternalsTest(testNonColocatedTemplates: boolean, app: Project
       'use strict';
 
       module.exports = {
-        test_page: 'tests/index.html?hidepassed',
+        test_page: 'tests?hidepassed',
         disable_watching: true,
         launch_in_ci: ['Chrome'],
         launch_in_dev: ['Chrome'],