.travis.yml

@@ -1,7 +1,8 @@
 language: node_js
 
 node_js:
-  - "node"
+  - stable
+  - lts/*
   - 6
 
 after_success:

CHANGELOG.md

@@ -2,6 +2,101 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="2.1.6"></a>
+## [2.1.6](https://github.com/postcss/postcss-loader/compare/v2.1.5...v2.1.6) (2018-07-10)
+
+
+### Bug Fixes
+
+* **package:** config memory leak, updates `postcss-load-config` v1.2.0...2.0.0 (`dependencies`) ([0547b12](https://github.com/postcss/postcss-loader/commit/0547b12))
+
+
+
+<a name="2.1.5"></a>
+## [2.1.5](https://github.com/postcss/postcss-loader/compare/v2.1.4...v2.1.5) (2018-05-04)
+
+
+### Bug Fixes
+
+* **index:** remove `sourceMap` warning ([#361](https://github.com/postcss/postcss-loader/issues/361)) ([4416791](https://github.com/postcss/postcss-loader/commit/4416791))
+
+
+
+<a name="2.1.4"></a>
+## [2.1.4](https://github.com/postcss/postcss-loader/compare/v2.1.3...v2.1.4) (2018-04-16)
+
+
+### Bug Fixes
+
+* restore loader object in postcss config context ([#355](https://github.com/postcss/postcss-loader/issues/355)) ([2ff1735](https://github.com/postcss/postcss-loader/commit/2ff1735))
+
+
+
+<a name="2.1.3"></a>
+## [2.1.3](https://github.com/postcss/postcss-loader/compare/v2.1.2...v2.1.3) (2018-03-20)
+
+
+### Bug Fixes
+
+* **options:** revert additionalProperties changes to keep SemVer ([bd7fc38](https://github.com/postcss/postcss-loader/commit/bd7fc38))
+
+
+
+<a name="2.1.2"></a>
+## [2.1.2](https://github.com/postcss/postcss-loader/compare/v2.1.1...v2.1.2) (2018-03-17)
+
+
+### Bug Fixes
+
+* **options:** disallow additional properties and add `ident` to validation ([#346](https://github.com/postcss/postcss-loader/issues/346)) ([82ef553](https://github.com/postcss/postcss-loader/commit/82ef553))
+
+
+
+<a name="2.1.1"></a>
+## [2.1.1](https://github.com/postcss/postcss-loader/compare/v2.1.0...v2.1.1) (2018-02-26)
+
+
+### Bug Fixes
+
+* **index:** don't set `to` value (`options`) ([#339](https://github.com/postcss/postcss-loader/issues/339)) ([cdbb8b6](https://github.com/postcss/postcss-loader/commit/cdbb8b6))
+
+
+
+<a name="2.1.0"></a>
+# [2.1.0](https://github.com/postcss/postcss-loader/compare/v2.0.10...v2.1.0) (2018-02-02)
+
+
+### Bug Fixes
+
+* **index:** continue watching after dependency `{Error}` ([#332](https://github.com/postcss/postcss-loader/issues/332)) ([a8921cc](https://github.com/postcss/postcss-loader/commit/a8921cc))
+
+
+### Features
+
+* **index:** pass AST (`result.root`) && Messages (`result.messages`) as metadata to other loaders ([#322](https://github.com/postcss/postcss-loader/issues/322)) ([56232e7](https://github.com/postcss/postcss-loader/commit/56232e7))
+
+
+
+<a name="2.0.10"></a>
+## [2.0.10](https://github.com/postcss/postcss-loader/compare/v2.0.9...v2.0.10) (2018-01-03)
+
+
+### Bug Fixes
+
+* **index:** copy loader `options` before modifying ([#326](https://github.com/postcss/postcss-loader/issues/326)) ([61ff03c](https://github.com/postcss/postcss-loader/commit/61ff03c))
+
+
+
+<a name="2.0.9"></a>
+## [2.0.9](https://github.com/postcss/postcss-loader/compare/v2.0.8...v2.0.9) (2017-11-24)
+
+
+### Bug Fixes
+
+* **index:** filter `ident` (`options.ident`) ([#315](https://github.com/postcss/postcss-loader/issues/315)) ([3e1c7fa](https://github.com/postcss/postcss-loader/commit/3e1c7fa))
+
+
+
 <a name="2.0.8"></a>
 ## [2.0.8](https://github.com/postcss/postcss-loader/compare/v2.0.6...v2.0.8) (2017-10-14)
 

README.md

@@ -116,7 +116,7 @@ module.exports = {
 |[`stringifier`](#syntaxes)|`{String\|Object}`|`undefined`|Set PostCSS Stringifier|
 |[`config`](#config)|`{Object}`|`undefined`|Set `postcss.config.js` config path && `ctx`|
 |[`plugins`](#plugins)|`{Array\|Function}`|`[]`|Set PostCSS Plugins|
-|[`sourceMap`](#sourceMap)|`{String\|Boolean}`|`false`|Enable Source Maps|
+|[`sourceMap`](#sourcemap)|`{String\|Boolean}`|`false`|Enable Source Maps|
 
 ### `Exec`
 
@@ -175,7 +175,7 @@ module.exports = ({ file, options, env }) => ({
   plugins: {
     'postcss-import': { root: file.dirname },
     'postcss-cssnext': options.cssnext ? options.cssnext : false,
-    'autoprefixer': env == 'production' ? options.autoprefixer : false,
+    'autoprefixer': env === 'production' ? options.autoprefixer : false,
     'cssnano': env === 'production' ? options.cssnano : false
   }
 })
@@ -268,8 +268,6 @@ module.exports = ({ file, options, env }) => ({
 
 Enables source map support, `postcss-loader` will use the previous source map given by other loaders and update it accordingly, if no previous loader is applied before `postcss-loader`, the loader will generate a source map for you.
 
-> :warning: If a previous loader like e.g `sass-loader` is applied and it's `sourceMap` option is set, but the `sourceMap` option in `postcss-loader` is omitted, previous source maps will be discarded by `postcss-loader` **entirely**.
-
 **webpack.config.js**
 ```js
 {
@@ -350,7 +348,7 @@ either add the css-loader’s [`importLoaders`] option.
 
 or use [postcss-modules] instead of `css-loader`.
 
-[`importLoaders`]: https://github.com/webpack-contrib/css-loader#importing-and-chained-loaders
+[`importLoaders`]: https://github.com/webpack-contrib/css-loader#importloaders
 [cannot be used]: https://github.com/webpack/css-loader/issues/137
 [CSS Modules]: https://github.com/webpack/css-loader#css-modules
 [postcss-modules]: https://github.com/outpunk/postcss-modules

lib/index.js

@@ -39,8 +39,8 @@ const SyntaxError = require('./Error')
  *
  * @return {cb} cb      Result
  */
