vike 0.4.218-commit-9d092f9 → 0.4.218-commit-023914f
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/api/build.js +2 -2
- package/dist/cjs/node/plugin/plugins/autoFullBuild.js +2 -2
- package/dist/cjs/node/plugin/plugins/commonConfig.js +22 -1
- package/dist/cjs/node/prerender/isPrerenderAutoRunEnabled.js +16 -0
- package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/node/api/build.js +2 -2
- package/dist/esm/node/plugin/plugins/autoFullBuild.js +2 -2
- package/dist/esm/node/plugin/plugins/commonConfig.js +23 -2
- package/dist/esm/node/prerender/isPrerenderAutoRunEnabled.d.ts +5 -0
- package/dist/esm/node/prerender/isPrerenderAutoRunEnabled.js +14 -0
- package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/utils/projectInfo.d.ts +1 -1
- package/package.json +1 -1
- package/dist/cjs/node/prerender/isPrerenderEnabled.js +0 -8
- package/dist/esm/node/prerender/isPrerenderEnabled.d.ts +0 -3
- package/dist/esm/node/prerender/isPrerenderEnabled.js +0 -6
|
@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.build = build;
|
|
37
37
|
const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
|
|
38
38
|
const vite_1 = require("vite");
|
|
39
|
-
const
|
|
39
|
+
const isPrerenderAutoRunEnabled_js_1 = require("../prerender/isPrerenderAutoRunEnabled.js");
|
|
40
40
|
/**
|
|
41
41
|
* Programmatically trigger `$ vike build`
|
|
42
42
|
*
|
|
@@ -49,7 +49,7 @@ async function build(options = {}) {
|
|
|
49
49
|
// Build server-side
|
|
50
50
|
const outputServer = await (0, vite_1.build)(setSSR(viteConfigEnhanced));
|
|
51
51
|
// Pre-render
|
|
52
|
-
if ((0,
|
|
52
|
+
if ((0, isPrerenderAutoRunEnabled_js_1.isPrerenderAutoRunEnabled)(vikeConfigGlobal)) {
|
|
53
53
|
const { runPrerenderFromAutoRun } = await Promise.resolve().then(() => __importStar(require('../prerender/runPrerender.js')));
|
|
54
54
|
await runPrerenderFromAutoRun(viteConfigEnhanced);
|
|
55
55
|
}
|
|
@@ -8,7 +8,7 @@ exports.autoFullBuild = autoFullBuild;
|
|
|
8
8
|
const vite_1 = require("vite");
|
|
9
9
|
const utils_js_1 = require("../utils.js");
|
|
10
10
|
const runPrerender_js_1 = require("../../prerender/runPrerender.js");
|
|
11
|
-
const
|
|
11
|
+
const isPrerenderAutoRunEnabled_js_1 = require("../../prerender/isPrerenderAutoRunEnabled.js");
|
|
12
12
|
const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
|
|
13
13
|
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
14
14
|
const logErrorHint_js_1 = require("../../runtime/renderPage/logErrorHint.js");
|
|
@@ -96,7 +96,7 @@ async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
|
|
|
96
96
|
(0, logErrorHint_js_1.logErrorHint)(err);
|
|
97
97
|
process.exit(1);
|
|
98
98
|
}
|
|
99
|
-
if ((0,
|
|
99
|
+
if ((0, isPrerenderAutoRunEnabled_js_1.isPrerenderAutoRunEnabled)(vikeConfigGlobal)) {
|
|
100
100
|
await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline);
|
|
101
101
|
forceExit = true;
|
|
102
102
|
}
|
|
@@ -16,6 +16,7 @@ const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
|
|
|
16
16
|
const context_js_1 = require("../../api/context.js");
|
|
17
17
|
const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
|
|
18
18
|
const prepareViteApiCall_js_1 = require("../../api/prepareViteApiCall.js");
|
|
19
|
+
const isPrerenderAutoRunEnabled_js_1 = require("../../prerender/isPrerenderAutoRunEnabled.js");
|
|
19
20
|
const pluginName = 'vike:commonConfig';
|
|
20
21
|
function commonConfig(vikeVitePluginOptions) {
|
|
21
22
|
return [
|
|
@@ -35,7 +36,8 @@ function commonConfig(vikeVitePluginOptions) {
|
|
|
35
36
|
_root: root,
|
|
36
37
|
_vikeVitePluginOptions: vikeVitePluginOptions,
|
|
37
38
|
vike: vikeConfig,
|
|
38
|
-
|
|
39
|
+
// TODO/v1-release: remove
|
|
40
|
+
configVikePromise: Promise.resolve(vikeConfig.vikeConfigGlobal)
|
|
39
41
|
};
|
|
40
42
|
}
|
|
41
43
|
}
|
|
@@ -62,6 +64,7 @@ function commonConfig(vikeVitePluginOptions) {
|
|
|
62
64
|
(0, assertResolveAlias_js_1.assertResolveAlias)(config);
|
|
63
65
|
assertEsm(config.root);
|
|
64
66
|
assertVikeCliOrApi(config);
|
|
67
|
+
temp_supportOldInterface(config);
|
|
65
68
|
}
|
|
66
69
|
},
|
|
67
70
|
config: {
|
|
@@ -144,3 +147,21 @@ function assertVikeCliOrApi(config) {
|
|
|
144
147
|
onlyOnce: true
|
|
145
148
|
});
|
|
146
149
|
}
|
|
150
|
+
function temp_supportOldInterface(config) {
|
|
151
|
+
if (!('vitePluginSsr' in config))
|
|
152
|
+
return;
|
|
153
|
+
(0, utils_js_1.assert)((0, utils_js_1.isObject)(config.vitePluginSsr));
|
|
154
|
+
if ((0, utils_js_1.hasProp)(config.vitePluginSsr, 'prerender', 'object')) {
|
|
155
|
+
(0, utils_js_1.assert)((0, utils_js_1.hasProp)(config.vitePluginSsr.prerender, 'disableAutoRun', 'boolean'));
|
|
156
|
+
if (config.vitePluginSsr.prerender.disableAutoRun) {
|
|
157
|
+
(0, isPrerenderAutoRunEnabled_js_1.temp_disablePrerenderAutoRun)();
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
if ((0, utils_js_1.hasProp)(config.vitePluginSsr, 'disableAutoRun')) {
|
|
161
|
+
if (config.vitePluginSsr.disableAutoRun) {
|
|
162
|
+
(0, utils_js_1.assert)(config.vitePluginSsr.disableAutoRun === 'prerender');
|
|
163
|
+
(0, isPrerenderAutoRunEnabled_js_1.temp_disablePrerenderAutoRun)();
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
(0, utils_js_1.assert)(false);
|
|
167
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isPrerenderAutoRunEnabled = isPrerenderAutoRunEnabled;
|
|
4
|
+
exports.temp_disablePrerenderAutoRun = temp_disablePrerenderAutoRun;
|
|
5
|
+
const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
|
|
6
|
+
const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('isPrerenderAutoRunEnabled.ts', {});
|
|
7
|
+
function isPrerenderAutoRunEnabled(vikeConfigGlobal) {
|
|
8
|
+
return (vikeConfigGlobal.prerender &&
|
|
9
|
+
!vikeConfigGlobal.prerender.disableAutoRun &&
|
|
10
|
+
!globalObject.isDisabled &&
|
|
11
|
+
vikeConfigGlobal.disableAutoFullBuild !== 'prerender');
|
|
12
|
+
}
|
|
13
|
+
// TODO/v1-release: remove
|
|
14
|
+
function temp_disablePrerenderAutoRun() {
|
|
15
|
+
globalObject.isDisabled = true;
|
|
16
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { build };
|
|
2
2
|
import { prepareViteApiCall } from './prepareViteApiCall.js';
|
|
3
3
|
import { build as buildVite } from 'vite';
|
|
4
|
-
import {
|
|
4
|
+
import { isPrerenderAutoRunEnabled } from '../prerender/isPrerenderAutoRunEnabled.js';
|
|
5
5
|
/**
|
|
6
6
|
* Programmatically trigger `$ vike build`
|
|
7
7
|
*
|
|
@@ -14,7 +14,7 @@ async function build(options = {}) {
|
|
|
14
14
|
// Build server-side
|
|
15
15
|
const outputServer = await buildVite(setSSR(viteConfigEnhanced));
|
|
16
16
|
// Pre-render
|
|
17
|
-
if (
|
|
17
|
+
if (isPrerenderAutoRunEnabled(vikeConfigGlobal)) {
|
|
18
18
|
const { runPrerenderFromAutoRun } = await import('../prerender/runPrerender.js');
|
|
19
19
|
await runPrerenderFromAutoRun(viteConfigEnhanced);
|
|
20
20
|
}
|
|
@@ -3,7 +3,7 @@ export { autoFullBuild };
|
|
|
3
3
|
import { build } from 'vite';
|
|
4
4
|
import { assertWarning } from '../utils.js';
|
|
5
5
|
import { runPrerenderFromAutoRun, runPrerender_forceExit } from '../../prerender/runPrerender.js';
|
|
6
|
-
import {
|
|
6
|
+
import { isPrerenderAutoRunEnabled } from '../../prerender/isPrerenderAutoRunEnabled.js';
|
|
7
7
|
import { isViteCliCall, getViteConfigFromCli } from '../shared/isViteCliCall.js';
|
|
8
8
|
import pc from '@brillout/picocolors';
|
|
9
9
|
import { logErrorHint } from '../../runtime/renderPage/logErrorHint.js';
|
|
@@ -91,7 +91,7 @@ async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
|
|
|
91
91
|
logErrorHint(err);
|
|
92
92
|
process.exit(1);
|
|
93
93
|
}
|
|
94
|
-
if (
|
|
94
|
+
if (isPrerenderAutoRunEnabled(vikeConfigGlobal)) {
|
|
95
95
|
await runPrerenderFromAutoRun(configInline);
|
|
96
96
|
forceExit = true;
|
|
97
97
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { commonConfig };
|
|
2
2
|
import { mergeConfig } from 'vite';
|
|
3
|
-
import { assert, assertUsage, assertWarning, findPackageJson, isDevCheck, isDocker } from '../utils.js';
|
|
3
|
+
import { assert, assertUsage, assertWarning, findPackageJson, hasProp, isDevCheck, isDocker, isObject } from '../utils.js';
|
|
4
4
|
import { assertRollupInput } from './buildConfig.js';
|
|
5
5
|
import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
|
|
6
6
|
import pc from '@brillout/picocolors';
|
|
@@ -11,6 +11,7 @@ import { isViteCliCall } from '../shared/isViteCliCall.js';
|
|
|
11
11
|
import { isVikeCliOrApi } from '../../api/context.js';
|
|
12
12
|
import { getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
|
|
13
13
|
import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
|
|
14
|
+
import { temp_disablePrerenderAutoRun } from '../../prerender/isPrerenderAutoRunEnabled.js';
|
|
14
15
|
const pluginName = 'vike:commonConfig';
|
|
15
16
|
function commonConfig(vikeVitePluginOptions) {
|
|
16
17
|
return [
|
|
@@ -30,7 +31,8 @@ function commonConfig(vikeVitePluginOptions) {
|
|
|
30
31
|
_root: root,
|
|
31
32
|
_vikeVitePluginOptions: vikeVitePluginOptions,
|
|
32
33
|
vike: vikeConfig,
|
|
33
|
-
|
|
34
|
+
// TODO/v1-release: remove
|
|
35
|
+
configVikePromise: Promise.resolve(vikeConfig.vikeConfigGlobal)
|
|
34
36
|
};
|
|
35
37
|
}
|
|
36
38
|
}
|
|
@@ -57,6 +59,7 @@ function commonConfig(vikeVitePluginOptions) {
|
|
|
57
59
|
assertResolveAlias(config);
|
|
58
60
|
assertEsm(config.root);
|
|
59
61
|
assertVikeCliOrApi(config);
|
|
62
|
+
temp_supportOldInterface(config);
|
|
60
63
|
}
|
|
61
64
|
},
|
|
62
65
|
config: {
|
|
@@ -139,3 +142,21 @@ function assertVikeCliOrApi(config) {
|
|
|
139
142
|
onlyOnce: true
|
|
140
143
|
});
|
|
141
144
|
}
|
|
145
|
+
function temp_supportOldInterface(config) {
|
|
146
|
+
if (!('vitePluginSsr' in config))
|
|
147
|
+
return;
|
|
148
|
+
assert(isObject(config.vitePluginSsr));
|
|
149
|
+
if (hasProp(config.vitePluginSsr, 'prerender', 'object')) {
|
|
150
|
+
assert(hasProp(config.vitePluginSsr.prerender, 'disableAutoRun', 'boolean'));
|
|
151
|
+
if (config.vitePluginSsr.prerender.disableAutoRun) {
|
|
152
|
+
temp_disablePrerenderAutoRun();
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
if (hasProp(config.vitePluginSsr, 'disableAutoRun')) {
|
|
156
|
+
if (config.vitePluginSsr.disableAutoRun) {
|
|
157
|
+
assert(config.vitePluginSsr.disableAutoRun === 'prerender');
|
|
158
|
+
temp_disablePrerenderAutoRun();
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
assert(false);
|
|
162
|
+
}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export { isPrerenderAutoRunEnabled };
|
|
2
|
+
export { temp_disablePrerenderAutoRun };
|
|
3
|
+
import type { VikeConfigGlobal } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
|
|
4
|
+
declare function isPrerenderAutoRunEnabled(vikeConfigGlobal: VikeConfigGlobal): boolean;
|
|
5
|
+
declare function temp_disablePrerenderAutoRun(): void;
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export { isPrerenderAutoRunEnabled };
|
|
2
|
+
export { temp_disablePrerenderAutoRun };
|
|
3
|
+
import { getGlobalObject } from '../../utils/getGlobalObject.js';
|
|
4
|
+
const globalObject = getGlobalObject('isPrerenderAutoRunEnabled.ts', {});
|
|
5
|
+
function isPrerenderAutoRunEnabled(vikeConfigGlobal) {
|
|
6
|
+
return (vikeConfigGlobal.prerender &&
|
|
7
|
+
!vikeConfigGlobal.prerender.disableAutoRun &&
|
|
8
|
+
!globalObject.isDisabled &&
|
|
9
|
+
vikeConfigGlobal.disableAutoFullBuild !== 'prerender');
|
|
10
|
+
}
|
|
11
|
+
// TODO/v1-release: remove
|
|
12
|
+
function temp_disablePrerenderAutoRun() {
|
|
13
|
+
globalObject.isDisabled = true;
|
|
14
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const PROJECT_VERSION: "0.4.218-commit-
|
|
1
|
+
export declare const PROJECT_VERSION: "0.4.218-commit-023914f";
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// Automatically updated by @brillout/release-me
|
|
2
|
-
export const PROJECT_VERSION = '0.4.218-commit-
|
|
2
|
+
export const PROJECT_VERSION = '0.4.218-commit-023914f';
|
package/package.json
CHANGED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isPrerenderEnabled = isPrerenderEnabled;
|
|
4
|
-
function isPrerenderEnabled(vikeConfigGlobal) {
|
|
5
|
-
return (vikeConfigGlobal.prerender &&
|
|
6
|
-
!vikeConfigGlobal.prerender.disableAutoRun &&
|
|
7
|
-
vikeConfigGlobal.disableAutoFullBuild !== 'prerender');
|
|
8
|
-
}
|