release 3.1.0

nonoroazoro · Nov 18, 2020 · a7534a5 · a7534a5
2 parents c20b579 + f0bddee
commit a7534a5
Show file tree

Hide file tree

Showing 27 changed files with 3,080 additions and 4,308 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -8,5 +8,21 @@
     },
     "parserOptions": {
         "project": "./tsconfig.eslint.json"
+    },
+    "rules": {
+        "@typescript-eslint/naming-convention": [
+            "error",
+            {
+                "selector": "variable",
+                "format": [
+                    "camelCase",
+                    "PascalCase",
+                    "snake_case",
+                    "UPPER_CASE"
+                ],
+                "leadingUnderscore": "allow",
+                "trailingUnderscore": "forbid"
+            }
+        ]
     }
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -19,7 +19,7 @@
             "sourceMaps": true,
             "osx": {
                 "preLaunchTask": "tsc-watch"
-            },
+            }
         }
     ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelogs
 
+## 3.1.0 - November 18, 2020
+
+- Note: Since the official `Settings Sync` doesn't meet my requirement, I decided to resume the updates.
+- Changed: Upgrade dependencies and some minor fix.
+
+
 ## 3.0.13 - December 10, 2019
 
 - Fixed: Rollback fs-extra to try to fix the issue in dock container.

diff --git a/package.json b/package.json
@@ -2,12 +2,12 @@
     "name": "syncing",
     "displayName": "%displayName%",
     "description": "%description%",
-    "version": "3.0.13",
+    "version": "3.1.0",
     "publisher": "nonoroazoro",
     "author": {
         "email": "xiaochao.k@gmail.com",
         "name": "nonoroazoro",
-        "url": "http://www.alibabagroup.com/"
+        "url": "https://github.com/nonoroazoro"
     },
     "homepage": "https://github.com/nonoroazoro/vscode-syncing",
     "license": "(MIT AND 996ICU)",
@@ -107,7 +107,6 @@
     },
     "scripts": {
         "vscode:prepublish": "npm run build",
-        "postinstall": "node ./node_modules/vscode/bin/install",
         "prebuild": "npm run clean && npm run cleanCov",
         "build": "cross-env NODE_ENV=production webpack --config ./scripts/webpack.config.prod.js",
         "build:ts": "tsc -p ./tsconfig.json",
@@ -119,48 +118,48 @@
         "test:cov": "npm run cleanCov && npm test -- --coverage"
     },
     "dependencies": {
-        "@octokit/rest": "^16.28.7",
-        "chokidar": "^3.3.0",
-        "date-fns": "^2.8.1",
-        "extract-zip": "^1.6.7",
-        "fs-extra": "7.0.1",
-        "https-proxy-agent": "^3.0.1",
-        "jsonc-parser": "^2.2.0",
-        "jsondiffpatch": "^0.3.11",
+        "@octokit/rest": "^18.0.9",
+        "chokidar": "^3.4.3",
+        "date-fns": "^2.16.1",
+        "extract-zip": "^2.0.1",
+        "fs-extra": "9.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "jsonc-parser": "^3.0.0",
+        "jsondiffpatch": "^0.4.1",
         "junk": "^3.1.0",
         "lodash.debounce": "^4.0.8",
         "lodash.pick": "^4.4.0",
         "micromatch": "^4.0.2",
-        "tmp": "0.1.0",
-        "tslib": "^1.10.0"
+        "tmp-promise": "^3.0.2",
+        "tslib": "^2.0.3"
     },
     "devDependencies": {
         "@types/extract-zip": "^1.6.2",
-        "@types/fs-extra": "^7.0.0",
-        "@types/jest": "^24.0.23",
+        "@types/fs-extra": "^9.0.4",
+        "@types/jest": "^26.0.15",
         "@types/lodash.debounce": "^4.0.6",
         "@types/lodash.pick": "^4.4.6",
-        "@types/micromatch": "^3.1.1",
-        "@types/node": "^12.12.14",
-        "@types/tmp": "0.1.0",
-        "@typescript-eslint/eslint-plugin": "^2.10.0",
-        "@typescript-eslint/parser": "^2.10.0",
+        "@types/micromatch": "^4.0.1",
+        "@types/node": "^14.14.8",
+        "@types/vscode": "^1.37.0",
+        "@typescript-eslint/eslint-plugin": "^4.8.1",
+        "@typescript-eslint/parser": "^4.8.1",
         "cache-loader": "^4.1.0",
-        "cross-env": "^6.0.3",
-        "eslint": "^6.7.2",
-        "eslint-config-zoro": "^2.7.3",
-        "eslint-loader": "^3.0.2",
-        "husky": "^3.1.0",
-        "jest": "^24.9.0",
-        "lint-staged": "^9.5.0",
+        "cross-env": "^7.0.2",
+        "eslint": "^7.13.0",
+        "eslint-config-zoro": "^4.0.1",
+        "eslint-loader": "^3.0.3",
+        "fork-ts-checker-webpack-plugin": "^6.0.3",
+        "husky": "^4.3.0",
+        "jest": "^26.6.3",
+        "lint-staged": "^10.5.1",
         "native-ext-loader": "^2.3.0",
-        "rimraf": "^3.0.0",
-        "ts-jest": "^24.2.0",
-        "ts-loader": "^6.2.1",
-        "typescript": "^3.7.3",
-        "vscode": "^1.1.36",
-        "webpack": "^4.41.2",
-        "webpack-cli": "^3.3.10",
+        "rimraf": "^3.0.2",
+        "ts-jest": "^26.4.4",
+        "ts-loader": "^8.0.11",
+        "typescript": "^4.0.5",
+        "webpack": "^5.5.0",
+        "webpack-cli": "^4.2.0",
         "webpackbar": "^4.0.0"
     }
 }
