diff --git a/.gitignore b/.gitignore index e35a46e..703ce36 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ src/_lib node_modules bower_components coverage +npm-debug.log diff --git a/npm-debug.log b/npm-debug.log deleted file mode 100644 index 8f75acc..0000000 --- a/npm-debug.log +++ /dev/null @@ -1,45 +0,0 @@ -0 info it worked if it ends with ok -1 verbose cli [ '/Users/hiasinho/.nvm/versions/node/v5.5.0/bin/node', -1 verbose cli '/Users/hiasinho/.nvm/versions/node/v5.5.0/bin/npm', -1 verbose cli 'version', -1 verbose cli 'minor' ] -2 info using npm@3.3.12 -3 info using node@v5.5.0 -4 info git [ 'status', '--porcelain' ] -5 verbose stack Error: Git working directory not clean. -5 verbose stack M LICENSE -5 verbose stack M README.md -5 verbose stack M bower.json -5 verbose stack M dist/leaflet-vector-markers.css -5 verbose stack M dist/leaflet-vector-markers.js -5 verbose stack M dist/leaflet-vector-markers.min.js -5 verbose stack M lib/Icon.js -5 verbose stack M src/Icon.js -5 verbose stack M src/leaflet-vector-markers.scss -5 verbose stack at /Users/hiasinho/.nvm/versions/node/v5.5.0/lib/node_modules/npm/lib/version.js:172:21 -5 verbose stack at ChildProcess.exithandler (child_process.js:204:7) -5 verbose stack at emitTwo (events.js:100:13) -5 verbose stack at ChildProcess.emit (events.js:185:7) -5 verbose stack at maybeClose (internal/child_process.js:821:16) -5 verbose stack at Socket. (internal/child_process.js:319:11) -5 verbose stack at emitOne (events.js:90:13) -5 verbose stack at Socket.emit (events.js:182:7) -5 verbose stack at Pipe._onclose (net.js:469:12) -6 verbose cwd /Volumes/Data/hiasinho/Sites/Leaflet.vector-markers -7 error Darwin 15.3.0 -8 error argv "/Users/hiasinho/.nvm/versions/node/v5.5.0/bin/node" "/Users/hiasinho/.nvm/versions/node/v5.5.0/bin/npm" "version" "minor" -9 error node v5.5.0 -10 error npm v3.3.12 -11 error Git working directory not clean. -11 error M LICENSE -11 error M README.md -11 error M bower.json -11 error M dist/leaflet-vector-markers.css -11 error M dist/leaflet-vector-markers.js -11 error M dist/leaflet-vector-markers.min.js -11 error M lib/Icon.js -11 error M src/Icon.js -11 error M src/leaflet-vector-markers.scss -12 error If you need help, you may report this error at: -12 error -13 verbose exit [ 1, true ] diff --git a/package.json b/package.json index 2bf51aa..ce19614 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/hiasinho/Leaflet.vector-markers.git" }, "scripts": { - "clean:lib": "rm -Rf ./lib", + "clean:lib": "rimraf ./lib", "compile:lib": "babel src --out-dir lib", "build:lib": "npm run clean:lib && npm run compile:lib", "build:dist": "webpack src/index.js dist/leaflet-vector-markers.js && webpack -p src/index.js dist/leaflet-vector-markers.min.js && webpack src/leaflet-vector-markers.scss dist/leaflet-vector-markers.css", @@ -26,11 +26,11 @@ }, "dependencies": { "autoprefixer": "^6.3.7", - "leaflet": "^0.7.0", + "leaflet": "^0.7.0 || ^1.0.0", "postcss-loader": "^0.9.1" }, "peerDependencies": { - "leaflet": "^0.7.0" + "leaflet": "^0.7.0 || ^1.0.0" }, "devDependencies": { "babel-cli": "^6.9.0", @@ -46,6 +46,7 @@ "jest-cli": "^12.1.1", "node-sass": "^3.7.0", "onchange": "^2.4.0", + "rimraf": "^2.6.1", "sass-loader": "^3.2.0", "style-loader": "^0.13.1", "webpack": "^1.13.1", @@ -79,4 +80,4 @@ "/src/VectorMarkers" ] } -} +} \ No newline at end of file diff --git a/src/Icon.js b/src/Icon.js index f03dd02..08ce6fe 100644 --- a/src/Icon.js +++ b/src/Icon.js @@ -1,11 +1,11 @@ import Leaflet from 'leaflet' const iconOptions = { - iconSize: [ 30, 50 ], - iconAnchor: [ 15, 50 ], - popupAnchor: [ 2, -40 ], - shadowAnchor: [ 39, 45 ], - shadowSize: [ 54, 51 ], + iconSize: [30, 50], + iconAnchor: [15, 50], + popupAnchor: [2, -40], + shadowAnchor: [39, 45], + shadowSize: [54, 51], className: 'vector-marker', prefix: 'fa', spinClass: 'fa-spin',