@nx/vite 22.1.0-rc.1 → 22.1.0-rc.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/package.json +5 -5
  2. package/src/generators/configuration/configuration.d.ts.map +1 -1
  3. package/src/generators/configuration/configuration.js +1 -1
  4. package/src/generators/vitest/vitest-generator.d.ts +1 -1
  5. package/src/generators/vitest/vitest-generator.d.ts.map +1 -1
  6. package/src/generators/vitest/vitest-generator.js +4 -2
  7. package/src/utils/version-utils.d.ts +2 -1
  8. package/src/utils/version-utils.d.ts.map +1 -1
  9. package/src/utils/version-utils.js +23 -7
  10. package/src/utils/versions.d.ts +12 -3
  11. package/src/utils/versions.d.ts.map +1 -1
  12. package/src/utils/versions.js +14 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/vite",
3
- "version": "22.1.0-rc.1",
3
+ "version": "22.1.0-rc.3",
4
4
  "private": false,
5
5
  "description": "The Nx Plugin for building and testing applications using Vite",
6
6
  "repository": {
@@ -30,11 +30,11 @@
30
30
  "migrations": "./migrations.json"
31
31
  },
32
32
  "dependencies": {
33
- "@nx/devkit": "22.1.0-rc.1",
33
+ "@nx/devkit": "22.1.0-rc.3",
34
34
  "@phenomnomnominal/tsquery": "~5.0.1",
35
35
  "enquirer": "~2.3.6",
36
- "@nx/js": "22.1.0-rc.1",
37
- "@nx/vitest": "22.1.0-rc.1",
36
+ "@nx/js": "22.1.0-rc.3",
37
+ "@nx/vitest": "22.1.0-rc.3",
38
38
  "picomatch": "4.0.2",
39
39
  "tsconfig-paths": "^4.1.2",
40
40
  "semver": "^7.6.3",
@@ -42,7 +42,7 @@
42
42
  "ajv": "^8.0.0"
43
43
  },
44
44
  "devDependencies": {
45
- "nx": "22.1.0-rc.1"
45
+ "nx": "22.1.0-rc.3"
46
46
  },
47
47
  "peerDependencies": {
48
48
  "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
package/src/generators/configuration/configuration.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAwBpB,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAE5D,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,8BAMzC;AAED,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,8BA6IzC;AAED,eAAe,0BAA0B,CAAC"}
1
+ {"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAwBpB,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAE5D,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,8BAMzC;AAED,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,8BAkJzC;AAED,eAAe,0BAA0B,CAAC"}
package/src/generators/configuration/configuration.js CHANGED
@@ -117,7 +117,7 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
117
117
  addPlugin: schema.addPlugin,
118
118
  compiler: schema.compiler,
119
119
  projectType,
120
- });
120
+ }, false, true);
121
121
  tasks.push(vitestTask);
122
122
  }
123
123
  if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
package/src/generators/vitest/vitest-generator.d.ts CHANGED
@@ -3,6 +3,6 @@ import { VitestGeneratorSchema } from './schema';
3
3
  /**
4
4
  * @deprecated Use `@nx/vitest:configuration` instead. This generator will be removed in Nx 23.
5
5
  */
6
- export declare function vitestGenerator(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean): Promise<import("@nx/devkit").GeneratorCallback>;
6
+ export declare function vitestGenerator(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean, suppressDeprecationWarning?: boolean): Promise<import("@nx/devkit").GeneratorCallback>;
7
7
  export default vitestGenerator;
8
8
  //# sourceMappingURL=vitest-generator.d.ts.map
package/src/generators/vitest/vitest-generator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vitest-generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAU,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,mDAUlB;AAED,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"vitest-generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAU,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,EACjB,0BAA0B,UAAQ,mDAYnC;AAED,eAAe,eAAe,CAAC"}
package/src/generators/vitest/vitest-generator.js CHANGED
@@ -7,8 +7,10 @@ const versions_1 = require("../../utils/versions");
7
7
  /**
8
8
  * @deprecated Use `@nx/vitest:configuration` instead. This generator will be removed in Nx 23.
9
9
  */
