Merge pull request #12 from 1999/use-webpack

Build sklad using webpack & move to ES6
1999 · Jan 19, 2016 · 2288595 · 2288595
2 parents 725a69b + 868abe9
commit 2288595
Show file tree

Hide file tree

Showing 13 changed files with 1,797 additions and 786 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.10"
+  - "stable"
 before_install:
   - "export CHROME_BIN=chromium-browser"
   - "export DISPLAY=:99.0"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.0
+
+ * Sklad is now built with Webpack. Library code is now transpiled from ES2015 into ES5 which leads to some overhead. New release has new major version only for safety reasons: no new changes are introduced, all tests passed :smiley:
+
 ## 2.0.0
 
  * new: promises support added

diff --git a/bower.json b/bower.json
@@ -3,16 +3,17 @@
   "version": "1.0.0",
   "homepage": "https://github.com/1999/sklad",
   "author": "Dmitry Sorin <info@staypositive.ru>",
-  "main": "sklad.js",
+  "main": "dist/sklad.min.js",
   "ignore": [
     "docs/**",
-    "tests/**"
+    "tests/**",
+    "lib/**"
   ],
   "scripts": {
     "test": "npm test"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=0.10"
+    "node": ">=4"
   }
 }
diff --git a/dist/sklad.min.js b/dist/sklad.min.js
diff --git a/dist/sklad.min.js.map b/dist/sklad.min.js.map