merged master, resolving conflict

woocommerce · Nov 17, 2017 · 4bb45f0 · 4bb45f0
2 parents b97b4fc + bbe2839
commit 4bb45f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+node_modules/less
+node_modules/.bin
diff --git a/package.json b/package.json
@@ -5,7 +5,9 @@
   "main": "jquery.flexslider.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "cp jquery.flexslider.js demo/js/jquery.flexslider.js"
+    "build:css": "./node_modules/.bin/lessc flexslider.less flexslider.css",
+    "build:demo": "cp jquery.flexslider.js demo/js/jquery.flexslider.js",
+    "build": "npm run build:css && npm run build:demo"
   },
   "repository": {
     "type": "git",
@@ -26,5 +28,8 @@
   "homepage": "https://github.com/woocommerce/FlexSlider#readme",
   "dependencies": {
     "jquery": ">=1.11.3"
+  },
+  "devDependencies": {
+    "less": "^2.7.3"
   }
 }