vike 0.4.160-commit-d574f51 → 0.4.161

package/dist/cjs/node/plugin/plugins/buildConfig.js

@@ -41,7 +41,7 @@ function buildConfig() {
                 addLogHook();
                 outDirs = (0, utils_js_1.getOutDirs)(config);
                 {
-                    isServerAssetsFixEnabled = (await (0, getVikeConfig_js_1.isV1Design)(config, false)) && (0, fixServerAssets_js_1.fixServerAssets_isEnabled)();
+                    isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
                     if (isServerAssetsFixEnabled) {
                         // https://github.com/vikejs/vike/issues/1339
                         config.build.ssrEmitAssets = true;

package/dist/cjs/node/plugin/plugins/commonConfig.js

@@ -31,7 +31,7 @@ function commonConfig() {
                     overrideViteDefaultPort(config);
                     /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
                     overrideViteDefaultSsrExternal(config)
-                    */
+                    //*/
                     workaroundCI(config);
                     (0, buildConfig_js_1.assertRollupInput)(config);
                     (0, assertResolveAlias_js_1.assertResolveAlias)(config);
@@ -52,21 +52,13 @@ function overrideViteDefaultPort(config) {
     (_b = config.preview).port ?? (_b.port = 3000);
 }
 /*
+import { version } from 'vite'
 function overrideViteDefaultSsrExternal(config: ResolvedConfig) {
-  if (!isViteVersionWithSsrExternalTrue()) return
+  if (!isVersionOrAbove(version, '5.0.12')) return
   // @ts-ignore Not released yet: https://github.com/vitejs/vite/pull/10939/files#diff-5a3d42620df2c6b17e25f440ffdb67683dee7ef57317674d19f41d5f30502310L5
   config.ssr.external ??= true
 }
-import { version } from 'vite'
-function isViteVersionWithSsrExternalTrue(): boolean {
-  const versionParts = version.split('.').map((s) => parseInt(s, 10)) as [number, number, number]
-  assert(versionParts.length === 3)
-  if (versionParts[0] > 5) return true
-  if (versionParts[1] > 0) return true
-  if (versionParts[2] >= 12) return true
-  return false
-}
-*/
+//*/
 // Workaround GitHub Action failing to access the server
 function workaroundCI(config) {
     var _a, _b;

package/dist/cjs/node/plugin/plugins/distFileNames.js

@@ -33,7 +33,7 @@ function distFileNames() {
                     //    - It's needed for getHash() of fixServerAssets()
                     //    - Asset URLs should always contain a hash: it's paramount for caching assets.
                     //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
-                    (0, utils_js_1.assertUsage)(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (Contact a maintainer if you need this as it's possible to support this.)");
+                    (0, utils_js_1.assertUsage)(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (It's possible to support, thus contact a maintainer if you need this.)");
                 }
             });
         }

package/dist/cjs/node/plugin/plugins/extractAssetsPlugin.js

@@ -9,12 +9,12 @@ exports.extractAssetsRE = exports.extractAssetsPlugin = void 0;
 const utils_js_1 = require("../utils.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const removeSourceMap_js_1 = require("../shared/removeSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -136,7 +136,7 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 configVike = await (0, getConfigVike_js_1.getConfigVike)(config_);
                 config = config_;
-                isServerAssetsFixEnabled = (await (0, getVikeConfig_js_1.isV1Design)(config, false)) && (0, fixServerAssets_js_1.fixServerAssets_isEnabled)();
+                isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
             },
             load(id) {
                 if (!(0, utils_js_1.isVirtualFileId)(id))

package/dist/cjs/node/plugin/utils.js

@@ -42,3 +42,4 @@ __exportStar(require("../../utils/assertKeys.js"), exports);
 __exportStar(require("../../utils/injectRollupInputs.js"), exports);
 __exportStar(require("../../utils/humanizeTime.js"), exports);
 __exportStar(require("../../utils/pLimit.js"), exports);
+__exportStar(require("../../utils/isVersionOrAbove.js"), exports);

package/dist/cjs/utils/assertNodeVersion.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertNodeVersion = void 0;
 const assert_js_1 = require("./assert.js");
 const isNodeJS_js_1 = require("./isNodeJS.js");
+const isVersionOrAbove_js_1 = require("./isVersionOrAbove.js");
 // package.json#engines.node isn't enough as users can ignore it
 function assertNodeVersion() {
     if (!(0, isNodeJS_js_1.isNodeJS)())
         return;
     const version = process.versions.node;
-    const major = parseInt(version.split('.')[0], 10);
-    (0, assert_js_1.assertUsage)(major >= 16, `Node.js ${version} isn't supported, use Node.js >=16.0.0 instead.`);
+    (0, assert_js_1.assertUsage)((0, isVersionOrAbove_js_1.isVersionOrAbove)(version, '16.0.0'), `Node.js ${version} isn't supported, use Node.js >=16.0.0 instead.`);
 }
 exports.assertNodeVersion = assertNodeVersion;

package/dist/cjs/utils/isVersionOrAbove.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVersionOrAbove = void 0;
+const assert_js_1 = require("./assert.js");
+function isVersionOrAbove(versionActual, versionExpected) {
+    const p1 = parseVersion(versionActual);
+    const p2 = parseVersion(versionExpected);
+    // major
+    if (p1[0] !== p2[0])
+        return p1[0] > p2[0];
+    // minor
+    if (p1[1] !== p2[1])
+        return p1[1] > p2[1];
+    // patch
+    if (p1[2] !== p2[2])
+        return p1[2] > p2[2];
+    // Same version
+    return true;
+}
+exports.isVersionOrAbove = isVersionOrAbove;
+function parseVersion(version) {
+    // Remove pre-release tag
+    version = version.split('-')[0];
+    // major.minor.patch
+    const partsStr = version.split('.');
+    (0, assert_js_1.assert)(partsStr.length === 3);
+    const parts = partsStr.map((s) => parseInt(s, 10));
+    return parts;
+}

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.160-commit-d574f51';
+const PROJECT_VERSION = '0.4.161';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/node/plugin/plugins/buildConfig.js

@@ -38,7 +38,7 @@ function buildConfig() {
                 addLogHook();
                 outDirs = getOutDirs(config);
                 {
-                    isServerAssetsFixEnabled = (await isV1Design(config, false)) && fixServerAssets_isEnabled();
+                    isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config, false));
                     if (isServerAssetsFixEnabled) {
                         // https://github.com/vikejs/vike/issues/1339
                         config.build.ssrEmitAssets = true;

package/dist/esm/node/plugin/plugins/commonConfig.js

@@ -26,7 +26,7 @@ function commonConfig() {
                     overrideViteDefaultPort(config);
                     /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
                     overrideViteDefaultSsrExternal(config)
-                    */
+                    //*/
                     workaroundCI(config);
                     assertRollupInput(config);
                     assertResolveAlias(config);
@@ -46,21 +46,13 @@ function overrideViteDefaultPort(config) {
     (_b = config.preview).port ?? (_b.port = 3000);
 }
 /*
+import { version } from 'vite'
 function overrideViteDefaultSsrExternal(config: ResolvedConfig) {
-  if (!isViteVersionWithSsrExternalTrue()) return
+  if (!isVersionOrAbove(version, '5.0.12')) return
   // @ts-ignore Not released yet: https://github.com/vitejs/vite/pull/10939/files#diff-5a3d42620df2c6b17e25f440ffdb67683dee7ef57317674d19f41d5f30502310L5
   config.ssr.external ??= true
 }
-import { version } from 'vite'
-function isViteVersionWithSsrExternalTrue(): boolean {
-  const versionParts = version.split('.').map((s) => parseInt(s, 10)) as [number, number, number]
-  assert(versionParts.length === 3)
-  if (versionParts[0] > 5) return true
-  if (versionParts[1] > 0) return true
-  if (versionParts[2] >= 12) return true
-  return false
-}
-*/
+//*/
 // Workaround GitHub Action failing to access the server
 function workaroundCI(config) {
     var _a, _b;

package/dist/esm/node/plugin/plugins/distFileNames.js

@@ -28,7 +28,7 @@ function distFileNames() {
                     //    - It's needed for getHash() of fixServerAssets()
                     //    - Asset URLs should always contain a hash: it's paramount for caching assets.
                     //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
-                    assertUsage(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (Contact a maintainer if you need this as it's possible to support this.)");
+                    assertUsage(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (It's possible to support, thus contact a maintainer if you need this.)");
                 }
             });
         }

package/dist/esm/node/plugin/plugins/extractAssetsPlugin.js

@@ -9,12 +9,12 @@ export { extractAssetsRE };
 import { viteIsSSR_options, assert, assertPosixPath, styleFileRE, createDebugger, isDebugEnabled, isScriptFile, resolveVirtualFileId, isVirtualFileId, getVirtualFileId, assertUsage } from '../utils.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { getConfigVike } from '../../shared/getConfigVike.js';
-import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
 import { removeSourceMap } from '../shared/removeSourceMap.js';
 import pc from '@brillout/picocolors';
 import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
+import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
@@ -135,7 +135,7 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 configVike = await getConfigVike(config_);
                 config = config_;
-                isServerAssetsFixEnabled = (await isV1Design(config, false)) && fixServerAssets_isEnabled();
+                isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config, false));
             },
             load(id) {
                 if (!isVirtualFileId(id))

package/dist/esm/node/plugin/utils.d.ts

@@ -20,3 +20,4 @@ export * from '../../utils/assertKeys.js';
 export * from '../../utils/injectRollupInputs.js';
 export * from '../../utils/humanizeTime.js';
 export * from '../../utils/pLimit.js';
+export * from '../../utils/isVersionOrAbove.js';

package/dist/esm/node/plugin/utils.js

@@ -26,3 +26,4 @@ export * from '../../utils/assertKeys.js';
 export * from '../../utils/injectRollupInputs.js';
 export * from '../../utils/humanizeTime.js';
 export * from '../../utils/pLimit.js';
+export * from '../../utils/isVersionOrAbove.js';

package/dist/esm/utils/assertNodeVersion.js

@@ -1,11 +1,11 @@
 export { assertNodeVersion };
 import { assertUsage } from './assert.js';
 import { isNodeJS } from './isNodeJS.js';
+import { isVersionOrAbove } from './isVersionOrAbove.js';
 // package.json#engines.node isn't enough as users can ignore it
 function assertNodeVersion() {
     if (!isNodeJS())
         return;
     const version = process.versions.node;
-    const major = parseInt(version.split('.')[0], 10);
-    assertUsage(major >= 16, `Node.js ${version} isn't supported, use Node.js >=16.0.0 instead.`);
+    assertUsage(isVersionOrAbove(version, '16.0.0'), `Node.js ${version} isn't supported, use Node.js >=16.0.0 instead.`);
 }

package/dist/esm/utils/isVersionOrAbove.d.ts

@@ -0,0 +1,2 @@
+export { isVersionOrAbove };
+declare function isVersionOrAbove(versionActual: string, versionExpected: `${number}.${number}.${number}`): boolean;

package/dist/esm/utils/isVersionOrAbove.js

@@ -0,0 +1,26 @@
+export { isVersionOrAbove };
+import { assert } from './assert.js';
+function isVersionOrAbove(versionActual, versionExpected) {
+    const p1 = parseVersion(versionActual);
+    const p2 = parseVersion(versionExpected);
+    // major
+    if (p1[0] !== p2[0])
+        return p1[0] > p2[0];
+    // minor
+    if (p1[1] !== p2[1])
+        return p1[1] > p2[1];
+    // patch
+    if (p1[2] !== p2[2])
+        return p1[2] > p2[2];
+    // Same version
+    return true;
+}
+function parseVersion(version) {
+    // Remove pre-release tag
+    version = version.split('-')[0];
+    // major.minor.patch
+    const partsStr = version.split('.');
+    assert(partsStr.length === 3);
+    const parts = partsStr.map((s) => parseInt(s, 10));
+    return parts;
+}

package/dist/esm/utils/projectInfo.d.ts

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.160-commit-d574f51";
+declare const PROJECT_VERSION: "0.4.161";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.160-commit-d574f51";
+    projectVersion: "0.4.161";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.160-commit-d574f51';
+const PROJECT_VERSION = '0.4.161';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.160-commit-d574f51",
+  "version": "0.4.161",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",