vike 0.4.164 → 0.4.165-commit-2598887

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 (40) hide show
  1. package/dist/cjs/node/plugin/index.js +7 -1
  2. package/dist/cjs/node/plugin/plugins/buildConfig.js +67 -57
  3. package/dist/cjs/node/plugin/shared/getHttpRequestAsyncStore.js +15 -23
  4. package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/{errMdx.js → errMdx1.js} +2 -2
  5. package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx2.js +85 -0
  6. package/dist/cjs/node/plugin/shared/loggerNotProd.js +15 -11
  7. package/dist/cjs/node/plugin/shared/loggerVite.js +12 -18
  8. package/dist/cjs/node/plugin/utils.js +1 -1
  9. package/dist/cjs/node/runtime/renderPage/loggerProd.js +5 -1
  10. package/dist/cjs/node/runtime/renderPage.js +2 -4
  11. package/dist/cjs/shared/route/resolveRouteString.js +0 -1
  12. package/dist/cjs/utils/assertNodeVersion.js +3 -4
  13. package/dist/cjs/utils/{isVersionOrAbove.js → assertVersion.js} +5 -1
  14. package/dist/cjs/utils/projectInfo.js +1 -1
  15. package/dist/esm/node/plugin/index.js +8 -2
  16. package/dist/esm/node/plugin/plugins/buildConfig.d.ts +1 -1
  17. package/dist/esm/node/plugin/plugins/buildConfig.js +67 -57
  18. package/dist/esm/node/plugin/shared/getHttpRequestAsyncStore.d.ts +0 -1
  19. package/dist/esm/node/plugin/shared/getHttpRequestAsyncStore.js +16 -24
  20. package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/{errMdx.d.ts → errMdx1.d.ts} +1 -1
  21. package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/{errMdx.js → errMdx1.js} +1 -1
  22. package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx2.d.ts +44 -0
  23. package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx2.js +82 -0
  24. package/dist/esm/node/plugin/shared/loggerNotProd.d.ts +3 -6
  25. package/dist/esm/node/plugin/shared/loggerNotProd.js +14 -10
  26. package/dist/esm/node/plugin/shared/loggerVite.js +13 -19
  27. package/dist/esm/node/plugin/utils.d.ts +1 -1
  28. package/dist/esm/node/plugin/utils.js +1 -1
  29. package/dist/esm/node/runtime/renderPage/loggerProd.js +5 -1
  30. package/dist/esm/node/runtime/renderPage.d.ts +0 -1
  31. package/dist/esm/node/runtime/renderPage.js +2 -4
  32. package/dist/esm/shared/page-configs/Config/PageContextConfig.d.ts +1 -1
  33. package/dist/esm/shared/route/resolveRouteString.js +0 -1
  34. package/dist/esm/utils/assertNodeVersion.js +3 -4
  35. package/dist/esm/utils/assertVersion.d.ts +4 -0
  36. package/dist/esm/utils/{isVersionOrAbove.js → assertVersion.js} +5 -1
  37. package/dist/esm/utils/projectInfo.d.ts +2 -2
  38. package/dist/esm/utils/projectInfo.js +1 -1
  39. package/package.json +2 -2
  40. package/dist/esm/utils/isVersionOrAbove.d.ts +0 -2
@@ -7,6 +7,7 @@ exports.version = exports.ssr = exports.plugin = void 0;
7
7
  exports.default = plugin;
8
8
  var utils_js_1 = require("./utils.js");
9
9
  Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
10
+ const vite_1 = require("vite");
10
11
  const utils_js_2 = require("./utils.js");
11
12
  const buildConfig_js_1 = require("./plugins/buildConfig.js");
12
13
  const previewConfig_js_1 = require("./plugins/previewConfig.js");
@@ -29,6 +30,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
29
30
  const fileEnv_js_1 = require("./plugins/fileEnv.js");
30
31
  (0, utils_js_2.assertNodeEnv_onVikePluginLoad)();
31
32
  (0, utils_js_2.markEnvAsVikePluginLoaded)();
33
+ assertViteVersion();
32
34
  // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
