diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 445b050a..998241d9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,9 +9,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Zip Extension - run: npm run build + run: npm run release - name: Browser Plugin Publish uses: PlasmoHQ/bpp@v2 with: - artifact: "extension.zip" + artifact: "dist/extension-v3.zip" keys: ${{ secrets.SUBMIT_KEYS }} diff --git a/.gitignore b/.gitignore index e9989bb0..5d541168 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ package-lock.json extension/tools/venv/ extension/tools/chrome-linux.zip extension/tools/chrome-linux/ -extension/test/nohup.out \ No newline at end of file +extension/test/nohup.out +dist \ No newline at end of file diff --git a/extension-v2/js/background.js b/extension-v2/js/background.js index 5c7f7ac9..04c0bf43 100644 --- a/extension-v2/js/background.js +++ b/extension-v2/js/background.js @@ -244,6 +244,7 @@ chrome.webRequest.onBeforeRequest.addListener( //"cdn.jsdelivr.net/npm/bootstrap@$1/dist/$2" "lib.baomitu.com/twitter-bootstrap/$1/$2" ); + url = url.replace("developers.google.com", "developers.google.cn"); return { redirectUrl: url }; }, { @@ -257,6 +258,7 @@ chrome.webRequest.onBeforeRequest.addListener( "*://www.gravatar.com/*", "*://maxcdn.bootstrapcdn.com/bootstrap/*", "*://cdn.jsdelivr.net/*", + "*://developers.google.com/*", // ...test_urls // 测试用例 ], }, diff --git a/extension/rules/README.md b/extension/rules/README.md index 8e3c9b6e..9e80a50d 100644 --- a/extension/rules/README.md +++ b/extension/rules/README.md @@ -16,10 +16,10 @@ 7. [jsdelivr](https://www.jsdelivr.com/) 8. [unpkg](https://unpkg.com/) 9. [cloudflare ](https://cdnjs.com/) -11. [google libraries cn](https://developers.google.cn/speed/libraries) -12. [七牛静态库](http://staticfile.org/) -13. [极客族公共加速服务](https://cdn.geekzu.org/cached.html) -14. [中科大反向代理列表如下:](https://mirrors.ustc.edu.cn/) +10. [google libraries cn](https://developers.google.cn/speed/libraries) +11. [七牛静态库](http://staticfile.org/) +12. [极客族公共加速服务](https://cdn.geekzu.org/cached.html) +13. [中科大反向代理列表如下:](https://mirrors.ustc.edu.cn/) ```text diff --git a/extension/rules/advance/RAEDME.md b/extension/rules/advance-no-use/RAEDME.md similarity index 71% rename from extension/rules/advance/RAEDME.md rename to extension/rules/advance-no-use/RAEDME.md index b06ed340..6ac7aebe 100644 --- a/extension/rules/advance/RAEDME.md +++ b/extension/rules/advance-no-use/RAEDME.md @@ -5,4 +5,4 @@ 1. 广告拦截 2. 访问 chromium source code 等 -## 使用`tools`目录下的辅助工具方便快捷 +## 配合`tools`目录下的辅助工具方便快捷 diff --git a/extension/rules/advance/auth.json b/extension/rules/advance-no-use/auth.json similarity index 100% rename from extension/rules/advance/auth.json rename to extension/rules/advance-no-use/auth.json diff --git a/extension/rules/advance/rules_advance_redirect_1.json b/extension/rules/advance-no-use/rules_advance_redirect_1.json similarity index 100% rename from extension/rules/advance/rules_advance_redirect_1.json rename to extension/rules/advance-no-use/rules_advance_redirect_1.json diff --git a/extension/rules/advance/rules_advance_redirect_2.json b/extension/rules/advance-no-use/rules_advance_redirect_2.json similarity index 100% rename from extension/rules/advance/rules_advance_redirect_2.json rename to extension/rules/advance-no-use/rules_advance_redirect_2.json diff --git a/extension/test/README.md b/extension/test/README.md index 1f7639b1..1be76ed6 100644 --- a/extension/test/README.md +++ b/extension/test/README.md @@ -8,5 +8,3 @@ 4. [`cdn.jsdelivr.net` 替换为 `fastly.jsdelivr.net` 打开 `https://cdn.jsdelivr.net/` 查看结果 ](https://cdn.jsdelivr.net/) 5. [`cdnjs.cloudflare.com` 替换为 `cdnjs.loli.net` 打开 `https://cdnjs.cloudflare.com/` 查看结果 ](https://cdnjs.cloudflare.com/ajax/libs/reveal.js/4.1.2/reveal.min.css) 6. [`developers.google.com` 替换为 `developers.google.cn` 打开 `https://developers.google.cn/` 查看结果 ](https://developers.google.cn) - -## diff --git a/package.json b/package.json index 7452b196..65013f68 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,8 @@ "private": true, "scripts": { "fmt": "prettier --write \"extension/**/*.{ts,js}\"", - "build": "cd extension/; zip -r ../extension.zip .; cd -" + "build": "mkdir -p dist ; cd extension/; zip -r ../dist/extension-v3.zip . -x './tools/*' -x './_metadata/*' -x './test/*' -x './rules/advance-no-use/*' -x './rules/example-no-use/*'; cd -", + "release": "bash release-archive.sh" }, "devDependencies": { "@types/chrome": "^0.0.139", diff --git a/release-archive.sh b/release-archive.sh new file mode 100644 index 00000000..53f4595c --- /dev/null +++ b/release-archive.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +set -exu +__DIR__=$( + cd "$(dirname "$0")" + pwd +) +cd ${__DIR__} + +test -d dist && rm -rf dist +mkdir -p dist + +test -f dist/extension-v2.zip && rm -f dist/extension-v2.zip +test -f dist/extension-v3.zip && rm -f dist/extension-v3.zip + +# 打包 manifest v3 +cd ${__DIR__}/extension/ + +zip -r ../dist/extension-v3.zip . \ + -x "./tools/*" \ + -x "./_metadata/*" \ + -x "./test/*" \ + -x "./rules/advance/*" \ + -x "./rules/example-no-use/*" \ + -x "./rules/README.md" + + +cd ${__DIR__} + + +# 打包 manifest v2 +cd ${__DIR__}/extension-v2/ + +zip -r ../dist/extension-v2.zip . \ + -x "./README.md" + + +cd ${__DIR__} + + + +cd dist +unzip extension-v2.zip -d extension-v2 +unzip extension-v3.zip -d extension-v3 + +cd ${__DIR__} \ No newline at end of file