@nx/vite 21.5.0-beta.0 → 21.5.0-beta.2

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 (13) hide show
  1. package/migrations.json +12 -0
  2. package/package.json +5 -5
  3. package/src/generators/configuration/configuration.d.ts.map +1 -1
  4. package/src/generators/configuration/configuration.js +1 -4
  5. package/src/generators/init/lib/utils.d.ts.map +1 -1
  6. package/src/generators/init/lib/utils.js +5 -1
  7. package/src/generators/init/schema.d.ts +1 -0
  8. package/src/generators/init/schema.json +7 -0
  9. package/src/generators/vitest/vitest-generator.d.ts.map +1 -1
  10. package/src/generators/vitest/vitest-generator.js +4 -2
  11. package/src/utils/versions.d.ts +2 -1
  12. package/src/utils/versions.d.ts.map +1 -1
  13. package/src/utils/versions.js +3 -2
package/migrations.json CHANGED
@@ -97,6 +97,18 @@
97
97
  "alwaysAddToPackageJson": false
98
98
  }
99
99
  }
100
+ },
101
+ "21.5.0": {
102
+ "version": "21.5.0-beta.0",
103
+ "packages": {
104
+ "vite": {
105
+ "version": "^7.1.3",
106
+ "alwaysAddToPackageJson": false
107
+ }
108
+ },
109
+ "incompatibleWith": {
110
+ "@remix-run/dev": "*"
111
+ }
100
112
  }
101
113
  }
102
114
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/vite",
3
- "version": "21.5.0-beta.0",
3
+ "version": "21.5.0-beta.2",
4
4
  "private": false,
5
5
  "description": "The Nx Plugin for building and testing applications using Vite",
6
6
  "repository": {
@@ -30,10 +30,10 @@
30
30
  "migrations": "./migrations.json"
31
31
  },
32
32
  "dependencies": {
33
- "@nx/devkit": "21.5.0-beta.0",
33
+ "@nx/devkit": "21.5.0-beta.2",
34
34
  "@phenomnomnominal/tsquery": "~5.0.1",
35
35
  "enquirer": "~2.3.6",
36
- "@nx/js": "21.5.0-beta.0",
36
+ "@nx/js": "21.5.0-beta.2",
37
37
  "picomatch": "4.0.2",
38
38
  "tsconfig-paths": "^4.1.2",
39
39
  "semver": "^7.6.3",
@@ -41,10 +41,10 @@
41
41
  "ajv": "^8.0.0"
42
42
  },
43
43
  "devDependencies": {
44
- "nx": "21.5.0-beta.0"
44
+ "nx": "21.5.0-beta.2"
45
45
  },
46
46
  "peerDependencies": {
47
- "vite": "^5.0.0 || ^6.0.0",
47
+ "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
48
48
  "vitest": "^1.3.1 || ^2.0.0 || ^3.0.0"
49
49
  },
