Merge pull request #8 from jedmao/update-deps

v1.1.5: Fix issue #5, retire Babel, update deps
jednano · Jan 20, 2017 · 98d960f · 98d960f
2 parents 6bb72d3 + 1607eee
commit 98d960f
Show file tree

Hide file tree

Showing 23 changed files with 113 additions and 329 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.eslintrc b/.eslintrc
diff --git a/.tasks/gulp-clean.js → .tasks/gulp-clean.ts b/.tasks/gulp-clean.js → .tasks/gulp-clean.ts
@@ -1,5 +1,5 @@
-import gulp from 'gulp';
-import rimraf from 'gulp-rimraf';
+import * as gulp from 'gulp';
+var rimraf = require('gulp-rimraf');
 
 export default () => {
 	return gulp.src([

diff --git a/.tasks/gulp-copy.js b/.tasks/gulp-copy.js
diff --git a/.tasks/gulp-copy.ts b/.tasks/gulp-copy.ts
@@ -0,0 +1,12 @@
+import * as gulp from 'gulp';
+
+export default () => {
+	return gulp.src(
+		[
+			'build/lib/**/*.js',
+			'build/lib/**/*.d.ts'
+		],
+		{ base: 'build' }
+	)
+		.pipe(gulp.dest('dist'));
+};
diff --git a/.tasks/gulp-eslint.js b/.tasks/gulp-eslint.js
diff --git a/.tasks/gulp-scripts.js b/.tasks/gulp-scripts.js
diff --git a/.tasks/gulp-test.js b/.tasks/gulp-test.js
diff --git a/.tasks/gulp-tslint.js → .tasks/gulp-tslint.ts b/.tasks/gulp-tslint.js → .tasks/gulp-tslint.ts
@@ -1,6 +1,6 @@
-import gulp from 'gulp';
-import plumber from 'gulp-plumber';
-import tslint from 'gulp-tslint';
+import * as gulp from 'gulp';
+var plumber = require('gulp-plumber');
+var tslint = require('gulp-tslint');
 
 export default () => {
 	return gulp.src([

diff --git a/.tasks/gulp-typescript.js b/.tasks/gulp-typescript.js
diff --git a/.tasks/gulp-watch.js b/.tasks/gulp-watch.js
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
-language: node_js
-
-node_js:
-  - '5.5'
-  - '4.2' #LTS
-
-notifications:
-  email:
-    on_success: change
-    on_failure: always
+language: node_js
+
+node_js:
+  - "node"
+  - "4"
+
+notifications:
+  email:
+    on_success: change
+    on_failure: always
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
+## 1.1.5
+- Fix build, PostCSS dependency.
+
 ## 1.1.2
 - Supports PostCSS 5.2.9.
 
+## 1.1.1
+- Fix module resolution (fixes [`#5`](https://github.com/jedmao/postcss-nested-props/issues/5)).
+
 ## 1.1.0
 - [Supports vendor pseudo elements](https://github.com/jedmao/postcss-nested-props/pull/4). Thanks [@ooHmartY](https://github.com/ooHmartY)!
 

diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ postcss([ require('postcss-nested-props') ]);
 
 ```ts
 ///<reference path="node_modules/postcss-nested-props/.d.ts" />
-import postcssNestedProps from 'postcss-nested-props';
+import * as postcssNestedProps from 'postcss-nested-props';
 
 postcss([ postcssNestedProps ]);
 ```

diff --git a/build/.eslintrc b/build/.eslintrc
@@ -1,7 +1,7 @@
-{
-	"rules": {
-		"indent": [2, 4, {
-			"SwitchCase": 1
-		}]
-	}
-}
+{
+	"rules": {
+		"indent": [2, 4, {
+			"SwitchCase": 1
+		}]
+	}
+}
diff --git a/build/test/.eslintrc b/build/test/.eslintrc
@@ -1,5 +1,5 @@
-{
-	"env": {
-		"mocha": true
-	}
-}
+{
+	"env": {
+		"mocha": true
+	}
+}
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
diff --git a/gulpfile.ts b/gulpfile.ts
@@ -0,0 +1,10 @@
+import * as gulp from 'gulp';
+
+function loadTask(taskName: string) {
+	return require(`./.tasks/gulp-${taskName}`).default;
+}
+
+gulp.task('default', ['tslint']);
+gulp.task('clean', loadTask('clean'));
+gulp.task('tslint', loadTask('tslint'));
+gulp.task('copy', loadTask('copy'));