schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2024-12-27 08:25:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into feature/added-html-option-to-export

Browse source
This commit is contained in:
orangemug 2020-09-09 15:12:23 +01:00
commit 731a315624
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View file

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

2
config/webpack.config.js
View file

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

1
package.json
View file

@ -11,6 +11,7 @@
"test-watch": "cross-env NODE_ENV=test wdio config/wdio.conf.js --watch", "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": "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-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-js": "eslint --ext js --ext jsx src test",
"lint-css": "stylelint \"src/styles/*.scss\"", "lint-css": "stylelint \"src/styles/*.scss\"",
"lint": "npm run lint-js && npm run lint-css", "lint": "npm run lint-js && npm run lint-css",

2
sandbox.config.json
View file

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