Version 3.5.2-rc.1

Fixed version check for prereleases
Duet3D · May 28, 2024 · 3f65d98 · 3f65d98
1 parent dee9133
commit 3f65d98
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "duetwebcontrol",
-   "version": "3.5.1+1",
+   "version": "3.5.2-rc.1",
    "author": "Christian Hammacher <christian@duet3d.com> (https://www.duet3d.com)",
    "homepage": "https://forum.duet3d.com/category/27/duet-web-control",
    "license": "GPL-3.0",

diff --git a/src/components/dialogs/IncompatibleVersionsDialog.vue b/src/components/dialogs/IncompatibleVersionsDialog.vue
@@ -35,6 +35,8 @@ import store from "@/store";
 import { LogType } from "@/utils/logging";
 import { MachineStatus } from "@duet3d/objectmodel";
 
+const patchDiffs: Array<semver.ReleaseType | null> = ["patch", "prepatch", "prerelease"];
+
 export default Vue.extend({
 	computed: {
 		isConnecting(): boolean { return store.state.isConnecting; },
@@ -56,7 +58,8 @@ export default Vue.extend({
 						// Check expansion board firmware versions
 						for (const board of store.state.machine.model.boards) {
 							if (board.canAddress && board.firmwareVersion && semver.compare(mainboardVersion, board.firmwareVersion, true) !== 0) {
-								if (semver.satisfies(board.firmwareVersion, '^' + mainboardVersion, true) || semver.satisfies(mainboardVersion, '^' + board.firmwareVersion, true)) {
+								const vDiff = semver.diff(mainboardVersion, board.firmwareVersion);
+								if (patchDiffs.includes(vDiff)) {
 									console.warn(`Expansion board #${board.canAddress} minor version mismatch (MB ${mainboardVersion} != EXP ${board.firmwareVersion})`);
 									patchVersionMismatch = true;
 								} else {
@@ -68,7 +71,8 @@ export default Vue.extend({
 
 						// Check DSF version
 						if (!versionMismatch && store.state.machine.model.sbc !== null && semver.compare(mainboardVersion, store.state.machine.model.sbc.dsf.version, true) !== 0) {
-							if (semver.satisfies(store.state.machine.model.sbc.dsf.version, '^' + mainboardVersion, true) || semver.satisfies(mainboardVersion, '^' + store.state.machine.model.sbc.dsf.version, true)) {
+							const vDiff = semver.diff(mainboardVersion, store.state.machine.model.sbc.dsf.version);
+							if (patchDiffs.includes(vDiff)) {
 								console.warn(`DSF minor version mismatch (MB ${mainboardVersion} != DSF ${store.state.machine.model.sbc.dsf.version})`);
 								patchVersionMismatch = true;
 							} else {
@@ -79,7 +83,8 @@ export default Vue.extend({
 
 						// Check DWC version
 						if (!versionMismatch && semver.compare(mainboardVersion, packageInfo.version, true) !== 0) {
-							if (semver.satisfies(packageInfo.version, '^' + mainboardVersion, true) || semver.satisfies(mainboardVersion, '^' + packageInfo.version, true)) {
+							const vDiff = semver.diff(mainboardVersion, packageInfo.version);
+							if (patchDiffs.includes(vDiff)) {
 								console.warn(`DWC minor version mismatch (MB ${mainboardVersion} != DWC ${packageInfo.version})`);
 								patchVersionMismatch = true;
 							} else {

diff --git a/src/plugins/imports.ts b/src/plugins/imports.ts
@@ -9,7 +9,7 @@ export default initCollection(DwcPlugin, [
         id: "GCodeViewer",
         name: "G-Code Viewer",
         author: "Juan Rosario",
-        version: "3.5.1+1",
+        version: "3.5.2-rc.1",
         loadDwcResources: () => import(
             /* webpackChunkName: "GCodeViewer" */
             "./GCodeViewer/index"
@@ -19,7 +19,7 @@ export default initCollection(DwcPlugin, [
         id: "HeightMap",
         name: "Height Map",
         author: "Duet3D Ltd",
-        version: "3.5.1+1",
+        version: "3.5.2-rc.1",
         loadDwcResources: () => import(
             /* webpackChunkName: "HeightMap" */
             "./HeightMap/index"
@@ -29,7 +29,7 @@ export default initCollection(DwcPlugin, [
         id: "InputShaping",
         name: "Input Shaping",
         author: "Duet3D Ltd",
-        version: "3.5.1+1",
+        version: "3.5.2-rc.1",
         loadDwcResources: () => import(
             /* webpackChunkName: "InputShaping" */
             "./InputShaping/index"
@@ -39,7 +39,7 @@ export default initCollection(DwcPlugin, [
         id: "ObjectModelBrowser",
         name: "Object Model Browser",
         author: "Duet3D Ltd",
-        version: "3.5.1+1",
+        version: "3.5.2-rc.1",
         loadDwcResources: () => import(
             /* webpackChunkName: "ObjectModelBrowser" */
             "./ObjectModelBrowser/index"
@@ -49,7 +49,7 @@ export default initCollection(DwcPlugin, [
         id: "OnScreenKeyboard",
         name: "On-Screen Keyboard",
         author: "Duet3D Ltd",
-        version: "3.5.1+1",
+        version: "3.5.2-rc.1",
         loadDwcResources: () => import(
             /* webpackChunkName: "OnScreenKeyboard" */
             "./OnScreenKeyboard/index"