vike 0.4.165 → 0.4.166-commit-a5e2596

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 (130) hide show
  1. package/dist/cjs/node/plugin/index.js +1 -1
  2. package/dist/cjs/node/plugin/plugins/baseUrls.js +1 -1
  3. package/dist/cjs/node/plugin/plugins/buildConfig/fixServerAssets.js +6 -2
  4. package/dist/cjs/node/plugin/plugins/buildConfig.js +78 -63
  5. package/dist/cjs/node/plugin/plugins/commonConfig/assertResolveAlias.js +14 -1
  6. package/dist/cjs/node/plugin/plugins/config/index.js +1 -1
  7. package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js +18 -23
  8. package/dist/cjs/node/plugin/plugins/envVars.js +3 -2
  9. package/dist/cjs/node/plugin/plugins/extractAssetsPlugin.js +9 -9
  10. package/dist/cjs/node/plugin/plugins/fileEnv.js +6 -3
  11. package/dist/cjs/node/plugin/plugins/importUserCode/index.js +6 -2
  12. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +0 -1
  13. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.js +53 -24
  14. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.js +6 -6
  15. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.js +10 -25
  16. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveImportPath.js +32 -35
  17. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js +18 -26
  18. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js +26 -21
  19. package/dist/cjs/node/plugin/shared/getFilePath.js +142 -0
  20. package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet.js +3 -8
  21. package/dist/cjs/node/plugin/shared/loggerNotProd.js +2 -1
  22. package/dist/cjs/node/plugin/utils.js +1 -1
  23. package/dist/cjs/node/prerender/runPrerender.js +6 -7
  24. package/dist/cjs/node/prerender/utils.js +2 -1
  25. package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js +1 -0
  26. package/dist/cjs/node/runtime/html/injectAssets/injectHtmlTags.js +1 -1
  27. package/dist/cjs/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js +3 -3
  28. package/dist/cjs/node/runtime/renderPage/executeOnRenderHtmlHook.js +2 -1
  29. package/dist/cjs/node/runtime/renderPage/getPageAssets/getManifestEntry.js +31 -33
  30. package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.js +9 -8
  31. package/dist/cjs/node/runtime/renderPage/getPageAssets.js +6 -12
  32. package/dist/cjs/node/runtime/renderPage/logErrorHint.js +5 -0
  33. package/dist/cjs/node/runtime/renderPage.js +34 -21
  34. package/dist/cjs/node/runtime/utils.js +0 -1
  35. package/dist/cjs/shared/page-configs/FilePath.js +2 -0
  36. package/dist/cjs/shared/route/abort.js +2 -1
  37. package/dist/cjs/shared/route/executeGuardHook.js +2 -1
  38. package/dist/cjs/shared/route/executeOnBeforeRouteHook.js +2 -1
  39. package/dist/cjs/shared/route/index.js +2 -3
  40. package/dist/cjs/shared/route/utils.js +0 -1
  41. package/dist/cjs/utils/assert.js +2 -0
  42. package/dist/cjs/utils/assertPathIsFilesystemAbsolute.js +1 -0
  43. package/dist/cjs/utils/assertSingleInstance.js +6 -5
  44. package/dist/cjs/utils/assertVersion.js +4 -1
  45. package/dist/cjs/utils/getGlobalObject.js +21 -6
  46. package/dist/cjs/utils/isNpmPackage.js +11 -5
  47. package/dist/cjs/utils/parseUrl.js +8 -1
  48. package/dist/cjs/utils/projectInfo.js +1 -4
  49. package/dist/esm/client/client-routing-runtime/history.d.ts +1 -1
  50. package/dist/esm/client/client-routing-runtime/history.js +5 -5
  51. package/dist/esm/client/client-routing-runtime/onBrowserHistoryNavigation.js +1 -1
  52. package/dist/esm/node/plugin/index.js +1 -1
  53. package/dist/esm/node/plugin/plugins/baseUrls.js +1 -1
  54. package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.js +6 -2
  55. package/dist/esm/node/plugin/plugins/buildConfig.d.ts +1 -1
  56. package/dist/esm/node/plugin/plugins/buildConfig.js +79 -64
  57. package/dist/esm/node/plugin/plugins/commonConfig/assertResolveAlias.js +14 -1
  58. package/dist/esm/node/plugin/plugins/config/index.js +1 -1
  59. package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js +19 -24
  60. package/dist/esm/node/plugin/plugins/envVars.js +4 -3
  61. package/dist/esm/node/plugin/plugins/extractAssetsPlugin.js +9 -9
  62. package/dist/esm/node/plugin/plugins/fileEnv.js +7 -4
  63. package/dist/esm/node/plugin/plugins/importUserCode/index.js +7 -3
  64. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.d.ts +1 -1
  65. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +0 -1
  66. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.d.ts +1 -1
  67. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.js +54 -25
  68. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.d.ts +1 -1
  69. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.js +6 -6
  70. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.d.ts +1 -1
  71. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.js +11 -26
  72. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveImportPath.d.ts +2 -1
  73. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveImportPath.js +32 -35
  74. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.d.ts +1 -1
  75. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js +18 -26
  76. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts +3 -2
  77. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js +26 -21
  78. package/dist/esm/node/plugin/shared/getFilePath.d.ts +21 -0
  79. package/dist/esm/node/plugin/shared/getFilePath.js +136 -0
  80. package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet.js +4 -9
  81. package/dist/esm/node/plugin/shared/loggerNotProd.js +2 -1
  82. package/dist/esm/node/plugin/utils.d.ts +1 -1
  83. package/dist/esm/node/plugin/utils.js +1 -1
  84. package/dist/esm/node/prerender/runPrerender.js +2 -3
  85. package/dist/esm/node/prerender/utils.d.ts +2 -1
  86. package/dist/esm/node/prerender/utils.js +2 -1
  87. package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js +1 -0
  88. package/dist/esm/node/runtime/html/injectAssets/injectHtmlTags.js +1 -1
  89. package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js +1 -1
  90. package/dist/esm/node/runtime/renderPage/executeOnRenderHtmlHook.js +2 -1
  91. package/dist/esm/node/runtime/renderPage/getPageAssets/getManifestEntry.js +32 -34
  92. package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.js +9 -8
  93. package/dist/esm/node/runtime/renderPage/getPageAssets.js +7 -13
  94. package/dist/esm/node/runtime/renderPage/logErrorHint.js +2 -0
  95. package/dist/esm/node/runtime/renderPage.js +34 -21
  96. package/dist/esm/node/runtime/utils.d.ts +0 -1
  97. package/dist/esm/node/runtime/utils.js +0 -1
  98. package/dist/esm/shared/page-configs/Config/PageContextConfig.d.ts +1 -1
  99. package/dist/esm/shared/page-configs/FilePath.d.ts +64 -0
  100. package/dist/esm/shared/page-configs/FilePath.js +1 -0
  101. package/dist/esm/shared/page-configs/PageConfig.d.ts +1 -42
  102. package/dist/esm/shared/route/abort.js +2 -1
  103. package/dist/esm/shared/route/executeGuardHook.js +2 -1
  104. package/dist/esm/shared/route/executeOnBeforeRouteHook.js +2 -1
  105. package/dist/esm/shared/route/index.js +2 -3
  106. package/dist/esm/shared/route/utils.d.ts +0 -1
  107. package/dist/esm/shared/route/utils.js +0 -1
  108. package/dist/esm/utils/assert.js +2 -0
  109. package/dist/esm/utils/assertPathIsFilesystemAbsolute.js +1 -0
  110. package/dist/esm/utils/assertSingleInstance.d.ts +2 -2
  111. package/dist/esm/utils/assertSingleInstance.js +5 -4
  112. package/dist/esm/utils/assertVersion.js +4 -1
  113. package/dist/esm/utils/debug.d.ts +1 -1
  114. package/dist/esm/utils/getGlobalObject.d.ts +6 -1
  115. package/dist/esm/utils/getGlobalObject.js +22 -6
  116. package/dist/esm/utils/isNpmPackage.d.ts +5 -7
  117. package/dist/esm/utils/isNpmPackage.js +15 -4
  118. package/dist/esm/utils/parseUrl.js +8 -1
  119. package/dist/esm/utils/projectInfo.d.ts +2 -2
  120. package/dist/esm/utils/projectInfo.js +1 -4
  121. package/package.json +26 -14
  122. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveFilePath.js +0 -33
  123. package/dist/cjs/node/runtime/renderPage/getPageAssets/assertClientEntryId.js +0 -19
  124. package/dist/cjs/utils/getFilePathAbsolute.js +0 -70
  125. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveFilePath.d.ts +0 -5
  126. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveFilePath.js +0 -27
  127. package/dist/esm/node/runtime/renderPage/getPageAssets/assertClientEntryId.d.ts +0 -2
  128. package/dist/esm/node/runtime/renderPage/getPageAssets/assertClientEntryId.js +0 -16
  129. package/dist/esm/utils/getFilePathAbsolute.d.ts +0 -5
  130. package/dist/esm/utils/getFilePathAbsolute.js +0 -64
