@cypress/vite-dev-server 2.1.0 → 2.2.2

package/CHANGELOG.md

@@ -1,3 +1,33 @@
+# [@cypress/vite-dev-server-v2.2.2](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v2.2.1...@cypress/vite-dev-server-v2.2.2) (2021-12-16)
+
+
+### Bug Fixes
+
+* check the port is avail on all local hosts ([#19402](https://github.com/cypress-io/cypress/issues/19402)) ([4826175](https://github.com/cypress-io/cypress/commit/4826175040bfc024a36df47dc0c74f2871fa944f))
+
+# [@cypress/vite-dev-server-v2.2.1](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v2.2.0...@cypress/vite-dev-server-v2.2.1) (2021-11-19)
+
+
+### Bug Fixes
+
+* compile npm packages for node 12 ([#18989](https://github.com/cypress-io/cypress/issues/18989)) ([30b3eb2](https://github.com/cypress-io/cypress/commit/30b3eb2376bc1ed69087ba96f60448687e8489e6))
+
+# [@cypress/vite-dev-server-v2.2.0](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v2.1.1...@cypress/vite-dev-server-v2.2.0) (2021-10-15)
+
+
+### Features
+
+* normalized signatures webpack & vite servers ([#18379](https://github.com/cypress-io/cypress/issues/18379)) ([8f5308f](https://github.com/cypress-io/cypress/commit/8f5308f7068b80fb877da539ce34fb67ba497c4f))
+
+# [@cypress/vite-dev-server-v2.1.1](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v2.1.0...@cypress/vite-dev-server-v2.1.1) (2021-10-04)
+
+
+### Bug Fixes
+
+* **vite-dev-server:** remove base and root from inlineVitConfig types ([#17180](https://github.com/cypress-io/cypress/issues/17180)) ([07e7d0e](https://github.com/cypress-io/cypress/commit/07e7d0ed252bf1a2bd3224f617e1fc2e64f19a06))
+* **vite-dev-server:** replace UserConfig with InlineConfig to allow correct `configFile` types ([#18167](https://github.com/cypress-io/cypress/issues/18167)) ([6e0c2c1](https://github.com/cypress-io/cypress/commit/6e0c2c1af81be750a74bad0528d52de45746a453))
+* **vite-dev-server:** windows `supportFile` + preserve optimize entries ([#18286](https://github.com/cypress-io/cypress/issues/18286)) ([ea2f6a4](https://github.com/cypress-io/cypress/commit/ea2f6a45c7057e51b2fc879ff70da75538fa1002))
+
 # [@cypress/vite-dev-server-v2.1.0](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v2.0.8...@cypress/vite-dev-server-v2.1.0) (2021-09-10)
 
 

package/dist/index.d.ts

@@ -1,4 +1,8 @@
 /// <reference types="cypress" />
+import { InlineConfig } from 'vite';
 import { StartDevServerOptions } from './startServer';
 export { StartDevServerOptions };
 export declare function startDevServer(startDevServerArgs: StartDevServerOptions): Promise<Cypress.ResolvedDevServerConfig>;
+export declare type CypressViteDevServerConfig = Omit<InlineConfig, 'base' | 'root'>;
+export declare function devServer(cypressDevServerConfig: Cypress.DevServerConfig, devServerConfig?: CypressViteDevServerConfig): Promise<Cypress.ResolvedDevServerConfig>;
+export declare function defineDevServerConfig(devServerConfig: CypressViteDevServerConfig): CypressViteDevServerConfig;

package/dist/index.js

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startDevServer = void 0;
+exports.defineDevServerConfig = exports.devServer = exports.startDevServer = void 0;
 const debug_1 = require("debug");
 const startServer_1 = require("./startServer");
-const debug = debug_1.debug('cypress:vite-dev-server:vite');
+const debug = (0, debug_1.debug)('cypress:vite-dev-server:vite');
 async function startDevServer(startDevServerArgs) {
-    const viteDevServer = await startServer_1.start(startDevServerArgs);
+    const viteDevServer = await (0, startServer_1.start)(startDevServerArgs);
     const app = await viteDevServer.listen();
     const port = app.config.server.port;
     debug('Component testing vite server started on port', port);
     return { port, close: app.httpServer.close };
 }
 exports.startDevServer = startDevServer;
+function devServer(cypressDevServerConfig, devServerConfig) {
+    return startDevServer({ options: cypressDevServerConfig, viteConfig: devServerConfig });
+}
+exports.devServer = devServer;
+function defineDevServerConfig(devServerConfig) {
+    return devServerConfig;
+}
+exports.defineDevServerConfig = defineDevServerConfig;

package/dist/makeCypressPlugin.js

@@ -8,8 +8,8 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
 const debug_1 = __importDefault(require("debug"));
-const debug = debug_1.default('cypress:vite-dev-server:plugin');
-const read = util_1.promisify(fs_1.readFile);
+const debug = (0, debug_1.default)('cypress:vite-dev-server:plugin');
+const read = (0, util_1.promisify)(fs_1.readFile);
 const pluginName = 'cypress-transform-html';
 const OSSepRE = new RegExp(`\\${path_1.sep}`, 'g');
 function convertPathToPosix(path) {
@@ -17,7 +17,7 @@ function convertPathToPosix(path) {
         ? path
         : path.replace(OSSepRE, '/');
 }
-const INIT_FILEPATH = path_1.resolve(__dirname, '../client/initCypressTests.js');
+const INIT_FILEPATH = (0, path_1.resolve)(__dirname, '../client/initCypressTests.js');
 const HMR_DEPENDENCY_LOOKUP_MAX_ITERATION = 50;
 function getSpecsPathsSet(specs) {
     return new Set(specs.map((spec) => spec.absolute));
@@ -28,7 +28,7 @@ const makeCypressPlugin = (projectRoot, supportFilePath, devServerEvents, specs)
     devServerEvents.on('dev-server:specs:changed', (specs) => {
         specsPathsSet = getSpecsPathsSet(specs);
     });
-    const posixSupportFilePath = supportFilePath ? convertPathToPosix(path_1.resolve(projectRoot, supportFilePath)) : undefined;
+    const posixSupportFilePath = supportFilePath ? convertPathToPosix((0, path_1.resolve)(projectRoot, supportFilePath)) : undefined;
     const normalizedSupportFilePath = posixSupportFilePath ? `${base}@fs/${posixSupportFilePath}` : undefined;
     return {
         name: pluginName,
@@ -60,7 +60,7 @@ const makeCypressPlugin = (projectRoot, supportFilePath, devServerEvents, specs)
             ];
         },
         configureServer: async (server) => {
-            const indexHtml = await read(path_1.resolve(__dirname, '..', 'index.html'), { encoding: 'utf8' });
+            const indexHtml = await read((0, path_1.resolve)(__dirname, '..', 'index.html'), { encoding: 'utf8' });
             const transformedIndexHtml = await server.transformIndexHtml(base, indexHtml);
             server.middlewares.use(`${base}index.html`, (req, res) => res.end(transformedIndexHtml));
         },
@@ -71,7 +71,7 @@ const makeCypressPlugin = (projectRoot, supportFilePath, devServerEvents, specs)
             let iterationNumber = 0;
             const exploredFiles = new Set();
             // until we reached a point where the current module is imported by no other
-            while (moduleImporters?.size) {
+            while (moduleImporters === null || moduleImporters === void 0 ? void 0 : moduleImporters.size) {
                 if (iterationNumber > HMR_DEPENDENCY_LOOKUP_MAX_ITERATION) {
                     debug(`max hmr iteration reached: ${HMR_DEPENDENCY_LOOKUP_MAX_ITERATION}; Rerun will not happen on this file change.`);
                     return [];

package/dist/startServer.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-import { ViteDevServer, UserConfig } from 'vite';
+import { ViteDevServer, InlineConfig } from 'vite';
 export interface StartDevServerOptions {
     /**
      * the Cypress dev server configuration object
@@ -11,6 +11,6 @@ export interface StartDevServerOptions {
      * to override some options, you can do so using this.
      * @optional
      */
-    viteConfig?: UserConfig;
+    viteConfig?: Omit<InlineConfig, 'base' | 'root'>;
 }
 export declare function start(devServerOptions: StartDevServerOptions): Promise<ViteDevServer>;

package/dist/startServer.js

@@ -9,7 +9,7 @@ const vite_1 = require("vite");
 const path_1 = require("path");
 const get_port_1 = __importDefault(require("get-port"));
 const makeCypressPlugin_1 = require("./makeCypressPlugin");
-const debug = debug_1.default('cypress:vite-dev-server:start');
+const debug = (0, debug_1.default)('cypress:vite-dev-server:start');
 const resolveServerConfig = async ({ viteConfig, options }) => {
     const { projectRoot, supportFile } = options.config;
     const requiredOptions = {
@@ -17,7 +17,7 @@ const resolveServerConfig = async ({ viteConfig, options }) => {
         root: projectRoot,
     };
     const finalConfig = { ...viteConfig, ...requiredOptions };
-    finalConfig.plugins = [...(finalConfig.plugins || []), makeCypressPlugin_1.makeCypressPlugin(projectRoot, supportFile, options.devServerEvents, options.specs)];
+    finalConfig.plugins = [...(finalConfig.plugins || []), (0, makeCypressPlugin_1.makeCypressPlugin)(projectRoot, supportFile, options.devServerEvents, options.specs)];
     // This alias is necessary to avoid a "prefixIdentifiers" issue from slots mounting
     // only cjs compiler-core accepts using prefixIdentifiers in slots which vue test utils use.
     // Could we resolve this usage in test-utils?
@@ -25,22 +25,30 @@ const resolveServerConfig = async ({ viteConfig, options }) => {
         finalConfig.resolve = finalConfig.resolve || {};
         finalConfig.resolve.alias = {
             ...finalConfig.resolve.alias,
-            '@vue/compiler-core': path_1.resolve(path_1.dirname(require.resolve('@vue/compiler-core')), 'dist', 'compiler-core.cjs.js'),
+            '@vue/compiler-core': (0, path_1.resolve)((0, path_1.dirname)(require.resolve('@vue/compiler-core')), 'dist', 'compiler-core.cjs.js'),
         };
     }
     catch (e) {
         // Vue 3 is not installed
     }
     finalConfig.server = finalConfig.server || {};
-    finalConfig.server.port = await get_port_1.default({ port: finalConfig.server.port || 3000, host: 'localhost' }),
+    finalConfig.server.port = await (0, get_port_1.default)({ port: finalConfig.server.port || 3000 }),
         // Ask vite to pre-optimize all dependencies of the specs
         finalConfig.optimizeDeps = finalConfig.optimizeDeps || {};
-    // pre-optimizea all the specs
+    // pre-optimize all the specs
     if ((options.specs && options.specs.length)) {
-        finalConfig.optimizeDeps.entries = [...options.specs.map((spec) => spec.relative)];
+        // fix: we must preserve entries configured on target project
+        const existingOptimizeDepsEntries = finalConfig.optimizeDeps.entries;
+        if (existingOptimizeDepsEntries) {
+            finalConfig.optimizeDeps.entries = [...existingOptimizeDepsEntries, ...options.specs.map((spec) => spec.relative)];
+        }
+        else {
+            finalConfig.optimizeDeps.entries = [...options.specs.map((spec) => spec.relative)];
+        }
         // only optimize a supportFile is it is not false or undefined
         if (supportFile) {
-            finalConfig.optimizeDeps.entries.push(supportFile);
+            // fix: on windows we need to replace backslashes with slashes
+            finalConfig.optimizeDeps.entries.push(supportFile.replace(/\\/g, '/'));
         }
     }
     debug(`the resolved server config is ${JSON.stringify(finalConfig, null, 2)}`);
@@ -53,6 +61,6 @@ async function start(devServerOptions) {
     }
     debug('starting vite dev server');
     const resolvedConfig = await resolveServerConfig(devServerOptions);
-    return vite_1.createServer(resolvedConfig);
+    return (0, vite_1.createServer)(resolvedConfig);
 }
 exports.start = start;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cypress/vite-dev-server",
-  "version": "2.1.0",
+  "version": "2.2.2",
   "description": "Launches Vite Dev Server for Component Testing",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,8 @@
     "build-prod": "tsc",
     "cy:open": "node ../../scripts/cypress.js open-ct --project ${PWD}",
     "cy:run": "node ../../scripts/cypress.js run-ct --project ${PWD}",
-    "test": "yarn cy:run",
+    "cy:run-signature": "yarn cy:run --config=\"{\\\"pluginsFile\\\":\\\"cypress/new-signature/plugins.js\\\"}\"",
+    "test": "yarn cy:run && yarn cy:run-signature",
     "watch": "tsc -w"
   },
   "dependencies": {