vike 0.4.142 → 0.4.143-commit-dc6fea0
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.
- package/dist/cjs/node/plugin/index.js +2 -2
- package/dist/cjs/node/plugin/plugins/buildConfig.js +4 -5
- package/dist/cjs/node/plugin/plugins/commonConfig.js +2 -7
- package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js +2 -2
- package/dist/cjs/node/plugin/plugins/envVars.js +3 -5
- package/dist/cjs/node/plugin/plugins/importUserCode/generateEagerImport.js +19 -8
- package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js +2 -2
- package/dist/cjs/node/plugin/plugins/importUserCode/index.js +1 -1
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getFilePathToShowToUser.js +6 -0
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js +122 -124
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.js +37 -27
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.js +50 -80
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/helpers.js +12 -3
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/replaceImportStatements.js +25 -25
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/transpileAndExecuteFile.js +19 -16
- package/dist/cjs/node/plugin/plugins/suppressRollupWarning.js +16 -3
- package/dist/cjs/node/plugin/shared/{getConfigValueSource.js → getConfigValueSourcesRelevant.js} +1 -12
- package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet.js +1 -1
- package/dist/cjs/node/plugin/shared/loggerNotProd.js +3 -3
- package/dist/cjs/node/plugin/utils.js +1 -2
- package/dist/cjs/node/prerender/runPrerender.js +13 -16
- package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js +1 -1
- package/dist/cjs/node/runtime/html/stream.js +4 -1
- package/dist/cjs/node/runtime/renderPage/analyzePage.js +2 -2
- package/dist/cjs/node/runtime/renderPage/loadPageFilesServerSide.js +2 -2
- package/dist/cjs/node/runtime/renderPage/log404/index.js +10 -5
- package/dist/cjs/node/shared/virtual-files/virtualFilePageConfigValuesAll.js +1 -1
- package/dist/cjs/shared/error-page.js +1 -1
- package/dist/cjs/shared/getPageFiles/assertPageConfigs.js +13 -13
- package/dist/cjs/shared/getPageFiles/getExports.js +3 -3
- package/dist/cjs/shared/getPageFiles/parseGlobResults.js +9 -43
- package/dist/cjs/shared/getPageFiles/parsePageConfigsSerialized.js +62 -0
- package/dist/cjs/shared/page-configs/assertExports.js +60 -0
- package/dist/cjs/shared/page-configs/loadConfigValues.js +18 -0
- package/dist/cjs/shared/page-configs/parseConfigValuesImported.js +50 -0
- package/dist/cjs/shared/page-configs/utils.js +1 -1
- package/dist/cjs/shared/route/loadPageRoutes.js +11 -13
- package/dist/cjs/shared/route/resolvePrecedence.js +32 -11
- package/dist/cjs/shared/route/resolveRedirects.js +1 -1
- package/dist/cjs/shared/route/resolveRouteFunction.js +1 -0
- package/dist/cjs/shared/route/resolveRouteString.js +99 -43
- package/dist/cjs/shared/utils.js +1 -1
- package/dist/cjs/types/defineConfig.js +7 -0
- package/dist/cjs/types/index.js +3 -0
- package/dist/cjs/utils/getFilePathAbsolute.js +16 -12
- package/dist/cjs/utils/objectAssign.js +3 -1
- package/dist/cjs/utils/parseUrl.js +6 -1
- package/dist/cjs/utils/projectInfo.js +1 -1
- package/dist/cjs/utils/requireResolve.js +60 -0
- package/dist/esm/__internal/index.d.ts +3 -3
- package/dist/esm/client/client-routing-runtime/createPageContext.d.ts +2 -2
- package/dist/esm/client/client-routing-runtime/getPageContext.d.ts +2 -2
- package/dist/esm/client/client-routing-runtime/getPageId.d.ts +2 -2
- package/dist/esm/client/client-routing-runtime/prefetch.js +3 -1
- package/dist/esm/client/client-routing-runtime/useClientRouter.js +2 -2
- package/dist/esm/client/server-routing-runtime/getPageContext.d.ts +1 -1
- package/dist/esm/client/shared/executeOnRenderClientHook.d.ts +2 -2
- package/dist/esm/client/shared/loadPageFilesClientSide.d.ts +2 -2
- package/dist/esm/client/shared/loadPageFilesClientSide.js +2 -2
- package/dist/esm/client/shared/preparePageContextForUserConsumptionClientSide.d.ts +2 -2
- package/dist/esm/node/plugin/index.js +3 -2
- package/dist/esm/node/plugin/plugins/buildConfig.js +4 -5
- package/dist/esm/node/plugin/plugins/commonConfig.js +2 -7
- package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js +1 -1
- package/dist/esm/node/plugin/plugins/envVars.js +4 -6
- package/dist/esm/node/plugin/plugins/importUserCode/generateEagerImport.d.ts +13 -2
- package/dist/esm/node/plugin/plugins/importUserCode/generateEagerImport.js +19 -8
- package/dist/esm/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js +2 -2
- package/dist/esm/node/plugin/plugins/importUserCode/index.js +2 -2
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getFilePathToShowToUser.d.ts +19 -2
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getFilePathToShowToUser.js +6 -0
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.d.ts +3 -2
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts +2 -2
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js +123 -125
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.d.ts +5 -0
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.js +35 -25
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.d.ts +3 -0
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.js +49 -79
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/helpers.js +10 -1
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/replaceImportStatements.d.ts +18 -6
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/replaceImportStatements.js +25 -25
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/transpileAndExecuteFile.d.ts +2 -2
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/transpileAndExecuteFile.js +19 -16
- package/dist/esm/node/plugin/plugins/suppressRollupWarning.js +16 -3
- package/dist/esm/node/plugin/shared/{getConfigValueSource.d.ts → getConfigValueSourcesRelevant.d.ts} +0 -2
- package/dist/esm/node/plugin/shared/{getConfigValueSource.js → getConfigValueSourcesRelevant.js} +0 -11
- package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet.js +2 -2
- package/dist/esm/node/plugin/shared/loggerNotProd.js +4 -4
- package/dist/esm/node/plugin/utils.d.ts +1 -2
- package/dist/esm/node/plugin/utils.js +1 -2
- package/dist/esm/node/prerender/runPrerender.js +13 -16
- package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js +1 -1
- package/dist/esm/node/runtime/html/injectAssets.d.ts +2 -2
- package/dist/esm/node/runtime/html/serializePageContextClientSide.d.ts +2 -2
- package/dist/esm/node/runtime/html/stream.js +4 -1
- package/dist/esm/node/runtime/renderPage/analyzePage.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/analyzePage.js +2 -2
- package/dist/esm/node/runtime/renderPage/createHttpResponseObject.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/debugPageFiles.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/executeOnRenderHtmlHook.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/handleErrorWithoutErrorPage.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/loadPageFilesServerSide.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/loadPageFilesServerSide.js +2 -2
- package/dist/esm/node/runtime/renderPage/log404/index.js +10 -5
- package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts +13 -13
- package/dist/esm/node/shared/getClientEntryFilePath.d.ts +2 -2
- package/dist/esm/node/shared/virtual-files/virtualFilePageConfigValuesAll.js +1 -1
- package/dist/esm/shared/addIs404ToPageProps.d.ts +2 -2
- package/dist/esm/shared/addUrlComputedProps.d.ts +4 -2
- package/dist/esm/shared/error-page.d.ts +3 -3
- package/dist/esm/shared/error-page.js +1 -1
- package/dist/esm/shared/getPageFiles/analyzeClientSide.d.ts +2 -2
- package/dist/esm/shared/getPageFiles/assertPageConfigs.d.ts +5 -5
- package/dist/esm/shared/getPageFiles/assertPageConfigs.js +12 -12
- package/dist/esm/shared/getPageFiles/getExports.d.ts +2 -2
- package/dist/esm/shared/getPageFiles/getExports.js +1 -1
- package/dist/esm/shared/getPageFiles/parseGlobResults.d.ts +3 -3
- package/dist/esm/shared/getPageFiles/parseGlobResults.js +9 -43
- package/dist/esm/shared/getPageFiles/parsePageConfigsSerialized.d.ts +6 -0
- package/dist/esm/shared/getPageFiles/parsePageConfigsSerialized.js +59 -0
- package/dist/esm/shared/getPageFiles/setPageFiles.d.ts +3 -3
- package/dist/esm/shared/page-configs/Config.d.ts +201 -14
- package/dist/esm/shared/page-configs/PageConfig.d.ts +60 -39
- package/dist/esm/shared/page-configs/assertExports.d.ts +6 -0
- package/dist/esm/shared/page-configs/assertExports.js +54 -0
- package/dist/esm/shared/page-configs/findPageConfig.d.ts +2 -2
- package/dist/esm/shared/page-configs/loadConfigValues.d.ts +3 -0
- package/dist/esm/shared/page-configs/loadConfigValues.js +15 -0
- package/dist/esm/shared/page-configs/parseConfigValuesImported.d.ts +3 -0
- package/dist/esm/shared/page-configs/parseConfigValuesImported.js +44 -0
- package/dist/esm/shared/page-configs/utils.d.ts +3 -2
- package/dist/esm/shared/page-configs/utils.js +1 -1
- package/dist/esm/shared/route/executeGuardHook.d.ts +2 -2
- package/dist/esm/shared/route/index.d.ts +3 -3
- package/dist/esm/shared/route/loadPageRoutes.d.ts +2 -2
- package/dist/esm/shared/route/loadPageRoutes.js +11 -13
- package/dist/esm/shared/route/resolvePrecedence.js +33 -12
- package/dist/esm/shared/route/resolveRedirects.js +1 -1
- package/dist/esm/shared/route/resolveRouteFunction.js +1 -0
- package/dist/esm/shared/route/resolveRouteString.d.ts +21 -4
- package/dist/esm/shared/route/resolveRouteString.js +98 -42
- package/dist/esm/shared/types.d.ts +8 -6
- package/dist/esm/shared/utils.d.ts +1 -1
- package/dist/esm/shared/utils.js +1 -1
- package/dist/esm/types/defineConfig.d.ts +3 -0
- package/dist/esm/types/defineConfig.js +4 -0
- package/dist/esm/types/index.d.ts +3 -1
- package/dist/esm/types/index.js +1 -1
- package/dist/esm/utils/getFilePathAbsolute.d.ts +2 -2
- package/dist/esm/utils/getFilePathAbsolute.js +15 -11
- package/dist/esm/utils/objectAssign.js +3 -1
- package/dist/esm/utils/parseUrl.js +6 -1
- package/dist/esm/utils/projectInfo.d.ts +1 -1
- package/dist/esm/utils/projectInfo.js +1 -1
- package/dist/esm/utils/requireResolve.d.ts +2 -0
- package/dist/esm/utils/requireResolve.js +57 -0
- package/package.json +3 -3
- package/dist/cjs/shared/page-configs/loadPageCode.js +0 -63
- package/dist/cjs/utils/addFileExtensionsToRequireResolve.js +0 -23
- package/dist/cjs/utils/assertDefaultExport.js +0 -53
- package/dist/esm/shared/page-configs/loadPageCode.d.ts +0 -3
- package/dist/esm/shared/page-configs/loadPageCode.js +0 -57
- package/dist/esm/utils/addFileExtensionsToRequireResolve.d.ts +0 -2
- package/dist/esm/utils/addFileExtensionsToRequireResolve.js +0 -20
- package/dist/esm/utils/assertDefaultExport.d.ts +0 -8
- package/dist/esm/utils/assertDefaultExport.js +0 -47
- /package/dist/cjs/shared/getPageFiles/{assertExports.js → assert_exports_old_design.js} +0 -0
- /package/dist/esm/shared/getPageFiles/{assertExports.d.ts → assert_exports_old_design.d.ts} +0 -0
- /package/dist/esm/shared/getPageFiles/{assertExports.js → assert_exports_old_design.js} +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vike",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.143-commit-dc6fea0",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"dev": "tsc --watch",
|
|
6
6
|
"build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"@brillout/json-serializer": "^0.5.6",
|
|
17
17
|
"@brillout/picocolors": "^1.0.9",
|
|
18
18
|
"@brillout/require-shim": "^0.1.2",
|
|
19
|
-
"@brillout/vite-plugin-import-build": "^0.2.
|
|
19
|
+
"@brillout/vite-plugin-import-build": "^0.2.20",
|
|
20
20
|
"acorn": "^8.8.2",
|
|
21
21
|
"cac": "^6.7.14",
|
|
22
22
|
"es-module-lexer": "^1.3.0",
|
|
@@ -163,7 +163,7 @@
|
|
|
163
163
|
},
|
|
164
164
|
"devDependencies": {
|
|
165
165
|
"@brillout/part-regex": "^0.1.2",
|
|
166
|
-
"@brillout/release-me": "^0.1.
|
|
166
|
+
"@brillout/release-me": "^0.1.8",
|
|
167
167
|
"@types/estree": "^1.0.0",
|
|
168
168
|
"@types/jest": "^27.4.1",
|
|
169
169
|
"@types/node": "^20.1.0",
|
|
@@ -1,63 +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.loadPageCode = void 0;
|
|
7
|
-
const utils_js_1 = require("../utils.js");
|
|
8
|
-
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
9
|
-
async function loadPageCode(pageConfig, isDev) {
|
|
10
|
-
if (pageConfig.isLoaded &&
|
|
11
|
-
// We don't need to cache in dev, since Vite already caches the virtual module
|
|
12
|
-
!isDev) {
|
|
13
|
-
return pageConfig;
|
|
14
|
-
}
|
|
15
|
-
const codeFiles = await pageConfig.loadConfigValuesAll();
|
|
16
|
-
// TODO: remove?
|
|
17
|
-
// pageConfig.configValuesOld = pageConfig.configValuesOld.filter((val) => !val.definedByCodeFile)
|
|
18
|
-
const addConfigValue = (configName, value, filePath, exportName) => {
|
|
19
|
-
/* TODO
|
|
20
|
-
assert(!isAlreadyDefined(val.configName), val.configName) // Conflicts are resolved upstream
|
|
21
|
-
*/
|
|
22
|
-
pageConfig.configValues[configName] = {
|
|
23
|
-
value,
|
|
24
|
-
definedAtInfo: {
|
|
25
|
-
filePath,
|
|
26
|
-
fileExportPath: [exportName]
|
|
27
|
-
}
|
|
28
|
-
/* TODO: remove?
|
|
29
|
-
definedByCodeFile: true
|
|
30
|
-
*/
|
|
31
|
-
};
|
|
32
|
-
assertIsNotNull(value, configName, filePath);
|
|
33
|
-
};
|
|
34
|
-
codeFiles.forEach((codeFile) => {
|
|
35
|
-
if (codeFile.isPlusFile) {
|
|
36
|
-
const { importFileExports, importFilePath } = codeFile;
|
|
37
|
-
if (codeFile.configName !== 'client') {
|
|
38
|
-
(0, utils_js_1.assertDefaultExportUnknown)(importFileExports, importFilePath);
|
|
39
|
-
}
|
|
40
|
-
Object.entries(importFileExports).forEach(([exportName, exportValue]) => {
|
|
41
|
-
const isSideExport = exportName !== 'default'; // .md files may have "side-exports" such as `export { frontmatter }`
|
|
42
|
-
const configName = isSideExport ? exportName : codeFile.configName;
|
|
43
|
-
if (isSideExport && configName in pageConfig.configValues) {
|
|
44
|
-
// We can't avoid side-export conflicts upstream. (Because we cannot know about side-exports upstream at build-time.)
|
|
45
|
-
// Side-exports have the lowest priority.
|
|
46
|
-
return;
|
|
47
|
-
}
|
|
48
|
-
addConfigValue(configName, exportValue, importFilePath, exportName);
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
else {
|
|
52
|
-
const { configName, importFilePath, importFileExportValue, importFileExportName } = codeFile;
|
|
53
|
-
addConfigValue(configName, importFileExportValue, importFilePath, importFileExportName);
|
|
54
|
-
}
|
|
55
|
-
});
|
|
56
|
-
(0, utils_js_1.objectAssign)(pageConfig, { isLoaded: true });
|
|
57
|
-
return pageConfig;
|
|
58
|
-
}
|
|
59
|
-
exports.loadPageCode = loadPageCode;
|
|
60
|
-
function assertIsNotNull(configValue, configName, importFilePath) {
|
|
61
|
-
(0, utils_js_1.assert)(!importFilePath.includes('+config.'));
|
|
62
|
-
(0, utils_js_1.assertUsage)(configValue !== null, `Set ${picocolors_1.default.cyan(configName)} to ${picocolors_1.default.cyan('null')} in a +config.h.js file instead of ${importFilePath}`);
|
|
63
|
-
}
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.addFileExtensionsToRequireResolve = void 0;
|
|
4
|
-
const assert_js_1 = require("./assert.js");
|
|
5
|
-
const isScriptFile_js_1 = require("./isScriptFile.js");
|
|
6
|
-
function addFileExtensionsToRequireResolve() {
|
|
7
|
-
const added = [];
|
|
8
|
-
isScriptFile_js_1.scriptFileExtensionList.forEach((ext) => {
|
|
9
|
-
(0, assert_js_1.assert)(!ext.includes('.'));
|
|
10
|
-
ext = `.${ext}`;
|
|
11
|
-
if (!require.extensions[ext]) {
|
|
12
|
-
require.extensions[ext] = require.extensions['.js'];
|
|
13
|
-
added.push(ext);
|
|
14
|
-
}
|
|
15
|
-
});
|
|
16
|
-
const clean = () => {
|
|
17
|
-
added.forEach((ext) => {
|
|
18
|
-
delete require.extensions[ext];
|
|
19
|
-
});
|
|
20
|
-
};
|
|
21
|
-
return clean;
|
|
22
|
-
}
|
|
23
|
-
exports.addFileExtensionsToRequireResolve = addFileExtensionsToRequireResolve;
|
|
@@ -1,53 +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.assertDefaultExportObject = exports.assertDefaultExportUnknown = void 0;
|
|
7
|
-
const assert_js_1 = require("./assert.js");
|
|
8
|
-
const isObject_js_1 = require("./isObject.js");
|
|
9
|
-
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
10
|
-
const IGNORE = [
|
|
11
|
-
// vite-plugin-solid adds `export { $$registrations }`
|
|
12
|
-
'$$registrations',
|
|
13
|
-
// @vitejs/plugin-vue adds `export { _rerender_only }`
|
|
14
|
-
'_rerender_only'
|
|
15
|
-
];
|
|
16
|
-
// support `export { frontmatter }` in .mdx files
|
|
17
|
-
const FILES_WITH_SIDE_EXPORTS = ['.md', '.mdx'];
|
|
18
|
-
function assertDefaultExportUnknown(fileExports, filePath) {
|
|
19
|
-
assertSingleDefaultExport(fileExports, filePath, true);
|
|
20
|
-
}
|
|
21
|
-
exports.assertDefaultExportUnknown = assertDefaultExportUnknown;
|
|
22
|
-
function assertDefaultExportObject(fileExports, filePath) {
|
|
23
|
-
assertSingleDefaultExport(fileExports, filePath, false);
|
|
24
|
-
const exportDefault = fileExports.default;
|
|
25
|
-
(0, assert_js_1.assertUsage)((0, isObject_js_1.isObject)(exportDefault), `The ${picocolors_1.default.cyan('export default')} of ${filePath} should be an object (but it's ${picocolors_1.default.cyan(`typeof exportDefault === ${JSON.stringify(typeof exportDefault)}`)} instead)`);
|
|
26
|
-
}
|
|
27
|
-
exports.assertDefaultExportObject = assertDefaultExportObject;
|
|
28
|
-
function assertSingleDefaultExport(fileExports, filePath, defaultExportValueIsUnknown) {
|
|
29
|
-
const exportsAll = Object.keys(fileExports);
|
|
30
|
-
const exportsRelevant = exportsAll.filter((exportName) => !IGNORE.includes(exportName));
|
|
31
|
-
const exportsInvalid = exportsRelevant.filter((e) => e !== 'default');
|
|
32
|
-
const exportsHasDefault = exportsRelevant.includes('default');
|
|
33
|
-
if (exportsInvalid.length === 0) {
|
|
34
|
-
if (exportsHasDefault) {
|
|
35
|
-
return;
|
|
36
|
-
}
|
|
37
|
-
else {
|
|
38
|
-
(0, assert_js_1.assert)(exportsRelevant.length === 0);
|
|
39
|
-
(0, assert_js_1.assertUsage)(false, `${filePath} doesn't export any value, but it should have a ${picocolors_1.default.cyan('export default')} instead`);
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
else if (!FILES_WITH_SIDE_EXPORTS.some((ext) => filePath.endsWith(ext))) {
|
|
43
|
-
if (defaultExportValueIsUnknown) {
|
|
44
|
-
exportsInvalid.forEach((exportInvalid) => {
|
|
45
|
-
(0, assert_js_1.assertWarning)(exportsInvalid.length === 0, `${filePath} should only have a default export: move ${picocolors_1.default.cyan(`export { ${exportInvalid} }`)} to +config.h.js or its own +${exportsInvalid}.js`, { onlyOnce: true });
|
|
46
|
-
});
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
const exportsInvalidStr = exportsInvalid.join(', ');
|
|
50
|
-
(0, assert_js_1.assertWarning)(exportsInvalid.length === 0, `${filePath} replace ${picocolors_1.default.cyan(`export { ${exportsInvalidStr} }`)} with ${picocolors_1.default.cyan(`export default { ${exportsInvalidStr} }`)}`, { onlyOnce: true });
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
}
|
|
@@ -1,57 +0,0 @@
|
|
|
1
|
-
export { loadPageCode };
|
|
2
|
-
import { assert, assertDefaultExportUnknown, assertUsage, objectAssign } from '../utils.js';
|
|
3
|
-
import pc from '@brillout/picocolors';
|
|
4
|
-
async function loadPageCode(pageConfig, isDev) {
|
|
5
|
-
if (pageConfig.isLoaded &&
|
|
6
|
-
// We don't need to cache in dev, since Vite already caches the virtual module
|
|
7
|
-
!isDev) {
|
|
8
|
-
return pageConfig;
|
|
9
|
-
}
|
|
10
|
-
const codeFiles = await pageConfig.loadConfigValuesAll();
|
|
11
|
-
// TODO: remove?
|
|
12
|
-
// pageConfig.configValuesOld = pageConfig.configValuesOld.filter((val) => !val.definedByCodeFile)
|
|
13
|
-
const addConfigValue = (configName, value, filePath, exportName) => {
|
|
14
|
-
/* TODO
|
|
15
|
-
assert(!isAlreadyDefined(val.configName), val.configName) // Conflicts are resolved upstream
|
|
16
|
-
*/
|
|
17
|
-
pageConfig.configValues[configName] = {
|
|
18
|
-
value,
|
|
19
|
-
definedAtInfo: {
|
|
20
|
-
filePath,
|
|
21
|
-
fileExportPath: [exportName]
|
|
22
|
-
}
|
|
23
|
-
/* TODO: remove?
|
|
24
|
-
definedByCodeFile: true
|
|
25
|
-
*/
|
|
26
|
-
};
|
|
27
|
-
assertIsNotNull(value, configName, filePath);
|
|
28
|
-
};
|
|
29
|
-
codeFiles.forEach((codeFile) => {
|
|
30
|
-
if (codeFile.isPlusFile) {
|
|
31
|
-
const { importFileExports, importFilePath } = codeFile;
|
|
32
|
-
if (codeFile.configName !== 'client') {
|
|
33
|
-
assertDefaultExportUnknown(importFileExports, importFilePath);
|
|
34
|
-
}
|
|
35
|
-
Object.entries(importFileExports).forEach(([exportName, exportValue]) => {
|
|
36
|
-
const isSideExport = exportName !== 'default'; // .md files may have "side-exports" such as `export { frontmatter }`
|
|
37
|
-
const configName = isSideExport ? exportName : codeFile.configName;
|
|
38
|
-
if (isSideExport && configName in pageConfig.configValues) {
|
|
39
|
-
// We can't avoid side-export conflicts upstream. (Because we cannot know about side-exports upstream at build-time.)
|
|
40
|
-
// Side-exports have the lowest priority.
|
|
41
|
-
return;
|
|
42
|
-
}
|
|
43
|
-
addConfigValue(configName, exportValue, importFilePath, exportName);
|
|
44
|
-
});
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
const { configName, importFilePath, importFileExportValue, importFileExportName } = codeFile;
|
|
48
|
-
addConfigValue(configName, importFileExportValue, importFilePath, importFileExportName);
|
|
49
|
-
}
|
|
50
|
-
});
|
|
51
|
-
objectAssign(pageConfig, { isLoaded: true });
|
|
52
|
-
return pageConfig;
|
|
53
|
-
}
|
|
54
|
-
function assertIsNotNull(configValue, configName, importFilePath) {
|
|
55
|
-
assert(!importFilePath.includes('+config.'));
|
|
56
|
-
assertUsage(configValue !== null, `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.h.js file instead of ${importFilePath}`);
|
|
57
|
-
}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
export { addFileExtensionsToRequireResolve };
|
|
2
|
-
import { assert } from './assert.js';
|
|
3
|
-
import { scriptFileExtensionList } from './isScriptFile.js';
|
|
4
|
-
function addFileExtensionsToRequireResolve() {
|
|
5
|
-
const added = [];
|
|
6
|
-
scriptFileExtensionList.forEach((ext) => {
|
|
7
|
-
assert(!ext.includes('.'));
|
|
8
|
-
ext = `.${ext}`;
|
|
9
|
-
if (!require.extensions[ext]) {
|
|
10
|
-
require.extensions[ext] = require.extensions['.js'];
|
|
11
|
-
added.push(ext);
|
|
12
|
-
}
|
|
13
|
-
});
|
|
14
|
-
const clean = () => {
|
|
15
|
-
added.forEach((ext) => {
|
|
16
|
-
delete require.extensions[ext];
|
|
17
|
-
});
|
|
18
|
-
};
|
|
19
|
-
return clean;
|
|
20
|
-
}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
export { assertDefaultExportUnknown };
|
|
2
|
-
export { assertDefaultExportObject };
|
|
3
|
-
declare function assertDefaultExportUnknown(fileExports: Record<string, unknown>, filePath: string): asserts fileExports is Record<string, unknown> & {
|
|
4
|
-
default: unknown;
|
|
5
|
-
};
|
|
6
|
-
declare function assertDefaultExportObject(fileExports: Record<string, unknown>, filePath: string): asserts fileExports is {
|
|
7
|
-
default: Record<string, unknown>;
|
|
8
|
-
};
|
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
export { assertDefaultExportUnknown };
|
|
2
|
-
export { assertDefaultExportObject };
|
|
3
|
-
import { assert, assertUsage, assertWarning } from './assert.js';
|
|
4
|
-
import { isObject } from './isObject.js';
|
|
5
|
-
import pc from '@brillout/picocolors';
|
|
6
|
-
const IGNORE = [
|
|
7
|
-
// vite-plugin-solid adds `export { $$registrations }`
|
|
8
|
-
'$$registrations',
|
|
9
|
-
// @vitejs/plugin-vue adds `export { _rerender_only }`
|
|
10
|
-
'_rerender_only'
|
|
11
|
-
];
|
|
12
|
-
// support `export { frontmatter }` in .mdx files
|
|
13
|
-
const FILES_WITH_SIDE_EXPORTS = ['.md', '.mdx'];
|
|
14
|
-
function assertDefaultExportUnknown(fileExports, filePath) {
|
|
15
|
-
assertSingleDefaultExport(fileExports, filePath, true);
|
|
16
|
-
}
|
|
17
|
-
function assertDefaultExportObject(fileExports, filePath) {
|
|
18
|
-
assertSingleDefaultExport(fileExports, filePath, false);
|
|
19
|
-
const exportDefault = fileExports.default;
|
|
20
|
-
assertUsage(isObject(exportDefault), `The ${pc.cyan('export default')} of ${filePath} should be an object (but it's ${pc.cyan(`typeof exportDefault === ${JSON.stringify(typeof exportDefault)}`)} instead)`);
|
|
21
|
-
}
|
|
22
|
-
function assertSingleDefaultExport(fileExports, filePath, defaultExportValueIsUnknown) {
|
|
23
|
-
const exportsAll = Object.keys(fileExports);
|
|
24
|
-
const exportsRelevant = exportsAll.filter((exportName) => !IGNORE.includes(exportName));
|
|
25
|
-
const exportsInvalid = exportsRelevant.filter((e) => e !== 'default');
|
|
26
|
-
const exportsHasDefault = exportsRelevant.includes('default');
|
|
27
|
-
if (exportsInvalid.length === 0) {
|
|
28
|
-
if (exportsHasDefault) {
|
|
29
|
-
return;
|
|
30
|
-
}
|
|
31
|
-
else {
|
|
32
|
-
assert(exportsRelevant.length === 0);
|
|
33
|
-
assertUsage(false, `${filePath} doesn't export any value, but it should have a ${pc.cyan('export default')} instead`);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
else if (!FILES_WITH_SIDE_EXPORTS.some((ext) => filePath.endsWith(ext))) {
|
|
37
|
-
if (defaultExportValueIsUnknown) {
|
|
38
|
-
exportsInvalid.forEach((exportInvalid) => {
|
|
39
|
-
assertWarning(exportsInvalid.length === 0, `${filePath} should only have a default export: move ${pc.cyan(`export { ${exportInvalid} }`)} to +config.h.js or its own +${exportsInvalid}.js`, { onlyOnce: true });
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
else {
|
|
43
|
-
const exportsInvalidStr = exportsInvalid.join(', ');
|
|
44
|
-
assertWarning(exportsInvalid.length === 0, `${filePath} replace ${pc.cyan(`export { ${exportsInvalidStr} }`)} with ${pc.cyan(`export default { ${exportsInvalidStr} }`)}`, { onlyOnce: true });
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|