vike 0.4.172-commit-8bdf055 → 0.4.172-commit-612974d
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/plugins/importUserCode/v1-design/assertExtensions.js +8 -2
- package/dist/cjs/utils/projectInfo.js +1 -1
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/assertExtensions.js +8 -2
- package/dist/esm/utils/projectInfo.d.ts +2 -2
- package/dist/esm/utils/projectInfo.js +1 -1
- package/package.json +1 -1
|
@@ -79,11 +79,12 @@ function assertExtensionsPeerDependencies(interfaceFilesRelevantList) {
|
|
|
79
79
|
Object.entries(require).forEach(([reqName, reqVersion]) => {
|
|
80
80
|
const errBase = `${picocolors_1.default.bold(name)} requires ${picocolors_1.default.bold(reqName)}`;
|
|
81
81
|
if (reqName === 'vike') {
|
|
82
|
-
(0, utils_js_1.assertUsage)(
|
|
82
|
+
(0, utils_js_1.assertUsage)(isVersionRange(utils_js_1.PROJECT_VERSION, reqVersion), `${errBase} version ${picocolors_1.default.bold(reqVersion)} but ${picocolors_1.default.bold(utils_js_1.PROJECT_VERSION)} is installed.`);
|
|
83
|
+
return;
|
|
83
84
|
}
|
|
84
85
|
const extensionVersion = extensions[reqName];
|
|
85
86
|
(0, utils_js_1.assertUsage)(extensionVersion, `${errBase}.`);
|
|
86
|
-
(0, utils_js_1.assertUsage)(
|
|
87
|
+
(0, utils_js_1.assertUsage)(isVersionRange(extensionVersion, reqVersion), `${errBase} version ${picocolors_1.default.bold(reqVersion)} but ${picocolors_1.default.bold(extensionVersion)} is installed.`);
|
|
87
88
|
});
|
|
88
89
|
});
|
|
89
90
|
}
|
|
@@ -127,3 +128,8 @@ function getFilePathToShowToUser(interfaceFile) {
|
|
|
127
128
|
(0, utils_js_1.assert)(filePathToShowToUserResolved);
|
|
128
129
|
return filePathToShowToUserResolved;
|
|
129
130
|
}
|
|
131
|
+
function isVersionRange(version, range) {
|
|
132
|
+
// Remove pre-release tag
|
|
133
|
+
version = version.split('-')[0];
|
|
134
|
+
return semver_1.default.satisfies(version, range);
|
|
135
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PROJECT_VERSION = exports.projectInfo = void 0;
|
|
4
|
-
const PROJECT_VERSION = '0.4.172-commit-
|
|
4
|
+
const PROJECT_VERSION = '0.4.172-commit-612974d';
|
|
5
5
|
exports.PROJECT_VERSION = PROJECT_VERSION;
|
|
6
6
|
const projectInfo = {
|
|
7
7
|
projectName: 'Vike',
|
|
@@ -74,11 +74,12 @@ function assertExtensionsPeerDependencies(interfaceFilesRelevantList) {
|
|
|
74
74
|
Object.entries(require).forEach(([reqName, reqVersion]) => {
|
|
75
75
|
const errBase = `${pc.bold(name)} requires ${pc.bold(reqName)}`;
|
|
76
76
|
if (reqName === 'vike') {
|
|
77
|
-
assertUsage(
|
|
77
|
+
assertUsage(isVersionRange(PROJECT_VERSION, reqVersion), `${errBase} version ${pc.bold(reqVersion)} but ${pc.bold(PROJECT_VERSION)} is installed.`);
|
|
78
|
+
return;
|
|
78
79
|
}
|
|
79
80
|
const extensionVersion = extensions[reqName];
|
|
80
81
|
assertUsage(extensionVersion, `${errBase}.`);
|
|
81
|
-
assertUsage(
|
|
82
|
+
assertUsage(isVersionRange(extensionVersion, reqVersion), `${errBase} version ${pc.bold(reqVersion)} but ${pc.bold(extensionVersion)} is installed.`);
|
|
82
83
|
});
|
|
83
84
|
});
|
|
84
85
|
}
|
|
@@ -121,3 +122,8 @@ function getFilePathToShowToUser(interfaceFile) {
|
|
|
121
122
|
assert(filePathToShowToUserResolved);
|
|
122
123
|
return filePathToShowToUserResolved;
|
|
123
124
|
}
|
|
125
|
+
function isVersionRange(version, range) {
|
|
126
|
+
// Remove pre-release tag
|
|
127
|
+
version = version.split('-')[0];
|
|
128
|
+
return semver.satisfies(version, range);
|
|
129
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { projectInfo };
|
|
2
2
|
export { PROJECT_VERSION };
|
|
3
|
-
declare const PROJECT_VERSION: "0.4.172-commit-
|
|
3
|
+
declare const PROJECT_VERSION: "0.4.172-commit-612974d";
|
|
4
4
|
declare const projectInfo: {
|
|
5
5
|
projectName: "Vike";
|
|
6
|
-
projectVersion: "0.4.172-commit-
|
|
6
|
+
projectVersion: "0.4.172-commit-612974d";
|
|
7
7
|
};
|