From 5f33a0fd00fefa5d8ca086dff322fa070175fea2 Mon Sep 17 00:00:00 2001 From: moz Date: Wed, 3 Jun 2026 14:05:39 +0800 Subject: [PATCH] ci: update ci Keep manifest-beta.json in sync with manifest.json --- .github/workflows/release.yml | 2 +- .gitignore | 50 +++++++++++++++++------------------ package.json | 4 +-- version-bump.mjs | 1 + 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 944f751..943404c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: - name: Build run: | - npm ci + npm ci --legacy-peer-deps npm run build - name: Lint diff --git a/.gitignore b/.gitignore index cc14c86..ab178ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,25 @@ -# vscode -.vscode - -# Intellij -*.iml -.idea - -# npm -node_modules - -# Don't include the compiled main.js file in the repo. -# They should be uploaded to GitHub releases instead. -main.js - -# Exclude sourcemaps -*.map - -# obsidian -data.json - -# Exclude macOS Finder (System Explorer) View States -.DS_Store - -# Exclude IDE files -/.trae/* +# vscode +.vscode + +# Intellij +*.iml +.idea + +# npm +node_modules + +# Don't include the compiled main.js file in the repo. +# They should be uploaded to GitHub releases instead. +main.js + +# Exclude sourcemaps +*.map + +# obsidian +data.json + +# Exclude macOS Finder (System Explorer) View States +.DS_Store + +# Exclude IDE files +/.trae/* diff --git a/package.json b/package.json index bcd0f51..06db443 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production", "test:smoke": "npm run build && node -e \"console.log('smoke ok')\"", "test:manual": "echo 'See TESTING.md for manual verification steps'", - "version": "node version-bump.mjs && git add manifest.json versions.json", + "version": "node version-bump.mjs && git add manifest.json manifest-beta.json versions.json", "lint": "npx eslint src/**/*.ts", "lint:fix": "npx eslint src/**/*.ts --fix", "optimize-icons": "node scripts/optimize-icons.mjs" @@ -27,7 +27,7 @@ "eslint": "^8.57.1", "eslint-plugin-obsidianmd": "^0.3.0", "globals": "^17.0.0", - "obsidian": "latest", + "obsidian": "^1.13.0", "svgo": "^4.0.0", "tslib": "2.4.0", "typescript": "^5.0.0", diff --git a/version-bump.mjs b/version-bump.mjs index 6b671f4..638097a 100644 --- a/version-bump.mjs +++ b/version-bump.mjs @@ -10,6 +10,7 @@ writeFileSync("manifest.json", JSON.stringify(manifest, null, "\t")); if (existsSync("manifest-beta.json")) { let manifestBeta = JSON.parse(readFileSync("manifest-beta.json", "utf8")); manifestBeta.version = targetVersion; + manifestBeta.minAppVersion = minAppVersion; writeFileSync("manifest-beta.json", JSON.stringify(manifestBeta, null, "\t")); }