diff --git a/.env.development.local.example b/.env.development.local.example
index 21088a8e41..e69de29bb2 100644
--- a/.env.development.local.example
+++ b/.env.development.local.example
@@ -1,2 +0,0 @@
-VUE_APP_API=http://fluidd.local
-VUE_APP_SOCKET=ws://fluidd.local/websocket
diff --git a/package-lock.json b/package-lock.json
index 5fbb97526c..3f1474c9b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,6 +53,12 @@
"source-map": "^0.5.0"
},
"dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ },
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -109,6 +115,14 @@
"@babel/helper-validator-option": "^7.12.1",
"browserslist": "^4.14.5",
"semver": "^5.5.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"@babel/helper-create-class-features-plugin": {
@@ -873,6 +887,14 @@
"@babel/helper-plugin-utils": "^7.10.4",
"resolve": "^1.8.1",
"semver": "^5.5.1"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"@babel/plugin-transform-shorthand-properties": {
@@ -1029,6 +1051,14 @@
"@babel/types": "^7.12.1",
"core-js-compat": "^3.6.2",
"semver": "^5.5.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"@babel/preset-modules": {
@@ -1809,6 +1839,12 @@
"integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==",
"dev": true
},
+ "@types/semver": {
+ "version": "7.3.4",
+ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.4.tgz",
+ "integrity": "sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==",
+ "dev": true
+ },
"@types/serve-static": {
"version": "1.13.7",
"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.7.tgz",
@@ -2259,162 +2295,6 @@
"tslint": "^5.20.1",
"webpack": "^4.0.0",
"yorkie": "^2.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
- "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true,
- "optional": true
- },
- "fork-ts-checker-webpack-plugin-v5": {
- "version": "npm:fork-ts-checker-webpack-plugin@5.2.1",
- "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
- "integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==",
- "dev": true,
- "optional": true,
- "requires": {
- "@babel/code-frame": "^7.8.3",
- "@types/json-schema": "^7.0.5",
- "chalk": "^4.1.0",
- "cosmiconfig": "^6.0.0",
- "deepmerge": "^4.2.2",
- "fs-extra": "^9.0.0",
- "memfs": "^3.1.2",
- "minimatch": "^3.0.4",
- "schema-utils": "2.7.0",
- "semver": "^7.3.2",
- "tapable": "^1.0.0"
- }
- },
- "fs-extra": {
- "version": "9.0.1",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
- "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "at-least-node": "^1.0.0",
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^1.0.0"
- }
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "optional": true
- },
- "jsonfile": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
- "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "graceful-fs": "^4.1.6",
- "universalify": "^2.0.0"
- },
- "dependencies": {
- "universalify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
- "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
- "dev": true,
- "optional": true
- }
- }
- },
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dev": true,
- "optional": true,
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "schema-utils": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
- "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
- "dev": true,
- "optional": true,
- "requires": {
- "@types/json-schema": "^7.0.4",
- "ajv": "^6.12.2",
- "ajv-keywords": "^3.4.1"
- }
- },
- "semver": {
- "version": "7.3.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
- "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
- "dev": true,
- "optional": true,
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "universalify": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
- "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
- "dev": true,
- "optional": true
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
- "dev": true,
- "optional": true
- }
}
},
"@vue/cli-plugin-unit-mocha": {
@@ -2599,31 +2479,12 @@
"universalify": "^0.1.0"
}
},
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "optional": true
- },
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true
},
- "loader-utils": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
- "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- }
- },
"locate-path": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -2702,16 +2563,6 @@
"strip-ansi": "^6.0.0"
}
},
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
"terser-webpack-plugin": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
@@ -2729,31 +2580,6 @@
"webpack-sources": "^1.4.3"
}
},
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.1.1",
- "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.1.tgz",
- "integrity": "sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
- },
- "dependencies": {
- "chalk": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
- "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- }
- }
- },
"webpack-bundle-analyzer": {
"version": "3.9.0",
"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
@@ -6215,6 +6041,14 @@
"semver": "^5.5.0",
"shebang-command": "^1.2.0",
"which": "^1.2.9"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"crypto-browserify": {
@@ -7515,6 +7349,12 @@
"yallist": "^2.1.2"
}
},
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ },
"yallist": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
@@ -7984,6 +7824,12 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true
},
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ },
"tapable": {
"version": "0.1.10",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
@@ -8190,6 +8036,14 @@
"natural-compare": "^1.4.0",
"semver": "^5.6.0",
"vue-eslint-parser": "^7.0.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"eslint-scope": {
@@ -9082,6 +8936,143 @@
"semver": "^5.6.0",
"tapable": "^1.0.0",
"worker-rpc": "^0.1.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
+ }
+ },
+ "fork-ts-checker-webpack-plugin-v5": {
+ "version": "npm:fork-ts-checker-webpack-plugin@5.2.1",
+ "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
+ "integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@types/json-schema": "^7.0.5",
+ "chalk": "^4.1.0",
+ "cosmiconfig": "^6.0.0",
+ "deepmerge": "^4.2.2",
+ "fs-extra": "^9.0.0",
+ "memfs": "^3.1.2",
+ "minimatch": "^3.0.4",
+ "schema-utils": "2.7.0",
+ "semver": "^7.3.2",
+ "tapable": "^1.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "fs-extra": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
+ "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "at-least-node": "^1.0.0",
+ "graceful-fs": "^4.2.0",
+ "jsonfile": "^6.0.1",
+ "universalify": "^1.0.0"
+ }
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "jsonfile": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "graceful-fs": "^4.1.6",
+ "universalify": "^2.0.0"
+ },
+ "dependencies": {
+ "universalify": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "schema-utils": {
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+ "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "@types/json-schema": "^7.0.4",
+ "ajv": "^6.12.2",
+ "ajv-keywords": "^3.4.1"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "universalify": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+ "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+ "dev": true,
+ "optional": true
+ }
}
},
"form-data": {
@@ -9200,6 +9191,12 @@
"resolved": "https://registry.npmjs.org/gamma/-/gamma-0.1.0.tgz",
"integrity": "sha1-MxVkNAO/J5BsqAqzfDbs6UQO8zA="
},
+ "generate-file-webpack-plugin": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/generate-file-webpack-plugin/-/generate-file-webpack-plugin-1.0.1.tgz",
+ "integrity": "sha512-HSZjlNKQWWtIGKwm+oFvhqVYRhED3Ox21ls7XcSEb0EkUrNnzSz1GBZd6/UY+l/MbThpJyPAKNLenvWDUPhfMw==",
+ "dev": true
+ },
"gensync": {
"version": "1.0.0-beta.2",
"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -12555,6 +12552,14 @@
"requires": {
"pify": "^4.0.1",
"semver": "^5.6.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"map-cache": {
@@ -13777,6 +13782,14 @@
"requires": {
"object.getownpropertydescriptors": "^2.0.3",
"semver": "^5.7.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"node-forge": {
@@ -13866,6 +13879,14 @@
"resolve": "^1.10.0",
"semver": "2 || 3 || 4 || 5",
"validate-npm-package-license": "^3.0.1"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"normalize-path": {
@@ -16707,10 +16728,27 @@
}
},
"semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true
+ "version": "7.3.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+ "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+ "requires": {
+ "lru-cache": "^6.0.0"
+ },
+ "dependencies": {
+ "lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "requires": {
+ "yallist": "^4.0.0"
+ }
+ },
+ "yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+ }
+ }
},
"send": {
"version": "0.17.1",
@@ -17128,6 +17166,16 @@
"rechoir": "^0.6.2"
}
},
+ "shx": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/shx/-/shx-0.3.3.tgz",
+ "integrity": "sha512-nZJ3HFWVoTSyyB+evEKjJ1STiixGztlqwKLTUNV5KqMWtGey9fTd4KU1gdZ1X9BV6215pswQ/Jew9NsuS/fNDA==",
+ "dev": true,
+ "requires": {
+ "minimist": "^1.2.3",
+ "shelljs": "^0.8.4"
+ }
+ },
"sigmund": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
@@ -18781,6 +18829,14 @@
"semver": "^5.3.0",
"tslib": "^1.8.0",
"tsutils": "^2.29.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"tsutils": {
@@ -19533,6 +19589,87 @@
}
}
},
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.1.1",
+ "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.1.tgz",
+ "integrity": "sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "loader-utils": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"vue-meta": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/vue-meta/-/vue-meta-2.4.0.tgz",
diff --git a/package.json b/package.json
index f5af5d5327..490d0bf168 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
"lint": "vue-cli-service lint",
"inspect": "vue-cli-service inspect",
"release": "standard-version",
- "deploy": "potato -s dist -u -b app.fluidd.xyz",
+ "deploy": "npm run copy.host.config && potato -s dist -u -b app.fluidd.xyz",
+ "copy.host.config": "shx cp -f ./public/config.hosted.json ./dist/config.json",
"start": "vue-cli-service serve",
"test": "echo \"Error: no test specified\" && exit 1"
},
@@ -31,6 +32,7 @@
"lodash-es": "^4.17.15",
"prismjs": "^1.22.0",
"register-service-worker": "^1.7.2",
+ "semver": "^7.3.4",
"vue": "^2.6.11",
"vue-chartjs": "^3.5.1",
"vue-class-component": "^7.2.3",
@@ -49,6 +51,7 @@
"@types/mocha": "^5.2.4",
"@types/plotly.js": "^1.54.6",
"@types/prismjs": "^1.16.2",
+ "@types/semver": "^7.3.4",
"@types/workbox-window": "^4.3.3",
"@typescript-eslint/eslint-plugin": "^2.33.0",
"@typescript-eslint/parser": "^2.33.0",
@@ -72,9 +75,11 @@
"eslint-plugin-standard": "^4.1.0",
"eslint-plugin-vue": "^6.2.2",
"fibers": "^5.0.0",
+ "generate-file-webpack-plugin": "^1.0.1",
"sass": "^1.30.0",
"sass-loader": "^10.1.0",
"serve": "^11.3.2",
+ "shx": "^0.3.3",
"standard-version": "^9.0.0",
"typescript": "~3.9.3",
"vue-cli-plugin-vuetify": "^2.0.8",
diff --git a/public/config.hosted.json b/public/config.hosted.json
new file mode 100644
index 0000000000..a510f353d6
--- /dev/null
+++ b/public/config.hosted.json
@@ -0,0 +1,18 @@
+{
+ "endpoints": [
+ "http://fluiddpi",
+ "http://mainsailos",
+ "http://octopi",
+ "http://fluiddpi.local",
+ "http://mainsailos.local",
+ "http://octopi.local",
+ "http://fluiddpi.local:7125",
+ "http://mainsailos.local:7125",
+ "http://octopi.local:7125"
+ ],
+ "blacklist": [
+ "fluidd.xyz",
+ "fluidd.net"
+ ],
+ "skipClientUpdates": true
+}
\ No newline at end of file
diff --git a/public/config.json b/public/config.json
index 40fbfcba19..32c9a113b2 100644
--- a/public/config.json
+++ b/public/config.json
@@ -13,5 +13,6 @@
"blacklist": [
"fluidd.xyz",
"fluidd.net"
- ]
+ ],
+ "skipClientUpdates": false
}
\ No newline at end of file
diff --git a/public/favicon.ico b/public/favicon.ico
index df36fcfb72..0f886e94a1 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/App.vue b/src/App.vue
index 738efc6446..4a91271f9f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,9 +17,9 @@
/>
-
+
@@ -36,7 +36,7 @@ import AppDrawer from '@/components/AppDrawer.vue'
import AppFooter from '@/components/AppFooter.vue'
import SocketDisconnectedWidget from '@/components/widgets/SocketDisconnectedWidget.vue'
import FlashMessage from '@/components/FlashMessage.vue'
-// import { MetaInfo } from 'vue-meta'
+import UpdateStatusWidget from '@/components/widgets/UpdateStatusWidget.vue'
@Component({
components: {
@@ -44,7 +44,8 @@ import FlashMessage from '@/components/FlashMessage.vue'
AppDrawer,
SocketDisconnectedWidget,
FlashMessage,
- AppFooter
+ AppFooter,
+ UpdateStatusWidget
}
})
export default class App extends Mixins(UtilsMixin) {
@@ -82,6 +83,10 @@ export default class App extends Mixins(UtilsMixin) {
// }
// }
+ get updating () {
+ return this.$store.state.version.busy
+ }
+
get progress () {
let progress = this.$store.state.socket.printer.display_status.progress || 0
progress = (progress * 100).toFixed()
diff --git a/src/components/AppBar.vue b/src/components/AppBar.vue
index 07a2f21b51..7d4ebd62a4 100644
--- a/src/components/AppBar.vue
+++ b/src/components/AppBar.vue
@@ -23,38 +23,47 @@
-
-
- $home
- Dashboard
-
-
- $files
- Jobs
-
-
- $tune
- Printer
-
-
-
-
- $estop
-
-
- Emergency Stop
-
+
+ $home
+ Dashboard
+
+
+ $files
+ Jobs
+
+
+ $tune
+ Printer
+
+
+
+
+ $estop
+
+
+ Emergency Stop
+
+
+
$menu
-
+
@@ -90,6 +99,14 @@ export default class AppBar extends Mixins(UtilsMixin) {
return (this.$store.state.config.fileConfig.general.jobsInMenu && this.klippyConnected)
}
+ get hasUpdates () {
+ return this.$store.getters['version/hasUpdates']
+ }
+
+ hasUpdate (component: 'klipper' | 'moonraker' | 'client') {
+ return this.$store.getters['version/hasUpdate'](component)
+ }
+
// Watch currentfile and refresh its metadata to ensure
// our status has the correct data.
@Watch('currentFile')
diff --git a/src/components/AppDrawer.vue b/src/components/AppDrawer.vue
index dfdd1997a9..1611e0afcd 100644
--- a/src/components/AppDrawer.vue
+++ b/src/components/AppDrawer.vue
@@ -6,7 +6,7 @@
dense>
- Printer: {{ instanceName }}
+
@@ -37,112 +37,38 @@
$cog
- Settings
+ UI Settings
-
-
-
- Available Printers
-
-
-
-
-
- {{ instance.name }}
- {{ instance.apiUrl }}
-
-
-
-
- $delete
-
-
-
-
-
-
-
- $plus
-
-
- Add another printer
-
-
-
+
-
-
-
- Close
- Save
-
-
-
- Enter your moonraker API endpoint.
- Some examples might include;
-
- fluidd.local,
- my_ip_address
-
-
-
- Having trouble? See here for more information.
-
-
-
-
-
-
-
-
+
+
-
-
diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index 7f9ee8c949..e6ae59cf37 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -2,7 +2,7 @@
© {{ new Date().getFullYear() }}
- fluidd: v{{ systemInfo.version }}-{{ systemInfo.hash }}, klippy: {{ systemInfo.software_version }}
+ fluidd: v{{ systemInfo.version }}-{{ systemInfo.hash }}
@@ -14,11 +14,9 @@ import { Component } from 'vue-property-decorator'
@Component({})
export default class Footer extends Vue {
get systemInfo () {
- const printerInfo = this.$store.state.socket.printer.info
return {
- version: this.$store.state.version,
- hash: this.$store.state.hash,
- ...printerInfo
+ version: this.$store.state.version.fluidd.version,
+ hash: this.$store.state.version.fluidd.hash
}
}
}
diff --git a/src/components/VersionStatus.vue b/src/components/VersionStatus.vue
new file mode 100644
index 0000000000..ddbd55710e
--- /dev/null
+++ b/src/components/VersionStatus.vue
@@ -0,0 +1,31 @@
+
+
+ UP TO DATE
+ DIRTY REPO
+ INVALID REPO
+ UPDATE
+
+
+
+
diff --git a/src/components/cards/dashboard/ConsoleCard.vue b/src/components/cards/dashboard/ConsoleCard.vue
index fa42d6c609..703023647b 100644
--- a/src/components/cards/dashboard/ConsoleCard.vue
+++ b/src/components/cards/dashboard/ConsoleCard.vue
@@ -7,7 +7,9 @@
:height="450"
:collapsed="true">
-
+
@@ -17,6 +19,7 @@ import { Component, Mixins } from 'vue-property-decorator'
import PrintStatusWidget from '@/components/widgets/PrintStatusWidget.vue'
import UtilsMixin from '@/mixins/utils'
import ConsoleWidget from '@/components/widgets/ConsoleWidget.vue'
+import { ConsoleEntry } from '@/store/socket/types'
@Component({
components: {
@@ -24,5 +27,9 @@ import ConsoleWidget from '@/components/widgets/ConsoleWidget.vue'
ConsoleWidget
}
})
-export default class ConsoleCard extends Mixins(UtilsMixin) {}
+export default class ConsoleCard extends Mixins(UtilsMixin) {
+ get items (): ConsoleEntry[] {
+ return this.$store.state.socket.console
+ }
+}
diff --git a/src/components/widgets/ConsoleWidget.vue b/src/components/widgets/ConsoleWidget.vue
index c32b37068e..524da063dd 100644
--- a/src/components/widgets/ConsoleWidget.vue
+++ b/src/components/widgets/ConsoleWidget.vue
@@ -1,12 +1,13 @@
-
- {{ getTime(item.time) }}
+
+ {{ getTime(item.time) }}
@@ -15,7 +16,7 @@
+
+
diff --git a/src/components/widgets/SystemVersionsWidget.vue b/src/components/widgets/SystemVersionsWidget.vue
new file mode 100644
index 0000000000..24fab73404
--- /dev/null
+++ b/src/components/widgets/SystemVersionsWidget.vue
@@ -0,0 +1,125 @@
+
+
+
+
+
+ Software Updates
+
+
+
+
+
+
+
+ {{ (component.name) ? component.name : i }}
+
+ {{ component.version }}
+
+ $chevronRight {{ component.remote_version }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ System
+
+
+
+
+ UPDATE
+
+
+
+
+
+ Check for updates
+
+ $refresh
+
+
+
+
+
+
diff --git a/src/components/widgets/TemperatureTargetsWidget.vue b/src/components/widgets/TemperatureTargetsWidget.vue
index 001ef3a849..bd88acd661 100644
--- a/src/components/widgets/TemperatureTargetsWidget.vue
+++ b/src/components/widgets/TemperatureTargetsWidget.vue
@@ -1,12 +1,12 @@
-
-
- Actual
+
+
+ Actual
-
+
- Target
+ Target
diff --git a/src/components/widgets/UpdateStatusWidget.vue b/src/components/widgets/UpdateStatusWidget.vue
new file mode 100644
index 0000000000..909599a16a
--- /dev/null
+++ b/src/components/widgets/UpdateStatusWidget.vue
@@ -0,0 +1,94 @@
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
+ Close
+
+
+
+
+
+
+
+
diff --git a/src/components/widgets/configuration/BedMeshWidget.vue b/src/components/widgets/configuration/BedMeshWidget.vue
index ed2efa4bd1..6106d00897 100644
--- a/src/components/widgets/configuration/BedMeshWidget.vue
+++ b/src/components/widgets/configuration/BedMeshWidget.vue
@@ -194,7 +194,7 @@ export default class BedMeshWidget extends Mixins(UtilsMixin) {
}
get meshLoaded (): boolean {
- return (this.currentMesh && this.currentMesh.profile_name !== '')
+ return ('profile_name' in this.currentMesh && this.currentMesh.profile_name.length > 0)
}
get hasDefault (): boolean {
diff --git a/src/globals.ts b/src/globals.ts
index bbcf1caa68..e10dbe2ef8 100644
--- a/src/globals.ts
+++ b/src/globals.ts
@@ -51,7 +51,6 @@ import {
mdiCogs,
mdiContentSaveOutline,
mdiAlert,
- mdiPowerPlug,
mdiDotsVertical,
mdiSend,
mdiArrowHorizontalLock,
@@ -66,7 +65,15 @@ import {
mdiCheckboxBlankOutline,
mdiCheckboxMarkedOutline,
mdiMenuDown,
- mdiFilePlus
+ mdiFilePlus,
+ mdiBellOutline,
+ mdiPower,
+ mdiPowerCycle,
+ mdiRestart,
+ mdiRestartAlert,
+ mdiUpdate,
+ mdiChevronRight,
+ mdiChevronLeft
} from '@mdi/js'
/**
@@ -94,11 +101,16 @@ export const Icons = Object.freeze({
menu: mdiDotsVertical,
menuAlt: mdiMenuDown,
chart: mdiChartTimelineVariant,
- power: mdiPowerPlug,
+ power: mdiPower,
+ powerCycle: mdiPowerCycle,
home: mdiHome,
close: mdiClose,
refresh: mdiRefresh,
+ restart: mdiRestart,
+ restartAlert: mdiRestartAlert,
+ update: mdiUpdate,
alert: mdiAlert,
+ bell: mdiBellOutline,
fireAlert: mdiFireAlert,
snowflakeAlert: mdiSnowflakeAlert,
blankCircle: mdiCheckboxBlankCircleOutline,
@@ -135,6 +147,8 @@ export const Icons = Object.freeze({
filamentEstimate: mdiFormatLineSpacing,
chevronUp: mdiChevronUp,
chevronDown: mdiChevronDown,
+ chevronRight: mdiChevronRight,
+ chevronLeft: mdiChevronLeft,
timer: mdiTimerSand,
fileCode: mdiFileCodeOutline,
files: mdiFileMultipleOutline,
@@ -159,7 +173,9 @@ export const Icons = Object.freeze({
})
export const Waits = Object.freeze({
+ onForceUpdateCheck: 'onForceUpdateCheck',
onDevicePowerToggle: 'onDevicePowerToggle',
+ onUpdate: 'onUpdate',
onHomeAll: 'onHomeAll',
onHomeXY: 'onHomeXY',
onHomeX: 'onHomeX',
diff --git a/src/init.ts b/src/init.ts
index 34671c7b3f..aa302aa580 100644
--- a/src/init.ts
+++ b/src/init.ts
@@ -2,8 +2,9 @@ import Vue from 'vue'
import vuetify from './plugins/vuetify'
import store from './store'
import { Globals } from './globals'
-import { ApiConfig, Config, FileConfig, InstanceConfig } from './store/config/types'
+import { ApiConfig, Config, FileConfig, HostConfig, InstanceConfig } from './store/config/types'
import { AxiosResponse } from 'axios'
+import { isOfType } from './store/helpers'
// Load API configuration
/**
@@ -14,15 +15,28 @@ import { AxiosResponse } from 'axios'
* 3. Load the active instance UI config, if it exists and commit to store.
* 4. Resume Vue Init
*/
-const getApiConfig = async (): Promise => {
+const getApiConfig = async (): Promise<{ config: ApiConfig | InstanceConfig; hostConfig: HostConfig | undefined }> => {
+ // Always start by loading the host configuration.
+ let hostConfigResponse: AxiosResponse
+ let hostConfig: HostConfig | undefined
+ try {
+ hostConfigResponse = await Vue.$http.get('/config.json?date=' + new Date().getTime())
+ if (hostConfigResponse && hostConfigResponse.data) {
+ hostConfig = hostConfigResponse.data
+ }
+ console.debug('Loaded web host configuration', hostConfig)
+ } catch (e) {
+ console.debug('Failed loading web host configuration')
+ }
+
// Local storage load
if (Globals.LOCAL_INSTANCES_STORAGE_KEY in localStorage) {
const instances: InstanceConfig[] = JSON.parse(localStorage[Globals.LOCAL_INSTANCES_STORAGE_KEY])
if (instances && instances.length) {
- for (const instance of instances) {
- if (instance.active) {
- console.debug('API Config from Local Storage', instance)
- return instance
+ for (const config of instances) {
+ if (config.active) {
+ console.debug('API Config from Local Storage', config)
+ return { config, hostConfig }
}
}
}
@@ -32,20 +46,13 @@ const getApiConfig = async (): Promise => {
// including the browser url.
let endpoints: string[] = []
let blacklist: string[] = []
- let config: AxiosResponse | undefined
- try {
- config = await Vue.$http.get('/config.json?date=' + new Date().getTime())
- } catch (e) {
- console.debug('Failed loading web host configuration')
+
+ if (hostConfig && 'endpoints' in hostConfig && hostConfig.endpoints.length) {
+ endpoints = hostConfig.endpoints
}
- if (config && config.data) {
- if (config.data.endpoints && config.data.endpoints.length) {
- endpoints = [...endpoints, ...config.data.endpoints]
- }
- if (config.data.blacklist && config.data.blacklist.length) {
- blacklist = [...blacklist, ...config.data.blacklist]
- }
+ if (hostConfig && 'blacklist' in hostConfig && hostConfig.blacklist.length) {
+ blacklist = hostConfig.blacklist
}
// Add the browsers url to our endpoints list, unless black listed.
@@ -68,17 +75,29 @@ const getApiConfig = async (): Promise => {
const i = results.findIndex(endpoint => endpoint !== undefined)
return (i > -1)
- ? Vue.$filters.getApiUrls(endpoints[i])
- : { apiUrl: '', socketUrl: '' }
+ ? { config: Vue.$filters.getApiUrls(endpoints[i]), hostConfig }
+ : { config: { apiUrl: '', socketUrl: '' }, hostConfig }
}
-export const appInit = async (config?: ApiConfig): Promise => {
+export const appInit = async (config?: ApiConfig, hostConfig?: HostConfig): Promise => {
// Reset the store to its default state.
store.dispatch('reset', {}, { root: true })
// Load the API Config
- const apiConfig = config || await getApiConfig()
- store.dispatch('config/onInitApiConfig', apiConfig) // Just sets the api urls.
+ let apiConfig: ApiConfig
+ if (config) {
+ apiConfig = config
+ } else {
+ const c = await getApiConfig()
+ apiConfig = c.config
+ if (c.hostConfig && isOfType(c.hostConfig, 'endpoints')) {
+ hostConfig = c.hostConfig
+ }
+ }
+
+ // if (hostConfig) store.dispatch('config/onInitHostConfig', hostConfig)
+ // Just sets the api urls.
+ store.dispatch('config/onInitApiConfig', apiConfig)
// Load the File Config.
let fileConfig: FileConfig | undefined | null
@@ -97,15 +116,15 @@ export const appInit = async (config?: ApiConfig): Promise => {
}
// fileConfig could equal;
- // - null - meaning we made a connection, but the no user configuration is saved yet, which is ok.
+ // - null - meaning we made a connection, but no user configuration is saved yet, which is ok.
// - undefined - meaning the API is likely down..
// apiConfig could have empty strings, meaning we have no valid connection.
- await store.dispatch('init', { apiConfig, fileConfig })
+ await store.dispatch('init', { apiConfig, fileConfig, hostConfig })
// Set vuetify to the correct initial theme.
if (store.state.config && store.state.config.fileConfig.general) {
vuetify.framework.theme.dark = store.state.config.fileConfig.general.darkMode
}
- return { apiConfig, fileConfig }
+ return { apiConfig, fileConfig, hostConfig }
}
diff --git a/src/plugins/socketClient.ts b/src/plugins/socketClient.ts
index dee3403bfc..2fa02a26a4 100644
--- a/src/plugins/socketClient.ts
+++ b/src/plugins/socketClient.ts
@@ -151,6 +151,7 @@ export class WebSocketClient {
}
if (options && options.wait) {
request.wait = options.wait
+ if (this.store) this.store.dispatch('socket/addWait', options.wait)
}
if (options && options.params) {
packet.params = options.params
diff --git a/src/scss/global.scss b/src/scss/global.scss
index 7c73f35e25..6907ea38e4 100644
--- a/src/scss/global.scss
+++ b/src/scss/global.scss
@@ -21,7 +21,14 @@
/* Add a class to help us spin an icon if we need.. */
.spin {
animation-name: spin;
- animation-duration: 2000ms;
+ animation-duration: 1000ms;
+ animation-iteration-count: infinite;
+ animation-timing-function: linear;
+}
+
+.spin-alt {
+ animation-name: spin-alt;
+ animation-duration: 1000ms;
animation-iteration-count: infinite;
animation-timing-function: linear;
}
@@ -34,10 +41,30 @@
}
}
+@keyframes spin-alt {
+ from {
+ transform: rotate(-360deg);
+ } to {
+ transform: rotate(0deg);
+ }
+}
+
+/* force no pointer events to avoid issues with dragging */
.no-pointer-events * {
pointer-events: none !important;
}
+/* Extra dense list items */
+.v-list-item--x-dense .v-list-item__content,
+.v-list--x-dense .v-list-item .v-list-item__content {
+ padding: 6px 0 !important;
+}
+
+.v-list-item--x-dense .v-list-item__action,
+.v-list--x-dense .v-list-item .v-list-item__action {
+ margin: 8px 0;
+}
+
/* Helps alignment for some outer buttons */
.v-text-field-outer-btn {
.v-input__control {
diff --git a/src/socketActions.ts b/src/socketActions.ts
index 09a29c9681..3bdc524dcc 100644
--- a/src/socketActions.ts
+++ b/src/socketActions.ts
@@ -1,5 +1,4 @@
import Vue from 'vue'
-import store from '@/store'
import { Waits } from '@/globals'
export const SocketActions = {
@@ -35,6 +34,60 @@ export const SocketActions = {
)
},
+ async machineUpdateStatus (refresh = false) {
+ const wait = Waits.onForceUpdateCheck
+ Vue.$socket.emit(
+ 'machine.update.status', {
+ dispatch: 'version/onUpdateStatus',
+ params: { refresh },
+ wait
+ }
+ )
+ },
+
+ async machineUpdateMoonraker () {
+ const wait = Waits.onUpdate
+ Vue.$socket.emit(
+ 'machine.update.moonraker', {
+ dispatch: 'version/onUpdatedMoonraker',
+ wait
+ }
+ )
+ },
+
+ async machineUpdateKlipper () {
+ const wait = Waits.onUpdate
+ Vue.$socket.emit(
+ 'machine.update.klipper', {
+ dispatch: 'version/onUpdatedKlipper',
+ params: {
+ include_deps: true
+ },
+ wait
+ }
+ )
+ },
+
+ async machineUpdateClient () {
+ const wait = Waits.onUpdate
+ Vue.$socket.emit(
+ 'machine.update.client', {
+ dispatch: 'version/onUpdatedClient',
+ wait
+ }
+ )
+ },
+
+ async machineUpdateSystem () {
+ const wait = Waits.onUpdate
+ Vue.$socket.emit(
+ 'machine.update.system', {
+ dispatch: 'version/onUpdatedSystem',
+ wait
+ }
+ )
+ },
+
async machineDevicePowerDevices () {
Vue.$socket.emit(
'machine.device_power.devices', {
@@ -56,7 +109,6 @@ export const SocketActions = {
const emit = (state === 'on')
? 'machine.device_power.on'
: 'machine.device_power.off'
- if (wait) store.dispatch('socket/addWait', wait)
Vue.$socket.emit(
emit, {
dispatch: 'devicePower/onToggle',
@@ -105,7 +157,6 @@ export const SocketActions = {
},
async printerPrintCancel () {
- store.dispatch('socket/addWait', Waits.onPrintCancel)
Vue.$socket.emit(
'printer.print.cancel', {
dispatch: 'socket/onPrintCancel',
@@ -115,7 +166,6 @@ export const SocketActions = {
},
async printerPrintPause () {
- store.dispatch('socket/addWait', Waits.onPrintPause)
Vue.$socket.emit(
'printer.print.pause', {
dispatch: 'socket/onPrintPause',
@@ -125,7 +175,6 @@ export const SocketActions = {
},
async printerPrintResume () {
- store.dispatch('socket/addWait', Waits.onPrintResume)
Vue.$socket.emit(
'printer.print.resume', {
dispatch: 'socket/onPrintResume',
@@ -135,7 +184,6 @@ export const SocketActions = {
},
async printerGcodeScript (gcode: string, wait?: string) {
- if (wait) store.dispatch('socket/addWait', wait)
Vue.$socket.emit(
'printer.gcode.script', {
dispatch: 'socket/onGcodeScript',
@@ -191,7 +239,6 @@ export const SocketActions = {
*/
async serverFilesGetDirectory (root: string, path: string) {
const wait = `${Waits.onGetDirectory}${path}`
- store.dispatch('socket/addWait', wait)
Vue.$socket.emit(
'server.files.get_directory',
{
diff --git a/src/store/config/actions.ts b/src/store/config/actions.ts
index fc38850a27..d3c97b392a 100644
--- a/src/store/config/actions.ts
+++ b/src/store/config/actions.ts
@@ -1,6 +1,6 @@
import Vue from 'vue'
import { ActionTree } from 'vuex'
-import { ConfigState, LocalConfig, GenericSave, Config, InstanceConfig, FileConfig } from './types'
+import { ConfigState, LocalConfig, GenericSave, Config, InstanceConfig, FileConfig, HostConfig } from './types'
import { RootState } from '../types'
import { Globals } from '@/globals'
@@ -12,6 +12,13 @@ export const actions: ActionTree = {
commit('onInitFile', payload)
},
+ /**
+ * Inits the host configuration.
+ */
+ async initHost ({ commit }, payload: HostConfig) {
+ commit('onInitHost', payload)
+ },
+
/**
* Inits any local storage state we may have.
*/
diff --git a/src/store/config/getters.ts b/src/store/config/getters.ts
index 7294d0e512..4121c0136c 100644
--- a/src/store/config/getters.ts
+++ b/src/store/config/getters.ts
@@ -5,5 +5,13 @@ import { RootState } from '../types'
export const getters: GetterTree = {
getCurrentInstance: (state) => {
return state.instances.find(instance => instance.active)
+ },
+
+ getInstances: (state) => {
+ const instances = [...state.instances]
+ instances.sort((a, b) => {
+ return (a.active) ? -1 : (b.active) ? 1 : 0
+ })
+ return instances
}
}
diff --git a/src/store/config/types.ts b/src/store/config/types.ts
index cb180dc75f..1f68f24b0a 100644
--- a/src/store/config/types.ts
+++ b/src/store/config/types.ts
@@ -20,6 +20,12 @@ export interface FileConfig {
dashboard: DashboardConfig;
}
+export interface HostConfig {
+ endpoints: string[];
+ blacklist: string[];
+ skipClientUpdates: boolean;
+}
+
export interface GeneralConfig {
instanceName: string;
jobsInMenu: boolean;
@@ -62,6 +68,7 @@ export interface GenericSave {
export interface Config {
apiConfig: ApiConfig | InstanceConfig;
fileConfig: FileConfig | undefined | null;
+ hostConfig?: HostConfig;
}
export interface ApiConfig {
diff --git a/src/store/helpers.ts b/src/store/helpers.ts
index 33a1e3eb36..64ca4eedd8 100644
--- a/src/store/helpers.ts
+++ b/src/store/helpers.ts
@@ -1,6 +1,13 @@
import { SocketState, ChartDataSet } from './socket/types'
import { FileChangeItem, FilePaths, AppFile, AppFileWithMeta, KlipperFile, KlipperFileWithMeta, Thumbnail } from './files/types'
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export const isOfType = (
+ varToBeChecked: any,
+ propertyToCheckFor: keyof T
+): varToBeChecked is T => (varToBeChecked as T)[propertyToCheckFor] !== undefined
+/* eslint-enable @typescript-eslint/no-explicit-any */
+
/**
* Return a file thumb if one exists
* Optionally, pick the largest or smallest image.
diff --git a/src/store/index.ts b/src/store/index.ts
index 9ada3a2f23..114dc78a99 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -4,6 +4,7 @@ import { socket } from './socket'
import { files } from './files'
import { config } from './config'
import { devicePower } from './devicePower'
+import { version } from './version'
import { RootState } from './types'
import { Config } from './config/types'
@@ -11,33 +12,25 @@ Vue.use(Vuex)
export default new Vuex.Store({
strict: (process.env.NODE_ENV === 'development'),
- state: {
- version: '',
- hash: ''
- },
+ state: {},
modules: {
config,
socket,
files,
- devicePower
- },
- mutations: {
- setVersion (state, payload) {
- state.version = payload
- },
- setHash (state, payload) {
- state.hash = payload
- }
+ devicePower,
+ version
},
+ mutations: {},
actions: {
async init ({ dispatch, commit }, payload: Config) {
// Should init the store, and ensure we've loaded our
// configuration if there is any.
- commit('setVersion', process.env.VERSION)
- commit('setHash', process.env.HASH)
+ commit('version/setVersion', process.env.VERSION)
+ commit('version/setHash', process.env.HASH)
const initFile = await dispatch('config/initFile', payload.fileConfig)
+ const initHost = await commit('version/setSkipClientUpdates', payload.hostConfig) // this should move to the config module if we ever add to it.
const initLocal = await dispatch('config/initLocal', payload)
- return [initLocal, initFile]
+ return [initFile, initHost, initLocal]
},
reset () {
// Reset the entire store - should be used when swapping instances.
diff --git a/src/store/socket/actions.ts b/src/store/socket/actions.ts
index c17c67c47b..a3b50c9e33 100644
--- a/src/store/socket/actions.ts
+++ b/src/store/socket/actions.ts
@@ -108,6 +108,7 @@ export const actions: ActionTree = {
} else {
// We're good, move on. Start by loading the server data, temperature and console history.
SocketActions.serverInfo()
+ SocketActions.machineUpdateStatus(true)
SocketActions.serverGcodeStore()
SocketActions.serverTemperatureStore()
}
@@ -326,6 +327,9 @@ export const actions: ActionTree = {
async notifyPowerChanged ({ dispatch }, payload) {
dispatch('devicePower/onStatus', { [payload.device]: payload.status }, { root: true })
},
+ async notifyUpdateResponse ({ dispatch }, payload) {
+ dispatch('version/onUpdateResponse', payload, { root: true })
+ },
/**
* ==========================================================================
diff --git a/src/store/types.ts b/src/store/types.ts
index 04404af699..45cf560ec0 100644
--- a/src/store/types.ts
+++ b/src/store/types.ts
@@ -1,11 +1,11 @@
import { ConfigState } from './config/types'
import { FilesState } from './files/types'
import { SocketState } from './socket/types'
+import { VersionState } from './version/types'
export interface RootState {
- version: string;
- hash: string;
config?: ConfigState;
files?: FilesState;
socket?: SocketState;
+ version?: VersionState;
}
diff --git a/src/store/version/actions.ts b/src/store/version/actions.ts
new file mode 100644
index 0000000000..fe0826dfe0
--- /dev/null
+++ b/src/store/version/actions.ts
@@ -0,0 +1,42 @@
+import { ActionTree } from 'vuex'
+import { VersionState } from './types'
+import { RootState } from '../types'
+import { SocketActions } from '@/socketActions'
+
+export const actions: ActionTree = {
+ /**
+ * Inits any file config we may have.
+ */
+ async onUpdateStatus ({ commit }, payload) {
+ console.debug('Finished machine.update.status', payload)
+ // commit('clearUpdateResponse')
+ commit('onUpdateStatus', payload)
+ },
+
+ /**
+ * As updates happen, we get responses here.
+ */
+ async onUpdateResponse ({ commit }, payload) {
+ commit('onUpdateResponse', payload)
+ },
+
+ async onUpdatedMoonraker () {
+ SocketActions.machineUpdateStatus()
+ console.debug('Finished updating moonraker')
+ },
+
+ async onUpdatedKlipper () {
+ SocketActions.machineUpdateStatus()
+ console.debug('Finished updating klipper')
+ },
+
+ async onUpdatedClient () {
+ SocketActions.machineUpdateStatus()
+ console.debug('Finished updating client')
+ },
+
+ async onUpdatedSystem () {
+ SocketActions.machineUpdateStatus()
+ console.debug('Finished updating system')
+ }
+}
diff --git a/src/store/version/getters.ts b/src/store/version/getters.ts
new file mode 100644
index 0000000000..bb9bf93afb
--- /dev/null
+++ b/src/store/version/getters.ts
@@ -0,0 +1,54 @@
+import { GetterTree } from 'vuex'
+import { isOfType } from '@/store/helpers'
+import { ArtifactVersion, HashVersion, VersionState } from './types'
+import { RootState } from '../types'
+import { valid, gt } from 'semver'
+
+export const getters: GetterTree = {
+ /**
+ * Returns the list of available components
+ */
+ getComponents: (state) => {
+ const components = { ...state.components }
+ // (obj, key) => {
+ // obj[key] = state.components[key]
+ // return obj
+ // }, {}
+ // )
+ // return ordered
+ return components
+ },
+
+ /**
+ * Returns an object indicating if any component has an update.
+ */
+ hasUpdates: (state, getters) => {
+ let r = false
+ for (const k in state.components) {
+ if (!r) {
+ r = getters.hasUpdate(k)
+ } else {
+ break
+ }
+ }
+ return r
+ },
+
+ /**
+ * Returns a boolean indicating if a given component has an update.
+ */
+ hasUpdate: (state) => (component: string): boolean => {
+ if (state.components[component] && isOfType(state.components[component], 'name')) {
+ const o = state.components[component] as ArtifactVersion
+ const version = valid(o.version)
+ const remoteVersion = valid(o.remote_version)
+ if (version && remoteVersion) {
+ return (gt(remoteVersion, version))
+ }
+ return false
+ } else {
+ const o = state.components[component] as HashVersion
+ return (o.current_hash !== o.remote_hash)
+ }
+ }
+}
diff --git a/src/store/version/index.ts b/src/store/version/index.ts
new file mode 100644
index 0000000000..95bdf15c92
--- /dev/null
+++ b/src/store/version/index.ts
@@ -0,0 +1,31 @@
+import { Module } from 'vuex'
+import { getters } from './getters'
+import { actions } from './actions'
+import { mutations } from './mutations'
+import { VersionState } from './types'
+import { RootState } from '../types'
+
+export const defaultState = (): VersionState => {
+ return {
+ busy: false,
+ skipClientUpdates: false,
+ responses: [],
+ components: {},
+ fluidd: {
+ version: '',
+ hash: ''
+ }
+ }
+}
+
+export const state = defaultState()
+
+const namespaced = true
+
+export const version: Module = {
+ namespaced,
+ state,
+ getters,
+ actions,
+ mutations
+}
diff --git a/src/store/version/mutations.ts b/src/store/version/mutations.ts
new file mode 100644
index 0000000000..648582d896
--- /dev/null
+++ b/src/store/version/mutations.ts
@@ -0,0 +1,50 @@
+import Vue from 'vue'
+import { MutationTree } from 'vuex'
+import { VersionState } from './types'
+import { defaultState } from './index'
+
+export const mutations: MutationTree = {
+ resetState (state) {
+ const newState = defaultState()
+ Object.keys(newState).forEach((key: string) => {
+ Vue.set(state, key, newState[key])
+ })
+ },
+
+ onUpdateStatus (state, payload) {
+ const versionInfo = payload.version_info || undefined
+ state.busy = payload.busy || false
+ if (versionInfo) {
+ for (const k in versionInfo) {
+ Vue.set(state.components, k, payload.version_info[k])
+ }
+ }
+ },
+
+ onUpdateResponse (state, payload) {
+ // If we get a complete === true, then assume the update is complete
+ // and set busy to false also.
+ if (payload.complete) {
+ state.busy = false
+ // state.responses = []
+ } else {
+ state.responses.unshift(payload)
+ }
+ },
+
+ clearUpdateResponse (state) {
+ state.responses = []
+ },
+
+ setVersion (state, payload) {
+ state.fluidd.version = payload
+ },
+ setHash (state, payload) {
+ state.fluidd.hash = payload
+ },
+ setSkipClientUpdates (state, payload) {
+ if (payload && 'skipClientUpdates' in payload) {
+ state.skipClientUpdates = payload.skipClientUpdates
+ }
+ }
+}
diff --git a/src/store/version/types.ts b/src/store/version/types.ts
new file mode 100644
index 0000000000..07de8e861a
--- /dev/null
+++ b/src/store/version/types.ts
@@ -0,0 +1,39 @@
+export interface VersionState {
+ [key: string]: boolean | VersionComponents | FluiddVersion | UpdateResponse[];
+ busy: boolean;
+ skipClientUpdates: boolean;
+ responses: UpdateResponse[];
+ components: VersionComponents;
+ fluidd: FluiddVersion;
+}
+
+export interface VersionComponents {
+ [key: string]: HashVersion | ArtifactVersion;
+}
+
+/** For klipper / moonraker */
+export interface HashVersion {
+ version: string;
+ current_hash: string;
+ remote_hash: string;
+ is_valid: boolean;
+ is_dirty: boolean;
+}
+
+/** For clients */
+export interface ArtifactVersion {
+ name: string;
+ version: string;
+ remote_version: string;
+}
+
+export interface FluiddVersion {
+ version: string;
+ hash: string;
+}
+
+export interface UpdateResponse {
+ message: string;
+ application: string;
+ proc_id: number;
+}
diff --git a/todo.md b/todo.md
index c3fff1a57a..f32aa39555 100644
--- a/todo.md
+++ b/todo.md
@@ -1,7 +1,8 @@
# TODO [fluidd]
## Next Up
-- self update
+- click on slider position won't update value
+- add log downloads to printer page / elsewhere when not in error state
- update panel collapse so these are remembered per instance
- stage 1 themes (pick a specific theme (red, green etc..)
- docker image
@@ -10,6 +11,7 @@
- auto save printer settings?
- PID calibrate option via dialog maybe?
- Drag and Drop move.
+- Add a way to specify a value for sliders
## Refactoring / Core
- cleanup socket store / move socket out and keep printer data
diff --git a/vue.config.js b/vue.config.js
index 9707d8e731..de67a1bd76 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,7 +1,13 @@
/* eslint-disable @typescript-eslint/no-var-requires */
const { IgnorePlugin } = require('webpack')
+const GenerateFilePlugin = require('generate-file-webpack-plugin')
// const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
+const v = require('./package.json').version
+const h = require('child_process')
+ .execSync('git rev-parse --short HEAD')
+ .toString()
+
module.exports = {
pwa: {
themeColor: '#2196F3',
@@ -19,8 +25,11 @@ module.exports = {
symlinks: false // Don't follow symlinks, fixes issues when using npm link.
},
plugins: [
- // new ContextReplacementPlugin(/moment[/\\]locale$/, /de|fr|hu/), // Ignore specific locales.
- new IgnorePlugin(/^\.\/locale$/, /moment$/) // Ignore all moment locales (comes from chartjs)
+ new IgnorePlugin(/^\.\/locale$/, /moment$/), // Ignore all moment locales (comes from chartjs)
+ new GenerateFilePlugin({
+ file: '.version',
+ content: v + '\n'
+ })
// new BundleAnalyzerPlugin({
// analyzerMode:
// (process.env.NODE_ENV === 'production') ? 'server' : 'disabled'
@@ -28,20 +37,11 @@ module.exports = {
]
},
chainWebpack: config => {
- // config
- // .resolve
- // .alias
- // .set('plotly.js/dist/plotly', 'plotly.js/dist/plotly-basic.js')
-
config
.plugin('define')
.tap(args => {
- const v = JSON.stringify(require('./package.json').version)
- const h = JSON.stringify(require('child_process')
- .execSync('git rev-parse --short HEAD')
- .toString())
- args[0]['process.env'].VERSION = v
- args[0]['process.env'].HASH = h
+ args[0]['process.env'].VERSION = JSON.stringify(v)
+ args[0]['process.env'].HASH = JSON.stringify(h)
return args
})
}