Skip to content
This repository was archived by the owner on Apr 24, 2024. It is now read-only.

Commit e357090

Browse files
authored
Upgrade dependencies (#1286)
* upgrade dependencies * fix package.lock * fix clean-css-cli
1 parent 618d898 commit e357090

File tree

7 files changed

+3198
-1480
lines changed

7 files changed

+3198
-1480
lines changed

.eslintrc

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@
66
"globals": {
77
"L": true
88
},
9+
"extends": "eslint:recommended",
910
"rules": {
10-
"quotes": [2, "single"],
11-
"no-underscore-dangle": [0],
12-
"no-loop-func": [0],
13-
"handle-callback-err": [0],
14-
"consistent-return": [0],
15-
"space-unary-ops": [0],
16-
"no-shadow": [0],
17-
"camelcase": [0],
18-
"curly": [0]
11+
"quotes": [2, "single"]
1912
}
2013
}

Makefile

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
CLEANCSS = node_modules/.bin/cleancss
2-
BROWSERIFY = node_modules/.bin/browserify
3-
41
# the default rule when someone runs simply `make`
52
all: \
63
dist/mapbox.js \
@@ -22,13 +19,13 @@ dist:
2219
mkdir -p dist
2320

2421
dist/mapbox.css: dist/mapbox.uncompressed.css
25-
$(CLEANCSS) dist/mapbox.uncompressed.css -o dist/mapbox.css
22+
npx cleancss dist/mapbox.uncompressed.css -o dist/mapbox.css
2623

2724
dist/mapbox.uncompressed.css: theme/style.css
2825
cat theme/style.css > dist/mapbox.uncompressed.css
2926

3027
dist/mapbox.standalone.css: theme/style.css
31-
cat theme/style.css | $(CLEANCSS) > dist/mapbox.standalone.css
28+
cat theme/style.css | npx cleancss > dist/mapbox.standalone.css
3229

3330
theme/images: theme/images/icons.svg
3431
./theme/images/render.sh
@@ -39,24 +36,24 @@ dist/images/icons-404040.png: theme/images
3936
rm -f dist/images/render.sh
4037

4138
# assemble a complete library for development
42-
dist/mapbox.js: node_modules/.install dist $(shell $(BROWSERIFY) --list src/index.js)
43-
$(BROWSERIFY) src/index.js --debug -p [minifyify --map mapbox.js.map --output dist/mapbox.js.map] > $@
39+
dist/mapbox.js: node_modules/.install dist $(shell npx browserify --list src/index.js)
40+
npx browserify src/index.js --debug -p [minifyify --map mapbox.js.map --output dist/mapbox.js.map] > $@
4441

4542
# assemble an uncompressed but complete library for development
46-
dist/mapbox.uncompressed.js: node_modules/.install dist $(shell $(BROWSERIFY) --list src/index.js)
47-
$(BROWSERIFY) src/index.js --debug > $@
43+
dist/mapbox.uncompressed.js: node_modules/.install dist $(shell npx browserify --list src/index.js)
44+
npx browserify src/index.js --debug > $@
4845

4946
# assemble a library without bundled leaflet
50-
dist/mapbox.standalone.js: node_modules/.install dist $(shell $(BROWSERIFY) --list src/mapbox.js)
51-
$(BROWSERIFY) src/mapbox.js --debug -p [minifyify --map mapbox.standalone.js.map --output dist/mapbox.standalone.js.map] > $@
47+
dist/mapbox.standalone.js: node_modules/.install dist $(shell npx browserify --list src/mapbox.js)
48+
npx browserify src/mapbox.js --debug -p [minifyify --map mapbox.standalone.js.map --output dist/mapbox.standalone.js.map] > $@
5249

5350
# assemble an uncompressed library without bundled leaflet
54-
dist/mapbox.standalone.uncompressed.js: node_modules/.install dist $(shell $(BROWSERIFY) --list src/mapbox.js)
55-
$(BROWSERIFY) src/mapbox.js --debug > $@
51+
dist/mapbox.standalone.uncompressed.js: node_modules/.install dist $(shell npx browserify --list src/mapbox.js)
52+
npx browserify src/mapbox.js --debug > $@
5653

5754
# assemble an uncompressed but complete library for development
58-
dist/mapbox.internals.js: node_modules/.install dist $(shell $(BROWSERIFY) --list src/internals.js)
59-
$(BROWSERIFY) src/internals.js --debug > $@
55+
dist/mapbox.internals.js: node_modules/.install dist $(shell npx browserify --list src/internals.js)
56+
npx browserify src/internals.js --debug > $@
6057

6158
clean:
6259
rm -rf dist/*

0 commit comments

Comments
 (0)