50
50
  "publishConfig": {
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;AAuBpB,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,8BA6IzC;AAED,eAAe,0BAA0B,CAAC"}
package/src/generators/configuration/configuration.js CHANGED
@@ -152,9 +152,6 @@ function updatePackageJson(tree, options, projectType) {
152
152
  // we configure the dts plugin with the entryRoot set to `src`
153
153
  const rootDir = (0, posix_1.join)(project.root, 'src');
154
154
  const outputPath = (0, devkit_1.joinPathFragments)(project.root, 'dist');
155
- // the file must exist in the TS solution setup, which is the only case this
156
- // function is called
157
- const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
158
155
  packageJson = (0, js_1.getUpdatedPackageJsonContent)(packageJson, {
159
156
  main,
160
157
  outputPath,
@@ -163,7 +160,7 @@ function updatePackageJson(tree, options, projectType) {
163
160
  generateExportsField: true,
164
161
  packageJsonPath,
165
162
  format: ['esm'],
166
- skipDevelopmentExports: !tsconfigBase.compilerOptions?.customConditions?.includes('development'),
163
+ developmentConditionName: (0, ts_solution_setup_1.getDefinedCustomConditionName)(tree),
167
164
  });
168
165
  }
169
166
  (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
package/src/generators/init/lib/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/init/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAGL,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAGhD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,mDAiB5B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,cAgB/C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,QAc5C"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/init/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAGL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAGhD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,mDAqB5B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,cAgB/C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,QAc5C"}
package/src/generators/init/lib/utils.js CHANGED
@@ -11,7 +11,11 @@ async function checkDependenciesInstalled(host, schema) {
11
11
  return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
12
12
  '@nx/vite': versions_1.nxVersion,
13
13
  '@nx/web': versions_1.nxVersion,
14
- vite: schema.useViteV5 ? versions_1.viteV5Version : versions_1.viteVersion,
14
+ vite: schema.useViteV5
15
+ ? versions_1.viteV5Version
16
+ : schema.useViteV6
17
+ ? versions_1.viteV6Version
18
+ : versions_1.viteVersion,
15
19
  vitest: vitest,
16
20
  '@vitest/ui': vitest,
17
21
  jiti: versions_1.jitiVersion,
package/src/generators/init/schema.d.ts CHANGED
@@ -7,5 +7,6 @@ export interface InitGeneratorSchema {
7
7
  addPlugin?: boolean;
8
8
  vitestOnly?: boolean;
9
9
  useViteV5?: boolean;
10
+ useViteV6?: boolean;
10
11
  projectRoot?: string;
11
12
  }
package/src/generators/init/schema.json CHANGED
@@ -38,6 +38,13 @@
38
38
  "default": false,
39
39
  "x-priority": "internal",
40
40
  "hidden": true
41
+ },
42
+ "useViteV6": {
43
+ "type": "boolean",
44
+ "description": "Use Vite v6",
45
+ "default": false,
46
+ "x-priority": "internal",
47
+ "hidden": true
41
48
  }
42
49
  }
43
50
  }
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,EAIL,iBAAiB,EASjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAKjD;;GAEG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAOlB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAoLlB;AA0LD,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,EAIL,iBAAiB,EASjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAKjD;;GAEG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAOlB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAuLlB;AA0LD,eAAe,eAAe,CAAC"}
package/src/generators/vitest/vitest-generator.js CHANGED
@@ -30,12 +30,14 @@ async function vitestGeneratorInternal(tree, schema, hasPlugin = false) {
30
30
  const isRootProject = root === '.';
31
31
  tasks.push(await (0, js_1.initGenerator)(tree, { ...schema, skipFormat: true }));
32
32
  const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
33
- const useVite5 = (0, semver_1.major)((0, semver_1.coerce)(pkgJson.devDependencies['vite']) ?? '6.0.0') === 5;
33
+ const useViteV5 = (0, semver_1.major)((0, semver_1.coerce)(pkgJson.devDependencies['vite']) ?? '7.0.0') === 5;
34
+ const useViteV6 = (0, semver_1.major)((0, semver_1.coerce)(pkgJson.devDependencies['vite']) ?? '7.0.0') === 6;
34
35
  const initTask = await (0, init_1.default)(tree, {
35
36
  projectRoot: root,
36
37
  skipFormat: true,
37
38
  addPlugin: schema.addPlugin,
38
- useViteV5: useVite5,
39
+ useViteV5,
40
+ useViteV6,
39
41
  });
40
42
  tasks.push(initTask);
41
43
  tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, { ...schema, uiFramework }));
package/src/utils/versions.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  export declare const nxVersion: any;
2
- export declare const viteVersion = "^6.0.0";
2
+ export declare const viteVersion = "^7.0.0";
3
+ export declare const viteV6Version = "^6.0.0";
3
4
  export declare const viteV5Version = "^5.0.0";
4
5
  export declare const vitestVersion = "^3.0.0";
5
6
  export declare const vitestV1Version = "^1.3.1";
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,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;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"}
package/src/utils/versions.js CHANGED
@@ -1,9 +1,10 @@
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.viteVersion = exports.nxVersion = void 0;
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;
4
4
  exports.nxVersion = require('../../package.json').version;
5
5
  // Also update @nx/remix/utils/versions when changing vite version
6
- exports.viteVersion = '^6.0.0';
6
+ exports.viteVersion = '^7.0.0';
7
+ exports.viteV6Version = '^6.0.0';
7
8
  exports.viteV5Version = '^5.0.0';
8
9
  exports.vitestVersion = '^3.0.0';
9
10
  exports.vitestV1Version = '^1.3.1';