10
- async function vitestGenerator(tree, schema, hasPlugin = false) {
11
- devkit_1.logger.warn(`The '@nx/vite:vitest' generator is deprecated. Please use '@nx/vitest:configuration' instead. This generator will be removed in Nx 23.`);
10
+ async function vitestGenerator(tree, schema, hasPlugin = false, suppressDeprecationWarning = false) {
11
+ if (!suppressDeprecationWarning) {
12
+ devkit_1.logger.warn(`The '@nx/vite:vitest' generator is deprecated. Please use '@nx/vitest:configuration' instead. This generator will be removed in Nx 23.`);
13
+ }
12
14
  (0, devkit_2.ensurePackage)('@nx/vitest', versions_1.nxVersion);
13
15
  const { configurationGenerator } = await Promise.resolve().then(() => require('@nx/vitest/generators'));
14
16
  return await configurationGenerator(tree, schema, hasPlugin);
package/src/utils/version-utils.d.ts CHANGED
@@ -5,7 +5,8 @@ type VitestDependenciesVersions = {
5
5
  vitestCoverageIstanbul: string;
6
6
  };
7
7
  export declare function getVitestDependenciesVersionsToInstall(tree: Tree): Promise<VitestDependenciesVersions>;
8
- export declare function isVitestV1(tree: Tree): Promise<boolean>;
8
+ export declare function isVitestV3(tree: Tree): Promise<boolean>;
9
+ export declare function isVitestV2(tree: Tree): Promise<boolean>;
9
10
  export declare function getInstalledVitestVersion(tree: Tree): string;
10
11
  export declare function getInstalledVitestVersionFromGraph(): Promise<string>;
11
12
  export {};
package/src/utils/version-utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/version-utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAWnD,KAAK,0BAA0B,GAAG;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,wBAAsB,sCAAsC,CAC1D,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,0BAA0B,CAAC,CAcrC;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,IAAI,oBAM1C;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAiB5D;AAED,wBAAsB,kCAAkC,oBASvD"}
1
+ {"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/version-utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAcnD,KAAK,0BAA0B,GAAG;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,wBAAsB,sCAAsC,CAC1D,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,0BAA0B,CAAC,CAqBrC;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,IAAI,oBAM1C;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,IAAI,oBAM1C;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAiB5D;AAED,wBAAsB,kCAAkC,oBASvD"}
package/src/utils/version-utils.js CHANGED
@@ -1,21 +1,30 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getVitestDependenciesVersionsToInstall = getVitestDependenciesVersionsToInstall;
4
- exports.isVitestV1 = isVitestV1;
4
+ exports.isVitestV3 = isVitestV3;
5
+ exports.isVitestV2 = isVitestV2;
5
6
  exports.getInstalledVitestVersion = getInstalledVitestVersion;
6
7
  exports.getInstalledVitestVersionFromGraph = getInstalledVitestVersionFromGraph;
7
8
  const devkit_1 = require("@nx/devkit");
8
9
  const semver_1 = require("semver");
9
10
  const versions_1 = require("./versions");
10
11
  async function getVitestDependenciesVersionsToInstall(tree) {
11
- if (await isVitestV1(tree)) {
12
+ if (await isVitestV3(tree)) {
12
13
  return {
13
- vitest: versions_1.vitestV1Version,
14
- vitestCoverageV8: versions_1.vitestV1CoverageV8Version,
15
- vitestCoverageIstanbul: versions_1.vitestV1CoverageIstanbulVersion,
14
+ vitest: versions_1.vitestV3Version,
15
+ vitestCoverageV8: versions_1.vitestV3CoverageV8Version,
16
+ vitestCoverageIstanbul: versions_1.vitestV3CoverageIstanbulVersion,
17
+ };
18
+ }
19
+ else if (await isVitestV2(tree)) {
20
+ return {
21
+ vitest: versions_1.vitestV2Version,
22
+ vitestCoverageV8: versions_1.vitestV2CoverageV8Version,
23
+ vitestCoverageIstanbul: versions_1.vitestV2CoverageIstanbulVersion,
16
24
  };
17
25
  }
18
26
  else {
27
+ // Default to latest (v4)
19
28
  return {
20
29
  vitest: versions_1.vitestVersion,
21
30
  vitestCoverageV8: versions_1.vitestCoverageV8Version,
@@ -23,12 +32,19 @@ async function getVitestDependenciesVersionsToInstall(tree) {
23
32
  };
24
33
  }
25
34
  }
26
- async function isVitestV1(tree) {
35
+ async function isVitestV3(tree) {
36
+ let installedVitestVersion = await getInstalledVitestVersionFromGraph();
37
+ if (!installedVitestVersion) {
38
+ installedVitestVersion = getInstalledVitestVersion(tree);
39
+ }
40
+ return (0, semver_1.major)(installedVitestVersion) === 3;
41
+ }
42
+ async function isVitestV2(tree) {
27
43
  let installedVitestVersion = await getInstalledVitestVersionFromGraph();
28
44
  if (!installedVitestVersion) {
29
45
  installedVitestVersion = getInstalledVitestVersion(tree);
30
46
  }
31
- return (0, semver_1.major)(installedVitestVersion) === 1;
47
+ return (0, semver_1.major)(installedVitestVersion) === 2;
32
48
  }
33
49
  function getInstalledVitestVersion(tree) {
34
50
  const installedVitestVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'vitest');
package/src/utils/versions.d.ts CHANGED
@@ -2,7 +2,10 @@ export declare const nxVersion: any;
2
2
  export declare const viteVersion = "^7.0.0";
3
3
  export declare const viteV6Version = "^6.0.0";
4
4
  export declare const viteV5Version = "^5.0.0";
5
- export declare const vitestVersion = "^3.0.0";
5
+ export declare const vitestV4Version = "^4.0.0";
6
+ export declare const vitestV3Version = "^3.0.0";
7
+ export declare const vitestV2Version = "^2.1.8";
8
+ export declare const vitestVersion = "^4.0.0";
6
9
  export declare const vitestV1Version = "^1.3.1";
7
10
  export declare const vitePluginReactVersion = "^4.2.0";
8
11
  export declare const vitePluginReactSwcVersion = "^3.5.0";
@@ -13,8 +16,14 @@ export declare const happyDomVersion = "~9.20.3";
13
16
  export declare const edgeRuntimeVmVersion = "~3.0.2";
14
17
  export declare const jitiVersion = "2.4.2";
15
18
  export declare const analogVitestAngular = "~1.19.1";
16
- export declare const vitestCoverageV8Version = "^3.0.5";
19
+ export declare const vitestV4CoverageV8Version = "^4.0.0";
20
+ export declare const vitestV3CoverageV8Version = "^3.0.5";
21
+ export declare const vitestV2CoverageV8Version = "^2.1.8";
22
+ export declare const vitestCoverageV8Version = "^4.0.0";
23
+ export declare const vitestV4CoverageIstanbulVersion = "^4.0.0";
24
+ export declare const vitestV3CoverageIstanbulVersion = "^3.0.5";
25
+ export declare const vitestV2CoverageIstanbulVersion = "^2.1.8";
26
+ export declare const vitestCoverageIstanbulVersion = "^4.0.0";
17
27
  export declare const vitestV1CoverageV8Version = "^1.0.4";
18
- export declare const vitestCoverageIstanbulVersion = "^3.0.5";
19
28
  export declare const vitestV1CoverageIstanbulVersion = "^1.0.4";
20
29
  //# sourceMappingURL=versions.d.ts.map
package/src/utils/versions.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,eAAe,WAAW,CAAC;AACxC,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAC/C,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAClD,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAG7C,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAClD,eAAO,MAAM,6BAA6B,WAAW,CAAC;AACtD,eAAO,MAAM,+BAA+B,WAAW,CAAC"}
1
+ {"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,aAAa,WAAW,CAAC;AAEtC,eAAO,MAAM,eAAe,WAAW,CAAC;AACxC,eAAO,MAAM,eAAe,WAAW,CAAC;AACxC,eAAO,MAAM,eAAe,WAAW,CAAC;AACxC,eAAO,MAAM,aAAa,WAAkB,CAAC;AAC7C,eAAO,MAAM,eAAe,WAAW,CAAC;AACxC,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAC/C,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAClD,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAG7C,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAClD,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAClD,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAClD,eAAO,MAAM,uBAAuB,WAA4B,CAAC;AACjE,eAAO,MAAM,+BAA+B,WAAW,CAAC;AACxD,eAAO,MAAM,+BAA+B,WAAW,CAAC;AACxD,eAAO,MAAM,+BAA+B,WAAW,CAAC;AACxD,eAAO,MAAM,6BAA6B,WAAkC,CAAC;AAC7E,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAClD,eAAO,MAAM,+BAA+B,WAAW,CAAC"}
package/src/utils/versions.js CHANGED
@@ -1,12 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.vitestV1CoverageIstanbulVersion = exports.vitestCoverageIstanbulVersion = exports.vitestV1CoverageV8Version = exports.vitestCoverageV8Version = exports.analogVitestAngular = exports.jitiVersion = exports.edgeRuntimeVmVersion = exports.happyDomVersion = exports.ajvVersion = exports.vitePluginDtsVersion = exports.jsdomVersion = exports.vitePluginReactSwcVersion = exports.vitePluginReactVersion = exports.vitestV1Version = exports.vitestVersion = exports.viteV5Version = exports.viteV6Version = exports.viteVersion = exports.nxVersion = void 0;
3
+ exports.vitestV1CoverageIstanbulVersion = exports.vitestV1CoverageV8Version = exports.vitestCoverageIstanbulVersion = exports.vitestV2CoverageIstanbulVersion = exports.vitestV3CoverageIstanbulVersion = exports.vitestV4CoverageIstanbulVersion = exports.vitestCoverageV8Version = exports.vitestV2CoverageV8Version = exports.vitestV3CoverageV8Version = exports.vitestV4CoverageV8Version = exports.analogVitestAngular = exports.jitiVersion = exports.edgeRuntimeVmVersion = exports.happyDomVersion = exports.ajvVersion = exports.vitePluginDtsVersion = exports.jsdomVersion = exports.vitePluginReactSwcVersion = exports.vitePluginReactVersion = exports.vitestV1Version = exports.vitestVersion = exports.vitestV2Version = exports.vitestV3Version = exports.vitestV4Version = exports.viteV5Version = exports.viteV6Version = exports.viteVersion = exports.nxVersion = void 0;
4
4
  exports.nxVersion = require('../../package.json').version;
5
5
  // Also update @nx/remix/utils/versions when changing vite version
6
6
  exports.viteVersion = '^7.0.0';
7
7
  exports.viteV6Version = '^6.0.0';
8
8
  exports.viteV5Version = '^5.0.0';
9
- exports.vitestVersion = '^3.0.0';
9
+ // TODO(v23): Remove vitest from here since once we drop vitest support in favor of @nx/vitest.
10
+ exports.vitestV4Version = '^4.0.0';
11
+ exports.vitestV3Version = '^3.0.0';
12
+ exports.vitestV2Version = '^2.1.8';
13
+ exports.vitestVersion = exports.vitestV4Version;
10
14
  exports.vitestV1Version = '^1.3.1';
11
15
  exports.vitePluginReactVersion = '^4.2.0';
12
16
  exports.vitePluginReactSwcVersion = '^3.5.0';
@@ -18,7 +22,13 @@ exports.edgeRuntimeVmVersion = '~3.0.2';
18
22
  exports.jitiVersion = '2.4.2';
19
23
  exports.analogVitestAngular = '~1.19.1';
20
24
  // Coverage providers
21
- exports.vitestCoverageV8Version = '^3.0.5';
25
+ exports.vitestV4CoverageV8Version = '^4.0.0';
26
+ exports.vitestV3CoverageV8Version = '^3.0.5';
27
+ exports.vitestV2CoverageV8Version = '^2.1.8';
28
+ exports.vitestCoverageV8Version = exports.vitestV4CoverageV8Version;
29
+ exports.vitestV4CoverageIstanbulVersion = '^4.0.0';
30
+ exports.vitestV3CoverageIstanbulVersion = '^3.0.5';
31
+ exports.vitestV2CoverageIstanbulVersion = '^2.1.8';
32
+ exports.vitestCoverageIstanbulVersion = exports.vitestV4CoverageIstanbulVersion;
22
33
  exports.vitestV1CoverageV8Version = '^1.0.4';
23
- exports.vitestCoverageIstanbulVersion = '^3.0.5';
24
34
  exports.vitestV1CoverageIstanbulVersion = '^1.0.4';