ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-01-04 12:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix/issue-110-update-mapbox-style-spec

Browse Source 
Conflicts:
	package.json
This commit is contained in:
orangemug
2017-04-13 08:26:25 +01:00
parent 45942e604b 9b1dd44b9d
commit c552838fdd
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@@ -21,6 +21,7 @@
"homepage": "https://github.com/maputnik/editor#readme",
"dependencies": {
"@mapbox/mapbox-gl-style-spec": "^9.0.0",
"@mapbox/mapbox-gl-rtl-text": "^0.1.0",
"classnames": "^2.2.5",
"codemirror": "^5.18.2",
"color": "^1.0.3",
@@ -103,11 +104,12 @@
"babel-preset-es2015": "6.18.0",
"babel-preset-react": "6.16.0",
"babel-runtime": "^6.11.6",
"base64-loader": "^1.0.0",
"css-loader": "0.26.1",
"eslint": "^3.5.0",
"eslint-plugin-react": "^6.2.0",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "0.9.0",
"file-loader": "^0.11.1",
"html-webpack-plugin": "^2.22.0",
"json-loader": "^0.5.4",
"karma": "^1.3.0",
@@ -124,7 +126,6 @@
"stylelint": "^7.7.1",
"stylelint-config-standard": "^15.0.1",
"transform-loader": "^0.2.3",
"url-loader": "0.5.7",
"wdio-mocha-framework": "^0.5.9",
"wdio-phantomjs-service": "^0.2.2",
"wdio-spec-reporter": "^0.1.0",