vike 0.4.212 → 0.4.214
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/RenderErrorPage.js +3 -3
- package/__internal/loadImportBuild.js +3 -0
- package/__internal/setup.js +3 -3
- package/__internal.js +3 -3
- package/abort.js +3 -3
- package/api.js +3 -0
- package/cli.js +3 -3
- package/client/router.js +3 -3
- package/client.js +3 -3
- package/dist/cjs/client/server-routing-runtime/utils.js +2 -2
- package/dist/cjs/node/api/APIOptions.js +2 -0
- package/dist/cjs/node/api/build.js +50 -0
- package/dist/cjs/node/api/dev.js +10 -0
- package/dist/cjs/node/api/enhanceViteConfig.js +52 -0
- package/dist/cjs/node/api/index.js +36 -0
- package/dist/cjs/node/api/prerender.js +10 -0
- package/dist/cjs/node/api/preview.js +10 -0
- package/dist/cjs/node/cli/entry.js +100 -0
- package/dist/cjs/node/cli/index.js +8 -7
- package/dist/cjs/node/cli/parseCli.js +61 -0
- package/dist/cjs/node/cli/utils.js +3 -1
- package/dist/cjs/node/plugin/index.js +3 -1
- package/dist/cjs/node/plugin/plugins/autoFullBuild.js +5 -5
- package/dist/cjs/node/plugin/plugins/buildConfig.js +13 -10
- package/dist/cjs/node/plugin/plugins/commonConfig/pluginName.js +4 -0
- package/dist/cjs/node/plugin/plugins/commonConfig.js +13 -5
- package/dist/cjs/node/plugin/plugins/previewConfig.js +1 -1
- package/dist/cjs/node/plugin/plugins/vite6HmrRegressionWorkaround.js +35 -0
- package/dist/cjs/node/plugin/shared/getEnvVarObject.js +29 -0
- package/dist/cjs/node/plugin/utils.js +2 -2
- package/dist/cjs/node/prerender/index.js +9 -2
- package/dist/cjs/node/prerender/runPrerender.js +15 -9
- package/dist/cjs/node/runtime/globalContext.js +1 -1
- package/dist/cjs/node/runtime/utils.js +2 -1
- package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
- package/dist/cjs/utils/assertNodeEnv.js +1 -1
- package/dist/esm/client/client-routing-runtime/utils.js +2 -2
- package/dist/esm/client/server-routing-runtime/utils.js +2 -2
- package/dist/esm/node/api/APIOptions.d.ts +10 -0
- package/dist/esm/node/api/build.d.ts +6 -0
- package/dist/esm/node/api/build.js +25 -0
- package/dist/esm/node/api/dev.d.ts +3 -0
- package/dist/esm/node/api/dev.js +8 -0
- package/dist/esm/node/api/enhanceViteConfig.d.ts +6 -0
- package/dist/esm/node/api/enhanceViteConfig.js +27 -0
- package/dist/esm/node/api/index.d.ts +12 -0
- package/dist/esm/node/api/index.js +10 -0
- package/dist/esm/node/api/prerender.d.ts +3 -0
- package/dist/esm/node/api/prerender.js +8 -0
- package/dist/esm/node/api/preview.d.ts +3 -0
- package/dist/esm/node/api/preview.js +8 -0
- package/dist/esm/node/cli/entry.d.ts +1 -0
- package/dist/esm/node/cli/entry.js +72 -0
- package/dist/esm/node/cli/index.d.ts +1 -2
- package/dist/esm/node/cli/index.js +4 -6
- package/dist/esm/node/cli/parseCli.d.ts +4 -0
- package/dist/esm/node/cli/parseCli.js +56 -0
- package/dist/esm/node/cli/utils.d.ts +1 -0
- package/dist/esm/node/cli/utils.js +3 -1
- package/dist/esm/node/plugin/index.js +3 -1
- package/dist/esm/node/plugin/plugins/autoFullBuild.js +6 -6
- package/dist/esm/node/plugin/plugins/buildConfig.js +13 -10
- package/dist/esm/node/plugin/plugins/commonConfig/pluginName.d.ts +1 -0
- package/dist/esm/node/plugin/plugins/commonConfig/pluginName.js +1 -0
- package/dist/esm/node/plugin/plugins/commonConfig.d.ts +1 -1
- package/dist/esm/node/plugin/plugins/commonConfig.js +11 -3
- package/dist/esm/node/plugin/plugins/extractAssetsPlugin.js +1 -1
- package/dist/esm/node/plugin/plugins/previewConfig.js +1 -1
- package/dist/esm/node/plugin/plugins/vite6HmrRegressionWorkaround.d.ts +3 -0
- package/dist/esm/node/plugin/plugins/vite6HmrRegressionWorkaround.js +33 -0
- package/dist/esm/node/plugin/shared/getEnvVarObject.d.ts +2 -0
- package/dist/esm/node/plugin/shared/getEnvVarObject.js +24 -0
- package/dist/esm/node/plugin/utils.js +2 -2
- package/dist/esm/node/prerender/index.d.ts +1 -1
- package/dist/esm/node/prerender/index.js +5 -1
- package/dist/esm/node/prerender/runPrerender.d.ts +7 -28
- package/dist/esm/node/prerender/runPrerender.js +15 -9
- package/dist/esm/node/runtime/globalContext.js +1 -1
- package/dist/esm/node/runtime/utils.js +2 -1
- package/dist/esm/shared/ConfigVike.d.ts +3 -9
- package/dist/esm/shared/page-configs/Config.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/utils/assertNodeEnv.js +1 -1
- package/dist/esm/utils/projectInfo.d.ts +1 -1
- package/dist-cjs-fixup.mjs +41 -0
- package/getPageContext.js +3 -0
- package/modifyUrl.js +3 -0
- package/node/cli/bin.js +3 -0
- package/package.json +43 -19
- package/plugin.js +3 -3
- package/prerender.js +3 -3
- package/routing.js +3 -3
- package/server.js +3 -3
- package/types.js +3 -0
- package/dist/cjs/node/cli/bin.js +0 -49
- package/dist/esm/node/cli/bin.js +0 -44
- package/node/cli/bin-entry.js +0 -3
- /package/dist/esm/node/{cli/bin.d.ts → api/APIOptions.js} +0 -0
package/RenderErrorPage.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
//
|
|
2
|
-
export * from './dist/shared/RenderErrorPage.
|
|
3
|
-
export { default } from './dist/shared/RenderErrorPage.
|
|
1
|
+
// Some tools still need this as of January 2025
|
|
2
|
+
export * from './dist/esm/shared/RenderErrorPage.js'
|
|
3
|
+
export { default } from './dist/esm/shared/RenderErrorPage.js'
|
package/__internal/setup.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
//
|
|
2
|
-
export * from '../dist/esm/node/runtime/page-files/setup.
|
|
3
|
-
export { default } from '../dist/esm/node/runtime/page-files/setup.
|
|
1
|
+
// Some tools still need this as of January 2025
|
|
2
|
+
export * from '../dist/esm/node/runtime/page-files/setup.js'
|
|
3
|
+
export { default } from '../dist/esm/node/runtime/page-files/setup.js'
|
package/__internal.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
//
|
|
2
|
-
export * from './dist/__internal/index.
|
|
3
|
-
export { default } from './dist/__internal/index.
|
|
1
|
+
// Some tools still need this as of January 2025
|
|
2
|
+
export * from './dist/esm/__internal/index.js'
|
|
3
|
+
export { default } from './dist/esm/__internal/index.js'
|
package/abort.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
//
|
|
2
|
-
export * from './dist/shared/abort.
|
|
3
|
-
export { default } from './dist/shared/abort.
|
|
1
|
+
// Some tools still need this as of January 2025
|
|
2
|
+
export * from './dist/esm/shared/abort.js'
|
|
3
|
+
export { default } from './dist/esm/shared/abort.js'
|
package/api.js
ADDED
package/cli.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
//
|
|
2
|
-
export * from './dist/esm/node/cli/index.
|
|
3
|
-
export { default } from './dist/esm/node/cli/index.
|
|
1
|
+
// Some tools still need this as of January 2025
|
|
2
|
+
export * from './dist/esm/node/cli/index.js'
|
|
3
|
+
export { default } from './dist/esm/node/cli/index.js'
|
package/client/router.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
//
|
|
2
|
-
export * from '../dist/esm/client/client-routing-runtime'
|
|
3
|
-
export { default } from '../dist/esm/client/client-routing-runtime'
|
|
1
|
+
// Some tools still need this as of January 2025
|
|
2
|
+
export * from '../dist/esm/client/client-routing-runtime/index.js'
|
|
3
|
+
export { default } from '../dist/esm/client/client-routing-runtime/index.js'
|
package/client.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
//
|
|
2
|
-
export * from './dist/esm/client/server-routing-runtime'
|
|
3
|
-
export { default } from './dist/esm/client/server-routing-runtime'
|
|
1
|
+
// Some tools still need this as of January 2025
|
|
2
|
+
export * from './dist/esm/client/server-routing-runtime/index.js'
|
|
3
|
+
export { default } from './dist/esm/client/server-routing-runtime/index.js'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Utils needed by Server Routing
|
|
2
|
+
// Utils needed by Vike's client runtime (with Server Routing)
|
|
3
3
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
4
4
|
if (k2 === undefined) k2 = k;
|
|
5
5
|
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
// We
|
|
18
|
+
// We call onLoad() here so that it's called even when only a subset of the runtime is loaded. (Making the assert() calls inside onLoad() a lot stronger.)
|
|
19
19
|
const onLoad_js_1 = require("./onLoad.js");
|
|
20
20
|
(0, onLoad_js_1.onLoad)();
|
|
21
21
|
__exportStar(require("../../utils/assert.js"), exports);
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.build = build;
|
|
27
|
+
const enhanceViteConfig_js_1 = require("./enhanceViteConfig.js");
|
|
28
|
+
const vite_1 = require("vite");
|
|
29
|
+
async function build(options = {}) {
|
|
30
|
+
const { viteConfigEnhanced, configVike } = await (0, enhanceViteConfig_js_1.enhanceViteConfig)(options.viteConfig, 'build');
|
|
31
|
+
// Build client-side
|
|
32
|
+
const outputClient = await (0, vite_1.build)(viteConfigEnhanced);
|
|
33
|
+
// Build server-side
|
|
34
|
+
const outputServer = await (0, vite_1.build)(setSSR(viteConfigEnhanced));
|
|
35
|
+
// Pre-render
|
|
36
|
+
if (configVike.prerender && !configVike.prerender.disableAutoRun && configVike.disableAutoFullBuild !== 'prerender') {
|
|
37
|
+
const { runPrerenderFromAutoRun } = await Promise.resolve().then(() => __importStar(require('../prerender/runPrerender.js')));
|
|
38
|
+
await runPrerenderFromAutoRun(viteConfigEnhanced, true);
|
|
39
|
+
}
|
|
40
|
+
return { outputClient, outputServer };
|
|
41
|
+
}
|
|
42
|
+
function setSSR(viteConfig) {
|
|
43
|
+
return {
|
|
44
|
+
...viteConfig,
|
|
45
|
+
build: {
|
|
46
|
+
...viteConfig.build,
|
|
47
|
+
ssr: true
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.dev = dev;
|
|
4
|
+
const enhanceViteConfig_js_1 = require("./enhanceViteConfig.js");
|
|
5
|
+
const vite_1 = require("vite");
|
|
6
|
+
async function dev(options = {}) {
|
|
7
|
+
const { viteConfigEnhanced } = await (0, enhanceViteConfig_js_1.enhanceViteConfig)(options.viteConfig, 'dev');
|
|
8
|
+
const server = await (0, vite_1.createServer)(viteConfigEnhanced);
|
|
9
|
+
return server;
|
|
10
|
+
}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.enhanceViteConfig = enhanceViteConfig;
|
|
27
|
+
const vite_1 = require("vite");
|
|
28
|
+
const getConfigVike_js_1 = require("../shared/getConfigVike.js");
|
|
29
|
+
const pluginName_js_1 = require("../plugin/plugins/commonConfig/pluginName.js");
|
|
30
|
+
async function enhanceViteConfig(viteConfig = {}, command) {
|
|
31
|
+
let viteConfigResolved = await resolveViteConfig(viteConfig, command);
|
|
32
|
+
let viteConfigEnhanced = viteConfig;
|
|
33
|
+
// Add vike to plugins if not present
|
|
34
|
+
if (!viteConfigResolved.plugins.some((p) => p.name === pluginName_js_1.pluginName)) {
|
|
35
|
+
// Using a dynamic import because the script calling the Vike API may not live in the same place as vite.config.js, thus have vike/plugin may resolved to two different node_modules/vike directories
|
|
36
|
+
const { plugin: vikePlugin } = await Promise.resolve().then(() => __importStar(require('../plugin/index.js')));
|
|
37
|
+
viteConfigEnhanced = {
|
|
38
|
+
...viteConfig,
|
|
39
|
+
plugins: [...(viteConfig.plugins ?? []), vikePlugin()]
|
|
40
|
+
};
|
|
41
|
+
viteConfigResolved = await resolveViteConfig(viteConfigEnhanced, command);
|
|
42
|
+
}
|
|
43
|
+
const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfigResolved);
|
|
44
|
+
// TODO: enable Vike extensions to add Vite plugins
|
|
45
|
+
return {
|
|
46
|
+
viteConfigEnhanced,
|
|
47
|
+
configVike
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
async function resolveViteConfig(viteConfig, command) {
|
|
51
|
+
return await (0, vite_1.resolveConfig)(viteConfig, command === 'build' || command === 'prerender' ? 'build' : 'serve', 'custom', command === 'dev' ? 'development' : 'production', command === 'preview');
|
|
52
|
+
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.prerender = exports.preview = exports.dev = exports.build = void 0;
|
|
27
|
+
const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
|
|
28
|
+
(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
|
|
29
|
+
const build_ = async (...args) => (await Promise.resolve().then(() => __importStar(require('./build.js')))).build(...args);
|
|
30
|
+
exports.build = build_;
|
|
31
|
+
const dev_ = async (...args) => (await Promise.resolve().then(() => __importStar(require('./dev.js')))).dev(...args);
|
|
32
|
+
exports.dev = dev_;
|
|
33
|
+
const preview_ = async (...args) => (await Promise.resolve().then(() => __importStar(require('./preview.js')))).preview(...args);
|
|
34
|
+
exports.preview = preview_;
|
|
35
|
+
const prerender_ = async (...args) => (await Promise.resolve().then(() => __importStar(require('./prerender.js')))).prerender(...args);
|
|
36
|
+
exports.prerender = prerender_;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.prerender = prerender;
|
|
4
|
+
const runPrerender_js_1 = require("../prerender/runPrerender.js");
|
|
5
|
+
const enhanceViteConfig_js_1 = require("./enhanceViteConfig.js");
|
|
6
|
+
async function prerender(options = {}) {
|
|
7
|
+
const { viteConfigEnhanced } = await (0, enhanceViteConfig_js_1.enhanceViteConfig)(options.viteConfig, 'prerender');
|
|
8
|
+
options.viteConfig = viteConfigEnhanced;
|
|
9
|
+
await (0, runPrerender_js_1.runPrerenderFromAPI)(options);
|
|
10
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.preview = preview;
|
|
4
|
+
const enhanceViteConfig_js_1 = require("./enhanceViteConfig.js");
|
|
5
|
+
const vite_1 = require("vite");
|
|
6
|
+
async function preview(options = {}) {
|
|
7
|
+
const { viteConfigEnhanced } = await (0, enhanceViteConfig_js_1.enhanceViteConfig)(options.viteConfig, 'preview');
|
|
8
|
+
const server = await (0, vite_1.preview)(viteConfigEnhanced);
|
|
9
|
+
return server;
|
|
10
|
+
}
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
const utils_js_1 = require("./utils.js");
|
|
30
|
+
const index_js_1 = require("../api/index.js");
|
|
31
|
+
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
32
|
+
const parseCli_js_1 = require("./parseCli.js");
|
|
33
|
+
cli();
|
|
34
|
+
async function cli() {
|
|
35
|
+
const { command } = (0, parseCli_js_1.parseCli)();
|
|
36
|
+
if (command === 'dev') {
|
|
37
|
+
await cmdDev();
|
|
38
|
+
}
|
|
39
|
+
else if (command === 'build') {
|
|
40
|
+
await cmdBuild();
|
|
41
|
+
}
|
|
42
|
+
else if (command === 'preview') {
|
|
43
|
+
await cmdPreview();
|
|
44
|
+
}
|
|
45
|
+
else if (command === 'prerender') {
|
|
46
|
+
await cmdPrerender();
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
async function cmdDev() {
|
|
50
|
+
const startTime = performance.now();
|
|
51
|
+
try {
|
|
52
|
+
const server = await (0, index_js_1.dev)();
|
|
53
|
+
await server.listen();
|
|
54
|
+
const info = server.config.logger.info;
|
|
55
|
+
const startupDurationString = picocolors_1.default.dim(`ready in ${picocolors_1.default.reset(picocolors_1.default.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
|
|
56
|
+
const hasExistingLogs = process.stdout.bytesWritten > 0 || process.stderr.bytesWritten > 0;
|
|
57
|
+
info(` ${picocolors_1.default.yellow(`${picocolors_1.default.bold(utils_js_1.projectInfo.projectName)} v${utils_js_1.projectInfo.projectVersion}`)} ${startupDurationString}\n`, {
|
|
58
|
+
clear: !hasExistingLogs
|
|
59
|
+
});
|
|
60
|
+
server.printUrls();
|
|
61
|
+
server.bindCLIShortcuts({ print: true });
|
|
62
|
+
}
|
|
63
|
+
catch (err) {
|
|
64
|
+
console.error(picocolors_1.default.red(`Error while starting dev server:`));
|
|
65
|
+
// Error comes from Vite; no need to use logErrorHint()
|
|
66
|
+
console.error(err);
|
|
67
|
+
process.exit(1);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
async function cmdBuild() {
|
|
71
|
+
try {
|
|
72
|
+
await (0, index_js_1.build)();
|
|
73
|
+
}
|
|
74
|
+
catch (err) {
|
|
75
|
+
console.error(picocolors_1.default.red(`Error during build:`));
|
|
76
|
+
// Error comes from Vite; no need to use logErrorHint()
|
|
77
|
+
console.error(err);
|
|
78
|
+
process.exit(1);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
async function cmdPreview() {
|
|
82
|
+
try {
|
|
83
|
+
const server = await (0, index_js_1.preview)();
|
|
84
|
+
server.printUrls();
|
|
85
|
+
server.bindCLIShortcuts({ print: true });
|
|
86
|
+
}
|
|
87
|
+
catch (err) {
|
|
88
|
+
console.error(picocolors_1.default.red(`Error while starting preview server:`));
|
|
89
|
+
// Error comes from Vite; no need to use logErrorHint()
|
|
90
|
+
console.error(err);
|
|
91
|
+
process.exit(1);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
async function cmdPrerender() {
|
|
95
|
+
const { runPrerenderFromCLIPrerenderCommand } = await Promise.resolve().then(() => __importStar(require('../prerender/runPrerender.js')));
|
|
96
|
+
await runPrerenderFromCLIPrerenderCommand();
|
|
97
|
+
}
|
|
98
|
+
process.on('unhandledRejection', (rejectValue) => {
|
|
99
|
+
throw rejectValue;
|
|
100
|
+
});
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// TODO/v1-release: remove this file
|
|
3
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
|
+
};
|
|
3
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
7
|
exports.prerender = void 0;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
};
|
|
11
|
-
exports.prerender = prerender;
|
|
8
|
+
var prerender_js_1 = require("../api/prerender.js");
|
|
9
|
+
Object.defineProperty(exports, "prerender", { enumerable: true, get: function () { return prerender_js_1.prerender; } });
|
|
10
|
+
const assert_js_1 = require("../../utils/assert.js");
|
|
11
|
+
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
12
|
+
(0, assert_js_1.assertWarning)(false, `${picocolors_1.default.cyan("import { prerender } from 'vike/cli'")} is deprecated in favor of ${picocolors_1.default.cyan("import { prerender } from 'vike/api'")}`, { onlyOnce: true });
|
|
@@ -0,0 +1,61 @@
|
|
|
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.parseCli = parseCli;
|
|
7
|
+
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
8
|
+
const utils_js_1 = require("./utils.js");
|
|
9
|
+
const commands = [
|
|
10
|
+
{ name: 'dev', desc: 'Start development server' },
|
|
11
|
+
{ name: 'build', desc: 'Build for production' },
|
|
12
|
+
{ name: 'preview', desc: 'Start preview server using production build (only works for SSG apps)' },
|
|
13
|
+
{ name: 'prerender', desc: 'Pre-render pages (only needed when partial.disableAutoRun is true)' }
|
|
14
|
+
];
|
|
15
|
+
function parseCli() {
|
|
16
|
+
const command = (() => {
|
|
17
|
+
const firstArg = process.argv[2];
|
|
18
|
+
if (!firstArg) {
|
|
19
|
+
showHelp();
|
|
20
|
+
}
|
|
21
|
+
showHelpOrVersion(firstArg);
|
|
22
|
+
if ((0, utils_js_1.includes)(commands.map((c) => c.name), firstArg))
|
|
23
|
+
return firstArg;
|
|
24
|
+
wrongUsage(`Unknown command ${picocolors_1.default.bold(firstArg)}`);
|
|
25
|
+
})();
|
|
26
|
+
for (const arg of process.argv.slice(3)) {
|
|
27
|
+
showHelpOrVersion(arg);
|
|
28
|
+
wrongUsage(`Unknown option ${picocolors_1.default.bold(arg)}`);
|
|
29
|
+
}
|
|
30
|
+
return { command };
|
|
31
|
+
}
|
|
32
|
+
function showHelp() {
|
|
33
|
+
const TAB = ' '.repeat(3);
|
|
34
|
+
const nameMaxLength = Math.max(...commands.map((c) => c.name.length));
|
|
35
|
+
console.log([
|
|
36
|
+
`vike@${utils_js_1.projectInfo.projectVersion}`,
|
|
37
|
+
'',
|
|
38
|
+
'Usage:',
|
|
39
|
+
...[...commands, { name: '-v', desc: "Print Vike's installed version" }].map((c) => ` ${picocolors_1.default.dim('$')} ${picocolors_1.default.bold(`vike ${c.name}`)}${' '.repeat(nameMaxLength - c.name.length)}${TAB}${picocolors_1.default.dim(`# ${c.desc}`)}`),
|
|
40
|
+
'',
|
|
41
|
+
`More infos at ${picocolors_1.default.underline('https://vike.dev/cli')}`
|
|
42
|
+
].join('\n'));
|
|
43
|
+
process.exit(1);
|
|
44
|
+
}
|
|
45
|
+
function showHelpOrVersion(arg) {
|
|
46
|
+
if (arg === '--version' || arg === '-v' || arg === '--v') {
|
|
47
|
+
showVersion();
|
|
48
|
+
}
|
|
49
|
+
if (arg === '--help' || arg === '-h' || arg === '--h') {
|
|
50
|
+
showHelp();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
function showVersion() {
|
|
54
|
+
console.log(utils_js_1.projectInfo.projectVersion);
|
|
55
|
+
process.exit(1);
|
|
56
|
+
}
|
|
57
|
+
function wrongUsage(msg) {
|
|
58
|
+
console.error(picocolors_1.default.red(msg));
|
|
59
|
+
console.log();
|
|
60
|
+
showHelp();
|
|
61
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// Utils needed by Vike's CLI
|
|
2
3
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
4
|
if (k2 === undefined) k2 = k;
|
|
4
5
|
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
@@ -14,8 +15,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
15
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
16
|
};
|
|
16
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
// We
|
|
18
|
+
// We call onLoad() here so that it's called even when only a subset of the CLI is loaded. (Making the assert() calls inside onLoad() a lot stronger.)
|
|
18
19
|
const onLoad_js_1 = require("./onLoad.js");
|
|
19
20
|
(0, onLoad_js_1.onLoad)();
|
|
20
21
|
__exportStar(require("../../utils/assert.js"), exports);
|
|
21
22
|
__exportStar(require("../../utils/projectInfo.js"), exports);
|
|
23
|
+
__exportStar(require("../../utils/includes.js"), exports);
|
|
@@ -33,6 +33,7 @@ const fileEnv_js_1 = require("./plugins/fileEnv.js");
|
|
|
33
33
|
const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
|
|
34
34
|
const resolveClientEntriesDev_js_1 = require("./resolveClientEntriesDev.js");
|
|
35
35
|
const workaroundCssModuleHmr_js_1 = require("./plugins/workaroundCssModuleHmr.js");
|
|
36
|
+
const vite6HmrRegressionWorkaround_js_1 = require("./plugins/vite6HmrRegressionWorkaround.js");
|
|
36
37
|
(0, utils_js_2.assertNodeEnv_onVikePluginLoad)();
|
|
37
38
|
(0, utils_js_2.markEnvAsVikePluginLoaded)();
|
|
38
39
|
assertViteVersion();
|
|
@@ -58,7 +59,8 @@ function plugin(vikeConfig) {
|
|
|
58
59
|
(0, baseUrls_js_1.baseUrls)(vikeConfig),
|
|
59
60
|
(0, envVars_js_1.envVarsPlugin)(),
|
|
60
61
|
(0, fileEnv_js_1.fileEnv)(),
|
|
61
|
-
(0, workaroundCssModuleHmr_js_1.workaroundCssModuleHmr)()
|
|
62
|
+
(0, workaroundCssModuleHmr_js_1.workaroundCssModuleHmr)(),
|
|
63
|
+
(0, vite6HmrRegressionWorkaround_js_1.vite6HmrRegressionWorkaround)()
|
|
62
64
|
];
|
|
63
65
|
return plugins;
|
|
64
66
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// TODO/v1-release: remove this file
|
|
2
3
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
4
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
5
|
};
|
|
@@ -13,6 +14,9 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
|
13
14
|
const logErrorHint_js_1 = require("../../runtime/renderPage/logErrorHint.js");
|
|
14
15
|
const buildConfig_js_1 = require("./buildConfig.js");
|
|
15
16
|
let forceExit = false;
|
|
17
|
+
(0, utils_js_1.assertWarning)(!(0, isViteCliCall_js_1.isViteCliCall)(), `Vite's CLI is deprecated ${picocolors_1.default.underline('https://vike.dev/migration/cli')}`, {
|
|
18
|
+
onlyOnce: true
|
|
19
|
+
});
|
|
16
20
|
function autoFullBuild() {
|
|
17
21
|
let config;
|
|
18
22
|
let configVike;
|
|
@@ -94,7 +98,7 @@ async function triggerFullBuild(config, configVike, bundle) {
|
|
|
94
98
|
process.exit(1);
|
|
95
99
|
}
|
|
96
100
|
if (configVike.prerender && !configVike.prerender.disableAutoRun && configVike.disableAutoFullBuild !== 'prerender') {
|
|
97
|
-
await (0, runPrerender_js_1.
|
|
101
|
+
await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, false);
|
|
98
102
|
forceExit = true;
|
|
99
103
|
}
|
|
100
104
|
}
|
|
@@ -107,10 +111,6 @@ function abortViteBuildSsr(configVike) {
|
|
|
107
111
|
function isDisabled(configVike) {
|
|
108
112
|
const { disableAutoFullBuild } = configVike;
|
|
109
113
|
if (disableAutoFullBuild === null || disableAutoFullBuild === 'prerender') {
|
|
110
|
-
// TODO/v1-release: remove autoFullBuild for both Vite's build() API and Vite's CLI
|
|
111
|
-
// - Tell users to use `$ vike build` instead of `$ vite build`
|
|
112
|
-
// - Remove the whole writeBundle() hook logic
|
|
113
|
-
// - make `$ vite build` only build the client-side
|
|
114
114
|
return !(0, isViteCliCall_js_1.isViteCliCall)();
|
|
115
115
|
}
|
|
116
116
|
else {
|
|
@@ -60,16 +60,19 @@ function buildConfig() {
|
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
|
-
config
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
63
|
+
config: {
|
|
64
|
+
order: 'post',
|
|
65
|
+
handler(config) {
|
|
66
|
+
(0, utils_js_1.assertNodeEnv_build)();
|
|
67
|
+
isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
|
|
68
|
+
return {
|
|
69
|
+
build: {
|
|
70
|
+
outDir: (0, utils_js_1.resolveOutDir)(config),
|
|
71
|
+
manifest: manifestTempFile,
|
|
72
|
+
copyPublicDir: !isSsrBuild
|
|
73
|
+
}
|
|
74
|
+
};
|
|
75
|
+
}
|
|
73
76
|
},
|
|
74
77
|
buildStart() {
|
|
75
78
|
(0, utils_js_1.assertNodeEnv_build)();
|
|
@@ -4,17 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.commonConfig = commonConfig;
|
|
7
|
+
const vite_1 = require("vite");
|
|
7
8
|
const utils_js_1 = require("../utils.js");
|
|
8
9
|
const buildConfig_js_1 = require("./buildConfig.js");
|
|
9
10
|
const require_shim_1 = require("@brillout/require-shim");
|
|
10
11
|
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
11
12
|
const path_1 = __importDefault(require("path"));
|
|
12
13
|
const assertResolveAlias_js_1 = require("./commonConfig/assertResolveAlias.js");
|
|
13
|
-
const
|
|
14
|
+
const pluginName_js_1 = require("./commonConfig/pluginName.js");
|
|
15
|
+
const getEnvVarObject_js_1 = require("../shared/getEnvVarObject.js");
|
|
14
16
|
function commonConfig() {
|
|
15
17
|
return [
|
|
16
18
|
{
|
|
17
|
-
name: pluginName,
|
|
19
|
+
name: pluginName_js_1.pluginName,
|
|
18
20
|
configResolved(config) {
|
|
19
21
|
assertSingleInstance(config);
|
|
20
22
|
(0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
|
|
@@ -35,21 +37,27 @@ function commonConfig() {
|
|
|
35
37
|
assertEsm(config.root);
|
|
36
38
|
}
|
|
37
39
|
},
|
|
38
|
-
// Override Vite's default port without overriding the user
|
|
39
40
|
config: {
|
|
40
41
|
order: 'post',
|
|
41
42
|
handler(configFromUser) {
|
|
42
|
-
|
|
43
|
+
// Change default port
|
|
44
|
+
let configFromVike = { server: {}, preview: {} };
|
|
43
45
|
setDefault('port', 3000, configFromUser, configFromVike);
|
|
46
|
+
// Set `--host` for Docker/Podman
|
|
44
47
|
if ((0, utils_js_1.isDocker)()) {
|
|
45
48
|
setDefault('host', true, configFromUser, configFromVike);
|
|
46
49
|
}
|
|
50
|
+
// VITE_CONFIG
|
|
51
|
+
const configFromEnvVar = (0, getEnvVarObject_js_1.getEnvVarObject)('VITE_CONFIG');
|
|
52
|
+
if (configFromEnvVar)
|
|
53
|
+
configFromVike = (0, vite_1.mergeConfig)(configFromEnvVar, configFromVike);
|
|
47
54
|
return configFromVike;
|
|
48
55
|
}
|
|
49
56
|
}
|
|
50
57
|
}
|
|
51
58
|
];
|
|
52
59
|
}
|
|
60
|
+
// Override Vite's default value without overriding user settings
|
|
53
61
|
function setDefault(setting, value, configFromUser, configFromVike) {
|
|
54
62
|
if (configFromUser.server?.[setting] === undefined)
|
|
55
63
|
configFromVike.server[setting] = value;
|
|
@@ -87,6 +95,6 @@ function assertEsm(userViteRoot) {
|
|
|
87
95
|
(0, utils_js_1.assertWarning)(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
|
|
88
96
|
}
|
|
89
97
|
function assertSingleInstance(config) {
|
|
90
|
-
const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
|
|
98
|
+
const numberOfInstances = config.plugins.filter((o) => o.name === pluginName_js_1.pluginName).length;
|
|
91
99
|
(0, utils_js_1.assertUsage)(numberOfInstances === 1, `Vike's Vite plugin (${picocolors_1.default.cyan("import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
|
|
92
100
|
}
|
|
@@ -51,7 +51,7 @@ function previewConfig() {
|
|
|
51
51
|
function assertDist() {
|
|
52
52
|
let { outDirRoot, outDirClient, outDirServer } = (0, utils_js_1.getOutDirs)(config);
|
|
53
53
|
[outDirRoot, outDirClient, outDirServer].forEach((outDirAny) => {
|
|
54
|
-
(0, utils_js_1.assertUsage)(fs_1.default.existsSync(outDirAny), `Cannot run ${picocolors_1.default.cyan('$
|
|
54
|
+
(0, utils_js_1.assertUsage)(fs_1.default.existsSync(outDirAny), `Cannot run ${picocolors_1.default.cyan('$ vike preview')}: your app isn't built (the build directory ${picocolors_1.default.cyan(outDirAny)} is missing). Make sure to run ${picocolors_1.default.cyan('$ vike build')} before running ${picocolors_1.default.cyan('$ vike preview')}.`);
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
57
|
function addStatic404Middleware(middlewares) {
|