diff options
| author | HampusM <hampus@hampusmat.com> | 2021-08-12 15:37:30 +0200 |
|---|---|---|
| committer | HampusM <hampus@hampusmat.com> | 2021-08-12 15:37:30 +0200 |
| commit | d41b27f43335cfb1a8ff49aeb121f992332429cf (patch) | |
| tree | 93b6e1ec9b292c3d80ee1a538d0e729612148052 /packages/client | |
| parent | 30f0b2ee1f494be1786280040fb47ec18bde8a6d (diff) | |
Cleaned up the settings implementation & renamed base_dir project-wide to git_dir
Diffstat (limited to 'packages/client')
| -rw-r--r-- | packages/client/package.json | 3 | ||||
| -rw-r--r-- | packages/client/vue.config.js | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/packages/client/package.json b/packages/client/package.json index 54068d6..f1797e3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -13,7 +13,6 @@ "core-js": "^3.6.5", "date-fns": "^2.22.1", "highlight.js": "^11.0.1", - "js-yaml": "^4.1.0", "marked": "^2.1.3", "vue": "^3.0.0", "vue-loading-overlay": "^4.0.3", @@ -32,6 +31,7 @@ "@vue/compiler-sfc": "^3.0.0", "@vue/eslint-config-standard": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", + "api": "^1.0.0", "eslint": "^7.31.0", "eslint-config-base": "^1.0.0", "eslint-plugin-import": "^2.23.4", @@ -40,7 +40,6 @@ "eslint-plugin-vue": "^7.14.0", "sass": "^1.26.5", "sass-loader": "^12.1.0", - "api": "^1.0.0", "typescript": "^4.3.5", "vue-eslint-parser": "^7.9.0", "webpack": "^5.46.0" diff --git a/packages/client/vue.config.js b/packages/client/vue.config.js index cf7622e..f19863a 100644 --- a/packages/client/vue.config.js +++ b/packages/client/vue.config.js @@ -1,13 +1,12 @@ -const yaml = require("js-yaml"); const fs = require("fs"); const path = require("path"); -const settings = yaml.load(fs.readFileSync(path.join(__dirname, "/../../settings.yml"), "utf8")); +const settings = JSON.parse(fs.readFileSync(path.join(__dirname, "/../../settings.json"), "utf-8")); module.exports = { devServer: { host: settings.host, - port: settings.dev_port, + port: settings.dev.port, proxy: { "^/api": { target: `http://${settings.host}:${settings.port}`, |