diff --git a/Dockerfile b/Dockerfile index b165a63..d25b6bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,13 @@ # 构建前端 # -FROM node:16.14.0-bullseye AS builder +FROM node:18.17.0-bullseye AS builder ARG BASE_PATH='/root/blivechat' WORKDIR "${BASE_PATH}/frontend" # 前端依赖 COPY frontend/package.json ./ -RUN npm i --registry=https://registry.npmmirror.com +RUN npm i # 编译前端 COPY frontend ./ @@ -24,8 +24,9 @@ ARG EXT_DATA_PATH='/mnt/data' WORKDIR "${BASE_PATH}" # 后端依赖 +COPY blivedm/requirements.txt blivedm/ COPY requirements.txt ./ -RUN pip3 install --no-cache-dir -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt +RUN pip3 install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple -r requirements.txt # 数据目录 COPY . ./ diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index 66793e3..43d6ac1 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -5,7 +5,7 @@ module.exports = { "node": true }, "parserOptions": { - "parser": "babel-eslint" + "parser": "@babel/eslint-parser" }, "extends": [ "plugin:vue/essential", @@ -75,5 +75,7 @@ module.exports = { "no-shadow": "warn", // 变量名和外部作用域重复 "no-console": "off", // 线上尽量不要用console输出,看不到的 + + "vue/multi-word-component-names": "off", // Vue组件名允许用1个单词 } } diff --git a/frontend/package.json b/frontend/package.json index c9274a5..0134844 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,32 +8,29 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "axios": "^0.21.1", - "core-js": "^3.6.5", + "axios": "^1.4.0", + "core-js": "^3.8.3", "downloadjs": "^1.4.7", - "element-ui": "^2.9.1", - "lodash": "^4.17.19", - "vue": "^2.6.10", - "vue-i18n": "^8.11.2", - "vue-router": "^3.0.6" + "element-ui": "^2.15.13", + "lodash": "^4.17.21", + "vue": "^2.6.14", + "vue-i18n": "^8.28.2", + "vue-router": "^3.6.5" }, "devDependencies": { - "@vue/cli-plugin-babel": "^4.5.12", - "@vue/cli-plugin-eslint": "^4.5.12", - "@vue/cli-service": "~4.5.12", - "babel-eslint": "^10.1.0", + "@babel/core": "^7.12.16", + "@babel/eslint-parser": "^7.12.16", + "@vue/cli-plugin-babel": "~5.0.0", + "@vue/cli-plugin-eslint": "~5.0.0", + "@vue/cli-service": "~5.0.0", "babel-plugin-component": "^1.1.1", - "eslint": "^6.7.2", - "eslint-plugin-vue": "^6.2.2", - "vue-template-compiler": "^2.5.21" - }, - "postcss": { - "plugins": { - "autoprefixer": {} - } + "eslint": "^7.32.0", + "eslint-plugin-vue": "^8.0.3", + "vue-template-compiler": "^2.6.14" }, "browserslist": [ "> 1%", - "last 2 versions" + "last 2 versions", + "not dead" ] } diff --git a/frontend/vue.config.js b/frontend/vue.config.js index a6bb0df..b1053ec 100644 --- a/frontend/vue.config.js +++ b/frontend/vue.config.js @@ -1,4 +1,5 @@ -const API_BASE_URL = 'http://localhost:12450' +// 不能用localhost,https://forum.dfinity.org/t/development-workflow-quickly-test-code-modifications/1793/21 +const API_BASE_URL = 'http://127.0.0.1:12450' module.exports = { devServer: {