diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 782b1db..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,8 +0,0 @@ -# dependabot 配置文件,用于自动更新依赖 - -version: 2 -updates: - - package-ecosystem: "npm" - directory: "/" - schedule: - interval: "daily" diff --git a/README.md b/README.md index 65b6ba7..98312b0 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,12 @@ yarn set version berry ``` * 启动各环境的命令详见 [`package.json`](./package.json)。~~测试环境以后会加上的~~ + +## 分支相关 +`wu` 开头的分支为开发分支,如 +[`wu_main`](https://github.com/crrashh1542/win-up-to-date/tree/wu_main) 就是本项目的主线分支。 + +以代号开头的分支为某特定代号下版本的版本发布分支,以下列表内加粗行表示为当前工作进行的分支。 +| 代号简写 | 代号 | 范围 | +|----------|---------------|---------------| +| **`th`** | **Threshold** | **v0 ~ v1.0** | diff --git a/package.json b/package.json index 7270e9f..92afcdf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "win-up-to-date", - "version": "0.12.4", + "version": "0.13.0", "description": "A website project showing the latest status of Windows Insider versions.", "main": "index.js", "repository": "https://github.com/crrashh1542/win-up-to-date", @@ -14,30 +14,31 @@ }, "dependencies": { "@fluentui/web-components": "^2.5.16", - "axios": "^1.6.3", - "core-js": "^3.35.0", + "axios": "^1.6.7", + "core-js": "^3.35.1", "moment": "^2.30.1", "normalize.css": "^8.0.1", - "vue": "^3.4.3", + "vue": "^3.4.15", "vue-router": "^4.2.5" }, "devDependencies": { - "@babel/core": "^7.23.7", - "@babel/eslint-parser": "^7.23.3", - "@typescript-eslint/eslint-plugin": "^6.16.0", - "@typescript-eslint/parser": "^6.16.0", + "@babel/core": "^7.23.9", + "@babel/eslint-parser": "^7.23.9", + "@typescript-eslint/eslint-plugin": "^6.19.1", + "@typescript-eslint/parser": "^6.19.1", "@vue/cli-plugin-babel": "~5.0.8", "@vue/cli-plugin-eslint": "~5.0.8", "@vue/cli-service": "~5.0.8", - "autoprefixer": "^10.4.16", - "compression-webpack-plugin": "^10.0.0", + "autoprefixer": "^10.4.17", + "compression-webpack-plugin": "^11.0.0", "eslint": "^8.56.0", - "eslint-plugin-vue": "^9.19.2", + "eslint-plugin-vue": "^9.20.1", "less": "^4.2.0", - "less-loader": "^11.1.4", - "postcss": "^8.4.32", + "less-loader": "^12.1.0", + "postcss": "^8.4.33", "speed-measure-webpack-plugin": "^1.5.0", - "tailwindcss": "^3.4.0" + "tailwindcss": "^3.4.1", + "vue-clipboard3": "^2.0.0" }, "eslintConfig": { "root": true, diff --git a/prebuild.js b/prebuild.js index bb7b740..3424a79 100644 --- a/prebuild.js +++ b/prebuild.js @@ -20,24 +20,32 @@ function getTime() { // STEP3 -------- 获取构建 hash function getHash(params) { const buildHash = childProcess.execSync('git rev-parse --short HEAD', { 'encoding': 'utf8' }).split('\n')[0] - console.log('[buildInfo] 已获取构建 commit hash:' + buildHash) + console.log('[buildInfo] 已获取当前提交 hash:' + buildHash) return buildHash } -// STEP4 -------- 获取构建次数 +// STEP5 -------- 获取构建分支 function getBuild(params) { const buildHash = childProcess.execSync('git rev-list HEAD --count', { 'encoding': 'utf8' }).split('\n')[0] console.log('[buildInfo] 已获取构建数:' + buildHash) return buildHash } -// STEP4 -------- 组装并输出到文件 +// STEP4 -------- 获取构建次数 +function getBranch(params) { + const buildBranch = childProcess.execSync('git rev-parse --abbrev-ref HEAD', { 'encoding': 'utf8' }).split('\n')[0] + console.log('[buildInfo] 已获取当前分支:' + buildBranch) + return buildBranch +} + +// STEP6 -------- 组装并输出到文件 function writeInfo() { // 组装要输出的内容 const content = ` { "time": "` + getTime() + `", "hash": "` + getHash() + `", - "build": ` + getBuild() + ` + "build": ` + getBuild() + `, + "branch": "` + getBranch() + `" }` // 新建 temp 文件夹 @@ -63,5 +71,5 @@ function writeInfo() { } -// STEP5 -------- 导出函数 +// STEP7 -------- 导出函数 module.exports = writeInfo \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index d3f9a27..895b070 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,12 +11,12 @@ import './assets/styles/reset.less' // 引入组件 import Appbar from './components/Appbar.vue' import Foo from './components/Footer.vue' -import Navi from './components/Navi.vue' +import Navbar from './components/Navbar.vue' import Setting from './components/Setting.vue' export default { name: 'App', - components: { Appbar, Foo, Setting, Navi }, + components: { Appbar, Foo, Setting, Navbar }, setup() { // STEP1 ------ 设置卡片显示的初始值,避免出现 undefined @@ -58,7 +58,7 @@ export default { - + diff --git a/src/assets/fonts/iconfont/iconfont.less b/src/assets/fonts/iconfont/iconfont.less index e120433..8b22b87 100644 --- a/src/assets/fonts/iconfont/iconfont.less +++ b/src/assets/fonts/iconfont/iconfont.less @@ -63,6 +63,27 @@ .icon-fluent::before { content: "\ed50"; } +.icon-qq::before { + content: "\e615"; +} + +// 详情页 +.icon-announcement::before { + content: "\e646"; +} +.icon-compile::before { + content: "\e6d4"; +} +.icon-arch::before { + content: "\ed4f"; +} +.icon-uup:before { + content: "\e61a"; +} +.icon-copy::before { + content: "\e678"; +} + // 底部导航栏 .icon-home::before { diff --git a/src/assets/fonts/iconfont/iconfont.ttf b/src/assets/fonts/iconfont/iconfont.ttf index c9299cd..3fa059c 100644 Binary files a/src/assets/fonts/iconfont/iconfont.ttf and b/src/assets/fonts/iconfont/iconfont.ttf differ diff --git a/src/assets/fonts/iconfont/iconfont.woff2 b/src/assets/fonts/iconfont/iconfont.woff2 index 08c994e..aa70e1d 100644 Binary files a/src/assets/fonts/iconfont/iconfont.woff2 and b/src/assets/fonts/iconfont/iconfont.woff2 differ diff --git a/src/assets/styles/global.less b/src/assets/styles/global.less index 579bb42..8d1ca0b 100644 --- a/src/assets/styles/global.less +++ b/src/assets/styles/global.less @@ -5,8 +5,7 @@ // 字体 @wu-font-family: 'Google Sans', 'iconfont'; -@wu-font-catalog-size: 24px; -@wu-font-catalog-weight: 500; + // 颜色 @import url('./color.less'); // 主题颜色 @@ -15,4 +14,5 @@ @wu-color-split-line: #e2e2e2; // 布局 -@wu-layout-nav-height: 64px; \ No newline at end of file +@wu-layout-nav-height: 64px; +@wu-icon-spacing: .4em; \ No newline at end of file diff --git a/src/components/Banner.vue b/src/components/Banner.vue index 37e8014..0bf5c9c 100644 --- a/src/components/Banner.vue +++ b/src/components/Banner.vue @@ -9,7 +9,7 @@ export default {