diff --git a/scripts/webpack.config.prod.js b/scripts/webpack.config.prod.js
@@ -1,5 +1,7 @@
 const fs = require("fs");
 const path = require("path");
+const TerserPlugin = require("terser-webpack-plugin");
+const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
 const Webpackbar = require("webpackbar");
 
 const ROOT_PATH = fs.realpathSync(process.cwd());
@@ -16,13 +18,26 @@ module.exports = {
     entry: {
         extension: ["./src/extension"]
     },
+    optimization: {
+        minimizer: [
+            new TerserPlugin({
+                extractComments: false,
+                terserOptions: {
+                    format: { comments: false }
+                }
+            })
+        ]
+    },
     output: {
         path: BUILD_PATH,
         filename: "[name].js",
         libraryTarget: "commonjs"
     },
     resolve: {
-        extensions: [".ts", ".js"]
+        extensions: [".ts", ".js"],
+        alias: {
+            "universal-user-agent$": "universal-user-agent/dist-node/index.js"
+        }
     },
     externals: {
         "vscode": "commonjs vscode"
@@ -53,7 +68,14 @@ module.exports = {
             }
         ]
     },
-    plugins: [new Webpackbar()],
+    plugins: [
+        new ForkTsCheckerWebpackPlugin({
+            eslint: {
+                files: "{scripts,src,tests}/**/*.{js,jsx,ts,tsx}"
+            }
+        }),
+        new Webpackbar()
+    ],
     stats: {
         children: false,
         modules: false

diff --git a/src/core/AutoSyncService.ts b/src/core/AutoSyncService.ts
@@ -1,13 +1,13 @@
 import * as vscode from "vscode";
 
-import * as Toast from "./Toast";
-import { VSCodeSetting } from "./VSCodeSetting";
 import { Gist } from "./Gist";
-import { ISyncingSettings, ISetting } from "../types/SyncingTypes";
-import { isAfter } from "../utils/date";
-import { SettingsWatcherService, WatcherEvent } from "../watcher";
 import { IGist } from "../types/GitHubTypes";
+import { isAfter } from "../utils/date";
+import { ISyncingSettings, ISetting } from "../types/SyncingTypes";
 import { localize } from "../i18n";
+import { SettingsWatcherService, WatcherEvent } from "../watcher";
+import { VSCodeSetting } from "./VSCodeSetting";
+import * as Toast from "./Toast";
 
 export class AutoSyncService
 {
@@ -102,7 +102,7 @@ export class AutoSyncService
                 Toast.statusInfo(localize("toast.settings.autoSync.nothingChanged"));
             }
         }
-        catch (err)
+        catch (err: any)
         {
             Toast.statusError(localize("toast.settings.autoSync.failed", err.message));
         }

diff --git a/src/core/Environment.ts b/src/core/Environment.ts
@@ -1,10 +1,10 @@
 import * as os from "os";
 import * as path from "path";
 
+import { getVSCodeBuiltinEnvironment } from "../utils/vscodeAPI";
+import { IExtension } from "../types/SyncingTypes";
 import { localize } from "../i18n";
 import { Platform } from "../types/Platform";
-import { IExtension } from "../types/SyncingTypes";
-import { getVSCodeBuiltinEnvironment } from "../utils/vscodeAPI";
 
 /**
  * VSCode environment wrapper.