@@ -1,70 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.getFilePathRelativeToUserRootDir = exports.getFilePathAbsolute = void 0;
7
- const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
8
- const assert_js_1 = require("./assert.js");
9
- const path_1 = __importDefault(require("path"));
10
- const assertIsNotProductionRuntime_js_1 = require("./assertIsNotProductionRuntime.js");
11
- const isNpmPackage_js_1 = require("./isNpmPackage.js");
12
- const assertPathIsFilesystemAbsolute_js_1 = require("./assertPathIsFilesystemAbsolute.js");
13
- const module_1 = require("module");
14
- // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
15
- const importMetaUrl = `file://${__filename}`;
16
- const require_ = (0, module_1.createRequire)(importMetaUrl);
17
- (0, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();
18
- // Vite handles paths such as /pages/index.page.js which are relative to `config.root`.
19
- // Make them absolute starting from the filesystem root.
20
- // Also resolve plus files living in npm packages such as restack/renderer/+onRenderHtml.js
21
- function getFilePathAbsolute(filePath, config) {
22
- (0, filesystemPathHandling_js_1.assertPosixPath)(filePath);
23
- if (filePath.startsWith('/@fs/')) {
24
- return filePath;
25
- }
26
- let filePathUnresolved;
27
- if ((0, isNpmPackage_js_1.isNpmPackageImport)(filePath)) {
28
- filePathUnresolved = filePath;
29
- }
30
- else {
31
- (0, assert_js_1.assert)(filePath.startsWith('/'));
32
- const { root } = config;
33
- (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(root);
34
- filePathUnresolved = path_1.default.posix.join(root, filePath);
35
- (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(filePathUnresolved);
36
- }
37
- let filePathAbsoluteFilesystem;
38
- try {
39
- filePathAbsoluteFilesystem = require_.resolve(filePathUnresolved, { paths: [config.root] });
40
- }
41
- catch (err) {
42
- console.error(err);
43
- (0, assert_js_1.assert)(false);
44
- }
45
- filePathAbsoluteFilesystem = (0, filesystemPathHandling_js_1.toPosixPath)(filePathAbsoluteFilesystem);
46
- (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(filePathAbsoluteFilesystem);
47
- return filePathAbsoluteFilesystem;
48
- }
49
- exports.getFilePathAbsolute = getFilePathAbsolute;
50
- function getFilePathRelativeToUserRootDir(filePathAbsoluteFilesystem, userRootDir, alwaysRelative = false) {
51
- (0, filesystemPathHandling_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
52
- (0, filesystemPathHandling_js_1.assertPosixPath)(userRootDir);
53
- let filePathRelativeToUserRootDir = path_1.default.posix.relative(userRootDir, filePathAbsoluteFilesystem);
54
- if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
55
- (0, assert_js_1.assert)(!filePathRelativeToUserRootDir.startsWith('.') && !filePathRelativeToUserRootDir.startsWith('/'),
56
- // Surprinsingly, this assertion seem to fail sometimes: https://github.com/vikejs/vike/issues/1139
57
- { filePathRelativeToUserRootDir, filePathAbsoluteFilesystem, userRootDir });
58
- filePathRelativeToUserRootDir = `/${filePathRelativeToUserRootDir}`;
59
- return filePathRelativeToUserRootDir;
60
- }
61
- else {
62
- if (alwaysRelative) {
63
- return filePathRelativeToUserRootDir;
64
- }
65
- else {
66
- return filePathAbsoluteFilesystem;
67
- }
68
- }
69
- }
70
- exports.getFilePathRelativeToUserRootDir = getFilePathRelativeToUserRootDir;
@@ -1,5 +0,0 @@
1
- export { resolveFilePathRelativeToUserRootDir };
2
- export { resolveFilePathAbsoluteFilesystem };
3
- import type { FilePathResolved } from '../../../../../../shared/page-configs/PageConfig.js';
4
- declare function resolveFilePathRelativeToUserRootDir(filePathRelativeToUserRootDir: string, userRootDir: string): FilePathResolved;
5
- declare function resolveFilePathAbsoluteFilesystem(filePathAbsoluteFilesystem: string, userRootDir: string): FilePathResolved;
@@ -1,27 +0,0 @@
1
- export { resolveFilePathRelativeToUserRootDir };
2
- export { resolveFilePathAbsoluteFilesystem };
3
- import path from 'path';
4
- import { assert, assertPosixPath } from '../../../../utils.js';
5
- function resolveFilePathRelativeToUserRootDir(filePathRelativeToUserRootDir, userRootDir) {
6
- assertPosixPath(filePathRelativeToUserRootDir);
7
- assertPosixPath(userRootDir);
8
- const filePathAbsoluteFilesystem = path.posix.join(userRootDir, filePathRelativeToUserRootDir);
9
- return getFilePathResolved(filePathRelativeToUserRootDir, filePathAbsoluteFilesystem);
10
- }
11
- function resolveFilePathAbsoluteFilesystem(filePathAbsoluteFilesystem, userRootDir) {
12
- assertPosixPath(filePathAbsoluteFilesystem);
13
- assertPosixPath(userRootDir);
14
- let filePathRelativeToUserRootDir = path.posix.relative(userRootDir, filePathAbsoluteFilesystem);
15
- assert(!filePathRelativeToUserRootDir.startsWith('.') && !filePathRelativeToUserRootDir.startsWith('/'));
16
- filePathRelativeToUserRootDir = '/' + filePathRelativeToUserRootDir;
17
- return getFilePathResolved(filePathRelativeToUserRootDir, filePathAbsoluteFilesystem);
18
- }
19
- function getFilePathResolved(filePathRelativeToUserRootDir, filePathAbsoluteFilesystem) {
20
- return {
21
- filePathRelativeToUserRootDir,
22
- filePathAbsoluteVite: filePathRelativeToUserRootDir,
23
- filePathAbsoluteFilesystem,
24
- filePathToShowToUser: filePathRelativeToUserRootDir,
25
- importPathAbsolute: null
26
- };
27
- }
@@ -1,2 +0,0 @@
1
- export { assertClientEntryId };
2
- declare function assertClientEntryId(id: string): void;
@@ -1,16 +0,0 @@
1
- export { assertClientEntryId };
2
- import { assert, assertPosixPath, isNpmPackageImport } from '../../utils.js';
3
- import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
4
- function assertClientEntryId(id) {
5
- assertPosixPath(id);
6
- assert(!id.startsWith('/@fs'), id);
7
- assert(
8
- // Client entry
9
- id.startsWith('@@vike/') ||
10
- // User files
11
- id.startsWith('/') ||
12
- // Page code importer
13
- isVirtualFileIdPageConfigValuesAll(id) ||
14
- // Import
15
- isNpmPackageImport(id), id);
16
- }
@@ -1,5 +0,0 @@
1
- export { getFilePathAbsolute };
2
- export { getFilePathRelativeToUserRootDir };
3
- import type { ResolvedConfig } from 'vite';
4
- declare function getFilePathAbsolute(filePath: string, config: ResolvedConfig): string;
5
- declare function getFilePathRelativeToUserRootDir(filePathAbsoluteFilesystem: string, userRootDir: string, alwaysRelative?: boolean): string;
@@ -1,64 +0,0 @@
1
- export { getFilePathAbsolute };
2
- export { getFilePathRelativeToUserRootDir };
3
- import { assertPosixPath, toPosixPath } from './filesystemPathHandling.js';
4
- import { assert } from './assert.js';
5
- import path from 'path';
6
- import { assertIsNotProductionRuntime } from './assertIsNotProductionRuntime.js';
7
- import { isNpmPackageImport } from './isNpmPackage.js';
8
- import { assertPathIsFilesystemAbsolute } from './assertPathIsFilesystemAbsolute.js';
9
- import { createRequire } from 'module';
10
- // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
11
- const importMetaUrl = import.meta.url;
12
- const require_ = createRequire(importMetaUrl);
13
- assertIsNotProductionRuntime();
14
- // Vite handles paths such as /pages/index.page.js which are relative to `config.root`.
15
- // Make them absolute starting from the filesystem root.
16
- // Also resolve plus files living in npm packages such as restack/renderer/+onRenderHtml.js
17
- function getFilePathAbsolute(filePath, config) {
18
- assertPosixPath(filePath);
19
- if (filePath.startsWith('/@fs/')) {
20
- return filePath;
21
- }
22
- let filePathUnresolved;
23
- if (isNpmPackageImport(filePath)) {
24
- filePathUnresolved = filePath;
25
- }
26
- else {
27
- assert(filePath.startsWith('/'));
28
- const { root } = config;
29
- assertPathIsFilesystemAbsolute(root);
30
- filePathUnresolved = path.posix.join(root, filePath);
31
- assertPathIsFilesystemAbsolute(filePathUnresolved);
32
- }
33
- let filePathAbsoluteFilesystem;
34
- try {
35
- filePathAbsoluteFilesystem = require_.resolve(filePathUnresolved, { paths: [config.root] });
36
- }
37
- catch (err) {
38
- console.error(err);
39
- assert(false);
40
- }
41
- filePathAbsoluteFilesystem = toPosixPath(filePathAbsoluteFilesystem);
42
- assertPathIsFilesystemAbsolute(filePathAbsoluteFilesystem);
43
- return filePathAbsoluteFilesystem;
44
- }
45
- function getFilePathRelativeToUserRootDir(filePathAbsoluteFilesystem, userRootDir, alwaysRelative = false) {
46
- assertPosixPath(filePathAbsoluteFilesystem);
47
- assertPosixPath(userRootDir);
48
- let filePathRelativeToUserRootDir = path.posix.relative(userRootDir, filePathAbsoluteFilesystem);
49
- if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
50
- assert(!filePathRelativeToUserRootDir.startsWith('.') && !filePathRelativeToUserRootDir.startsWith('/'),
51
- // Surprinsingly, this assertion seem to fail sometimes: https://github.com/vikejs/vike/issues/1139
52
- { filePathRelativeToUserRootDir, filePathAbsoluteFilesystem, userRootDir });
53
- filePathRelativeToUserRootDir = `/${filePathRelativeToUserRootDir}`;
54
- return filePathRelativeToUserRootDir;
55
- }
56
- else {
57
- if (alwaysRelative) {
58
- return filePathRelativeToUserRootDir;
59
- }
60
- else {
61
- return filePathAbsoluteFilesystem;
62
- }
63
- }
64
- }