3.0.0

Author: jonathantneal

.appveyor.yml

@@ -2,7 +2,7 @@
 
 environment:
   matrix:
-    - nodejs_version: 4
+    - nodejs_version: 8
 
 version: "{build}"
 build: off

.editorconfig

@@ -3,18 +3,16 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = unset
 indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{json,yml}]
-indent_size = 2
-indent_style = space
-
 [*.md]
-indent_style = space
 trim_trailing_whitespace = false
 
+[*.{json,md,yml}]
+indent_size = 2
+indent_style = space
+
 [test/*.css]
 insert_final_newline = false

.gitignore

@@ -1,5 +1,5 @@
 node_modules
-index.bundle.js
+index.*.*
 package-lock.json
 *.log*
 *.result.css

.rollup.js

@@ -2,11 +2,14 @@ import babel from 'rollup-plugin-babel';
 
 export default {
 	input: 'index.js',
-	output: { file: 'index.bundle.js', format: 'cjs' },
+	output: [
+		{ file: 'index.cjs.js', format: 'cjs' },
+		{ file: 'index.es.mjs', format: 'es' }
+	],
 	plugins: [
 		babel({
 			presets: [
-				['env', { modules: false, targets: { node: 4 } }]
+				['@babel/env', { modules: false, targets: { node: 6 } }]
 			]
 		})
 	]

.travis.yml

@@ -3,7 +3,7 @@
 language: node_js
 
 node_js:
-  - 4
+  - 8
 
 install:
   - npm install

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changes to PostCSS Sass
 
+### 3.0.0 (October 4, 2018)
+
+- Fixed: issue with sourcemaps 0.7.x returning a Promise instead of an Object
+- Updated: `node-sass` to 4.9.3 (minor)
+- Updated: `postcss` to 7.0.5 (major)
+- Updated: `source-map` to 0.7.3 (major for this project)
+
 ### 2.0.0 (December 25, 2017)
 
 - Added: custom `source-map` implemention with fix for

index.js

@@ -58,20 +58,18 @@ export default postcss.plugin('postcss-sass', opts => (root, result) => {
 			(sassError, sassResult) => sassError ? reject(sassError) : resolve(sassResult)
 		)
 	).then(
-		({ css: sassCSS, map: sassMap }) => {
+		({ css: sassCSS, map: sassMap }) => mergeSourceMaps(
+			postMap.toJSON(),
+			JSON.parse(sassMap)
+		).then(prev => {
 			// update root to post-node-sass ast
 			result.root = postcss.parse(
 				sassCSS.toString(),
 				Object.assign({}, postConfig, {
-					map: {
-						prev: mergeSourceMaps(
-							postMap.toJSON(),
-							JSON.parse(sassMap)
-						)
-					}
+					map: { prev }
 				})
 			);
-		}
+		})
 	);
 });
 

lib/merge-source-maps.js

@@ -5,64 +5,68 @@ import { SourceMapConsumer, SourceMapGenerator } from 'source-map';
 const sassMatch = /#sass$/;
 
 // returns merged source maps
-export default function (...maps) {
+export default (...maps) => {
 	// new sourcemap
 	const generator = new SourceMapGenerator();
 
 	// existing sourcemaps
-	const consumers = maps.map(
+	const consumersPromise = Promise.all(maps.map(
 		map => new SourceMapConsumer(map)
-	);
-
-	consumers.forEach(
-		consumer => {
-			// copy each original mapping to the new sourcemap
-			consumer.eachMapping(
-				mapping => {
-					const originalPosition = originalPositionFor(mapping, consumers);
-
-					if (originalPosition.source) {
-						generator.addMapping({
-							generated: {
-								line: mapping.generatedLine,
-								column: mapping.generatedColumn
-							},
-							original: {
-								// use positive numbers to work around sass/libsass#2312
-								line: Math.abs(originalPosition.line),
-								column: Math.abs(originalPosition.column)
-							},
-							source: originalPosition.source,
-							name: originalPosition.name
-						});
+	));
+
+	return consumersPromise.then(
+		consumers => consumers.forEach(
+			consumer => {
+				// copy each original mapping to the new sourcemap
+				consumer.eachMapping(
+					mapping => {
+						const originalPosition = originalPositionFor(mapping, consumers);
+
+						if (originalPosition.source) {
+							generator.addMapping({
+								generated: {
+									line: mapping.generatedLine,
+									column: mapping.generatedColumn
+								},
+								original: {
+									// use positive numbers to work around sass/libsass#2312
+									line: Math.abs(originalPosition.line),
+									column: Math.abs(originalPosition.column)
+								},
+								source: originalPosition.source,
+								name: originalPosition.name
+							});
+						}
 					}
-				}
-			);
+				);
 
-			// copy each original source to the new sourcemap
-			consumer.sources.forEach(
-				source => {
-					generator._sources.add(source);
+				// copy each original source to the new sourcemap
+				consumer.sources.forEach(
+					source => {
+						generator._sources.add(source);
 
-					const content = consumer.sourceContentFor(source);
+						const content = consumer.sourceContentFor(source);
 
-					if (content !== null) {
-						generator.setSourceContent(source, content);
+						if (content !== null) {
+							generator.setSourceContent(source, content);
+						}
 					}
-				}
+				);
+			}
+		)
+	).then(
+		() => {
+			// merged map as json
+			const mergedMap = JSON.parse(generator);
+
+			// clean all special sass sources in merged map
+			mergedMap.sources = mergedMap.sources.map(
+				source => source.replace(sassMatch, '')
 			);
-		}
-	);
 
-	// merged map as json
-	const mergedMap = JSON.parse(generator);
-
-	// clean all special sass sources in merged map
-	mergedMap.sources = mergedMap.sources.map(
-		source => source.replace(sassMatch, '')
+			return mergedMap;
+		}
 	);
-
-	return mergedMap;
 }
 
 function originalPositionFor(mapping, consumers) {

package.json

@@ -1,49 +1,47 @@
 {
   "name": "@csstools/postcss-sass",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Use Sass as a PostCSS plugin",
   "author": "Jonathan Neal <[email protected]>",
   "license": "CC0-1.0",
   "repository": "jonathantneal/postcss-sass",
   "homepage": "https://github.com/jonathantneal/postcss-sass#readme",
   "bugs": "https://github.com/jonathantneal/postcss-sass/issues",
-  "main": "index.bundle.js",
-  "module": "index.js",
+  "main": "index.cjs.js",
+  "module": "index.es.mjs",
   "files": [
-    "index.js",
-    "index.bundle.js",
-    "lib"
+    "index.es.mjs",
+    "index.cjs.js"
   ],
   "scripts": {
     "prepublishOnly": "npm test",
     "pretest": "rollup -c .rollup.js --silent",
-    "test": "echo 'Running tests...'; npm run test:ec && npm run test:js && npm run test:tape",
-    "test:ec": "echint --ignore index.bundle.js test",
+    "test": "npm run test:js && npm run test:tape",
     "test:js": "eslint *.js --cache --ignore-path .gitignore --quiet",
     "test:tape": "postcss-tape"
   },
   "engines": {
     "node": ">=4.0.0"
   },
   "dependencies": {
-    "@csstools/sass-import-resolve": "^1.0",
-    "node-sass": "^4.7",
-    "postcss": "^6.0",
-    "source-map": "^0.6"
+    "@csstools/sass-import-resolve": "^1.0.0",
+    "node-sass": "^4.9.3",
+    "postcss": "^7.0.5",
+    "source-map": "~0.7.3"
   },
   "devDependencies": {
-    "babel-core": "^6.26",
-    "babel-eslint": "^8.1",
-    "babel-preset-env": "^1.6",
-    "echint": "^4.0",
-    "eslint": "^4.14",
-    "eslint-config-dev": "2.0",
-    "postcss-import": "^11.0",
-    "postcss-tape": "2.2",
-    "postcss-unroot": "^1.0",
-    "pre-commit": "^1.2",
-    "rollup": "^0.53",
-    "rollup-plugin-babel": "^3.0"
+    "@babel/core": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "babel-eslint": "^10.0.1",
+    "echint": "^4.0.1",
+    "eslint": "^5.6.1",
+    "eslint-config-dev": "2.0.0",
+    "postcss-import": "^12.0.0",
+    "postcss-tape": "2.2.0",
+    "postcss-unroot": "^1.0.2",
+    "pre-commit": "^1.2.2",
+    "rollup": "^0.66.4",
+    "rollup-plugin-babel": "^4.0.1"
   },
   "eslintConfig": {
     "extends": "dev",