Merge branch 'develop'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelogs
 
+## 2.0.6 - November 29, 2018
+
+- Fixed: Fixed the [issue](https://github.com/octokit/rest.js/issues/1144) introduced by `deepmerge`.
+
+
 ## 2.0.5 - November 29, 2018
 
 - Changed: Replaced `moment` with `date-fns` which can significantly reduce the extension's size.

package.json

@@ -2,7 +2,7 @@
     "name": "syncing",
     "displayName": "%displayName%",
     "description": "%description%",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "publisher": "nonoroazoro",
     "author": {
         "email": "[email protected]",
@@ -104,8 +104,8 @@
         "precommit": "lint-staged",
         "postinstall": "node ./node_modules/vscode/bin/install",
         "prebuild": "npm run clean && npm run cleanCov",
-        "build": "tsc -p ./tsconfig.json --sourceMap false",
-        "build:wp": "webpack --config ./webpack.config.prod.js",
+        "build": "cross-env NODE_ENV=production webpack --config ./webpack.config.prod.js --progress",
+        "build:ts": "tsc -p ./tsconfig.json --sourceMap false",
         "watch": "tsc -p ./tsconfig.json -w",
         "clean": "rimraf dist/*",
         "cleanCov": "rimraf @coverage",
@@ -136,6 +136,7 @@
         "@types/minimatch": "^3.0.3",
         "@types/node": "^10.12.10",
         "@types/tmp": "0.0.33",
+        "cross-env": "^5.2.0",
         "husky": "^1.2.0",
         "jest": "^23.6.0",
         "lint-staged": "^8.1.0",

webpack.config.prod.js

@@ -18,7 +18,10 @@ module.exports = {
         libraryTarget: "commonjs",
     },
     resolve: {
-        extensions: [".ts", ".js"]
+        extensions: [".ts", ".js"],
+        alias: {
+            deepmerge$: 'deepmerge/dist/umd.js',
+        }
     },
     externals: {
         "vscode": "commonjs vscode"
@@ -33,11 +36,6 @@ module.exports = {
                     }
                 ],
                 exclude: /node_modules/
-            },
-            {
-                test: /\.mjs$/,
-                type: "javascript/auto",
-                use: []
             }
         ]
     },

yarn.lock

@@ -1378,6 +1378,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+cross-env@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2"
+  integrity sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==
+  dependencies:
+    cross-spawn "^6.0.5"
+    is-windows "^1.0.0"
+
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -3123,7 +3131,7 @@ is-valid-glob@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
   integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
 
-is-windows@^1.0.1, is-windows@^1.0.2:
+is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==