Merge remote-tracking branch 'upstream/master' into fix/issue-718

.github/workflows/ci.yml

@@ -122,7 +122,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: maputnik/desktop
-        ref: v1.0.6
+        ref: v1.0.7
         path: ./src/github.com/maputnik/desktop/
 
     - name: Make

config/webpack.config.js

@@ -53,7 +53,7 @@ module.exports = {
       // See <https://webpack.js.org/configuration/watch/#watchoptions-poll> for details
       poll: (!!process.env.WEBPACK_DEV_SERVER_POLLING ? true : false),
       watch: false
-    }
+    },
   },
   plugins: [
     new webpack.NoEmitOnErrorsPlugin(),

package.json

@@ -11,6 +11,7 @@
     "test-watch": "cross-env NODE_ENV=test wdio config/wdio.conf.js --watch",
     "start": "webpack-dev-server --progress --profile --colors --config config/webpack.config.js",
     "start-prod": "webpack-dev-server --progress --profile --colors --config config/webpack.production.config.js",
+    "start-sandbox": "webpack-dev-server --disable-host-check --host 0.0.0.0 --progress --profile --colors --config config/webpack.production.config.js",
     "lint-js": "eslint --ext js --ext jsx src test",
     "lint-css": "stylelint \"src/styles/*.scss\"",
     "lint": "npm run lint-js && npm run lint-css",

sandbox.config.json

@@ -1,5 +1,5 @@
 {
   "container": {
-    "startScript": "start-prod"
+    "startScript": "start-sandbox"
   }
 }