Merge 3.2b4+1

Author: Sindarius

README.md

@@ -8,31 +8,39 @@ Duet Web Control is free software; it is licensed under the terms of the GNU Pub
 
 ## Supported electronics
 
-At this time the following platforms are supported:
+At this time the following platforms are officially supported:
 
-* Duet Maestro
+* Duet 2 Maestro
 * Duet 2 WiFi
 * Duet 2 Ethernet
-* Duet 3
+* Duet 3 MB 6HC
+* Duet 3 Mini 5+ Ethernet
+* Duet 3 Mini 5+ WiFi
 
 ## Build variants
 
-There are two variants available:
+There are two build variants available:
 
-* DuetWebControl-SD for Duet Maestro and Duet 2 series
-* DuetWebControl-SBC for Duet 3
+* DuetWebControl-SD for Duet Maestro, Duet 2 series, and Duet 3 series in standalone mode
+* DuetWebControl-SBC for Duet 3 series in SBC mode
 
 ## Project setup
+
 ```
 npm install
 ```
 
 ### Compiles and hot-reloads for development
+
 ```
 npm run serve
 ```
 
+In order to use the local development setup with software versions >= 3.2.0, it is possible to add `M586 C"*"` to your `config.g`.
+However, this is a potential security issue because it permits cross-origin requests from ALL foreign sites.
+
 ### Compiles and minifies for production
+
 ```
 npm run build
 ```

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "duetwebcontrol",
-  "version": "3.2.0-beta4",
+  "version": "3.2.0-beta4+1",
   "repository": "github:chrishamm/DuetWebControl",
   "homepage": "https://forum.duet3d.com/category/27/duet-web-control",
   "license": "GPL-3.0",
@@ -12,45 +12,45 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "chart.js": "^2.9.3",
+    "chart.js": "^2.9.4",
     "chartjs-adapter-date-fns": "^1.0.0",
     "compare-versions": "^3.6.0",
-    "core-js": "^3.6.5",
+    "core-js": "^3.8.0",
     "date-fns": "^2.16.1",
-    "file-saver": "^2.0.2",
+    "file-saver": "^2.0.5",
     "gcode-preview": "^2.1.1",
     "izitoast": "^1.4.0",
     "jszip": "^3.5.0",
     "piecon": "^0.5.0",
     "register-service-worker": "^1.7.1",
     "roboto-fontface": "*",
-    "simple-keyboard": "^2.30.31",
-    "three": "^0.120.1",
+    "simple-keyboard": "^2.32.52",
+    "three": "^0.123.0",
     "turbo-crc32": "^1.0.1",
     "vue": "^2.6.12",
     "vue-codemirror": "^4.0.6",
-    "vue-i18n": "^8.21.0",
-    "vue-router": "^3.4.3",
-    "vuetify": "^2.3.10",
-    "vuex": "^3.5.1"
+    "vue-i18n": "^8.22.2",
+    "vue-router": "^3.4.9",
+    "vuetify": "^2.3.19",
+    "vuex": "^3.6.0"
   },
   "devDependencies": {
-    "@mdi/font": "^5.5.55",
-    "@vue/cli-plugin-babel": "^4.5.4",
-    "@vue/cli-plugin-eslint": "^4.5.4",
-    "@vue/cli-plugin-pwa": "^4.5.4",
-    "@vue/cli-service": "^4.5.4",
+    "@mdi/font": "^5.8.55",
+    "@vue/cli-plugin-babel": "^4.5.9",
+    "@vue/cli-plugin-eslint": "^4.5.9",
+    "@vue/cli-plugin-pwa": "^4.5.9",
+    "@vue/cli-service": "^4.5.9",
     "babel-eslint": "^10.1.0",
     "babel-plugin-prismjs": "^2.0.1",
     "babel-plugin-transform-builtin-extend": "^1.1.2",
     "compression-webpack-plugin": "^5.0.2",
     "eslint": "^6.8.0",
     "eslint-plugin-vue": "^6.2.2",
-    "sass": "^1.26.10",
+    "sass": "^1.29.0",
     "sass-loader": "^8.0.2",
     "stylus": "^0.54.8",
     "stylus-loader": "^3.0.1",
-    "vue-cli-plugin-vuetify": "^2.0.7",
+    "vue-cli-plugin-vuetify": "^2.0.8",
     "vue-template-compiler": "^2.6.12",
     "vuetify-loader": "^1.6.0",
     "zip-webpack-plugin": "^3.0.0"

package.json

@@ -124,6 +124,7 @@ textarea {
 
 		<connect-dialog></connect-dialog>
 		<connection-dialog></connection-dialog>
+		<file-transfer-dialog></file-transfer-dialog>
 		<messagebox-dialog></messagebox-dialog>
 
 		<component v-for="component in injectedComponentNames" :is="component" :key="component"></component>
@@ -153,7 +154,6 @@ export default {
 
 			darkTheme: state => state.settings.darkTheme,
 			webcam: state => state.settings.webcam,
-
 			machineMode: state => state.machine.model.state.machineMode,
 			injectedComponents: state => state.uiInjection.injectedComponents
 		}),