Merge pull request #227 from EhTagTranslation/feat/user-script

Feat/user script

Author: OpportunityLiu

.github/dependabot.yml

@@ -5,15 +5,14 @@
 
 version: 2
 updates:
+    # Maintain dependencies for GitHub Actions
+    - package-ecosystem: 'github-actions'
+      directory: '/'
+      schedule:
+          interval: 'daily'
 
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-
-  # Maintain dependencies for npm
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "daily"
+    # Maintain dependencies for npm
+    - package-ecosystem: 'npm'
+      directory: '/'
+      schedule:
+          interval: 'daily'

.github/workflows/build.yml

@@ -1,8 +1,9 @@
 name: build
 
 on:
-    - push
-    - create
+    push:
+    create:
+    pull_request:
 
 jobs:
     build:
@@ -15,19 +16,20 @@ jobs:
                   node-version: 12
             - name: Install
               uses: bahmutov/npm-install@v1
-            - name: update-db
-              run: yarn update-db
             - name: yarn build
-              run: yarn build
-            - uses: actions/upload-artifact@master
+              run: |
+                  yarn build:firefox
+                  yarn build:chrome
+                  yarn build:monkey
+            - uses: actions/upload-artifact@v2
               with:
-                  name: EhSyringe
-                  path: release
+                  path: releases/*
             - name: publish to github release
               uses: ncipollo/release-action@v1
               if: github.event_name == 'create' && github.event.ref_type == 'tag'
               with:
                   token: ${{ secrets.GITHUB_TOKEN }}
                   body: |
                       [更新日志](https://github.com/EhTagTranslation/EhSyringe/blob/master/CHANGELOG.md)
-                  artifacts: release/*
+                  artifacts: releases/*
+                  prerelease: ${{ contains(github.event.ref, '-') }}

.gitignore

@@ -2,10 +2,7 @@
 
 # compiled output
 /dist
-/artifacts
-/tmp
-/out-tsc
-/release
+/releases
 
 # dependencies
 /node_modules

.vscode/settings.json

@@ -12,5 +12,12 @@
     "[typescript]": {
         "editor.defaultFormatter": "dbaeumer.vscode-eslint"
     },
-    "typescript.tsdk": "node_modules\\typescript\\lib"
+    "typescript.tsdk": "node_modules\\typescript\\lib",
+    "json.schemas": [
+        {
+            "fileMatch": ["manifest.json"],
+            "url": "http://json.schemastore.org/webextension"
+        }
+    ],
+    "cSpell.words": ["ehgt", "ehsyringe", "exhentai", "hentai", "omnibox", "typedi"]
 }

src/manifest.json manifest.json

@@ -1,13 +1,6 @@
 {
-    "$schema": "http://json.schemastore.org/webextension",
     "manifest_version": 2,
-    "name": "${displayName}",
-    "short_name": "${displayName}",
-    "description": "${description}",
-    "author": "${author}",
-    "version": "${version}",
-    "homepage_url": "${homepage}",
-    "applications": {
+    "__firefox__applications": {
         "gecko": {
             "id": "{759d5566-1dce-41ae-bae9-00dd5172c422}",
             "strict_min_version": "57.0"
@@ -32,13 +25,12 @@
             "48": "assets/logo48.png",
             "128": "assets/logo128.png"
         },
-        "default_title": "${displayName}",
-        "default_popup": "template/popup.html"
+        "default_popup": "assets/popup.html"
     },
     "content_scripts": [
         {
             "matches": ["*://exhentai.org/*", "*://e-hentai.org/*", "*://*.exhentai.org/*", "*://*.e-hentai.org/*"],
-            "js": ["script/main.js"],
+            "js": ["script/page.js"],
             "run_at": "document_start"
         }
     ],

package.json

@@ -4,20 +4,22 @@
     "version": "1.3.1",
     "description": "E 站注射器，将中文翻译注入到 E 站体内。",
     "author": "EhTagTranslation",
-    "main": "syringe.js",
     "scripts": {
-        "start": "npm run dev:chrome",
-        "dev:chrome": "webpack --mode=development --watch",
-        "dev:firefox": "webpack --mode=development --watch --firefox",
-        "dev:android": "webpack --mode=development --watch --android",
-        "prebuild": "yarn clean",
-        "build": "webpack --mode=production --pack && run-script-os ",
-        "build:win32": "move release\\ehsyringe-*.zip release\\Ehsyringe.firefox.zip",
-        "build:nix": "mv release/ehsyringe-*.zip release/Ehsyringe.firefox.zip",
+        "prestart": "yarn clean",
+        "start": "webpack --mode=development --watch",
+        "start:ext": "yarn start --web-ext",
+        "start:chrome": "yarn start:ext --vendor=chrome",
+        "start:firefox": "yarn start:ext --vendor=firefox",
+        "start:monkey": "yarn start --user-script",
+        "build": "webpack --mode=production",
+        "build:ext": "yarn build --web-ext",
+        "build:chrome": "yarn build:ext --vendor=chrome && web-ext build -s dist -a releases -n ehsyringe.chrome.zip -o",
+        "build:firefox": "yarn build:ext --vendor=firefox && web-ext build -s dist -a releases -n ehsyringe.firefox.zip -o",
+        "build:monkey": "yarn build --user-script",
         "update-db": "node ./tools/update-db.js",
-        "lint": "prettier --check . && eslint ./src/**/*.ts",
-        "lint:fix": "prettier --write . && eslint --fix ./src/**/*.ts",
-        "clean": "rimraf dist release"
+        "lint": "eslint ./src/**/*.ts",
+        "format": "prettier --ignore-path .gitignore --write .",
+        "clean": "rimraf dist releases"
     },
     "repository": {
         "type": "git",
@@ -31,15 +33,19 @@
     "homepage": "https://github.com/EhTagTranslation/EhSyringe",
     "devDependencies": {
         "@types/chrome": "^0.0.121",
+        "@types/escape-html": "^1.0.0",
+        "@types/node": "^14.0.24",
         "@types/pako": "^1.0.1",
-        "@typescript-eslint/eslint-plugin": "^3.6.1",
-        "@typescript-eslint/parser": "^3.6.1",
+        "@types/tampermonkey": "^4.0.0",
+        "@typescript-eslint/eslint-plugin": "^3.7.0",
+        "@typescript-eslint/parser": "^3.7.0",
         "copy-webpack-plugin": "^6.0.3",
         "css-loader": "^3.6.0",
         "cssnano": "^4.1.10",
         "eslint": "^7.5.0",
         "eslint-config-prettier": "^6.11.0",
         "eslint-plugin-prettier": "^3.1.4",
+        "execa": "^4.0.3",
         "file-loader": "^6.0.0",
         "keypair": "^1.0.1",
         "less": "^3.12.2",
@@ -50,24 +56,31 @@
         "postcss-loader": "^3.0.0",
         "prettier": "^2.0.5",
         "rimraf": "^3.0.2",
-        "run-script-os": "^1.1.1",
         "style-loader": "^1.2.1",
         "ts-loader": "^8.0.1",
+        "tsconfig-paths-webpack-plugin": "^3.2.0",
+        "type-fest": "^0.16.0",
         "typescript": "^3.9.7",
         "typescript-lit-html-plugin": "^0.9.0",
+        "url-loader": "^4.1.0",
         "web-ext": "^4.3.0",
-        "webext-webpack-plugin": "^0.0.8",
         "webpack": "^4.43.0",
         "webpack-cli": "^3.3.12",
-        "zip-webpack-plugin": "^3.0.0"
+        "webpack-userscript": "^2.5.4",
+        "webpack-webextension-plugin": "^0.2.0",
+        "yargs": "^15.4.1"
     },
     "dependencies": {
+        "core-js": "^3.6.5",
         "emoji-regex": "^9.0.0",
+        "escape-html": "^1.0.3",
         "lit-element": "^2.3.1",
         "lit-html": "^1.2.1",
         "normalize.css": "^8.0.1",
         "pako": "^1.0.11",
         "rxjs": "^6.6.0",
+        "tslib": "^2.0.0",
+        "typedi": "^0.8.0",
         "webextension-polyfill-ts": "^0.19.0"
     }
 }