vike 0.4.259-commit-58f1d2c → 0.4.259-commit-a909f04

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.
@@ -58,7 +58,7 @@ async function getViteInfo(viteContext) {
58
58
  let viteConfigFromUserResolved = clone(viteConfigFromUserVikeApiOptions ?? {});
59
59
  // Precedence:
60
60
  // 1. (highest precedence) | viteConfigFromUserEnvVar | VITE_CONFIG
61
- // 2. | viteConfigFromUserVikeMode | VIKE_CONFIG & Vike CLI options — only `+mode`
61
+ // 2. | viteConfigFromUserVikeSettings | VIKE_CONFIG & Vike CLI options — only `+mode` & `+root`
62
62
  // 3. | viteConfigFromUserViteCli | Vite CLI args — `[root]` & `-c/--config`
63
63
  // 4. | viteConfigFromUserVikeApiOptions | Vike API options
64
64
  // 5. (lowest precedence) | viteConfigFromUserViteConfigFile | vite.config.js
@@ -69,11 +69,18 @@ async function getViteInfo(viteContext) {
69
69
  if (viteConfigFromUserViteCli) {
70
70
  viteConfigFromUserResolved = merge(viteConfigFromUserResolved ?? {}, viteConfigFromUserViteCli);
71
71
  }
72
- // Resolve Vike's +mode setting
72
+ // Resolve Vike's +mode and +root settings.
73
+ // These alias Vite settings that need to be resolved early: +root determines where Vike looks for
74
+ // +config.js files (so it can't be defined inside +config.js itself), and +mode affects which
75
+ // vite.config.js environment is loaded. That's why — unlike +host/+port/+force which are applied
76
+ // later from the resolved Vike config — they're read here from Vike's CLI options & VIKE_CONFIG only.
73
77
  {
74
- const viteConfigFromUserVikeMode = pick(getVikeConfigFromCliOrEnv().vikeConfigFromCliOrEnv, ['mode']);
75
- if (Object.keys(viteConfigFromUserVikeMode).length > 0) {
76
- viteConfigFromUserResolved = merge(viteConfigFromUserResolved ?? {}, viteConfigFromUserVikeMode);
78
+ const viteConfigFromUserVikeSettings = pick(getVikeConfigFromCliOrEnv().vikeConfigFromCliOrEnv, [
79
+ 'mode',
80
+ 'root',
81
+ ]);
82
+ if (Object.keys(viteConfigFromUserVikeSettings).length > 0) {
83
+ viteConfigFromUserResolved = merge(viteConfigFromUserResolved ?? {}, viteConfigFromUserVikeSettings);
77
84
  }
78
85
  }
79
86
  // Resolve VITE_CONFIG
@@ -81,6 +81,7 @@ function showHelp() {
81
81
  `vike dev ${pc.cyan('--port')} 80 ${TAB}${pc.dim('# Change the server port')}`,
82
82
  `vike build ${pc.cyan('--mode')} staging${TAB}${pc.dim('# Set the mode to run in')}`,
83
83
  `vike dev ${pc.cyan('--force')} ${TAB}${pc.dim("# Disable Vite's cache")}`,
84
+ `vike dev ${pc.cyan('--root')} src ${TAB}${pc.dim('# Set the project root directory')}`,
84
85
  ]
85
86
  .map((o) => ` ${pc.dim('$')} ${o}`)
86
87
  .join('\n'),
@@ -205,6 +205,11 @@ const metaBuiltIn = {
205
205
  global: true,
206
206
  vite: true,
207
207
  },
208
+ root: {
209
+ env: { config: true },
210
+ global: true,
211
+ vite: true,
212
+ },
208
213
  csp: {
209
214
  env: { server: true },
210
215
  },
@@ -489,6 +489,16 @@ type ConfigBuiltIn = {
489
489
  * https://vike.dev/force
490
490
  */
491
491
  force?: boolean;
492
+ /**
493
+ * The root directory of your project.
494
+ *
495
+ * Can be an absolute path, or a path relative to the current working directory.
496
+ *
497
+ * @default process.cwd()
498
+ *
499
+ * https://vike.dev/root
500
+ */
501
+ root?: string;
492
502
  /**
493
503
  * Content Security Policy (CSP).
494
504
  *
@@ -1 +1 @@
1
- export declare const PROJECT_VERSION: "0.4.259-commit-58f1d2c";
1
+ export declare const PROJECT_VERSION: "0.4.259-commit-a909f04";
@@ -1,2 +1,2 @@
1
1
  // Automatically updated by @brillout/release-me
2
- export const PROJECT_VERSION = '0.4.259-commit-58f1d2c';
2
+ export const PROJECT_VERSION = '0.4.259-commit-a909f04';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vike",
3
- "version": "0.4.259-commit-58f1d2c",
3
+ "version": "0.4.259-commit-a909f04",
4
4
  "repository": "https://github.com/vikejs/vike",
5
5
  "exports": {
6
6
  "./server": {
@@ -146,7 +146,7 @@
146
146
  "semver": "^7.8.1",
147
147
  "sirv": "^3.0.2",
148
148
  "source-map-support": "^0.5.0",
149
- "tinyglobby": "^0.2.16",
149
+ "tinyglobby": "^0.2.17",
150
150
  "vite": ">=6.3.0",
151
151
  "vite-plugin-wrapper": "^0.1.0"
152
152
  },