vike 0.4.161-commit-b829fee → 0.4.162-commit-49fe40c

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 (108) hide show
  1. package/dist/cjs/__internal/index.js +2 -2
  2. package/dist/cjs/node/plugin/index.js +0 -2
  3. package/dist/cjs/node/plugin/plugins/buildConfig.js +1 -0
  4. package/dist/cjs/node/plugin/plugins/config/index.js +2 -7
  5. package/dist/cjs/node/plugin/plugins/devConfig/determineFsAllowList.js +1 -8
  6. package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js +1 -18
  7. package/dist/cjs/node/plugin/plugins/devConfig/index.js +2 -4
  8. package/dist/cjs/node/plugin/plugins/extractAssetsPlugin.js +0 -19
  9. package/dist/cjs/node/plugin/plugins/importUserCode/index.js +8 -8
  10. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getConfigValuesSerialized.js +1 -9
  11. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +3 -0
  12. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.js +1 -1
  13. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.js +4 -4
  14. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveImportPath.js +1 -1
  15. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transformFileImports.js +35 -36
  16. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js +109 -104
  17. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js +36 -32
  18. package/dist/cjs/node/plugin/utils.js +0 -1
  19. package/dist/cjs/node/prerender/runPrerender.js +2 -2
  20. package/dist/cjs/node/prerender/utils.js +1 -1
  21. package/dist/cjs/node/runtime/html/serializePageContextClientSide.js +1 -0
  22. package/dist/cjs/node/runtime/renderPage/getPageAssets/assertClientEntryId.js +2 -3
  23. package/dist/cjs/node/runtime/utils.js +1 -2
  24. package/dist/cjs/node/shared/virtual-files/virtualFileImportUserCode.js +1 -0
  25. package/dist/cjs/shared/hooks/getHook.js +1 -1
  26. package/dist/cjs/shared/page-configs/helpers/getConfigValue.js +1 -0
  27. package/dist/cjs/shared/page-configs/serialize/parseConfigValuesImported.js +1 -1
  28. package/dist/cjs/shared/route/abort.js +1 -0
  29. package/dist/cjs/shared/route/resolvePrecedence.js +1 -0
  30. package/dist/cjs/utils/{nodeEnv.js → assertNodeEnv.js} +3 -0
  31. package/dist/cjs/utils/formatHintLog.js +1 -0
  32. package/dist/cjs/utils/hasProp.js +1 -0
  33. package/dist/cjs/utils/isScriptFile.js +15 -4
  34. package/dist/cjs/utils/projectInfo.js +1 -1
  35. package/dist/esm/__internal/index.js +1 -1
  36. package/dist/esm/client/client-routing-runtime/renderPageClientSide.js +20 -14
  37. package/dist/esm/client/shared/getPageContextProxyForUser.js +19 -2
  38. package/dist/esm/client/shared/loadUserFilesClientSide.js +1 -0
  39. package/dist/esm/node/plugin/index.js +0 -2
  40. package/dist/esm/node/plugin/plugins/buildConfig.js +1 -0
  41. package/dist/esm/node/plugin/plugins/config/index.js +2 -7
  42. package/dist/esm/node/plugin/plugins/devConfig/determineFsAllowList.d.ts +1 -2
  43. package/dist/esm/node/plugin/plugins/devConfig/determineFsAllowList.js +1 -8
  44. package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.d.ts +1 -2
  45. package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js +2 -19
  46. package/dist/esm/node/plugin/plugins/devConfig/index.js +2 -4
  47. package/dist/esm/node/plugin/plugins/extractAssetsPlugin.js +0 -19
  48. package/dist/esm/node/plugin/plugins/importUserCode/index.js +8 -8
  49. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getConfigValuesSerialized.js +1 -9
  50. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +3 -0
  51. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.d.ts +3 -3
  52. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.js +1 -1
  53. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.d.ts +1 -1
  54. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.js +4 -4
  55. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveImportPath.js +1 -1
  56. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transformFileImports.d.ts +1 -13
  57. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transformFileImports.js +35 -36
  58. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.d.ts +1 -1
  59. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js +111 -106
  60. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts +2 -3
  61. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js +36 -32
  62. package/dist/esm/node/plugin/utils.d.ts +0 -1
  63. package/dist/esm/node/plugin/utils.js +0 -1
  64. package/dist/esm/node/prerender/runPrerender.d.ts +3 -3
  65. package/dist/esm/node/prerender/runPrerender.js +2 -2
  66. package/dist/esm/node/prerender/utils.d.ts +1 -1
  67. package/dist/esm/node/prerender/utils.js +1 -1
  68. package/dist/esm/node/runtime/html/serializePageContextClientSide.js +1 -0
  69. package/dist/esm/node/runtime/renderPage/getPageAssets/assertClientEntryId.js +2 -3
  70. package/dist/esm/node/runtime/utils.d.ts +1 -2
  71. package/dist/esm/node/runtime/utils.js +1 -2
  72. package/dist/esm/node/shared/virtual-files/virtualFileImportUserCode.js +1 -0
  73. package/dist/esm/shared/ConfigVike.d.ts +0 -27
  74. package/dist/esm/shared/hooks/getHook.js +2 -2
  75. package/dist/esm/shared/page-configs/Config.d.ts +5 -0
  76. package/dist/esm/shared/page-configs/PageConfig.d.ts +1 -1
  77. package/dist/esm/shared/page-configs/helpers/getConfigValue.js +1 -0
  78. package/dist/esm/shared/page-configs/serialize/parseConfigValuesImported.js +1 -1
  79. package/dist/esm/shared/route/abort.js +1 -0
  80. package/dist/esm/shared/route/resolvePrecedence.js +1 -0
  81. package/dist/esm/utils/{nodeEnv.js → assertNodeEnv.js} +3 -0
  82. package/dist/esm/utils/debug.d.ts +1 -1
  83. package/dist/esm/utils/formatHintLog.js +1 -0
  84. package/dist/esm/utils/hasProp.js +1 -0
  85. package/dist/esm/utils/isScriptFile.d.ts +3 -1
  86. package/dist/esm/utils/isScriptFile.js +14 -3
  87. package/dist/esm/utils/projectInfo.d.ts +2 -2
  88. package/dist/esm/utils/projectInfo.js +1 -1
  89. package/package.json +3 -2
  90. package/dist/cjs/node/plugin/plugins/config/findConfigVikeFromStemPackages.js +0 -27
  91. package/dist/cjs/node/plugin/plugins/config/resolveExtensions.js +0 -107
  92. package/dist/cjs/node/plugin/plugins/config/stemUtils.js +0 -85
  93. package/dist/cjs/node/plugin/plugins/extensionsAssets.js +0 -101
  94. package/dist/cjs/utils/getDependencyPackageJson.js +0 -91
  95. package/dist/cjs/utils/isStemPackageName.js +0 -14
  96. package/dist/esm/node/plugin/plugins/config/findConfigVikeFromStemPackages.d.ts +0 -3
  97. package/dist/esm/node/plugin/plugins/config/findConfigVikeFromStemPackages.js +0 -24
  98. package/dist/esm/node/plugin/plugins/config/resolveExtensions.d.ts +0 -4
  99. package/dist/esm/node/plugin/plugins/config/resolveExtensions.js +0 -101
  100. package/dist/esm/node/plugin/plugins/config/stemUtils.d.ts +0 -8
  101. package/dist/esm/node/plugin/plugins/config/stemUtils.js +0 -79
  102. package/dist/esm/node/plugin/plugins/extensionsAssets.d.ts +0 -3
  103. package/dist/esm/node/plugin/plugins/extensionsAssets.js +0 -95
  104. package/dist/esm/utils/getDependencyPackageJson.d.ts +0 -6
  105. package/dist/esm/utils/getDependencyPackageJson.js +0 -85
  106. package/dist/esm/utils/isStemPackageName.d.ts +0 -1
  107. package/dist/esm/utils/isStemPackageName.js +0 -10
  108. /package/dist/esm/utils/{nodeEnv.d.ts → assertNodeEnv.d.ts} +0 -0
