@cypress/vite-dev-server 5.1.1 → 5.2.1

package/dist/devServer.js

@@ -32,7 +32,11 @@ async function devServer(config) {
         port,
         // Close is for unit testing only. We kill this child process which will handle the closing of the server
         close(cb) {
-            return server.close().then(() => cb === null || cb === void 0 ? void 0 : cb()).catch(cb);
+            debug('closing dev server');
+            return server.close().then(() => {
+                debug('closed dev server');
+                cb === null || cb === void 0 ? void 0 : cb();
+            }).catch(cb);
         },
     };
 }

package/dist/plugins/cypress.js

@@ -24,6 +24,7 @@ const Cypress = (options, vite) => {
     // eslint-disable-next-line no-restricted-syntax
     let loader = fs_1.default.readFileSync(INIT_FILEPATH, 'utf8');
     devServerEvents.on('dev-server:specs:changed', (specs) => {
+        debug(`dev-server:secs:changed: ${specs.map((spec) => spec.relative)}`);
         specsPathsSet = getSpecsPathsSet(specs);
     });
     return {

package/dist/plugins/sourcemap.js

@@ -10,26 +10,31 @@ const CypressSourcemap = (options, vite) => {
         enforce: 'post',
         transform(code, id, options) {
             try {
-                if (/\.js$/i.test(id) && !/\/\/# sourceMappingURL=/i.test(code)) {
+                // Remove query parameters from the id. This is necessary because some files
+                // have a cache buster query parameter (e.g. `?v=12345`)
+                const queryParameterLessId = id.split('?')[0];
+                // Check if the file has a JavaScript extension and does not have an inlined sourcemap
+                if (/\.(js|jsx|ts|tsx|vue|svelte|mjs|cjs)$/i.test(queryParameterLessId) && !/\/\/# sourceMappingURL=data/i.test(code)) {
                     /*
-                    The Vite dev server and plugins automatically generate sourcemaps for most files, but they are
-                    only included in the served files if any transpilation actually occurred (JSX, TS, etc). This
-                    means that files that are "pure" JS won't include sourcemaps, so JS spec files that don't require
-                    transpilation won't get code frames in the runner.
-          
-                    A sourcemap for these files is generated (just not served) which is in effect an "identity"
-                    sourcemap mapping 1-to-1 to the output file. We can grab this and pass it along as a sourcemap
-                    we want Vite to embed into the output, giving Cypress a sourcemap to use for codeFrame lookups.
-                    @see https://rollupjs.org/guide/en/#thisgetcombinedsourcemap
-          
-                    We utilize a 'post' plugin here and manually append the sourcemap content to the code. We *should*
+                    The Vite dev server and plugins automatically generate sourcemaps for most files, but there are
+                    some files that don't have sourcemaps generated for them or are not inlined. We utilize a 'post' plugin
+                    here and manually append the sourcemap content to the code in these cases. We *should*
                     be able to pass the sourcemap along using the `map` attribute in the return value, but Babel-based
                     plugins don't work with this which causes sourcemaps to break for files that go through common
                     plugins like `@vitejs/plugin-react`. By manually appending the sourcemap at this point in time
                     Babel-transformed files end up with correct sourcemaps.
                     */
                     const sourcemap = this.getCombinedSourcemap();
-                    code += `\n//# sourceMappingURL=${sourcemap.toUrl()}`;
+                    const sourcemapUrl = sourcemap.toUrl();
+                    if (/\/\/# sourceMappingURL=/i.test(code)) {
+                        // If the code already has a sourceMappingURL, it is not an inlined sourcemap
+                        // and we should replace it with the new sourcemap
+                        code = code.replace(/\/\/# sourceMappingURL=(.*)$/m, `//# sourceMappingURL=${sourcemapUrl}`);
+                    }
+                    else {
+                        // If the code does not have a sourceMappingURL, we should append the new sourcemap
+                        code += `\n//# sourceMappingURL=${sourcemapUrl}`;
+                    }
                     return {
                         code,
                         map: { mappings: '' },

package/dist/resolveConfig.js

@@ -52,7 +52,7 @@ const createViteDevServerConfig = async (config, vite) => {
 exports.createViteDevServerConfig = createViteDevServerConfig;
 function makeCypressViteConfig(config, vite) {
     var _a, _b, _c;
-    const { cypressConfig: { port, projectRoot, devServerPublicPathRoute, supportFile, cypressBinaryRoot, isTextTerminal, }, specs, } = config;
+    const { cypressConfig: { experimentalJustInTimeCompile, port, projectRoot, devServerPublicPathRoute, supportFile, cypressBinaryRoot, isTextTerminal, }, specs, } = config;
     const vitePort = port !== null && port !== void 0 ? port : undefined;
     // Vite caches its output in the .vite directory in the node_modules where vite lives.
     // So we want to find that node_modules path and ensure it's added to the "allow" list
@@ -95,7 +95,7 @@ function makeCypressViteConfig(config, vite) {
                     // Supported from Vite v3 - add null check for v2 users.
                     (_a = vite.searchForWorkspaceRoot) === null || _a === void 0 ? void 0 : _a.call(vite, process.cwd()),
                 ],
-            }, port: vitePort, host: '127.0.0.1' }, (isTextTerminal
+            }, port: vitePort, host: '127.0.0.1' }, (isTextTerminal && !experimentalJustInTimeCompile
             ? { watch: { ignored: '**/*' }, hmr: false }
             : {})),
         plugins: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cypress/vite-dev-server",
-  "version": "5.1.1",
+  "version": "5.2.1",
   "description": "Launches Vite Dev Server for Component Testing",
   "main": "index.js",
   "scripts": {