6.0.0

Author: jonathantneal

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changes to PostCSS Normalize
 
+### 6.0.0 (June 16, 2018)
+
+- Use normalize.css v8 (major)
+- Include normalize.css comments
+- Include normalize.css sourcemap
+
 ### 5.0.0 (June 7, 2018)
 
 - Update `browserslist` to v3.2.8 (major)

CONTRIBUTING.md

@@ -26,7 +26,7 @@ scope and avoid unrelated commits.
    cd postcss-normalize
 
    # Assign the original repo to a remote called "upstream"
-   git remote add upstream git@github.com:jonathantneal/postcss-normalize.git
+   git remote add upstream git@github.com:csstools/postcss-normalize.git
 
    # Install the tools necessary for testing
    npm install

INSTALL.md

@@ -1,6 +1,6 @@
 # Installing PostCSS Normalize
 
-$[PostCSS Normalize] runs in all Node environments, with special instructions for:
+[PostCSS Normalize] runs in all Node environments, with special instructions for:
 
 | [Node](#node) | [Webpack](#webpack) | [Create React App](#create-react-app) | [Gulp](#gulp) | [Grunt](#grunt) |
 | --- | --- | --- | --- | --- |
@@ -144,6 +144,6 @@ grunt.initConfig({
 [Grunt PostCSS]: https://github.com/nDmitry/grunt-postcss
 [PostCSS]: https://github.com/postcss/postcss
 [PostCSS Loader]: https://github.com/postcss/postcss-loader
-[PostCSS Normalize]: https://github.com/jonathantneal/postcss-normalize
+[PostCSS Normalize]: https://github.com/csstools/postcss-normalize
 [React App Rewire PostCSS]: https://github.com/csstools/react-app-rewire-postcss
 [React App Rewired]: https://github.com/timarney/react-app-rewired

README.md

@@ -11,7 +11,7 @@ Use `@import-normalize` to determine where [normalize.css] rules should be
 included. Duplicate `@import-normalize` rules will be removed. See all the
 [Options] for more information.
 
-```css
+```pcss
 @import-normalize;
 ```
 
@@ -129,15 +129,15 @@ postcssNormalize({
 });
 ```
 
-[cli-img]: https://img.shields.io/travis/jonathantneal/postcss-normalize.svg
-[cli-url]: https://travis-ci.org/jonathantneal/postcss-normalize
+[cli-img]: https://img.shields.io/travis/csstools/postcss-normalize.svg
+[cli-url]: https://travis-ci.org/csstools/postcss-normalize
 [git-img]: https://img.shields.io/badge/support-chat-blue.svg
 [git-url]: https://gitter.im/postcss/postcss
 [npm-img]: https://img.shields.io/npm/v/postcss-normalize.svg
 [npm-url]: https://www.npmjs.com/package/postcss-normalize
 
 [browserslist]: http://browserl.ist/
-[normalize.css]: https://github.com/jonathantneal/normalize.css
-[Options]: #Options
+[normalize.css]: https://github.com/csstools/normalize.css
+[Options]: #options
 [PostCSS]: https://github.com/postcss/postcss
-[PostCSS Normalize]: https://github.com/jonathantneal/postcss-normalize
+[PostCSS Normalize]: https://github.com/csstools/postcss-normalize

index.js

@@ -1,62 +1,58 @@
-// tooling
-const browserslist   = require('browserslist');
-const normalizeRules = require('./lib/normalize.js');
-const postcss        = require('postcss');
+import postcss from 'postcss';
+import postcssBrowserComments from 'postcss-browser-comments';
+import fs from 'fs';
 
-// plugin
-module.exports = postcss.plugin('postcss-normalize', (opts) => {
-	return (root) => {
-		// client browser list
-		const clientBrowserList = browserslist(opts && opts.browsers, {
-			path: root.source && root.source.input && root.source.input.file
-		});
+export default postcss.plugin('postcss-normalize', opts => {
+	const parsedNormalize = parseNormalize(opts);
 
-		// applied rules from normalize
-		const appliedRules = normalizeRules.map(
-			(rule) => {
-				const clone = rule.clone();
-
-				clone.nodes = clone.nodes.filter(
-					(decl, index) => {
-						// whether the declaration browser list matches the client browser list
-						return clientBrowserList.some(
-							(clientBrowser) => browserslist(rule.nodes[index].browserList).some(
-								(declBrowser) => declBrowser === clientBrowser
-							)
-						);
-					}
-				);
-
-				return clone;
-			}
-		).filter(
-			(rule) => rule.nodes.length
-		);
+	return async root => {
+		const normalizeRoot = await parsedNormalize;
 
 		// use @import postcss-normalize insertion point
 		root.walkAtRules(
 			'import-normalize',
-			(atrule) => {
+			atrule => {
 				if (opts && opts.allowDuplicates) {
 					// use any insertion point
-					atrule.replaceWith(
-						appliedRules.map(
-							(rule) => rule.clone()
-						)
-					);
-				} else if (appliedRules[0].parent) {
+					atrule.replaceWith(normalizeRoot);
+				} else if (normalizeRoot.parent) {
 					// remove duplicate insertions
 					atrule.remove();
 				} else {
 					// use the first insertion point
-					atrule.replaceWith(appliedRules);
+					atrule.replaceWith(normalizeRoot);
 				}
 			}
 		);
 
-		if (opts && opts.forceImport && !appliedRules[0].parent) {
+		if (opts && opts.forceImport && !normalizeRoot.parent) {
 			// prepend required normalize rules
-			root.prepend(appliedRules);
+			root.prepend(normalizeRoot);
 		}
 	};
 });
+
+function parseNormalize(opts) {
+	const from = require.resolve('@csstools/normalize.css');
+	const postcssBrowserCommentsParser = postcssBrowserComments(opts);
+
+	return new Promise(
+		(resolve, reject) => fs.readFile(from, 'utf8',
+			(err, res) => {
+				if (err) {
+					reject(err);
+				} else {
+					resolve(res);
+				}
+			}
+		)
+	).then(
+		css => postcss.parse(css, { from })
+	).then(
+		root => {
+			postcssBrowserCommentsParser(root);
+
+			return root;
+		}
+	);
+}