css-loader 0.27.1 → 0.28.1

package/CHANGELOG.md

@@ -2,6 +2,45 @@
 
 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="0.28.1"></a>
+## [0.28.1](https://github.com/webpack/css-loader/compare/v0.28.0...v0.28.1) (2017-05-02)
+
+
+### Bug Fixes
+
+* allow to specify a full hostname as a root URL ([#521](https://github.com/webpack/css-loader/issues/521)) ([06d27a1](https://github.com/webpack/css-loader/commit/06d27a1))
+* case insensitivity of [@import](https://github.com/import) ([#514](https://github.com/webpack/css-loader/issues/514)) ([de4356b](https://github.com/webpack/css-loader/commit/de4356b))
+* don't handle empty [@import](https://github.com/import) and url() ([#513](https://github.com/webpack/css-loader/issues/513)) ([868fc94](https://github.com/webpack/css-loader/commit/868fc94))
+* imported variables are replaced in exports if followed by a comma ([#504](https://github.com/webpack/css-loader/issues/504)) ([956bad7](https://github.com/webpack/css-loader/commit/956bad7))
+* loader now correctly handles `url` with space(s) ([#495](https://github.com/webpack/css-loader/issues/495)) ([534ea55](https://github.com/webpack/css-loader/commit/534ea55))
+* url with a trailing space is now handled correctly ([#494](https://github.com/webpack/css-loader/issues/494)) ([e1ec4f2](https://github.com/webpack/css-loader/commit/e1ec4f2))
+* use `btoa` instead `Buffer` ([#501](https://github.com/webpack/css-loader/issues/501)) ([fbb0714](https://github.com/webpack/css-loader/commit/fbb0714))
+
+
+### Performance Improvements
+
+* generate source maps only when explicitly set ([#478](https://github.com/webpack/css-loader/issues/478)) ([b8f5c8f](https://github.com/webpack/css-loader/commit/b8f5c8f))
+
+
+
+<a name="0.28.0"></a>
+# [0.28.0](https://github.com/webpack/css-loader/compare/v0.27.3...v0.28.0) (2017-03-30)
+
+
+### Features
+
+* add alias feature to rewrite URLs ([#274](https://github.com/webpack/css-loader/issues/274)) ([c8db489](https://github.com/webpack/css-loader/commit/c8db489))
+
+
+
+<a name="0.27.3"></a>
+## [0.27.3](https://github.com/webpack/css-loader/compare/v0.27.2...v0.27.3) (2017-03-13)
+
+
+
+<a name="0.27.2"></a>
+# [0.27.2](https://github.com/webpack/css-loader/compare/v0.27.1...v0.27.2) (2017-03-12)
+
 <a name="0.27.1"></a>
 # [0.27.1](https://github.com/webpack/css-loader/compare/v0.27.0...v0.27.1) (2017-03-10)
 

package/README.md

@@ -6,7 +6,7 @@
 [![chat][chat]][chat-url]
 
 <div align="center">
-  <img width="200" height="200"
+  <img width="180" height="180" vspace="20"
     src="https://cdn.worldvectorlogo.com/logos/css-3.svg">
   <a href="https://github.com/webpack/webpack">
     <img width="200" height="200"
@@ -23,11 +23,16 @@ npm install --save-dev css-loader
 
 <h2 align="center">Usage</h2>
 
-The `css-loader` interprets `@import` and `url()` like `requires`.
+The `css-loader` interprets `@import` and `url()` like `import/require()`
+and will resolve them.
 
-Use the loader either via your webpack config, CLI or inline.
+Good loaders for requiring your assets are the [file-loader](https://github.com/webpack/file-loader)
+and the [url-loader](https://github.com/webpack/url-loader) which you should specify in your config (see [below](https://github.com/michael-ciniawsky/css-loader#assets)).
 
-### Via webpack config (recommended)
+**file.css**
+```js
+import css from 'file.css';
+```
 
 **webpack.config.js**
 ```js
@@ -43,108 +48,155 @@ module.exports = {
 }
 ```
 
-**In your application**
-```js
-import css from 'file.css';
-```
+### `toString`
 
-### CLI
+You can also use the css-loader results directly as string, such as in Angular's component style.
 
-```bash
-webpack --module-bind 'css=style-loader!css-loader'
+**webpack.config.js**
+```js
+{
+   test: /\.css$/,
+   use: [
+     'to-string-loader',
+     'css-loader'
+   ]
+}
 ```
 
-**In your application**
+or
+
 ```js
-import css from 'file.css';
+const css = require('./test.css').toString();
+
+console.log(css); // {String}
 ```
 
-### Inline
+If there are SourceMaps, they will also be included in the result string.
+
+If, for one reason or another, you need to extract CSS as a
+plain string resource (i.e. not wrapped in a JS module) you
+might want to check out the [extract-loader](https://github.com/peerigon/extract-loader).
+It's useful when you, for instance, need to post process the CSS as a string.
 
-**In your application**
+**webpack.config.js**
 ```js
-import css from 'style-loader!css-loader!./file.css';
+{
+   test: /\.css$/,
+   use: [
+     'handlebars-loader', // handlebars loader expects raw resource string
+     'extract-loader',
+     'css-loader'
+   ]
+}
 ```
 
 <h2 align="center">Options</h2>
 
-`@import` and `url()` are interpreted like `import` and will be resolved by the css-loader.
-Good loaders for requiring your assets are the [file-loader](https://github.com/webpack/file-loader)
-and the [url-loader](https://github.com/webpack/url-loader) which you should specify in your config (see below).
-
-To be compatible with existing css files (if not in CSS Module mode):
+|Name|Type|Default|Description|
+|:--:|:--:|:-----:|:----------|
+|**`root`**|`{String}`|`/`|Path to resolve URLs, URLs starting with `/` will not be translated|
+|**`url`**|`{Boolean}`|`true`| Enable/Disable `url()` handling|
+|**`alias`**|`{Object}`|`{}`|Create aliases to import certain modules more easily|
+|**`import`** |`{Boolean}`|`true`| Enable/Disable @import handling|
+|**`modules`**|`{Boolean}`|`false`|Enable/Disable CSS Modules|
+|**`minimize`**|`{Boolean\|Object}`|`false`|Enable/Disable minification|
+|**`sourceMap`**|`{Boolean}`|`false`|Enable/Disable Sourcemaps|
+|**`camelCase`**|`{Boolean\|String}`|`false`|Export Classnames in CamelCase|
+|**`importLoaders`**|`{Number}`|`0`|Number of loaders applied before CSS loader|
 
-* `url(image.png)` => `require('./image.png')`
-* `url(~module/image.png)` => `require('module/image.png')`
+### `root`
 
-<h2 align="center">Options</h2>
+For URLs that start with a `/`, the default behavior is to not translate them.
 
-|Name|Default|Description|
-|:--:|:-----:|:----------|
-|**`root`**|`/`|Path to resolve URLs, URLs starting with `/` will not be translated|
-|**`modules`**|`false`|Enable/Disable CSS Modules|
-|**`import`** |`true`| Enable/Disable @import handling|
-|**`url`**|`true`| Enable/Disable `url()` handling|
-|**`minimize`**|`false`|Enable/Disable minification|
-|**`sourceMap`**|`false`|Enable/Disable Sourcemaps|
-|**`camelCase`**|`false`|Export Classnames in CamelCase|
-|**`importLoaders`**|`0`|Number of loaders applied before CSS loader|
+`url(/image.png) => url(/image.png)`
 
-The following webpack config can load CSS files, embed small PNG/JPG/GIF/SVG images as well as fonts as [Data URLs](https://tools.ietf.org/html/rfc2397) and copy larger files to the output directory.
+If a `root` query parameter is set, however, it will be prepended to the URL
+and then translated.
 
 **webpack.config.js**
 ```js
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: /\.css$/,
-        use: [ 'style-loader', 'css-loader' ]
-      },
-      {
-        test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000
-        }
-      }
-    ]
-  }
-};
+{
+  loader: 'css-loader',
+  options: { root: '.' }
+}
 ```
 
-### Root
+`url(/image.png)` => `require('./image.png')`
 
-For URLs that start with a `/`, the default behavior is to not translate them:
+Using 'Root-relative' urls is not recommended. You should only use it for legacy CSS files.
 
-* `url(/image.png)` => `url(/image.png)`
+### `url`
 
-If a `root` query parameter is set, however, it will be prepended to the URL
-and then translated:
+To disable `url()` resolving by `css-loader` set the option to `false`.
+
+To be compatible with existing css files (if not in CSS Module mode).
+
+```
+url(image.png) => require('./image.png')
+url(~module/image.png) => require('module/image.png')
+```
+
+### `alias`
+
+Rewrite your urls with alias, this is useful when it's hard to change url paths of your input files, for example, when you're using some css / sass files in another package (bootstrap, ratchet, font-awesome, etc.).
+
+`css-loader`'s `alias` follows the same syntax as webpack's `resolve.alias`, you can see the details at the [resolve docs] (https://webpack.js.org/configuration/resolve/#resolve-alias)
+
+**file.scss**
+```css
+@charset "UTF-8";
+@import "bootstrap";
+```
 
 **webpack.config.js**
 ```js
-rules: [
-  {
-    test: /\.css$/,
-    use: [
-      'style-loader',
-      {
-        loader: 'css-loader',
-        options: { root: '.' }
+{
+  test: /\.scss$/,
+  use: [
+    {
+      loader: "style-loader"
+    },
+    {
+      loader: "css-loader",
+      options: {
+        alias: {
+          "../fonts/bootstrap": "bootstrap-sass/assets/fonts/bootstrap"
+        }
       }
-    ]
-  }
-]
+    },
+    {
+      loader: "sass-loader",
+      options: {
+        includePaths: [
+          path.resolve("./node_modules/bootstrap-sass/assets/stylesheets")
+        ]
+      }
+    }
+  ]
+}
 ```
 
-* `url(/image.png)` => `require('./image.png')`
+Check out this [working bootstrap example](https://github.com/bbtfr/webpack2-bootstrap-sass-sample).
 
-Using 'Root-relative' urls is not recommended. You should only use it for legacy CSS files.
+### `import`
 
-### CSS Scope
+To disable `@import` resolving by `css-loader` set the option to `false`
 
-By default CSS exports all class names into a global selector scope. Styles can be locally scoped to avoid globally scoping styles.
+```css
+@import url('https://fonts.googleapis.com/css?family=Roboto');
+```
+
+> _⚠️ Use with caution, since this disables resolving for **all** `@import`s, including css modules `composes: xxx from 'path/to/file.css'` feature._
+
+### [`modules`](https://github.com/css-modules/css-modules)
+
+The query parameter `modules` enables the **CSS Modules** spec.
+
+This enables local scoped CSS by default. (You can switch it off with `:global(...)` or `:global` for selectors and/or rules.).
+
+#### `Scope`
+
+By default CSS exports all classnames into a global selector scope. Styles can be locally scoped to avoid globally scoping styles.
 
 The syntax `:local(.className)` can be used to declare `className` in the local scope. The local identifiers are exported by the module.
 
@@ -152,7 +204,6 @@ With `:local` (without brackets) local mode can be switched on for this selector
 
 The loader replaces local selectors with unique identifiers. The choosen unique identifiers are exported by the module.
 
-**app.css**
 ```css
 :local(.className) { background: red; }
 :local .className { color: green; }
@@ -160,17 +211,16 @@ The loader replaces local selectors with unique identifiers. The choosen unique
 :local .className .subClass :global(.global-class-name) { color: blue; }
 ```
 
-**app.bundle.css**
-``` css
+```css
 ._23_aKvs-b8bW2Vg3fwHozO { background: red; }
 ._23_aKvs-b8bW2Vg3fwHozO { color: green; }
 ._23_aKvs-b8bW2Vg3fwHozO ._13LGdX8RMStbBE9w-t0gZ1 { color: green; }
 ._23_aKvs-b8bW2Vg3fwHozO ._13LGdX8RMStbBE9w-t0gZ1 .global-class-name { color: blue; }
 ```
 
-> Note: Identifiers are exported
+> :information_source: Identifiers are exported
 
-``` js
+```js
 exports.locals = {
   className: '_23_aKvs-b8bW2Vg3fwHozO',
   subClass: '_13LGdX8RMStbBE9w-t0gZ1'
@@ -179,13 +229,14 @@ exports.locals = {
 
 CamelCase is recommended for local selectors. They are easier to use in the within the imported JS module.
 
-`url()` URLs in block scoped (`:local .abc`) rules behave like requests in modules:
+`url()` URLs in block scoped (`:local .abc`) rules behave like requests in modules.
 
-* `./file.png` instead of `file.png`
-* `module/file.png` instead of `~module/file.png`
+```
+file.png => ./file.png
+~module/file.png => module/file.png
+```
 
 You can use `:local(#someId)`, but this is not recommended. Use classes instead of ids.
-
 You can configure the generated ident with the `localIdentName` query parameter (default `[hash:base64]`).
 
  **webpack.config.js**
@@ -204,39 +255,29 @@ You can configure the generated ident with the `localIdentName` query parameter
 }
 ```
 
-You can also specify the absolute path to your custom `getLocalIdent` function to generate classname based on a different schema. Note that this requires `webpack >= v2.x.` since to be able to pass function in. For example:
+You can also specify the absolute path to your custom `getLocalIdent` function to generate classname based on a different schema. This requires `webpack >= 2.2.1` (it supports functions in the `options` object).
 
+**webpack.config.js**
 ```js
 {
-  test: /\.css$/,
-  use: [
-    {
-      loader: 'css-loader',
-      options: {
-        modules: true,
-        localIdentName: '[path][name]__[local]--[hash:base64:5]',
-        getLocalIdent: (context, localIdentName, localName, options) => {
-          return 'whatever_random_class_name'
-        }
-      }
+  loader: 'css-loader',
+  options: {
+    modules: true,
+    localIdentName: '[path][name]__[local]--[hash:base64:5]',
+    getLocalIdent: (context, localIdentName, localName, options) => {
+      return 'whatever_random_class_name'
     }
-  ]
+  }
 }
 ```
 
-Note: For prerendering with extract-text-webpack-plugin you should use `css-loader/locals` instead of `style-loader!css-loader` **in the prerendering bundle**. It doesn't embed CSS but only exports the identifier mappings.
+> :information_source: For prerendering with extract-text-webpack-plugin you should use `css-loader/locals` instead of `style-loader!css-loader` **in the prerendering bundle**. It doesn't embed CSS but only exports the identifier mappings.
 
-### [CSS Modules](https://github.com/css-modules/css-modules)
+#### `Composing`
 
-The query parameter `modules` enables the **CSS Modules** spec.
-
-This enables local scoped CSS by default. (You can switch it off with `:global(...)` or `:global` for selectors and/or rules.)
-
-### CSS Composing
+When declaring a local classname you can compose a local class from another local classname.
 
-When declaring a local class name you can compose a local class from another local class name.
-
-``` css
+```css
 :local(.className) {
   background: red;
   color: yellow;
@@ -248,7 +289,7 @@ When declaring a local class name you can compose a local class from another loc
 }
 ```
 
-This doesn't result in any change to the CSS itself but exports multiple class names:
+This doesn't result in any change to the CSS itself but exports multiple classnames.
 
 ```js
 exports.locals = {
@@ -268,18 +309,18 @@ exports.locals = {
 }
 ```
 
-### Importing CSS Locals
+#### `Importing`
 
-To import a local class name from another module:
+To import a local classname from another module.
 
-``` css
+```css
 :local(.continueButton) {
   composes: button from 'library/button.css';
   background: red;
 }
 ```
 
-``` css
+```css
 :local(.nameEdit) {
   composes: edit highlight from './edit.css';
   background: red;
@@ -288,7 +329,7 @@ To import a local class name from another module:
 
 To import from multiple modules use multiple `composes:` rules.
 
-``` css
+```css
 :local(.className) {
   composes: edit hightlight from './edit.css';
   composes: button from 'module/button.css';
@@ -297,137 +338,157 @@ To import from multiple modules use multiple `composes:` rules.
 }
 ```
 
-### SourceMaps
+### `minimize`
 
-To include Sourcemaps set the `sourceMap` query param.
+By default the css-loader minimizes the css if specified by the module system.
 
-I. e. the extract-text-webpack-plugin can handle them.
+In some cases the minification is destructive to the css, so you can provide your own options to the minifier if needed. cssnano is used for minification and you find a [list of options here](http://cssnano.co/options/).
 
-They are not enabled by default because they expose a runtime overhead and increase in bundle size (JS SourceMap do not). In addition to that relative paths are buggy and you need to use an absolute public path which include the server URL.
+You can also disable or enforce minification with the `minimize` query parameter.
 
 **webpack.config.js**
 ```js
 {
-  test: /\.css$/,
-  use: [
-    {
-      loader: 'css-loader',
-      options: {
-        sourceMap: true
-      }
-    }
-  ]
+  loader: 'css-loader',
+  options: {
+    minimize: true || {/* CSSNano Options */}
+  }
 }
 ```
 
-### toString
+### `sourceMap`
 
-You can also use the css-loader results directly as string, such as in Angular's component style. 
+To include source maps set the `sourceMap` option.
 
-**webpack.config.js**
+I. e. the extract-text-webpack-plugin can handle them.
+
+They are not enabled by default because they expose a runtime overhead and increase in bundle size (JS source maps do not). In addition to that relative paths are buggy and you need to use an absolute public path which include the server URL.
 
+**webpack.config.js**
 ```js
 {
-   test: /\.css$/,
-   use: [
-     {
-       loaders: ['to-string-loader', 'css-loader']
-     }
-   ]
+  loader: 'css-loader',
+  options: {
+    sourceMap: true
+  }
 }
 ```
 
-or
+### `camelCase`
 
-```js
-const cssText = require('./test.css').toString();
+By default, the exported JSON keys mirror the class names. If you want to camelize class names (useful in JS), pass the query parameter `camelCase` to css-loader.
+
+|Name|Type|Description|
+|:--:|:--:|:----------|
+|**`true`**|`{Boolean}`|Class names will be camelized|
+|**`'dashes'`**|`{String}`|Only dashes in class names will be camelized|
+|**`'only'`** |`{String}`|Introduced in `0.27.1`. Class names will be camelized, the original class name will be removed from the locals|
+|**`'dashesOnly'`**|`{String}`|Introduced in `0.27.1`. Dashes in class names will be camelized, the original class name will be removed from the locals|
 
-console.log(cssText);
+**file.css**
+```css
+.class-name {}
 ```
 
-If there are SourceMaps, they will also be included in the result string.
+**file.js**
+```js
+import { className } from 'file.css';
+```
 
-### ImportLoaders
+**webpack.config.js**
+```js
+{
+  loader: 'css-loader',
+  options: {
+    camelCase: true
+  }
+}
+```
 
-The query parameter `importLoaders` allow to configure which loaders should be applied to `@import`ed resources.
+### `importLoaders`
 
-`importLoaders`: That many loaders after the css-loader are used to import resources.
+The query parameter `importLoaders` allows to configure how many loaders before `css-loader` should be applied to `@import`ed resources.
 
 **webpack.config.js**
 ```js
 {
   test: /\.css$/,
   use: [
+    'style-loader',
     {
       loader: 'css-loader',
       options: {
-        importLoaders: 1
+        importLoaders: 1 // 0 => no loaders (default); 1 => postcss-loader; 2 => postcss-loader, sass-loader
       }
     },
-    'postcss-loader'
+    'postcss-loader',
+    'sass-loader'
   ]
 }
 ```
 
 This may change in the future, when the module system (i. e. webpack) supports loader matching by origin.
 
-### Minification
+<h2 align="center">Examples</h2>
 
-By default the css-loader minimizes the css if specified by the module system.
-
-In some cases the minification is destructive to the css, so you can provide some options to it. cssnano is used for minification and you find a [list of options here](http://cssnano.co/options/).
+### Assets
 
-You can also disable or enforce minification with the `minimize` query parameter.
+The following `webpack.config.js` can load CSS files, embed small PNG/JPG/GIF/SVG images as well as fonts as [Data URLs](https://tools.ietf.org/html/rfc2397) and copy larger files to the output directory.
 
 **webpack.config.js**
 ```js
-{
-  test: /\.css$/,
-  use: [
-    {
-      loader: 'css-loader',
-      options: {
-        minimize: true || {/* CSSNano Options */}
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.css$/,
+        use: [ 'style-loader', 'css-loader' ]
+      },
+      {
+        test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000
+        }
       }
-    }
-  ]
+    ]
+  }
 }
 ```
 
-### CamelCase
-
-By default, the exported JSON keys mirror the class names. If you want to camelize class names (useful in JS), pass the query parameter `camelCase` to css-loader.
-
-#### Possible Options
+### Extract
 
-|Option|Description|
-|:----:|:--------|
-|**`true`**|Class names will be camelized|
-|**`'dashes'`**|Only dashes in class names will be camelized|
-|**`'only'`** |Class names will be camelized, the original class name will be removed from the locals|
-|**`'dashesOnly'`**|Dashes in class names will be camelized, the original class name will be removed from the locals|
+For production builds it's recommended to extract the CSS from your bundle being able to use parallel loading of CSS/JS resources later on. This can be achieved by using the [extract-text-webpack-plugin](https://github.com/webpack-contrib/extract-text-webpack-plugin) to extract the CSS when running in production mode.
 
 **webpack.config.js**
 ```js
-{
-  test: /\.css$/,
-  use: [
-    {
-      loader: 'css-loader',
-      options: {
-        camelCase: true
-      }
-    }
-  ]
-}
-```
+const env = process.env.NODE_ENV
 
-```css
-.class-name {}
-```
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
 
-```js
-import { className } from 'file.css';
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.css$/,
+        use: env === 'production'
+          ? ExtractTextPlugin.extract({
+              fallback: 'style-loader'
+              use: [ 'css-loader' ]
+          })
+          : [ 'style-loader', 'css-loader' ]
+      },
+    ]
+  },
+  plugins: env === 'production'
+    ? [
+        new ExtractTextPlugin({
+          filename: '[name].css'
+        })
+      ]
+    : []
+  ]
+}
 ```
 
 <h2 align="center">Maintainers</h2>
@@ -437,29 +498,49 @@ import { className } from 'file.css';
     <tr>
       <td align="center">
         <img width="150" height="150"
-        src="https://avatars3.githubusercontent.com/u/166921?v=3&s=150">
+        src="https://github.com/bebraw.png?v=3&s=150">
         </br>
         <a href="https://github.com/bebraw">Juho Vepsäläinen</a>
       </td>
       <td align="center">
         <img width="150" height="150"
-        src="https://avatars2.githubusercontent.com/u/8420490?v=3&s=150">
+        src="https://github.com/d3viant0ne.png?v=3&s=150">
         </br>
         <a href="https://github.com/d3viant0ne">Joshua Wiens</a>
       </td>
       <td align="center">
         <img width="150" height="150"
-        src="https://avatars3.githubusercontent.com/u/533616?v=3&s=150">
+        src="https://github.com/SpaceK33z.png?v=3&s=150">
         </br>
         <a href="https://github.com/SpaceK33z">Kees Kluskens</a>
       </td>
       <td align="center">
         <img width="150" height="150"
-        src="https://avatars3.githubusercontent.com/u/3408176?v=3&s=150">
+        src="https://github.com/TheLarkInn.png?v=3&s=150">
         </br>
         <a href="https://github.com/TheLarkInn">Sean Larkin</a>
       </td>
     </tr>
+    <tr>
+      <td align="center">
+        <img width="150" height="150"
+        src="https://github.com/michael-ciniawsky.png?v=3&s=150">
+        </br>
+        <a href="https://github.com/michael-ciniawsky">Michael Ciniawsky</a>
+      </td>
+      <td align="center">
+        <img width="150" height="150"
+        src="https://github.com/evilebottnawi.png?v=3&s=150">
+        </br>
+        <a href="https://github.com/evilebottnawi">Evilebot Tnawi</a>
+      </td>
+      <td align="center">
+        <img width="150" height="150"
+        src="https://github.com/joscha.png?v=3&s=150">
+        </br>
+        <a href="https://github.com/joscha">Joscha Feth</a>
+      </td>
+    </tr>
   <tbody>
 </table>
 

package/lib/createResolver.js

@@ -0,0 +1,36 @@
+module.exports = function createResolver(alias) {
+	if(typeof alias !== "object" || Array.isArray(alias)) {
+		return function(url) {
+			return url
+		};
+	}
+
+	alias = Object.keys(alias).map(function(key) {
+		var onlyModule = false;
+		var obj = alias[key];
+		if(/\$$/.test(key)) {
+			onlyModule = true;
+			key = key.substr(0, key.length - 1);
+		}
+		if(typeof obj === "string") {
+			obj = {
+				alias: obj
+			};
+		}
+		obj = Object.assign({
+			name: key,
+			onlyModule: onlyModule
+		}, obj);
+		return obj;
+	});
+
+	return function(url) {
+		alias.forEach(function(obj) {
+			var name = obj.name;
+			if(url === name || (!obj.onlyModule && url.startsWith(name + "/"))) {
+				url = obj.alias + url.substr(name.length);
+			}
+		});
+		return url;
+	}
+}

package/lib/css-base.js

@@ -3,13 +3,13 @@
 	Author Tobias Koppers @sokra
 */
 // css base code, injected by the css-loader
-module.exports = function() {
+module.exports = function(useSourceMap) {
 	var list = [];
 
 	// return the list of modules as css string
 	list.toString = function toString() {
 		return this.map(function (item) {
-			const content = cssWithMappingToString(item);
+			var content = cssWithMappingToString(item, useSourceMap);
 			if(item[2]) {
 				return "@media " + item[2] + "{" + content + "}";
 			} else {
@@ -47,16 +47,30 @@ module.exports = function() {
 	return list;
 };
 
-function cssWithMappingToString(item) {
+function cssWithMappingToString(item, useSourceMap) {
 	var content = item[1] || '';
 	var cssMapping = item[3];
 	if (!cssMapping) {
 		return content;
 	}
-	var convertSourceMap = require('./convert-source-map');
-	var sourceMapping = convertSourceMap.fromObject(cssMapping).toComment({multiline: true});
-	var sourceURLs = cssMapping.sources.map(function (source) {
-		return '/*# sourceURL=' + cssMapping.sourceRoot + source + ' */'
-	});
-	return [content].concat(sourceURLs).concat([sourceMapping]).join('\n');
+
+	if (useSourceMap && typeof btoa === 'function') {
+		var sourceMapping = toComment(cssMapping);
+		var sourceURLs = cssMapping.sources.map(function (source) {
+			return '/*# sourceURL=' + cssMapping.sourceRoot + source + ' */'
+		});
+
+		return [content].concat(sourceURLs).concat([sourceMapping]).join('\n');
+	}
+
+	return [content].join('\n');
+}
+
+// Adapted from convert-source-map (MIT)
+function toComment(sourceMap) {
+	// eslint-disable-next-line no-undef
+	var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));
+	var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64;
+
+	return '/*# ' + data + ' */';
 }

package/lib/loader.js

@@ -6,6 +6,7 @@ var loaderUtils = require("loader-utils");
 var processCss = require("./processCss");
 var getImportPrefix = require("./getImportPrefix");
 var compileExports = require("./compile-exports");
+var createResolver = require("./createResolver");
 
 
 module.exports = function(content, map) {
@@ -15,9 +16,16 @@ module.exports = function(content, map) {
 	var root = query.root;
 	var moduleMode = query.modules || query.module;
 	var camelCaseKeys = query.camelCase || query.camelcase;
+	var sourceMap = query.sourceMap || false;
+	var resolve = createResolver(query.alias);
 
-	if(map !== null && typeof map !== "string") {
-		map = JSON.stringify(map);
+	if(sourceMap) {
+		if (map && typeof map !== "string") {
+			map = JSON.stringify(map);
+		}
+	} else {
+		// Some loaders (example `"postcss-loader": "1.x.x"`) always generates source map, we should remove it
+		map = null;
 	}
 
 	processCss(content, map, {
@@ -26,7 +34,8 @@ module.exports = function(content, map) {
 		to: loaderUtils.getCurrentRequest(this),
 		query: query,
 		minimize: this.minimize,
-		loaderContext: this
+		loaderContext: this,
+		sourceMap: sourceMap
 	}, function(err, result) {
 		if(err) return callback(err);
 
@@ -69,7 +78,7 @@ module.exports = function(content, map) {
 				var match = result.urlItemRegExp.exec(item);
 				var idx = +match[1];
 				var urlItem = result.urlItems[idx];
-				var url = urlItem.url;
+				var url = resolve(urlItem.url);
 				idx = url.indexOf("?#");
 				if(idx < 0) idx = url.indexOf("#");
 				var urlRequest;
@@ -108,7 +117,9 @@ module.exports = function(content, map) {
 		}
 
 		// embed runtime
-		callback(null, "exports = module.exports = require(" + loaderUtils.stringifyRequest(this, require.resolve("./css-base.js")) + ")();\n" +
+		callback(null, "exports = module.exports = require(" +
+			loaderUtils.stringifyRequest(this, require.resolve("./css-base.js")) +
+			")(" + query.sourceMap + ");\n" +
 			"// imports\n" +
 			importJs + "\n\n" +
 			"// module\n" +

package/lib/processCss.js

@@ -13,7 +13,7 @@ var localByDefault = require("postcss-modules-local-by-default");
 var extractImports = require("postcss-modules-extract-imports");
 var modulesScope = require("postcss-modules-scope");
 var modulesValues = require("postcss-modules-values");
-var cssnano = require("cssnano");
+var valueParser = require('postcss-value-parser');
 
 var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 	return function(css) {
@@ -24,21 +24,24 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 
 		function replaceImportsInString(str) {
 			if(options.import) {
-				var tokens = str.split(/(\S+)/);
-				tokens = tokens.map(function (token) {
+				var tokens = valueParser(str);
+				tokens.walk(function (node) {
+					if (node.type !== 'word') {
+						return;
+					}
+					var token = node.value;
 					var importIndex = imports["$" + token];
 					if(typeof importIndex === "number") {
-						return "___CSS_LOADER_IMPORT___" + importIndex + "___";
+						node.value = "___CSS_LOADER_IMPORT___" + importIndex + "___";
 					}
-					return token;
-				});
-				return tokens.join("");
+				})
+				return tokens.toString();
 			}
 			return str;
 		}
 
 		if(options.import) {
-			css.walkAtRules("import", function(rule) {
+			css.walkAtRules(/import/i, function(rule) {
 				var values = Tokenizer.parseValues(rule.params);
 				var url = values.nodes[0].nodes[0];
 				if(url.type === "url") {
@@ -46,6 +49,9 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 				} else if(url.type === "string") {
 					url = url.value;
 				} else throw rule.error("Unexpected format" + rule.params);
+				if (!url.replace(/\s/g, '').length) {
+					return;
+				}
 				values.nodes[0].nodes.shift();
 				var mediaQuery = Tokenizer.stringifyValues(values);
 				if(loaderUtils.isUrlRequest(url, options.root) && options.mode === "global") {
@@ -98,8 +104,11 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 					}
 					break;
 				case "url":
-					if (options.url && !/^#/.test(item.url) && loaderUtils.isUrlRequest(item.url, options.root)) {
-						item.stringType = "";
+					if (options.url && item.url.replace(/\s/g, '').length && !/^#/.test(item.url) && loaderUtils.isUrlRequest(item.url, options.root)) {
+						// Don't remove quotes around url when contain space
+						if (item.url.indexOf(" ") === -1) {
+							item.stringType = "";
+						}
 						delete item.innerSpacingBefore;
 						delete item.innerSpacingAfter;
 						var url = item.url;
@@ -133,7 +142,7 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 
 module.exports = function processCss(inputSource, inputMap, options, callback) {
 	var query = options.query;
-	var root = query.root;
+	var root = query.root && query.root.length > 0 ? query.root.replace(/\/$/, "") : query.root;
 	var context = query.context;
 	var localIdentName = query.localIdentName || "[hash:base64]";
 	var localIdentRegExp = query.localIdentRegExp;
@@ -141,7 +150,7 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 	var minimize = typeof forceMinimize !== "undefined" ? !!forceMinimize : options.minimize;
 
 	var customGetLocalIdent = query.getLocalIdent || getLocalIdent;
-	
+
 	var parserOptions = {
 		root: root,
 		mode: options.mode,
@@ -154,7 +163,9 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 			mode: options.mode,
 			rewriteUrl: function(global, url) {
 				if(parserOptions.url){
-					if(!loaderUtils.isUrlRequest(url, root)) {
+                    url = url.trim();
+
+					if(!url.replace(/\s/g, '').length || !loaderUtils.isUrlRequest(url, root)) {
 						return url;
 					}
 					if(global) {
@@ -179,6 +190,7 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 	]);
 
 	if(minimize) {
+		var cssnano = require("cssnano");
 		var minimizeOptions = assign({}, query.minimize);
 		["zindex", "normalizeUrl", "discardUnused", "mergeIdents", "reduceIdents", "autoprefixer"].forEach(function(name) {
 			if(typeof minimizeOptions[name] === "undefined")
@@ -191,12 +203,12 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 		// we need a prefix to avoid path rewriting of PostCSS
 		from: "/css-loader!" + options.from,
 		to: options.to,
-		map: {
+		map: options.sourceMap ? {
 			prev: inputMap,
 			sourcesContent: true,
 			inline: false,
 			annotation: false
-		}
+		} : null
 	}).then(function(result) {
 		callback(null, {
 			source: result.css,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "0.27.1",
+  "version": "0.28.1",
   "author": "Tobias Koppers @sokra",
   "description": "css loader module for webpack",
   "engines": {
@@ -13,7 +13,6 @@
   ],
   "dependencies": {
     "babel-code-frame": "^6.11.0",
-    "convert-source-map": "^1.3.0",
     "css-selector-tokenizer": "^0.7.0",
     "cssnano": ">=2.6.1 <4",
     "loader-utils": "^1.0.2",
@@ -24,6 +23,7 @@
     "postcss-modules-local-by-default": "^1.0.1",
     "postcss-modules-scope": "^1.0.0",
     "postcss-modules-values": "^1.1.0",
+    "postcss-value-parser": "^3.3.0",
     "source-list-map": "^0.1.7"
   },
   "devDependencies": {

package/lib/convert-source-map.js

@@ -1,143 +0,0 @@
-/* eslint-disable */
-'use strict';
-// XXXXX: This file should not exist. Working around a core level bug
-// that prevents using fs at loaders.
-//var fs = require('fs'); // XXX
-var path = require('path');
-
-var commentRx = /^\s*\/(?:\/|\*)[@#]\s+sourceMappingURL=data:(?:application|text)\/json;(?:charset[:=]\S+?;)?base64,(?:.*)$/mg;
-var mapFileCommentRx =
-  //Example (Extra space between slashes added to solve Safari bug. Exclude space in production):
-  //     / /# sourceMappingURL=foo.js.map           /*# sourceMappingURL=foo.js.map */
-  /(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/){1}[ \t]*$)/mg
-
-function decodeBase64(base64) {
-  return new Buffer(base64, 'base64').toString();
-}
-
-function stripComment(sm) {
-  return sm.split(',').pop();
-}
-
-function readFromFileMap(sm, dir) {
-  // NOTE: this will only work on the server since it attempts to read the map file
-
-  mapFileCommentRx.lastIndex = 0;
-  var r = mapFileCommentRx.exec(sm);
-
-  // for some odd reason //# .. captures in 1 and /* .. */ in 2
-  var filename = r[1] || r[2];
-  var filepath = path.resolve(dir, filename);
-
-  try {
-    return fs.readFileSync(filepath, 'utf8');
-  } catch (e) {
-    throw new Error('An error occurred while trying to read the map file at ' + filepath + '\n' + e);
-  }
-}
-
-function Converter (sm, opts) {
-  opts = opts || {};
-
-  if (opts.isFileComment) sm = readFromFileMap(sm, opts.commentFileDir);
-  if (opts.hasComment) sm = stripComment(sm);
-  if (opts.isEncoded) sm = decodeBase64(sm);
-  if (opts.isJSON || opts.isEncoded) sm = JSON.parse(sm);
-
-  this.sourcemap = sm;
-}
-
-Converter.prototype.toJSON = function (space) {
-  return JSON.stringify(this.sourcemap, null, space);
-};
-
-Converter.prototype.toBase64 = function () {
-  var json = this.toJSON();
-  return new Buffer(json).toString('base64');
-};
-
-Converter.prototype.toComment = function (options) {
-  var base64 = this.toBase64();
-  var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64;
-  return options && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
-};
-
-// returns copy instead of original
-Converter.prototype.toObject = function () {
-  return JSON.parse(this.toJSON());
-};
-
-Converter.prototype.addProperty = function (key, value) {
-  if (this.sourcemap.hasOwnProperty(key)) throw new Error('property %s already exists on the sourcemap, use set property instead');
-  return this.setProperty(key, value);
-};
-
-Converter.prototype.setProperty = function (key, value) {
-  this.sourcemap[key] = value;
-  return this;
-};
-
-Converter.prototype.getProperty = function (key) {
-  return this.sourcemap[key];
-};
-
-exports.fromObject = function (obj) {
-  return new Converter(obj);
-};
-
-exports.fromJSON = function (json) {
-  return new Converter(json, { isJSON: true });
-};
-
-exports.fromBase64 = function (base64) {
-  return new Converter(base64, { isEncoded: true });
-};
-
-exports.fromComment = function (comment) {
-  comment = comment
-    .replace(/^\/\*/g, '//')
-    .replace(/\*\/$/g, '');
-
-  return new Converter(comment, { isEncoded: true, hasComment: true });
-};
-
-exports.fromMapFileComment = function (comment, dir) {
-  return new Converter(comment, { commentFileDir: dir, isFileComment: true, isJSON: true });
-};
-
-// Finds last sourcemap comment in file or returns null if none was found
-exports.fromSource = function (content) {
-  var m = content.match(commentRx);
-  return m ? exports.fromComment(m.pop()) : null;
-};
-
-// Finds last sourcemap comment in file or returns null if none was found
-exports.fromMapFileSource = function (content, dir) {
-  var m = content.match(mapFileCommentRx);
-  return m ? exports.fromMapFileComment(m.pop(), dir) : null;
-};
-
-exports.removeComments = function (src) {
-  return src.replace(commentRx, '');
-};
-
-exports.removeMapFileComments = function (src) {
-  return src.replace(mapFileCommentRx, '');
-};
-
-exports.generateMapFileComment = function (file, options) {
-  var data = 'sourceMappingURL=' + file;
-  return options && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
-};
-
-Object.defineProperty(exports, 'commentRegex', {
-  get: function getCommentRegex () {
-    return commentRx;
-  }
-});
-
-Object.defineProperty(exports, 'mapFileCommentRegex', {
-  get: function getMapFileCommentRegex () {
-    return mapFileCommentRx;
-  }
-});