mirror of
https://github.com/a-nyx/maputnik-with-pmtiles.git
synced 2024-12-26 18:40:37 +01:00
Merge remote-tracking branch 'upstream/master' into fix/issue-707
This commit is contained in:
commit
44aea3745e
4 changed files with 4 additions and 3 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -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
|
||||
|
|
|
@ -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(),
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"container": {
|
||||
"startScript": "start-prod"
|
||||
"startScript": "start-sandbox"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue