vike 0.4.223-commit-17500eb → 0.4.223-commit-32cd543

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 (7) hide show
  1. package/dist/cjs/node/api/prepareViteApiCall.js +9 -2
  2. package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
  3. package/dist/esm/node/api/prepareViteApiCall.js +9 -2
  4. package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
  5. package/dist/esm/utils/PROJECT_VERSION.js +1 -1
  6. package/dist/esm/utils/projectInfo.d.ts +1 -1
  7. package/package.json +1 -1
package/dist/cjs/node/api/prepareViteApiCall.js CHANGED
@@ -87,7 +87,10 @@ async function getViteRoot(operation) {
87
87
  }
88
88
  async function getInfoFromVite(viteConfigFromOptions, operation) {
89
89
  const viteConfigFromUserViteFile = await loadViteConfigFile(viteConfigFromOptions, operation);
90
- const root = normalizeViteRoot(viteConfigFromUserViteFile?.root ?? viteConfigFromOptions?.root ?? process.cwd());
90
+ const root = normalizeViteRoot(
91
+ // `viteConfigFromOptions.root` before `viteConfigFromUserViteFile.root` replicates Vite's precedence:
92
+ // https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L1001
93
+ viteConfigFromOptions?.root ?? viteConfigFromUserViteFile?.root ?? process.cwd());
91
94
  globalObject.root = root;
92
95
  let vikeVitePluginOptions;
93
96
  let viteConfigEnhanced = viteConfigFromOptions;
@@ -153,7 +156,11 @@ function getResolveConfigArgs(viteConfig = {}, operation) {
153
156
  return [inlineConfig, command, defaultMode, defaultNodeEnv, isPreview];
154
157
  }
155
158
  function normalizeViteRoot(root) {
156
- return (0, utils_js_1.toPosixPath)(path_1.default.resolve(root));
159
+ // `path.resolve(viteConfigFromUserViteFile.configFile, root)` could be more intuitive than `path.resolve(process.cwd(), root)` but we replicate Vite's behavior (`vite.config.js` should follow Vite's API), see:
160
+ // https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L1063
161
+ return (0, utils_js_1.toPosixPath)(
162
+ // Equivalent to `path.resolve(process.cwd(), root)`
163
+ path_1.default.resolve(root));
157
164
  }
158
165
  const errMsg = `A Vite plugin is modifying Vite's setting ${picocolors_1.default.cyan('root')} which is forbidden`;
159
166
  async function assertViteRoot2(root, viteConfigEnhanced, operation) {
package/dist/cjs/utils/PROJECT_VERSION.js CHANGED
@@ -2,4 +2,4 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PROJECT_VERSION = void 0;
4
4
  // Automatically updated by @brillout/release-me
5
- exports.PROJECT_VERSION = '0.4.223-commit-17500eb';
5
+ exports.PROJECT_VERSION = '0.4.223-commit-32cd543';
package/dist/esm/node/api/prepareViteApiCall.js CHANGED
@@ -49,7 +49,10 @@ async function getViteRoot(operation) {
49
49
  }
50
50
  async function getInfoFromVite(viteConfigFromOptions, operation) {
51
51
  const viteConfigFromUserViteFile = await loadViteConfigFile(viteConfigFromOptions, operation);
52
- const root = normalizeViteRoot(viteConfigFromUserViteFile?.root ?? viteConfigFromOptions?.root ?? process.cwd());
52
+ const root = normalizeViteRoot(
53
+ // `viteConfigFromOptions.root` before `viteConfigFromUserViteFile.root` replicates Vite's precedence:
54
+ // https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L1001
55
+ viteConfigFromOptions?.root ?? viteConfigFromUserViteFile?.root ?? process.cwd());
53
56
  globalObject.root = root;
54
57
  let vikeVitePluginOptions;
55
58
  let viteConfigEnhanced = viteConfigFromOptions;
@@ -115,7 +118,11 @@ function getResolveConfigArgs(viteConfig = {}, operation) {
115
118
  return [inlineConfig, command, defaultMode, defaultNodeEnv, isPreview];
116
119
  }
117
120
  function normalizeViteRoot(root) {
118
- return toPosixPath(path.resolve(root));
121
+ // `path.resolve(viteConfigFromUserViteFile.configFile, root)` could be more intuitive than `path.resolve(process.cwd(), root)` but we replicate Vite's behavior (`vite.config.js` should follow Vite's API), see:
122
+ // https://github.com/vitejs/vite/blob/4f5845a3182fc950eb9cd76d7161698383113b18/packages/vite/src/node/config.ts#L1063
123
+ return toPosixPath(
124
+ // Equivalent to `path.resolve(process.cwd(), root)`
125
+ path.resolve(root));
119
126
  }
120
127
  const errMsg = `A Vite plugin is modifying Vite's setting ${pc.cyan('root')} which is forbidden`;
121
128
  async function assertViteRoot2(root, viteConfigEnhanced, operation) {
package/dist/esm/utils/PROJECT_VERSION.d.ts CHANGED
@@ -1 +1 @@
1
- export declare const PROJECT_VERSION: "0.4.223-commit-17500eb";
1
+ export declare const PROJECT_VERSION: "0.4.223-commit-32cd543";
package/dist/esm/utils/PROJECT_VERSION.js CHANGED
@@ -1,2 +1,2 @@
1
1
  // Automatically updated by @brillout/release-me
2
- export const PROJECT_VERSION = '0.4.223-commit-17500eb';
2
+ export const PROJECT_VERSION = '0.4.223-commit-32cd543';
package/dist/esm/utils/projectInfo.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  export declare const projectInfo: {
2
2
  projectName: "Vike";
3
- projectVersion: "0.4.223-commit-17500eb";
3
+ projectVersion: "0.4.223-commit-32cd543";
4
4
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vike",
3
- "version": "0.4.223-commit-17500eb",
3
+ "version": "0.4.223-commit-32cd543",
4
4
  "repository": "https://github.com/vikejs/vike",
5
5
  "exports": {
6
6
  "./server": {