v2.1.0

Author: dangreen

Diff for: .editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+indent_style = tab
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[package.json]
+indent_style = space
+indent_size = 2
+
+[*.md]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = false

Diff for: .eslintrc.js

@@ -1,3 +1,6 @@
 module.exports = {
-	'extends': 'trigen/base'
+	'extends': 'trigen/base',
+	'env': {
+		'node': true
+	}
 };

Diff for: .gitignore

@@ -13,8 +13,6 @@ lib-cov
 
 # Coverage directory used by tools like istanbul
 coverage
-
-# nyc test coverage
 .nyc_output
 
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
@@ -26,12 +24,20 @@ coverage
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
 
-# Dependency directories
+# Dependency directory
 node_modules
-jspm_packages
 
 # Optional npm cache directory
 .npm
 
 # Optional REPL history
 .node_repl_history
+
+# OS X stuff
+.DS_Store
+
+# Some caches
+.eslintcache
+
+# Compiled dist
+lib

Diff for: .npmignore

@@ -0,0 +1,12 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [2.1.0] - 2017-11-23
+### Changed
+- `babel-cli` -> `Rollup`
+- `Promise/then` -> `async/await`
+- Upgrade to `[email protected]`

Diff for: CHANGELOG.md

@@ -1,17 +1,25 @@
-[![NPM](https://nodei.co/npm/gulp-progressive-css.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/gulp-progressive-css/)
-
 # gulp-progressive-css
 
+[![NPM version][npm]][npm-url]
+[![Node version][node]][node-url]
+[![Dependency status][deps]][deps-url]
+
+[npm]: https://img.shields.io/npm/v/gulp-progressive-css.svg
+[npm-url]: https://www.npmjs.com/package/gulp-progressive-css
+
+[node]: https://img.shields.io/node/v/gulp-progressive-css.svg
+[node-url]: https://nodejs.org
+
+[deps]: https://img.shields.io/david/TrigenSoftware/gulp-progressive-css.svg
+[deps-url]: https://david-dm.org/TrigenSoftware/gulp-progressive-css
+
 Transfrom `<link>` in HTML to progressive CSS loading.
 
-# Getting Started
+# Install
 
-Install with npm
 ```bash
 npm i -D gulp-progressive-css
-```
-or
-```bash
+# or
 yarn add -D gulp-progressive-css
 ```
 
@@ -89,3 +97,6 @@ gulp.task('html', gulp.series('css', () =>
 		.pipe(gulp.dest('dist'))
 ));
 ```
+
+---
+[![NPM](https://nodei.co/npm/gulp-progressive-css.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/gulp-progressive-css/)

Diff for: README.md

@@ -68,7 +68,7 @@ <h1>Footer</h1>
 			</main>
 		</footer>
 		<script>
-			!(function(w){'use strict';w.importCSS=j;var d=document,e=d.body||d.getElementsByTagName('head')[0],f=d.styleSheets,g=[];function h(a,b){for(var c=f.length;c--;)if(f[c].href===a)return void b();setTimeout(function(){h(a,b)})}function j(a,b,c){function k(){return n&&(m.media=b||'all'),n}function l(){m.addEventListener&&m.removeEventListener('load',l),n=!0;var o=!0;c?k():g=g.filter(function(p){return!(o=o&&p())})}var m=d.createElement('link'),n=!1;m.rel='stylesheet',m.href=a,m.media='only x',c||g.push(k),e.insertBefore(m,null),m.addEventListener&&m.addEventListener('load',l),h(m.href,l)}})(window);
+			(function(){'use strict';function a(b,d){for(var e=c.length;e--;)if(c[e].href===b)return void d();setTimeout(function(){a(b,d)})}var b=window.document,c=b.styleSheets,d=b.body||b.getElementsByTagName('head')[0],e=[];window.importCSS=function(c,f,g){function h(){return k&&(j.media=f||'all'),k}function i(){j.addEventListener&&j.removeEventListener('load',i),k=!0;var a=!0;g?h():e=e.filter(function(b){return!(a=a&&b())})}var j=b.createElement('link'),k=!1;j.rel='stylesheet',j.href=c,j.media='only x',g||e.push(h),d.insertBefore(j,null),j.addEventListener&&j.addEventListener('load',i),a(j.href,i)}})();;
 			importCSS('//google.com/font.css', 0, true);
 			importCSS('content.css');
 			importCSS('footer.css');

Diff for: example/dist/index.html

@@ -1,16 +1,27 @@
 {
   "name": "gulp-progressive-css",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Transfrom `<link>` in HTML to progressive CSS loading.",
+  "author": "dangreen",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TrigenSoftware/gulp-progressive-css.git"
+  },
+  "bugs": {
+    "url": "https://github.com/TrigenSoftware/gulp-progressive-css/issues"
+  },
   "main": "lib/index.js",
+  "engines": {
+    "node": ">=6.0.0"
+  },
   "scripts": {
-    "eslint": "eslint --cache 'src/*.js'",
+    "lint": "eslint --cache 'src/*.js'",
     "compile": "npm run eslint && babel ./src -d ./lib",
-    "prepublish": "npm run eslint && npm run compile"
+    "build": "rollup -c",
+    "watch": "rollup -c -w",
+    "prepublishOnly": "npm run build"
   },
-  "repository": "https://github.com/TrigenSoftware/gulp-progressive-css",
-  "author": "dangreen",
-  "license": "MIT",
   "keywords": [
     "gulp",
     "gulpplugin",
@@ -20,27 +31,45 @@
   ],
   "dependencies": {
     "detect-indent": "^5.0.0",
-    "html-minifier": "^3.3.1",
-    "import-css": "^2.0.0",
+    "html-minifier": "^3.5.6",
+    "import-css": "^3.0.0",
     "pn": "^1.0.0",
     "through2": "^2.0.3",
-    "vinyl": "^2.0.1"
+    "vinyl": "^2.1.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.23.0",
+    "babel-core": "^6.26.0",
     "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-stage-0": "^6.22.0",
-    "eslint": "^3.15.0",
-    "eslint-config-trigen": "^1.1.0"
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-stage-0": "^6.24.1",
+    "escope": "^3.6.0",
+    "eslint": "^4.11.0",
+    "eslint-config-trigen": "^2.3.0",
+    "rollup": "^0.51.8",
+    "rollup-plugin-babel": "^3.0.2",
+    "rollup-plugin-commonjs": "^8.2.6",
+    "rollup-plugin-eslint": "^4.0.0",
+    "rollup-plugin-node-resolve": "^3.0.0"
   },
   "babel": {
     "presets": [
-      "es2015",
+      [
+        "env",
+        {
+          "targets": {
+            "node": "6"
+          }
+        }
+      ],
       "stage-0"
     ],
     "plugins": [
-      "add-module-exports"
+      "add-module-exports",
+      "transform-runtime"
     ]
-  }
+  },
+  "files": [
+    "lib"
+  ]
 }

Diff for: example/dist/loader.php

@@ -0,0 +1,55 @@
+import commonjs from 'rollup-plugin-commonjs';
+import resolve from 'rollup-plugin-node-resolve';
+import babel from 'rollup-plugin-babel';
+import eslint from 'rollup-plugin-eslint';
+import pkg from './package.json';
+
+const plugins = [
+	eslint({
+		exclude:      ['**/*.json', 'node_modules/**'],
+		throwOnError: process.env.ROLLUP_WATCH != 'true'
+	}),
+	babel(Object.assign({
+		runtimeHelpers: true,
+		babelrc:        false,
+		exclude:        'node_modules/**'
+	}, pkg.babel, {
+		presets: pkg.babel.presets.map((preset) => {
+
+			if (Array.isArray(preset) && preset[0] == 'env') {
+				preset[1].modules = false;
+			}
+
+			return preset
+		})
+	})),
+	resolve({
+		preferBuiltins: true
+	}),
+	commonjs()
+];
+
+const dependencies = [].concat(
+	['path', 'url'],
+	Object.keys(pkg.dependencies)
+);
+
+function external(id) {
+	return dependencies.some(_ =>
+		_ == id || id.indexOf(`${_}/`) == 0
+	);
+}
+
+export default {
+	input:  'src/index.js',
+	watch:  {
+		include: 'src/**/*.js'
+	},
+	plugins,
+	external,
+	output: {
+		file:      pkg.main,
+		format:    'cjs',
+		sourcemap: true
+	}
+};

Diff for: package.json

@@ -1,5 +1,5 @@
-import Transformer from './transformer';
 import through from 'through2';
+import Transformer from './transformer';
 
 export default function plugin(inputOptions) {
 
@@ -12,17 +12,28 @@ export default function plugin(inputOptions) {
 
 	const transformer = new Transformer(options);
 
-	function each(file, enc, next) {
+	async function each(file, enc, next) {
 
 		if (file.isNull() || file.isStream()) {
 			next(null, file);
 			return;
 		}
 
-		transformer.transformHtmlFile(file).then((files) => {
-			files.forEach(file => this.push(file));
+		try {
+
+			const files = await transformer.transformHtmlFile(file);
+
+			files.forEach((file) => {
+				this.push(file);
+			});
+
 			next(null);
-		}).catch(next);
+			return;
+
+		} catch (err) {
+			next(err);
+			return;
+		}
 	}
 
 	return through.obj(each);