33
35
  function plugin(vikeConfig) {
34
36
  const plugins = [
@@ -36,7 +38,7 @@ function plugin(vikeConfig) {
36
38
  ...(0, commonConfig_js_1.commonConfig)(),
37
39
  (0, index_js_2.importUserCode)(),
38
40
  ...(0, index_js_1.devConfig)(),
39
- (0, buildConfig_js_1.buildConfig)(),
41
+ ...(0, buildConfig_js_1.buildConfig)(),
40
42
  (0, previewConfig_js_1.previewConfig)(),
41
43
  ...(0, autoFullBuild_js_1.autoFullBuild)(),
42
44
  (0, packageJsonFile_js_1.packageJsonFile)(),
@@ -69,3 +71,7 @@ Object.defineProperty(plugin, 'apply', {
69
71
  (0, utils_js_2.assertUsage)(false, `Add ${picocolors_1.default.cyan('vike()')} instead of ${picocolors_1.default.cyan('vike')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
70
72
  }
71
73
  });
74
+ // node_modules/vike/package.json#peerDependencies.vite isn't enough as users can ignore it
75
+ function assertViteVersion() {
76
+ (0, utils_js_2.assertVersion)('Vite', vite_1.version, '4.4.0');
77
+ }
@@ -28,71 +28,81 @@ function buildConfig() {
28
28
  let isSsrBuild;
29
29
  let outDirs;
30
30
  let config;
31
- return {
32
- name: 'vike:buildConfig',
33
- apply: 'build',
34
- enforce: 'post',
35
- configResolved: {
36
- order: 'post',
37
- async handler(config_) {
38
- config = config_;
39
- (0, utils_js_1.assertNodeEnv_build)();
40
- assertRollupInput(config);
41
- const entries = await getEntries(config);
42
- (0, utils_js_1.assert)(Object.keys(entries).length > 0);
43
- config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
44
- addLogHook();
45
- outDirs = (0, utils_js_1.getOutDirs)(config);
46
- {
47
- isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
48
- if (isServerAssetsFixEnabled) {
49
- // https://github.com/vikejs/vike/issues/1339
50
- config.build.ssrEmitAssets = true;
51
- // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
52
- config.build.cssMinify = 'esbuild';
31
+ return [
32
+ {
33
+ name: 'vike:buildConfig:configResolved',
34
+ apply: 'build',
35
+ enforce: 'post',
36
+ configResolved: {
37
+ order: 'post',
38
+ async handler(config_) {
39
+ config = config_;
40
+ (0, utils_js_1.assertNodeEnv_build)();
41
+ assertRollupInput(config);
42
+ const entries = await getEntries(config);
43
+ (0, utils_js_1.assert)(Object.keys(entries).length > 0);
44
+ config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
45
+ addLogHook();
46
+ outDirs = (0, utils_js_1.getOutDirs)(config);
47
+ {
48
+ isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
49
+ if (isServerAssetsFixEnabled) {
50
+ // https://github.com/vikejs/vike/issues/1339
51
+ config.build.ssrEmitAssets = true;
52
+ // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
53
+ config.build.cssMinify = 'esbuild';
54
+ }
53
55
  }
54
56
  }
57
+ },
58
+ config(config) {
59
+ (0, utils_js_1.assertNodeEnv_build)();
60
+ isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
61
+ return {
62
+ build: {
63
+ outDir: (0, utils_js_1.resolveOutDir)(config),
64
+ manifest: manifestTempFile,
65
+ copyPublicDir: !isSsrBuild
66
+ }
67
+ };
68
+ },
69
+ buildStart() {
70
+ (0, utils_js_1.assertNodeEnv_build)();
55
71
  }
56
72
  },
57
- config(config) {
58
- (0, utils_js_1.assertNodeEnv_build)();
59
- isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
60
- return {
61
- build: {
62
- outDir: (0, utils_js_1.resolveOutDir)(config),
63
- manifest: manifestTempFile,
64
- copyPublicDir: !isSsrBuild
65
- }
66
- };
67
- },
68
- buildStart() {
69
- (0, utils_js_1.assertNodeEnv_build)();
70
- },
71
- writeBundle: {
72
- order: 'post',
73
- sequential: true,
74
- async handler(options, bundle) {
75
- if (isSsrBuild) {
76
- // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
77
- // - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
78
- // - We'll able to do so once we replace `$ vite build` with `$ vike build`
79
- const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
80
- const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
81
- const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
82
- if (!isServerAssetsFixEnabled) {
83
- await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
84
- }
85
- else {
86
- const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(config);
87
- await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
73
+ {
74
+ name: 'vike:buildConfig:writeBundle',
75
+ apply: 'build',
76
+ // Make sure other writeBundle() hooks are called after this writeBundle() hook.
77
+ // - set_constant_ASSETS_MAP() needs to be called before dist/server/ code is executed.
78
+ // - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
79
+ enforce: 'pre',
80
+ writeBundle: {
81
+ order: 'pre',
82
+ sequential: true,
83
+ async handler(options, bundle) {
84
+ if (isSsrBuild) {
85
+ // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
86
+ // - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
87
+ // - We'll able to do so once we replace `$ vite build` with `$ vike build`
88
+ const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
89
+ const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
90
+ const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
91
+ if (!isServerAssetsFixEnabled) {
92
+ await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
93
+ }
94
+ else {
95
+ const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(config);
96
+ await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
97
+ }
98
+ await promises_1.default.rm(clientManifestFilePath);
99
+ await promises_1.default.rm(serverManifestFilePath);
100
+ await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
88
101
  }
89
- await promises_1.default.rm(clientManifestFilePath);
90
- await promises_1.default.rm(serverManifestFilePath);
91
- await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
92
102
  }
93
103
  }
94
104
  }
95
- };
105
+ ];
96
106
  }
97
107
  exports.buildConfig = buildConfig;
98
108
  async function getEntries(config) {
@@ -32,6 +32,7 @@ const utils_js_1 = require("../utils.js");
32
32
  const transpileAndExecuteFile_js_1 = require("../plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js");
33
33
  const loggerNotProd_js_1 = require("./loggerNotProd.js");
34
34
  const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
35
+ const node_util_1 = require("node:util");
35
36
  (0, utils_js_1.assertIsNotProductionRuntime)();
36
37
  let asyncLocalStorage = null;
37
38
  async function installHttpRequestAsyncStore() {
@@ -61,29 +62,14 @@ async function installHttpRequestAsyncStore() {
61
62
  return false;
62
63
  }
63
64
  };
64
- // Remove once https://github.com/vitejs/vite/pull/13495 is released
65
- const swallowedErrorMessages = new Set();
66
- const markErrorMessageAsLogged = (errMsg) => {
67
- swallowedErrorMessages.add(errMsg);
68
- };
69
- const onRequestDone = () => {
70
- swallowedErrorMessages.forEach((errMsg) => {
71
- if (!Array.from(loggedErrors).some((err) => String(err).includes(errMsg))) {
72
- console.error('loggedErrors', loggedErrors);
73
- console.error('swallowedErrorMessages', swallowedErrorMessages);
74
- (0, utils_js_1.assert)(false);
75
- }
76
- });
77
- };
78
65
  const store = {
79
66
  httpRequestId,
80
67
  markErrorAsLogged,
81
- markErrorMessageAsLogged,
82
68
  shouldErrorBeSwallowed,
83
69
  errorDebugNoteAlreadyShown: false
84
70
  };
85
71
  const pageContextReturn = await asyncLocalStorage.run(store, renderPage);
86
- return { pageContextReturn, onRequestDone };
72
+ return { pageContextReturn };
87
73
  });
88
74
  return;
89
75
  }
@@ -109,14 +95,20 @@ function isEquivalent(err1, err2) {
109
95
  }
110
96
  if ((0, errorWithCodeSnippet_js_1.isEquivalentErrorWithCodeSnippet)(err1, err2))
111
97
  return true;
112
- if (err1.constructor === Error &&
113
- Object.keys(err1).length === 0 &&
114
- isDefinedAndSame(err1.message, err2.message) &&
115
- isDefinedAndSame(err1.stack, err2.stack)) {
98
+ if ((0, utils_js_1.unique)([
99
+ // error.message and error.stack aren't enumerable and therefore not listed by Object.keys()
100
+ 'message',
101
+ 'stack',
102
+ ...Object.keys(err1),
103
+ ...Object.keys(err2)
104
+ ]).every((k) => {
105
+ // isDeepStrictEqual() need to compare error.position wich is an object.
106
+ if ((0, node_util_1.isDeepStrictEqual)(err1[k], err2[k]))
107
+ return true;
108
+ // console.log('diff', k)
109
+ return false;
110
+ })) {
116
111
  return true;
117
112
  }
118
113
  return false;
119
114
  }
120
- function isDefinedAndSame(val1, val2) {
121
- return val1 && val1 === val2;
122
- }
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.errMdx = void 0;
4
- exports.errMdx = {
3
+ exports.errMdx1 = void 0;
4
+ exports.errMdx1 = {
5
5
  name: '5:5-5:6',
6
6
  message: 'Unexpected closing slash `/` in tag, expected an open tag first',
7
7
  reason: 'Unexpected closing slash `/` in tag, expected an open tag first',
@@ -0,0 +1,85 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.errMdx2 = void 0;
4
+ exports.errMdx2 = {
5
+ reason: 'Unexpected closing slash `/` in tag, expected an open tag first',
6
+ line: 23,
7
+ column: 450,
8
+ position: {
9
+ start: {
10
+ line: 23,
11
+ column: 450,
12
+ offset: 1967,
13
+ _index: 0,
14
+ _bufferIndex: 444
15
+ },
16
+ end: {
17
+ line: 23,
18
+ column: 451,
19
+ offset: 1968,
20
+ _index: 0,
21
+ _bufferIndex: 445
22
+ }
23
+ },
24
+ source: 'mdast-util-mdx-jsx',
25
+ ruleId: 'unexpected-closing-slash',
26
+ plugin: '@mdx-js/rollup',
27
+ id: '/home/rom/code/vike/docs/pages/abort/+Page.mdx',
28
+ pluginCode: "import { Link } from '@brillout/docpress'\n" +
29
+ '\n' +
30
+ 'By using <Link href="/render" text={<code>throw render()</code>}></Link> or <Link href="/redirect" text={<code>throw redirect()</code>}></Link> you abort the rendering of the current page and render something else instead.\n' +
31
+ '\n' +
32
+ `<h2 id="throw-redirect-vs-throw-render"><code>{'throw redirect()'}</code>{' VS '}<code>{'throw render()'}</code></h2>\n` +
33
+ '\n' +
34
+ 'While `throw redirect()` changes the URL, `throw render()` preserves it:\n' +
35
+ " - If a user goes to `/admin` and `throw redirect('/login')` is called, then the user will see the new URL `/login` in the browser's address bar.\n" +
36
+ " - If a user goes to `/admin` and `throw render('/login')` is called, then the user keeps seeing the same URL `/admin` in the browser's address bar.\n" +
37
+ '\n' +
38
+ "In general, we recommend using `throw render('/login')` instead of `throw redirect('/login')` as it preserves the URL and, therefore, the user's intention. We further explain this techniue at <Link href=\"/auth#login-flow\" />.\n" +
39
+ '\n' +
40
+ '\n' +
41
+ `<h2 id="debug">{'Debug'}</h2>\n` +
42
+ '\n' +
43
+ "If `throw redirect()` or `throw render()` doesn't work:\n" +
44
+ " - **Make sure `throw redirect()` / `throw render()` isn't intercepted.** \n" +
45
+ " In developement, check your server logs for the following log. If this log is missing then it means that Vike didn't catch the `throw redirect()` / `throw render()` exception: some other code is intercepting it preventing Vike from catching it.\n" +
46
+ ' ```\n' +
47
+ " 10:00:00 AM [vike][request(42)] throw redirect('/some-url') intercepted while\n" +
48
+ ' rendering /some-other-url\n' +
49
+ ' ```\n' +
50
+ ' > Most notably, using `throw redirect()` / `throw render()` inside a UI component usually doesn\'t work because most <Link href="/ui-framework">UI framework</Link> will intercept the execption and thus Vike won\'t be able to catch it. Instead, consider using `throw redirect()` / `throw render()` in a Vike hook such as <Link href="/guard">guard()</Link> or <Link href="/data">data()</Link>, or consider using <Link href="/navigate" />`navigate()`</Link>.\n' +
51
+ ' - **Make sure to use `throw redirect()` / `throw render()` within a Vike hook.** \n' +
52
+ " If you use `throw redirect()` / `throw render()` outside of Vike hooks, for example in some server middleware code then Vike won't be able to intercept it.\n" +
53
+ '\n' +
54
+ "If `throw redirect()` doesn't work:\n" +
55
+ ' - **Make sure to add `pageContext.httpResponse.headers` to the HTTP response.** \n' +
56
+ ' If you\'ve embedded Vike into your server using <Link text={<code>renderPage()</code>} href="/renderPage" />, then insepct whether `pageContext.httpResponse.headers` contains the `Location` header and double check that you\'re correctly adding all the headers defined by `pageContext.httpResponse.headers` to the HTTP response.\n' +
57
+ '\n' +
58
+ '\n' +
59
+ `<h2 id="see-also">{'See also'}</h2>\n` +
60
+ '\n' +
61
+ ' - <Link href="/redirect" />\n' +
62
+ ' - <Link href="/render" />\n' +
63
+ ' - <Link href="/navigate" />\n' +
64
+ '\n' +
65
+ '\n' +
66
+ 'export const headings = [{"headingId":"throw-redirect-vs-throw-render","headingLevel":2,"title":"`throw redirect()` VS `throw render()`"}, {"headingId":"debug","headingLevel":2,"title":"Debug"}, {"headingId":"see-also","headingLevel":2,"title":"See also"}];\n',
67
+ loc: {
68
+ file: '/home/rom/code/vike/docs/pages/abort/+Page.mdx',
69
+ start: {
70
+ line: 23,
71
+ column: 450,
72
+ offset: 1967,
73
+ _index: 0,
74
+ _bufferIndex: 444
75
+ },
76
+ end: {
77
+ line: 23,
78
+ column: 451,
79
+ offset: 1968,
80
+ _index: 0,
81
+ _bufferIndex: 445
82
+ }
83
+ },
84
+ frame: ''
85
+ };
@@ -9,7 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
9
9
  return (mod && mod.__esModule) ? mod : { "default": mod };
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.clearLogs = exports.logErrorDebugNote = exports.logConfigErrorRecover = exports.logConfigError = exports.logConfigInfo = exports.logViteErrorContainingCodeSnippet = exports.logViteAny = void 0;
12
+ exports.clearLogs = exports.logErrorDebugNote = exports.logConfigErrorRecover = exports.logConfigError = exports.logConfigInfo = exports.logViteError = exports.logViteAny = void 0;
13
13
  const abort_js_1 = require("../../../shared/route/abort.js");
14
14
  const globalContext_js_1 = require("../../runtime/globalContext.js");
15
15
  const loggerRuntime_js_1 = require("../../runtime/renderPage/loggerRuntime.js");
@@ -56,15 +56,17 @@ function logConfigErrorRecover() {
56
56
  }
57
57
  exports.logConfigErrorRecover = logConfigErrorRecover;
58
58
  function logRuntimeError(err,
59
- /** `httpRequestId` is `null` when pre-rendering */
59
+ // httpRequestId is `null` when pre-rendering
60
60
  httpRequestId) {
61
- logErr(err, httpRequestId);
61
+ logErr(err, httpRequestId, false);
62
62
  }
63
- function logViteErrorContainingCodeSnippet(err) {
64
- logErr(err);
63
+ function logViteError(err,
64
+ // httpRequestId is `undefined` if development environment doesn't support async stores
65
+ httpRequestId) {
66
+ logErr(err, httpRequestId, true);
65
67
  }
66
- exports.logViteErrorContainingCodeSnippet = logViteErrorContainingCodeSnippet;
67
- function logErr(err, httpRequestId = null) {
68
+ exports.logViteError = logViteError;
69
+ function logErr(err, httpRequestId = null, errorComesFromVite) {
68
70
  (0, utils_js_1.warnIfErrorIsNotObject)(err);
69
71
  if ((0, abort_js_1.isAbortError)(err) && !(0, isErrorDebug_js_1.isErrorDebug)()) {
70
72
  return;
@@ -103,9 +105,10 @@ function logErr(err, httpRequestId = null) {
103
105
  (0, log_js_1.logWithVikeTag)(picocolors_1.default.red(`Following error was thrown by the ${hookName}() hook defined at ${hookFilePath}`), 'error', category);
104
106
  }
105
107
  else if (category) {
106
- logFallbackErrIntro(category);
108
+ logFallbackErrIntro(category, errorComesFromVite);
107
109
  }
108
110
  (0, log_js_1.logDirectly)(err, 'error');
111
+ // Needs to be called after logging the error.
109
112
  (0, loggerProd_js_1.onRuntimeError)(err);
110
113
  }
111
114
  function logConfigError(err) {
@@ -140,12 +143,13 @@ function logConfigError(err) {
140
143
  return;
141
144
  }
142
145
  if (category)
143
- logFallbackErrIntro(category);
146
+ logFallbackErrIntro(category, false);
144
147
  (0, log_js_1.logDirectly)(err, 'error');
145
148
  }
146
149
  exports.logConfigError = logConfigError;
147
- function logFallbackErrIntro(category) {
148
- (0, log_js_1.logWithVikeTag)(picocolors_1.default.bold(picocolors_1.default.red('[Error] An error was thrown:')), 'error', category);
150
+ function logFallbackErrIntro(category, errorComesFromVite) {
151
+ const msg = errorComesFromVite ? 'Transpilation error' : 'An error was thrown';
152
+ (0, log_js_1.logWithVikeTag)(picocolors_1.default.bold(picocolors_1.default.red(`[Error] ${msg}:`)), 'error', category);
149
153
  }
150
154
  function getConfigCategory() {
151
155
  const category = getCategory() ?? 'config';
@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.improveViteLogs = void 0;
4
4
  const utils_js_1 = require("../utils.js");
5
5
  const loggerNotProd_js_1 = require("./loggerNotProd.js");
6
- const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
7
6
  const getHttpRequestAsyncStore_js_1 = require("./getHttpRequestAsyncStore.js");
8
7
  const removeSuperfluousViteLog_js_1 = require("./loggerVite/removeSuperfluousViteLog.js");
9
8
  const isErrorDebug_js_1 = require("./isErrorDebug.js");
10
- const loggerProd_js_1 = require("../../runtime/renderPage/loggerProd.js");
11
9
  function improveViteLogs(config) {
12
10
  intercept('info', config);
13
11
  intercept('warn', config);
@@ -28,29 +26,25 @@ function intercept(logType, config) {
28
26
  }
29
27
  msg = cleanFirstViteLog(msg);
30
28
  const store = (0, getHttpRequestAsyncStore_js_1.getHttpRequestAsyncStore)();
31
- // Dedupe Vite error messages
32
- if (options.error && store?.shouldErrorBeSwallowed(options.error)) {
29
+ if (options.error) {
30
+ // Vite does a poor job of handling errors.
31
+ // - It doesn't format error code snippets.
32
+ // - It only shows error.message which means that crucial information such as error.id isn't shown to the user.
33
+ (0, loggerNotProd_js_1.logViteError)(options.error, store?.httpRequestId);
34
+ // We swallow Vite's message: we didn't see it add any value so far.
35
+ // - It can even be confusing, such as the following:
36
+ // ```
37
+ // Error when evaluating SSR module virtual:vike:pageConfigValuesAll:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
38
+ // ```
39
+ (0, utils_js_1.assert)(!(0, isErrorDebug_js_1.isErrorDebug)());
33
40
  return;
34
41
  }
35
- // Remove this once https://github.com/vitejs/vite/pull/13495 is released and widely used
36
- if (msg.startsWith('Transform failed with ') && store && logType === 'error') {
37
- store.markErrorMessageAsLogged(msg);
38
- return;
39
- }
40
- if (options.error && (0, errorWithCodeSnippet_js_1.isErrorWithCodeSnippet)(options.error)) {
41
- (0, loggerNotProd_js_1.logViteErrorContainingCodeSnippet)(options.error);
42
- return;
43
- }
44
- // Only allow Vite to clear its first log. All other clearing is controlled by vike.
42
+ // Only allow Vite to clear for its first log. All other clearing is controlled by vike.
45
43
  if (options.clear)
46
44
  (0, loggerNotProd_js_1.clearLogs)({ clearIfFirstLog: true });
47
- if (options.error)
48
- store?.markErrorAsLogged(options.error);
49
45
  // Vite's default logger preprends the "[vite]" tag if and only if options.timestamp is true
50
46
  const prependViteTag = options.timestamp || !!store?.httpRequestId;
51
47
  (0, loggerNotProd_js_1.logViteAny)(msg, logType, store?.httpRequestId ?? null, prependViteTag);
52
- if (options.error)
53
- (0, loggerProd_js_1.onRuntimeError)(options.error);
54
48
  };
55
49
  }
56
50
  function cleanFirstViteLog(msg) {
@@ -41,4 +41,4 @@ __exportStar(require("../../utils/assertKeys.js"), exports);
41
41
  __exportStar(require("../../utils/injectRollupInputs.js"), exports);
42
42
  __exportStar(require("../../utils/humanizeTime.js"), exports);
43
43
  __exportStar(require("../../utils/pLimit.js"), exports);
44
- __exportStar(require("../../utils/isVersionOrAbove.js"), exports);
44
+ __exportStar(require("../../utils/assertVersion.js"), exports);
@@ -20,10 +20,14 @@ function logErrorProd(err, _httpRquestId) {
20
20
  // We ensure we print a string; Cloudflare Workers doesn't seem to properly stringify `Error` objects.
21
21
  const errStr = (0, utils_js_1.isObject)(err) && 'stack' in err ? String(err.stack) : String(err);
22
22
  console.error(picocolors_1.default.red(errStr));
23
+ // Needs to be called after logging the error.
23
24
  onRuntimeError(err);
24
25
  }
25
26
  exports.logErrorProd = logErrorProd;
26
- // Every server-side runtime error is expected to go through onRuntimeError(). (In principle, any runtime error is (or at least should) be catched by Vike, otherwise Vike couldn't render the error page.)
27
+ // Every server-side runtime error is expected to go through `onRuntimeError()`.
28
+ // - onRuntimeError(err) should always be called after `console.error(err)`.
29
+ // - Because the error hint of logErrorHint(err) should be shown *after* the error.
30
+ // - In principle, any runtime error is (or at least should) be catched by Vike, otherwise Vike couldn't render the error page.
27
31
  function onRuntimeError(err) {
28
32
  // The more runtime errors we pass to logErrorHint() the better.
29
33
  (0, logErrorHint_js_1.logErrorHint)(err);
@@ -27,8 +27,7 @@ const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
27
27
  pendingRequestsCount: 0
28
28
  });
29
29
  let renderPage_wrapper = async (_httpRequestId, ret) => ({
30
- pageContextReturn: await ret(),
31
- onRequestDone: () => { }
30
+ pageContextReturn: await ret()
32
31
  });
33
32
  const renderPage_addWrapper = (wrapper) => {
34
33
  renderPage_wrapper = wrapper;
@@ -48,10 +47,9 @@ async function renderPage(pageContextInit) {
48
47
  const { urlOriginal } = pageContextInit;
49
48
  logHttpRequest(urlOriginal, httpRequestId);
50
49
  globalObject.pendingRequestsCount++;
51
- const { pageContextReturn, onRequestDone } = await renderPage_wrapper(httpRequestId, () => renderPageAndPrepare(pageContextInit, httpRequestId));
50
+ const { pageContextReturn } = await renderPage_wrapper(httpRequestId, () => renderPageAndPrepare(pageContextInit, httpRequestId));
52
51
  logHttpResponse(urlOriginal, httpRequestId, pageContextReturn);
53
52
  globalObject.pendingRequestsCount--;
54
- onRequestDone();
55
53
  (0, utils_js_1.checkType)(pageContextReturn);
56
54
  return pageContextReturn;
57
55
  }
@@ -111,7 +111,6 @@ function parseRouteString(routeString) {
111
111
  }
112
112
  exports.parseRouteString = parseRouteString;
113
113
  function getUrlFromRouteString(routeString) {
114
- (0, utils_js_2.assert)(routeString.startsWith('/'));
115
114
  if (isStaticRouteString(routeString)) {
116
115
  const url = routeString;
117
116
  return url;
@@ -1,14 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.assertNodeVersion = void 0;
4
- const assert_js_1 = require("./assert.js");
5
4
  const isNodeJS_js_1 = require("./isNodeJS.js");
6
- const isVersionOrAbove_js_1 = require("./isVersionOrAbove.js");
7
- // package.json#engines.node isn't enough as users can ignore it
5
+ const assertVersion_js_1 = require("./assertVersion.js");
6
+ // node_modules/vike/package.json#engines.node isn't enough as users can ignore it
8
7
  function assertNodeVersion() {
9
8
  if (!(0, isNodeJS_js_1.isNodeJS)())
10
9
  return;
11
10
  const version = process.versions.node;
12
- (0, assert_js_1.assertUsage)((0, isVersionOrAbove_js_1.isVersionOrAbove)(version, '16.0.0'), `Node.js ${version} isn't supported, use Node.js >=16.0.0 instead.`);
11
+ (0, assertVersion_js_1.assertVersion)('Node.js', version, '16.0.0');
13
12
  }
14
13
  exports.assertNodeVersion = assertNodeVersion;
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isVersionOrAbove = void 0;
3
+ exports.isVersionOrAbove = exports.assertVersion = void 0;
4
4
  const assert_js_1 = require("./assert.js");
5
+ function assertVersion(dependencyName, versionActual, versionExpected) {
6
+ (0, assert_js_1.assertUsage)(isVersionOrAbove(versionActual, versionExpected), `${dependencyName} ${versionActual} isn't supported, use ${dependencyName} >= ${versionExpected} instead.`);
7
+ }
8
+ exports.assertVersion = assertVersion;
5
9
  function isVersionOrAbove(versionActual, versionExpected) {
6
10
  const p1 = parseVersion(versionActual);
7
11
  const p2 = parseVersion(versionExpected);
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PROJECT_VERSION = exports.projectInfo = void 0;
4
4
  const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
5
- const PROJECT_VERSION = '0.4.164';
5
+ const PROJECT_VERSION = '0.4.165-commit-2598887';
6
6
  exports.PROJECT_VERSION = PROJECT_VERSION;
7
7
  const projectInfo = {
8
8
  projectName: 'Vike',
@@ -3,7 +3,8 @@ export { plugin };
3
3
  // TODO/v1-release: remove
4
4
  export { plugin as ssr };
5
5
  export { PROJECT_VERSION as version } from './utils.js';
6
- import { assertNodeEnv_onVikePluginLoad, assertUsage, markEnvAsVikePluginLoaded } from './utils.js';
6
+ import { version } from 'vite';
7
+ import { assertNodeEnv_onVikePluginLoad, assertUsage, assertVersion, markEnvAsVikePluginLoaded } from './utils.js';
7
8
  import { buildConfig } from './plugins/buildConfig.js';
8
9
  import { previewConfig } from './plugins/previewConfig.js';
9
10
  import { autoFullBuild } from './plugins/autoFullBuild.js';
@@ -25,6 +26,7 @@ import pc from '@brillout/picocolors';
25
26
  import { fileEnv } from './plugins/fileEnv.js';
26
27
  assertNodeEnv_onVikePluginLoad();
27
28
  markEnvAsVikePluginLoaded();
29
+ assertViteVersion();
28
30
  // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
29
31
  function plugin(vikeConfig) {
30
32
  const plugins = [
@@ -32,7 +34,7 @@ function plugin(vikeConfig) {
32
34
  ...commonConfig(),
33
35
  importUserCode(),
34
36
  ...devConfig(),
35
- buildConfig(),
37
+ ...buildConfig(),
36
38
  previewConfig(),
37
39
  ...autoFullBuild(),
38
40
  packageJsonFile(),
@@ -63,3 +65,7 @@ Object.defineProperty(plugin, 'apply', {
63
65
  assertUsage(false, `Add ${pc.cyan('vike()')} instead of ${pc.cyan('vike')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
64
66
  }
65
67
  });
68
+ // node_modules/vike/package.json#peerDependencies.vite isn't enough as users can ignore it
69
+ function assertViteVersion() {
70
+ assertVersion('Vite', version, '4.4.0');
71
+ }
@@ -5,7 +5,7 @@ export { manifestTempFile };
5
5
  import type { ResolvedConfig, Plugin } from 'vite';
6
6
  import type { PageConfigBuildTime } from '../../../shared/page-configs/PageConfig.js';
7
7
  declare const manifestTempFile = "_temp_manifest.json";
8
- declare function buildConfig(): Plugin;
8
+ declare function buildConfig(): Plugin[];
9
9
  declare function analyzeClientEntries(pageConfigs: PageConfigBuildTime[], config: ResolvedConfig): {
10
10
  hasClientRouting: boolean;
11
11
  hasServerRouting: boolean;