@@ -1,101 +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.extensionsAssets = void 0;
7
- const utils_js_1 = require("../utils.js");
8
- const fs_1 = __importDefault(require("fs"));
9
- const path_1 = __importDefault(require("path"));
10
- const sirv_1 = __importDefault(require("sirv"));
11
- const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
12
- const isAsset_js_1 = require("../shared/isAsset.js");
13
- const ASSET_DIR = 'assets';
14
- function extensionsAssets() {
15
- let config;
16
- let extensionsAssetsDir;
17
- return {
18
- name: 'vike:extensionsAssets',
19
- async configResolved(config_) {
20
- config = config_;
21
- const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
22
- extensionsAssetsDir = getExtensionsAssetsDir(config, configVike);
23
- },
24
- configureServer(server) {
25
- if (extensionsAssetsDir.length > 0) {
26
- return () => {
27
- serveExtensionsAssets(server.middlewares, extensionsAssetsDir, config);
28
- };
29
- }
30
- },
31
- writeBundle() {
32
- if (!config.build.ssr && extensionsAssetsDir.length > 0) {
33
- copyExtensionsAssetsDir(config, extensionsAssetsDir);
34
- }
35
- }
36
- };
37
- }
38
- exports.extensionsAssets = extensionsAssets;
39
- function serveExtensionsAssets(middlewares, extensionsAssetsDirs, config) {
40
- (0, utils_js_1.assert)(ASSET_DIR === getAsssetsDirConfig(config));
41
- extensionsAssetsDirs.forEach((assetsDir) => {
42
- const serve = (0, sirv_1.default)(assetsDir);
43
- middlewares.use(async (req, res, next) => {
44
- if (!req.url?.startsWith(`/${ASSET_DIR}/`)) {
45
- next();
46
- return;
47
- }
48
- // https://github.com/lukeed/sirv/issues/148 - [Feature Request] New option base.
49
- req.url = '/' + req.url.slice(`/${ASSET_DIR}/`.length);
50
- serve(req, res, next);
51
- });
52
- });
53
- }
54
- function getExtensionsAssetsDir(config, configVike) {
55
- const { extensions } = configVike;
56
- const extensionsWithAssetsDir = extensions.filter(({ assetsDir }) => assetsDir);
57
- if (0 === extensionsWithAssetsDir.length)
58
- return [];
59
- (0, utils_js_1.assertUsage)(ASSET_DIR === getAsssetsDirConfig(config), 'Cannot modify vite.config.js#build.assetsDir while using ' + extensionsWithAssetsDir[0].npmPackageName);
60
- const extensionsAssetsDir = extensionsWithAssetsDir.map(({ assetsDir }) => {
61
- (0, utils_js_1.assert)(assetsDir);
62
- (0, utils_js_1.assertPosixPath)(assetsDir);
63
- return assetsDir;
64
- });
65
- return extensionsAssetsDir;
66
- }
67
- function getAsssetsDirConfig(config) {
68
- let { assetsDir } = config.build;
69
- (0, utils_js_1.assertPosixPath)(assetsDir);
70
- assetsDir = assetsDir.split('/').filter(Boolean).join('/');
71
- return assetsDir;
72
- }
73
- function copyExtensionsAssetsDir(config, extensionsAssetsDirs) {
74
- (0, utils_js_1.assert)(ASSET_DIR === getAsssetsDirConfig(config));
75
- const { outDirClient } = (0, utils_js_1.getOutDirs)(config);
76
- (0, utils_js_1.assertPosixPath)(outDirClient);
77
- const outDirAssets = path_1.default.posix.join(outDirClient, ASSET_DIR);
78
- extensionsAssetsDirs.forEach((assetsDir) => {
79
- copyAssetFiles(assetsDir, outDirAssets);
80
- });
81
- }
82
- // Adapted from https://github.com/vitejs/vite/blob/e92d025cedabb477687d6a352ee8c9b7d529f623/packages/vite/src/node/utils.ts#L589-L604
83
- function copyAssetFiles(srcDir, destDir) {
84
- let destDirCreated = false;
85
- for (const file of fs_1.default.readdirSync(srcDir)) {
86
- const srcFile = path_1.default.resolve(srcDir, file);
87
- const destFile = path_1.default.resolve(destDir, file);
88
- const stat = fs_1.default.statSync(srcFile);
89
- if (stat.isDirectory()) {
90
- copyAssetFiles(srcFile, destFile);
91
- }
92
- else if ((0, isAsset_js_1.isAsset)(srcFile)) {
93
- (0, utils_js_1.assert)(!(0, utils_js_1.isScriptFile)(srcFile));
94
- if (!destDirCreated) {
95
- fs_1.default.mkdirSync(destDir, { recursive: true });
96
- destDirCreated = true;
97
- }
98
- fs_1.default.copyFileSync(srcFile, destFile);
99
- }
100
- }
101
- }
@@ -1,91 +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.getDependencyRootDir = exports.getDependencyPackageJsonPath = exports.getDependencyPackageJson = void 0;
7
- // There doesn't seem to be any alternative:
8
- // - https://github.com/antfu/local-pkg
9
- // - https://stackoverflow.com/questions/74640378/find-and-read-package-json-of-a-dependency
10
- // - https://stackoverflow.com/questions/58442451/finding-the-root-directory-of-a-dependency-in-npm
11
- // - https://stackoverflow.com/questions/10111163/how-can-i-get-the-path-of-a-module-i-have-loaded-via-require-that-is-not-mine/63441056#63441056
12
- const assert_js_1 = require("./assert.js");
13
- const isNpmPackage_js_1 = require("./isNpmPackage.js");
14
- const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
15
- const isObject_js_1 = require("./isObject.js");
16
- const path_1 = __importDefault(require("path"));
17
- const fs_1 = __importDefault(require("fs"));
18
- const assertIsNotProductionRuntime_js_1 = require("./assertIsNotProductionRuntime.js");
19
- const module_1 = require("module");
20
- // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
21
- const importMetaUrl = `file://${__filename}`;
22
- const require_ = (0, module_1.createRequire)(importMetaUrl);
23
- (0, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();
24
- function getDependencyPackageJson(npmPackageName, userAppRootDir) {
25
- const packageJsonPath = getDependencyPackageJsonPath(npmPackageName, userAppRootDir);
26
- const packageJson = fs_1.default.readFileSync(packageJsonPath, 'utf8');
27
- (0, assert_js_1.assert)((0, isObject_js_1.isObject)(packageJson));
28
- return packageJson;
29
- }
30
- exports.getDependencyPackageJson = getDependencyPackageJson;
31
- function getDependencyRootDir(npmPackageName, userAppRootDir) {
32
- const rootDir = path_1.default.posix.dirname(getDependencyPackageJsonPath(npmPackageName, userAppRootDir));
33
- return rootDir;
34
- }
35
- exports.getDependencyRootDir = getDependencyRootDir;
36
- function getDependencyPackageJsonPath(npmPackageName, userAppRootDir) {
37
- (0, assert_js_1.assert)((0, isNpmPackage_js_1.isNpmPackageName)(npmPackageName));
38
- let packageJsonPath = resolvePackageJsonDirectly(npmPackageName, userAppRootDir);
39
- if (!packageJsonPath) {
40
- packageJsonPath = resolvePackageJsonWithMainEntry(npmPackageName, userAppRootDir);
41
- }
42
- (0, assert_js_1.assertUsage)(packageJsonPath, `Cannot read ${npmPackageName}/package.json. Define package.json#exports["./package.json"] with the value "./package.json" in the package.json of ${npmPackageName}.`);
43
- packageJsonPath = (0, filesystemPathHandling_js_1.toPosixPath)(packageJsonPath);
44
- (0, assert_js_1.assert)(packageJsonPath.endsWith('/package.json'), packageJsonPath); // package.json#exports["package.json"] may point to another file than package.json
45
- return packageJsonPath;
46
- }
47
- exports.getDependencyPackageJsonPath = getDependencyPackageJsonPath;
48
- function resolvePackageJsonDirectly(npmPackageName, userAppRootDir) {
49
- let packageJsonPath;
50
- try {
51
- packageJsonPath = require_.resolve(`${npmPackageName}/package.json`, { paths: [userAppRootDir] });
52
- }
53
- catch (err) {
54
- if (isUnexpectedError(err))
55
- throw err;
56
- return null;
57
- }
58
- return packageJsonPath;
59
- }
60
- function resolvePackageJsonWithMainEntry(npmPackageName, userAppRootDir) {
61
- let mainEntry;
62
- try {
63
- mainEntry = require_.resolve(npmPackageName, { paths: [userAppRootDir] });
64
- }
65
- catch (err) {
66
- if (isUnexpectedError(err))
67
- throw err;
68
- return null;
69
- }
70
- const packageJsonPath = searchPackageJSON(mainEntry);
71
- return packageJsonPath;
72
- }
73
- // If the npm package doesn't define package.json#exports then require.resolve(`${npmPackageName}/package.json`) just works.
74
- // This means we can assume packageJson#exports to be defined and, consequently, we can assume the error code to always be ERR_PACKAGE_PATH_NOT_EXPORTED.
75
- // (If MODULE_NOT_FOUND is thrown then this means that npmPackageName isn't installed.)
76
- function isUnexpectedError(err) {
77
- return err?.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED';
78
- }
79
- // Copied and adapted from https://github.com/antfu/local-pkg
80
- function searchPackageJSON(dir) {
81
- let packageJsonPath;
82
- while (true) {
83
- (0, assert_js_1.assert)(dir);
84
- const newDir = path_1.default.dirname(dir);
85
- (0, assert_js_1.assert)(newDir !== dir);
86
- dir = newDir;
87
- packageJsonPath = path_1.default.join(dir, 'package.json');
88
- if (fs_1.default.existsSync(packageJsonPath))
89
- return packageJsonPath;
90
- }
91
- }
@@ -1,14 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isStemPackageName = void 0;
4
- function isStemPackageName(npmPackageName) {
5
- if (npmPackageName.startsWith('stem-')) {
6
- return true;
7
- }
8
- const [orgName, pkgName] = npmPackageName.split('/');
9
- if (orgName.startsWith('@') && pkgName?.startsWith('stem-')) {
10
- return true;
11
- }
12
- return false;
13
- }
14
- exports.isStemPackageName = isStemPackageName;
@@ -1,3 +0,0 @@
1
- export { findConfigVikeFromStemPackages };
2
- import type { ConfigVikeUserProvided } from '../../../../shared/ConfigVike.js';
3
- declare function findConfigVikeFromStemPackages(root: string): Promise<ConfigVikeUserProvided[]>;
@@ -1,24 +0,0 @@
1
- export { findConfigVikeFromStemPackages };
2
- import { assert, createDebugger, isObject } from '../../utils.js';
3
- import { getStemPackages } from './stemUtils.js';
4
- const debug = createDebugger('vike:stem');
5
- async function findConfigVikeFromStemPackages(root) {
6
- if (isDeno())
7
- return [];
8
- const stemPackages = await getStemPackages(root);
9
- const configVikeFromStemPackages = [];
10
- debug('Stem packages found:', stemPackages.map(({ stemPackageName, stemPackageRootDir }) => ({ stemPackageName, stemPackageRootDir })));
11
- await Promise.all(stemPackages.map(async ({ loadModule }) => {
12
- const moduleExports = (await loadModule('vike.config.js')) || (await loadModule('vite-plugin-ssr.config.js'));
13
- if (!moduleExports)
14
- return;
15
- const configVike = moduleExports.default;
16
- assert(isObject(configVike));
17
- configVikeFromStemPackages.push(configVike);
18
- }));
19
- return configVikeFromStemPackages;
20
- }
21
- function isDeno() {
22
- // @ts-ignore
23
- return typeof Deno !== 'undefined' && Deno.env;
24
- }
@@ -1,4 +0,0 @@
1
- export { resolveExtensions };
2
- import type { ResolvedConfig } from 'vite';
3
- import type { ConfigVikeUserProvided, ExtensionResolved } from '../../../../shared/ConfigVike.js';
4
- declare function resolveExtensions(configs: ConfigVikeUserProvided[], config: ResolvedConfig): ExtensionResolved[];
@@ -1,101 +0,0 @@
1
- export { resolveExtensions };
2
- import { assert, assertUsage, getNpmPackageName, toPosixPath, isNpmPackageName, getDependencyRootDir, assertPosixPath } from '../../utils.js';
3
- import path from 'path';
4
- import fs from 'fs';
5
- import { isValidFileType } from '../../../../shared/getPageFiles/fileTypes.js';
6
- import { createRequire } from 'module';
7
- import pc from '@brillout/picocolors';
8
- // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
9
- const importMetaUrl = import.meta.url;
10
- const require_ = createRequire(importMetaUrl);
11
- function resolveExtensions(configs, config) {
12
- const extensions = configs.map((c) => c.extensions ?? []).flat();
13
- return extensions.map((extension) => {
14
- const { npmPackageName } = extension;
15
- assertUsage(isNpmPackageName(npmPackageName), `vike extension ${pc.cyan(npmPackageName)} doesn't seem to be a valid npm package name`);
16
- const npmPackageRootDir = getDependencyRootDir(npmPackageName, config.root);
17
- assertPosixPath(npmPackageRootDir);
18
- const pageConfigsDistFiles = resolvePageFilesDist([
19
- ...(extension.pageConfigsDistFiles ?? []),
20
- // TODO/v1-release: remove
21
- ...(extension.pageFilesDist ?? [])
22
- ], npmPackageName, config, npmPackageRootDir);
23
- let pageConfigsSrcDirResolved = null;
24
- {
25
- const pageConfigsSrcDir = extension.pageConfigsSrcDir ?? extension.pageFilesSrc;
26
- if (pageConfigsSrcDir) {
27
- assertPathProvidedByUser('pageConfigsSrcDir', pageConfigsSrcDir, true);
28
- assert(pageConfigsSrcDir.endsWith('*'));
29
- pageConfigsSrcDirResolved = path.posix.join(npmPackageRootDir, pageConfigsSrcDir.slice(0, -1));
30
- }
31
- }
32
- assertUsage(pageConfigsSrcDirResolved || pageConfigsDistFiles, `Extension ${npmPackageName} should define either extension[number].pageConfigsDistFiles or extension[number].pageConfigsSrcDir`);
33
- assertUsage(!pageConfigsDistFiles || !pageConfigsSrcDirResolved, `Extension ${npmPackageName} shouldn't define extension[number].pageConfigsDistFiles as well extension[number].pageConfigsSrcDir, it should define only one instead`);
34
- const assetsDir = (() => {
35
- if (!extension.assetsDir) {
36
- return null;
37
- }
38
- assertPathProvidedByUser('assetsDir', extension.assetsDir);
39
- assertPosixPath(extension.assetsDir);
40
- const assetsDir = path.posix.join(npmPackageRootDir, extension.assetsDir);
41
- return assetsDir;
42
- })();
43
- assertUsage(!(assetsDir && pageConfigsSrcDirResolved), `Extension ${npmPackageName} shouldn't define both extension[number].pageConfigsSrcDir and extension[number].assetsDir`);
44
- const extensionResolved = {
45
- npmPackageName,
46
- npmPackageRootDir,
47
- pageConfigsDistFiles,
48
- pageConfigsSrcDir: pageConfigsSrcDirResolved,
49
- assetsDir
50
- };
51
- return extensionResolved;
52
- });
53
- }
54
- function assertPathProvidedByUser(pathName, pathValue, starSuffix) {
55
- const errMsg = `extension[number].${pathName} value ${pc.cyan(pathValue)}`;
56
- assertUsage(!pathValue.includes('\\'), `${errMsg} shouldn't contain any backward slahes '\' (replace them with forward slahes '/')`);
57
- assertUsage(!starSuffix || pathValue.endsWith('/*'), `${errMsg} should end with '/*'`);
58
- assertUsage(pathValue.startsWith('/'), `${errMsg} should start with '/'`);
59
- }
60
- function resolvePageFilesDist(pageConfigsDistFiles, npmPackageName, config, npmPackageRootDir) {
61
- if (!pageConfigsDistFiles || pageConfigsDistFiles.length === 0)
62
- return null;
63
- const pageConfigsDistFilesResolved = [];
64
- pageConfigsDistFiles.forEach((importPath) => {
65
- const errPrefix = `The page file ${pc.cyan(importPath)} (provided in extensions[number].pageFiles) should`;
66
- assertUsage(npmPackageName === getNpmPackageName(importPath), `${errPrefix} be a ${pc.cyan(npmPackageName)} module (e.g. ${pc.cyan(`${npmPackageName}/renderer/_default.page.server.js`)})`);
67
- assertUsage(isValidFileType(importPath), `${errPrefix} end with '.js', '.js', '.cjs', or '.css'`);
68
- const filePath = resolveImportPath(importPath, npmPackageName, config, npmPackageRootDir);
69
- pageConfigsDistFilesResolved.push({
70
- importPath,
71
- filePath
72
- });
73
- const filePathCSS = getPathCSS(filePath);
74
- if (filePathCSS !== filePath && fs.existsSync(filePathCSS)) {
75
- const importPathCSS = getPathCSS(importPath);
76
- assertUsage(filePathCSS === resolveImportPath(importPathCSS, npmPackageName, config, npmPackageRootDir), `The entry package.json#exports["${importPathCSS}"] in the package.json of ${npmPackageName} (${npmPackageRootDir}/package.json) has a wrong value: make sure it resolves to ${filePathCSS}`);
77
- pageConfigsDistFilesResolved.push({
78
- importPath: importPathCSS,
79
- filePath: filePathCSS
80
- });
81
- }
82
- });
83
- return pageConfigsDistFilesResolved;
84
- }
85
- function resolveImportPath(importPath, npmPackageName, config, npmPackageRootDir) {
86
- let filePath;
87
- try {
88
- filePath = require_.resolve(importPath, { paths: [config.root] });
89
- }
90
- catch (err) {
91
- if (err?.code === 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
92
- assertUsage(false, `Define ${importPath} in the package.json#exports of ${npmPackageName} (${npmPackageRootDir}/package.json) with a Node.js export condition (even if it's a browser file such as CSS)`);
93
- }
94
- throw err;
95
- }
96
- filePath = toPosixPath(filePath);
97
- return filePath;
98
- }
99
- function getPathCSS(filePath) {
100
- return filePath.split('.').slice(0, -1).join('.') + '.css';
101
- }
@@ -1,8 +0,0 @@
1
- export { getStemPackages };
2
- export type { StemPackage };
3
- type StemPackage = {
4
- stemPackageName: string;
5
- stemPackageRootDir: string;
6
- loadModule: (moduleId: string) => Promise<null | Record<string, unknown>>;
7
- };
8
- declare function getStemPackages(userAppRootDir: string): Promise<StemPackage[]>;
@@ -1,79 +0,0 @@
1
- // Move to standalone package? E.g. https://www.npmjs.com/package/stem
2
- export { getStemPackages };
3
- import path from 'path';
4
- import { assert, assertUsage, assertWarning, toPosixPath, assertPosixPath, getDependencyRootDir, findFile } from '../../utils.js';
5
- import { import_ } from '@brillout/import';
6
- import { createRequire } from 'module';
7
- // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
8
- const importMetaUrl = import.meta.url;
9
- const require_ = createRequire(importMetaUrl);
10
- async function getStemPackages(userAppRootDir) {
11
- const userRootDir = findUserRootDir(userAppRootDir);
12
- const userPkgJson = getUserPackageJson(userRootDir);
13
- const stemPkgNames = getStemPkgNames(userPkgJson);
14
- const stemPackages = await Promise.all(stemPkgNames.map((stemPackageName) => {
15
- assert(stemPackageName.includes('stem-'));
16
- const resolveModulePath = (moduleId) => {
17
- const importPath = `${stemPackageName}/${moduleId}`;
18
- try {
19
- const modulePath = require_.resolve(importPath, { paths: [userRootDir] });
20
- return modulePath;
21
- }
22
- catch (err) {
23
- // - ERR_PACKAGE_PATH_NOT_EXPORTED => package.json#exports[importPath] is missing
24
- // - We assert that Stem packages always define package.json#exports down below
25
- if (err.code === 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
26
- return null;
27
- }
28
- // All other errors such as ERR_MODULE_NOT_FOUND should be thrown
29
- throw err;
30
- }
31
- };
32
- const loadModule = async (moduleId) => {
33
- const modulePath = resolveModulePath(moduleId);
34
- if (modulePath === null)
35
- return null;
36
- const moduleExports = moduleId.endsWith('.json')
37
- ? require_(modulePath)
38
- : await import_(modulePath);
39
- return moduleExports;
40
- };
41
- const stemPackageRootDir = getDependencyRootDir(stemPackageName, userAppRootDir);
42
- return {
43
- stemPackageName,
44
- stemPackageRootDir,
45
- loadModule
46
- };
47
- }));
48
- return stemPackages;
49
- }
50
- function findUserRootDir(userAppRootDir) {
51
- const userPkgJsonPath = findFile('package.json', userAppRootDir);
52
- assertUsage(userPkgJsonPath, `Couldn't find package.json in any parent directory starting from ${userAppRootDir}`);
53
- return toPosixPath(path.dirname(userPkgJsonPath));
54
- }
55
- function getStemPkgNames(userPkgJson) {
56
- const stemPkgNames = Object.keys(userPkgJson.dependencies ?? {}).filter((depName) => {
57
- if (depName.startsWith('stem-')) {
58
- assertWarning(false, `${depName} should be renamed to @someNpmOrgOrUser/${depName} (to follow the convention that all Stem packages belond to an npm organization)`, { onlyOnce: true });
59
- return true;
60
- }
61
- if (depName.split('/')[1]?.startsWith('stem-')) {
62
- return true;
63
- }
64
- return false;
65
- });
66
- return stemPkgNames;
67
- }
68
- function getUserPackageJson(userRootDir) {
69
- assertPosixPath(userRootDir);
70
- const userPkgJsonPath = path.posix.join(userRootDir, './package.json');
71
- let userPkgJson;
72
- try {
73
- userPkgJson = require_(userPkgJsonPath);
74
- }
75
- catch {
76
- throw new Error(`No package.json found at ${userRootDir}`);
77
- }
78
- return userPkgJson;
79
- }
@@ -1,3 +0,0 @@
1
- export { extensionsAssets };
2
- import type { Plugin } from 'vite';
3
- declare function extensionsAssets(): Plugin;
@@ -1,95 +0,0 @@
1
- export { extensionsAssets };
2
- import { assert, isScriptFile, assertUsage, assertPosixPath, getOutDirs } from '../utils.js';
3
- import fs from 'fs';
4
- import path from 'path';
5
- import sirv from 'sirv';
6
- import { getConfigVike } from '../../shared/getConfigVike.js';
7
- import { isAsset } from '../shared/isAsset.js';
8
- const ASSET_DIR = 'assets';
9
- function extensionsAssets() {
10
- let config;
11
- let extensionsAssetsDir;
12
- return {
13
- name: 'vike:extensionsAssets',
14
- async configResolved(config_) {
15
- config = config_;
16
- const configVike = await getConfigVike(config);
17
- extensionsAssetsDir = getExtensionsAssetsDir(config, configVike);
18
- },
19
- configureServer(server) {
20
- if (extensionsAssetsDir.length > 0) {
21
- return () => {
22
- serveExtensionsAssets(server.middlewares, extensionsAssetsDir, config);
23
- };
24
- }
25
- },
26
- writeBundle() {
27
- if (!config.build.ssr && extensionsAssetsDir.length > 0) {
28
- copyExtensionsAssetsDir(config, extensionsAssetsDir);
29
- }
30
- }
31
- };
32
- }
33
- function serveExtensionsAssets(middlewares, extensionsAssetsDirs, config) {
34
- assert(ASSET_DIR === getAsssetsDirConfig(config));
35
- extensionsAssetsDirs.forEach((assetsDir) => {
36
- const serve = sirv(assetsDir);
37
- middlewares.use(async (req, res, next) => {
38
- if (!req.url?.startsWith(`/${ASSET_DIR}/`)) {
39
- next();
40
- return;
41
- }
42
- // https://github.com/lukeed/sirv/issues/148 - [Feature Request] New option base.
43
- req.url = '/' + req.url.slice(`/${ASSET_DIR}/`.length);
44
- serve(req, res, next);
45
- });
46
- });
47
- }
48
- function getExtensionsAssetsDir(config, configVike) {
49
- const { extensions } = configVike;
50
- const extensionsWithAssetsDir = extensions.filter(({ assetsDir }) => assetsDir);
51
- if (0 === extensionsWithAssetsDir.length)
52
- return [];
53
- assertUsage(ASSET_DIR === getAsssetsDirConfig(config), 'Cannot modify vite.config.js#build.assetsDir while using ' + extensionsWithAssetsDir[0].npmPackageName);
54
- const extensionsAssetsDir = extensionsWithAssetsDir.map(({ assetsDir }) => {
55
- assert(assetsDir);
56
- assertPosixPath(assetsDir);
57
- return assetsDir;
58
- });
59
- return extensionsAssetsDir;
60
- }
61
- function getAsssetsDirConfig(config) {
62
- let { assetsDir } = config.build;
63
- assertPosixPath(assetsDir);
64
- assetsDir = assetsDir.split('/').filter(Boolean).join('/');
65
- return assetsDir;
66
- }
67
- function copyExtensionsAssetsDir(config, extensionsAssetsDirs) {
68
- assert(ASSET_DIR === getAsssetsDirConfig(config));
69
- const { outDirClient } = getOutDirs(config);
70
- assertPosixPath(outDirClient);
71
- const outDirAssets = path.posix.join(outDirClient, ASSET_DIR);
72
- extensionsAssetsDirs.forEach((assetsDir) => {
73
- copyAssetFiles(assetsDir, outDirAssets);
74
- });
75
- }
76
- // Adapted from https://github.com/vitejs/vite/blob/e92d025cedabb477687d6a352ee8c9b7d529f623/packages/vite/src/node/utils.ts#L589-L604
77
- function copyAssetFiles(srcDir, destDir) {
78
- let destDirCreated = false;
79
- for (const file of fs.readdirSync(srcDir)) {
80
- const srcFile = path.resolve(srcDir, file);
81
- const destFile = path.resolve(destDir, file);
82
- const stat = fs.statSync(srcFile);
83
- if (stat.isDirectory()) {
84
- copyAssetFiles(srcFile, destFile);
85
- }
86
- else if (isAsset(srcFile)) {
87
- assert(!isScriptFile(srcFile));
88
- if (!destDirCreated) {
89
- fs.mkdirSync(destDir, { recursive: true });
90
- destDirCreated = true;
91
- }
92
- fs.copyFileSync(srcFile, destFile);
93
- }
94
- }
95
- }
@@ -1,6 +0,0 @@
1
- export { getDependencyPackageJson };
2
- export { getDependencyPackageJsonPath };
3
- export { getDependencyRootDir };
4
- declare function getDependencyPackageJson(npmPackageName: string, userAppRootDir: string): Record<string, unknown>;
5
- declare function getDependencyRootDir(npmPackageName: string, userAppRootDir: string): string;
6
- declare function getDependencyPackageJsonPath(npmPackageName: string, userAppRootDir: string): string;
@@ -1,85 +0,0 @@
1
- export { getDependencyPackageJson };
2
- export { getDependencyPackageJsonPath };
3
- export { getDependencyRootDir };
4
- // There doesn't seem to be any alternative:
5
- // - https://github.com/antfu/local-pkg
6
- // - https://stackoverflow.com/questions/74640378/find-and-read-package-json-of-a-dependency
7
- // - https://stackoverflow.com/questions/58442451/finding-the-root-directory-of-a-dependency-in-npm
8
- // - https://stackoverflow.com/questions/10111163/how-can-i-get-the-path-of-a-module-i-have-loaded-via-require-that-is-not-mine/63441056#63441056
9
- import { assert, assertUsage } from './assert.js';
10
- import { isNpmPackageName } from './isNpmPackage.js';
11
- import { toPosixPath } from './filesystemPathHandling.js';
12
- import { isObject } from './isObject.js';
13
- import path from 'path';
14
- import fs from 'fs';
15
- import { assertIsNotProductionRuntime } from './assertIsNotProductionRuntime.js';
16
- import { createRequire } from 'module';
17
- // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
18
- const importMetaUrl = import.meta.url;
19
- const require_ = createRequire(importMetaUrl);
20
- assertIsNotProductionRuntime();
21
- function getDependencyPackageJson(npmPackageName, userAppRootDir) {
22
- const packageJsonPath = getDependencyPackageJsonPath(npmPackageName, userAppRootDir);
23
- const packageJson = fs.readFileSync(packageJsonPath, 'utf8');
24
- assert(isObject(packageJson));
25
- return packageJson;
26
- }
27
- function getDependencyRootDir(npmPackageName, userAppRootDir) {
28
- const rootDir = path.posix.dirname(getDependencyPackageJsonPath(npmPackageName, userAppRootDir));
29
- return rootDir;
30
- }
31
- function getDependencyPackageJsonPath(npmPackageName, userAppRootDir) {
32
- assert(isNpmPackageName(npmPackageName));
33
- let packageJsonPath = resolvePackageJsonDirectly(npmPackageName, userAppRootDir);
34
- if (!packageJsonPath) {
35
- packageJsonPath = resolvePackageJsonWithMainEntry(npmPackageName, userAppRootDir);
36
- }
37
- assertUsage(packageJsonPath, `Cannot read ${npmPackageName}/package.json. Define package.json#exports["./package.json"] with the value "./package.json" in the package.json of ${npmPackageName}.`);
38
- packageJsonPath = toPosixPath(packageJsonPath);
39
- assert(packageJsonPath.endsWith('/package.json'), packageJsonPath); // package.json#exports["package.json"] may point to another file than package.json
40
- return packageJsonPath;
41
- }
42
- function resolvePackageJsonDirectly(npmPackageName, userAppRootDir) {
43
- let packageJsonPath;
44
- try {
45
- packageJsonPath = require_.resolve(`${npmPackageName}/package.json`, { paths: [userAppRootDir] });
46
- }
47
- catch (err) {
48
- if (isUnexpectedError(err))
49
- throw err;
50
- return null;
51
- }
52
- return packageJsonPath;
53
- }
54
- function resolvePackageJsonWithMainEntry(npmPackageName, userAppRootDir) {
55
- let mainEntry;
56
- try {
57
- mainEntry = require_.resolve(npmPackageName, { paths: [userAppRootDir] });
58
- }
59
- catch (err) {
60
- if (isUnexpectedError(err))
61
- throw err;
62
- return null;
63
- }
64
- const packageJsonPath = searchPackageJSON(mainEntry);
65
- return packageJsonPath;
66
- }
67
- // If the npm package doesn't define package.json#exports then require.resolve(`${npmPackageName}/package.json`) just works.
68
- // This means we can assume packageJson#exports to be defined and, consequently, we can assume the error code to always be ERR_PACKAGE_PATH_NOT_EXPORTED.
69
- // (If MODULE_NOT_FOUND is thrown then this means that npmPackageName isn't installed.)
70
- function isUnexpectedError(err) {
71
- return err?.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED';
72
- }
73
- // Copied and adapted from https://github.com/antfu/local-pkg
74
- function searchPackageJSON(dir) {
75
- let packageJsonPath;
76
- while (true) {
77
- assert(dir);
78
- const newDir = path.dirname(dir);
79
- assert(newDir !== dir);
80
- dir = newDir;
81
- packageJsonPath = path.join(dir, 'package.json');
82
- if (fs.existsSync(packageJsonPath))
83
- return packageJsonPath;
84
- }
85
- }
@@ -1 +0,0 @@
1
- export declare function isStemPackageName(npmPackageName: string): boolean;
@@ -1,10 +0,0 @@
1
- export function isStemPackageName(npmPackageName) {
2
- if (npmPackageName.startsWith('stem-')) {
3
- return true;
4
- }
5
- const [orgName, pkgName] = npmPackageName.split('/');
6
- if (orgName.startsWith('@') && pkgName?.startsWith('stem-')) {
7
- return true;
8
- }
9
- return false;
10
- }