-module.exports = function loader (css, map) {
-  const options = loaderUtils.getOptions(this) || {}
+module.exports = function loader (css, map, meta) {
+  const options = Object.assign({}, loaderUtils.getOptions(this))
 
   validateOptions(require('./options.json'), options, 'PostCSS Loader')
 
@@ -52,11 +52,15 @@ module.exports = function loader (css, map) {
   Promise.resolve().then(() => {
     const length = Object.keys(options)
       .filter((option) => {
-        // if (option === 'exec') return
-        if (option === 'config') return
-        if (option === 'sourceMap') return
-
-        return option
+        switch (option) {
+          // case 'exec':
+          case 'ident':
+          case 'config':
+          case 'sourceMap':
+            return
+          default:
+            return option
+        }
       })
       .length
 
@@ -86,7 +90,9 @@ module.exports = function loader (css, map) {
       }
     }
 
-    return postcssrc(rc.ctx, rc.path, { argv: false })
+    rc.ctx.webpack = this;
+
+    return postcssrc(rc.ctx, rc.path)
   }).then((config) => {
     if (!config) config = {}
 
@@ -99,7 +105,6 @@ module.exports = function loader (css, map) {
 
     let plugins = config.plugins || []
     let options = Object.assign({
-      to: file,
       from: file,
       map: sourceMap
         ? sourceMap === 'inline'
@@ -132,10 +137,6 @@ module.exports = function loader (css, map) {
       css = this.exec(css, this.resource)
     }
 
-    if (!sourceMap && map) {
-      this.emitWarning(`\n\n ⚠️  PostCSS Loader\n\nPrevious source map found, but options.sourceMap isn't set.\nIn this case the loader will discard the source map entirely for performance reasons.\nSee https://github.com/postcss/postcss-loader#sourcemap for more information.\n\n`)
-    }
-
     if (sourceMap && typeof map === 'string') map = JSON.parse(map)
     if (sourceMap && map) options.map.prev = map
 
@@ -156,6 +157,11 @@ module.exports = function loader (css, map) {
           map.sources = map.sources.map((src) => path.resolve(src))
         }
 
+        if (!meta) meta = {}
+
+        meta.ast = { 'type': 'postcss', root: result.root }
+        meta.messages = result.messages
+
         if (this.loaderIndex === 0) {
           /**
            * @memberof loader
@@ -169,6 +175,7 @@ module.exports = function loader (css, map) {
 
           return null
         }
+
         /**
          * @memberof loader
          * @callback cb
@@ -177,11 +184,13 @@ module.exports = function loader (css, map) {
          * @param {String} css  Result (Raw Module)
          * @param {Object} map  Source Map
          */
-        cb(null, css, map)
+        cb(null, css, map, meta)
 
         return null
       })
   }).catch((err) => {
+    if (err.file) this.addDependency(err.file)
+
     return err.name === 'CssSyntaxError' ? cb(new SyntaxError(err)) : cb(err)
   })
 }

lib/options.json

@@ -16,6 +16,9 @@
     "exec": {
       "type": "boolean"
     },
+    "ident": {
+      "type": "string"
+    },
     "parser": {
       "type": [ "string", "object" ]
     },

package.json

@@ -1,53 +1,39 @@
 {
   "name": "postcss-loader",
-  "version": "2.0.8",
+  "version": "2.1.6",
   "description": "PostCSS loader for webpack",
   "main": "lib/index.js",
-  "engines": {
-    "node": ">= 4"
-  },
   "files": [
     "lib"
   ],
+  "engines": {
+    "node": ">= 4"
+  },
   "dependencies": {
     "loader-utils": "^1.1.0",
     "postcss": "^6.0.0",
-    "postcss-load-config": "^1.2.0",
-    "schema-utils": "^0.3.0"
+    "postcss-load-config": "^2.0.0",
+    "schema-utils": "^0.4.0"
   },
   "devDependencies": {
-    "coveralls": "^2.0.0",
-    "jest": "^21.0.0",
-    "jsdoc-to-markdown": "^3.0.0",
+    "jest": "^22.0.0",
+    "jsdoc-to-markdown": "^4.0.0",
     "memory-fs": "^0.4.0",
+    "postcss-import": "^11.0.0",
     "postcss-js": "^1.0.0",
-    "standard": "^10.0.0",
+    "standard": "^11.0.0",
     "standard-version": "^4.0.0",
     "sugarss": "^1.0.0",
+    "util.promisify": "^1.0.0",
     "webpack": "^3.0.0"
   },
   "scripts": {
-    "clean": "rm -rf dmd jest* coverage jsdoc-api test/results",
-    "lint": "standard",
-    "docs": "jsdoc2md lib/index.js > LOADER.md",
-    "postdocs": "npm run clean",
-    "pretest": "npm run clean",
+    "lint": "standard --env jest",
     "test": "jest --verbose --coverage",
+    "docs": "jsdoc2md lib/index.js > LOADER.md",
+    "clean": "rm -rf coverage test/outputs",
     "release": "standard-version"
   },
-  "jest": {
-    "collectCoverageFrom": [
-      "lib/*.js"
-    ]
-  },
-  "standard": {
-    "env": {
-      "jest": true
-    },
-    "ignore": [
-      "*.test.js"
-    ]
-  },
   "keywords": [
     "css",
     "postcss",

test/__snapshots__/Errors.test.js.snap

@@ -12,9 +12,7 @@ exports[`Errors Syntax Error 1`] = `
 `;
 
 exports[`Errors Validation Error 1`] = `
-"Validation Error
-
-PostCSS Loader Invalid Options
+"PostCSS Loader Invalid Options
 
 options.sourceMap should be string,boolean
 "

test/__snapshots__/loader.test.js.snap

@@ -1,3 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Loader Default 1`] = `"module.exports = \\"a { color: black }\\\\n\\""`;
+
+exports[`Loader Watching Dependencies Error 1`] = `"module.exports = \\"a { color: black }\\\\n\\""`;
+
+exports[`Loader Watching Dependencies Error 2`] = `"throw new Error(\\"Module build failed: Syntax Error \\\\n\\\\n(1:5) Unknown word\\\\n\\\\n\\\\u001b[31m\\\\u001b[1m>\\\\u001b[22m\\\\u001b[39m\\\\u001b[90m 1 | \\\\u001b[39ma \\\\u001b[33m{\\\\u001b[39m color black \\\\u001b[33m}\\\\u001b[39m\\\\n \\\\u001b[90m   | \\\\u001b[39m    \\\\u001b[31m\\\\u001b[1m^\\\\u001b[22m\\\\u001b[39m\\\\n \\\\u001b[90m 2 | \\\\u001b[39m\\\\n\\");"`;
+
+exports[`Loader Watching Dependencies Error 3`] = `"module.exports = \\"a { color: black }\\\\n\\""`;

test/fixtures/config/context/plugin.js

@@ -0,0 +1,15 @@
+'use strict'
+
+const postcss = require('postcss')
+
+// This plugin creates asset file in webpack compilation
+module.exports = postcss.plugin('plugin', (ctx) => {
+  ctx.webpack._compilation.assets['asset.txt'] = {
+    source() {
+      return '123';
+    },
+    size() {
+      return 0;
+    }
+  }
+})

test/fixtures/config/context/postcss.config.js

@@ -0,0 +1,5 @@
+module.exports = (ctx) => ({
+  plugins: [
+    require('./plugin')(ctx)
+  ]
+})

test/fixtures/watch/error.css

@@ -0,0 +1 @@
+a { color black }

test/fixtures/watch/index.css

@@ -0,0 +1 @@
+a { color: black }

test/fixtures/watch/index.js

@@ -0,0 +1,3 @@
+import style from './style.css'
+
+export default style

test/fixtures/watch/style.css

@@ -0,0 +1 @@
+@import "./import";

test/helpers/compiler.js

@@ -12,7 +12,7 @@ module.exports = function compiler (fixture, config, options) {
     output: {
       path: path.resolve(
         __dirname,
-        `../results/${config.path ? config.path : ''}`
+        `../outputs/${config.path ? config.path : ''}`
       ),
       filename: '[name].bundle.js'
     },
@@ -31,7 +31,7 @@ module.exports = function compiler (fixture, config, options) {
     },
     plugins: [
       new webpack.optimize.CommonsChunkPlugin({
-        name: ['runtime'],
+        name: [ 'runtime' ],
         minChunks: Infinity
       })
     ].concat(config.plugins || [])
@@ -43,11 +43,21 @@ module.exports = function compiler (fixture, config, options) {
 
   if (!options.emit) compiler.outputFileSystem = new MemoryFS()
 
-  return new Promise((resolve, reject) => {
-    return compiler.run((err, stats) => {
-      if (err) reject(err)
+  if (options.watch) {
+    return new Promise((resolve, reject) => {
+      const watcher = compiler.watch({}, (err, stats) => {
+        options.watch(err, stats, () => {
+          watcher.close(resolve)
+        })
+      })
+    })
+  } else {
+    return new Promise((resolve, reject) => {
+      return compiler.run((err, stats) => {
+        if (err) reject(err)
 
-      resolve(stats)
+        resolve(stats)
+      })
     })
-  })
+  }
 }

test/helpers/fs.js

@@ -0,0 +1,38 @@
+const path = require('path')
+const promisify = require('util.promisify')
+
+const {
+  unlink: _unlink,
+  readFile: _readFile,
+  writeFile: _writeFile
+} = require('fs')
+
+const fs = {
+  readFile: promisify(_readFile),
+  writeFile: promisify(_writeFile),
+  unlink: promisify(_unlink)
+}
+
+function readFile (name) {
+  const file = path.join(__dirname, '../fixtures', name)
+
+  return fs.readFile(file)
+    .then((data) => data.toString())
+}
+
+function writeFile (name, data) {
+  const file = path.join(__dirname, '../fixtures', name)
+
+  return fs.writeFile(file, data)
+}
+
+module.exports.copyFile = function copyFile (src, dest) {
+  return readFile(src)
+    .then((data) => writeFile(dest, data))
+}
+
+module.exports.deleteFile = function deleteFile (name) {
+  const file = path.join(__dirname, '../fixtures', name)
+
+  return fs.unlink(file)
+}

test/loader.test.js

@@ -2,6 +2,7 @@
 
 const webpack = require('./helpers/compiler')
 const { loader } = require('./helpers/compilation')
+const { copyFile, deleteFile } = require('./helpers/fs');
 
 describe('Loader', () => {
   test('Default', () => {
@@ -20,4 +21,70 @@ describe('Loader', () => {
         expect(src).toMatchSnapshot()
       })
   })
+
+  describe('Watching', () => {
+    describe('Dependencies', () => {
+      const files = {
+        css: 'watch/index.css',
+        error: 'watch/error.css',
+        changed: 'watch/import.css'
+      }
+
+      beforeEach(() => copyFile(files.css, files.changed))
+
+      afterEach(() => deleteFile(files.changed))
+
+      test('Error', () => {
+        const config = {
+          loader: {
+            options: {
+              plugins: [
+                require('postcss-import')
+              ],
+            }
+          }
+        }
+
+        const steps = [
+          (stats) => {
+            const { err, src } = loader(stats)
+
+            expect(src).toMatchSnapshot()
+            expect(err.length).toEqual(0)
+
+            return copyFile(files.error, files.changed)
+          },
+          (stats) => {
+            const { err, src } = loader(stats)
+
+            expect(src).toMatchSnapshot()
+            expect(err.length).toEqual(1)
+
+            return copyFile(files.css, files.changed)
+          },
+          (stats, close) => {
+            const { err, src } = loader(stats)
+
+            expect(src).toMatchSnapshot()
+            expect(src).toEqual("module.exports = \"a { color: black }\\n\"")
+            expect(err.length).toEqual(0)
+
+            return close()
+          }
+        ]
+
+        let step = 0
+
+        const options = {
+          watch (err, stats, close) {
+            steps[step](stats, close)
+
+            step++
+          }
+        }
+
+        return webpack('watch/index.js', config, options)
+      })
+    })
+  })
 })

test/options/__snapshots__/config.test.js.snap

@@ -2,6 +2,8 @@
 
 exports[`Options Config - {Object} 1`] = `"module.exports = \\"a { color: rgba(255, 0, 0, 1.0) }\\\\n\\""`;
 
+exports[`Options Config - Context - {Object} - with ident 1`] = `"module.exports = \\"a { color: rgba(255, 0, 0, 1.0) }\\\\n\\""`;
+
 exports[`Options Config - Context - {Object} 1`] = `"module.exports = \\"a { color: rgba(255, 0, 0, 1.0) }\\\\n\\""`;
 
 exports[`Options Config - Path - {String} 1`] = `"module.exports = \\"a { color: black }\\\\n\\""`;

test/options/__snapshots__/sourceMap.test.js.snap

@@ -4,11 +4,11 @@ exports[`Options Sourcemap - {Boolean} 1`] = `"module.exports = \\"a { color: rg
 
 exports[`Options Sourcemap - {Boolean} 2`] = `
 Object {
-  "file": "../../style.css",
+  "file": "../fixtures/css/style.css",
   "mappings": "AAAA,IAAI,2BAAY,EAAE",
   "names": Array [],
   "sources": Array [
-    "../../style.css",
+    "../fixtures/css/style.css",
   ],
   "sourcesContent": Array [
     "a { color: black }
@@ -18,4 +18,4 @@ Object {
 }
 `;
 
-exports[`Options Sourcemap - {String} 1`] = `"module.exports = \\"a { color: rgba(255, 0, 0, 1.0) }\\\\n\\\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0eWxlLmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxJQUFJLDJCQUFZLEVBQUUiLCJmaWxlIjoic3R5bGUuY3NzIiwic291cmNlc0NvbnRlbnQiOlsiYSB7IGNvbG9yOiBibGFjayB9XG4iXX0= */\\""`;
+exports[`Options Sourcemap - {String} 1`] = `"module.exports = \\"a { color: rgba(255, 0, 0, 1.0) }\\\\n\\\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZml4dHVyZXMvY3NzL3N0eWxlLmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxJQUFJLDJCQUFZLEVBQUUiLCJmaWxlIjoidGVzdC9maXh0dXJlcy9jc3Mvc3R5bGUuY3NzIiwic291cmNlc0NvbnRlbnQiOlsiYSB7IGNvbG9yOiBibGFjayB9XG4iXX0= */\\""`;

test/options/config.test.js

@@ -53,4 +53,46 @@ describe('Options', () => {
         expect(src).toMatchSnapshot()
       })
   })
+
+
+  test('Config - Context - {Object} - with ident', () => {
+    const config = {
+      loader: {
+        options: {
+          ident: 'postcss',
+          config: {
+            path: 'test/fixtures/config/postcss.config.js',
+            ctx: { plugin: true }
+          }
+        }
+      }
+    }
+
+    return webpack('css/index.js', config).then((stats) => {
+        const src = loader(stats).src
+
+        expect(src).toEqual("module.exports = \"a { color: rgba(255, 0, 0, 1.0) }\\n\"")
+        expect(src).toMatchSnapshot()
+      })
+  })
+
+  test('Pass loader object to config context', () => {
+    const config = {
+      loader: {
+        options: {
+          config: {
+            path: 'test/fixtures/config/context/postcss.config.js'
+          }
+        }
+      }
+    }
+
+    return webpack('css/index.js', config).then((stats) => {
+      const assets = stats.compilation.assets;
+      const expectedAssetName = 'asset.txt';
+
+      expect(expectedAssetName in assets).toBeTruthy();
+      expect(assets[expectedAssetName].source()).toBe('123');
+    })
+  })
 })

test/options/sourceMap.test.js

@@ -41,7 +41,7 @@ describe('Options', () => {
     return webpack('css/index.js', config).then((stats) => {
         const src = loader(stats).src
 
-        expect(src).toEqual("module.exports = \"a { color: rgba(255, 0, 0, 1.0) }\\n\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0eWxlLmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxJQUFJLDJCQUFZLEVBQUUiLCJmaWxlIjoic3R5bGUuY3NzIiwic291cmNlc0NvbnRlbnQiOlsiYSB7IGNvbG9yOiBibGFjayB9XG4iXX0= */\"")
+        expect(src).toEqual("module.exports = \"a { color: rgba(255, 0, 0, 1.0) }\\n\\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZml4dHVyZXMvY3NzL3N0eWxlLmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxJQUFJLDJCQUFZLEVBQUUiLCJmaWxlIjoidGVzdC9maXh0dXJlcy9jc3Mvc3R5bGUuY3NzIiwic291cmNlc0NvbnRlbnQiOlsiYSB7IGNvbG9yOiBibGFjayB9XG4iXX0= */\"")
         expect(src).toMatchSnapshot()
       })
   })