postcss-modules - npm Package Compare versions

Comparing version 0.6.0 to 0.6.1

build/behaviours.js

@@ -6,6 +6,4 @@ 'use strict';
 });
-exports.defaultPlugins = exports.behaviours = undefined;
-
-var _defaultPlugins;
-
+exports.behaviours = undefined;
+exports.getDefaultPlugins = getDefaultPlugins;
 exports.isValidBehaviour = isValidBehaviour;
@@ -26,6 +24,14 @@
 
-var defaultPlugins = exports.defaultPlugins = (_defaultPlugins = {}, _defineProperty(_defaultPlugins, behaviours.LOCAL, [_cssModulesLoaderCore2.default.values, _cssModulesLoaderCore2.default.localByDefault, _cssModulesLoaderCore2.default.extractImports, _cssModulesLoaderCore2.default.scope]), _defineProperty(_defaultPlugins, behaviours.GLOBAL, [_cssModulesLoaderCore2.default.values, _cssModulesLoaderCore2.default.extractImports, _cssModulesLoaderCore2.default.scope]), _defaultPlugins);
+function getDefaultPlugins(behaviour, generateScopedName) {
+  var _plugins;
 
+  var scope = _cssModulesLoaderCore2.default.scope({ generateScopedName: generateScopedName });
+
+  var plugins = (_plugins = {}, _defineProperty(_plugins, behaviours.LOCAL, [_cssModulesLoaderCore2.default.values, _cssModulesLoaderCore2.default.localByDefault, _cssModulesLoaderCore2.default.extractImports, scope]), _defineProperty(_plugins, behaviours.GLOBAL, [_cssModulesLoaderCore2.default.values, _cssModulesLoaderCore2.default.extractImports, scope]), _plugins);
+
+  return plugins[behaviour];
+}
+
 function isValidBehaviour(behaviour) {
   return Object.values(behaviours).includes(behaviour);
 }

build/index.js

@@ -7,6 +7,2 @@ 'use strict';
 
-var _cssModulesLoaderCore = require('css-modules-loader-core');
-
-var _cssModulesLoaderCore2 = _interopRequireDefault(_cssModulesLoaderCore);
-
 var _parser = require('css-modules-loader-core/lib/parser');
@@ -59,4 +55,6 @@
 
-function getDefaultPlugins(opts, behaviour, inputFile) {
+function getDefaultPluginsList(opts, inputFile) {
   var globalModulesWhitelist = opts.globalModulePaths || null;
+  var defaultBehaviour = getDefaultScopeBehaviour(opts);
+  var generateName = getScopedNameGenerator(opts);
 
@@ -67,6 +65,8 @@ if (globalModulesWhitelist) {
     });
-    return _behaviours.defaultPlugins[isGlobalModule ? _behaviours.behaviours.GLOBAL : _behaviours.behaviours.LOCAL];
+    var moduleBehaviour = isGlobalModule ? _behaviours.behaviours.GLOBAL : _behaviours.behaviours.LOCAL;
+
+    return (0, _behaviours.getDefaultPlugins)(moduleBehaviour, generateName);
   }
 
-  return _behaviours.defaultPlugins[behaviour];
+  return (0, _behaviours.getDefaultPlugins)(defaultBehaviour, generateName);
 }
@@ -82,4 +82,2 @@
   var getJSON = opts.getJSON || _saveJSON2.default;
-  var defaultScopeBehaviour = getDefaultScopeBehaviour(opts);
-  _cssModulesLoaderCore2.default.scope.generateScopedName = getScopedNameGenerator(opts);
 
@@ -89,3 +87,3 @@ return function (css, result) {
     var resultPlugins = result.processor.plugins.filter(isResultPlugin);
-    var pluginList = getDefaultPlugins(opts, defaultScopeBehaviour, inputFile);
+    var pluginList = getDefaultPluginsList(opts, inputFile);
     var plugins = [].concat(_toConsumableArray(pluginList), _toConsumableArray(resultPlugins));
@@ -92,0 +90,0 @@ var loader = getLoader(opts, plugins);

CHANGELOG.md

@@ -0,1 +1,4 @@
+## 0.6.1
+* Fixed `generateScopedName` bug with multiple postcss-modules instances (https://github.com/css-modules/postcss-modules/issues/37)
+
 ## 0.6.0
@@ -2,0 +5,0 @@ * Added `globalModulePaths` option (Thanks to @pospi).

package.json

 {
   "name": "postcss-modules",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "PostCSS plugin to use CSS Modules everywhere",
@@ -5,0 +5,0 @@ "main": "build/index.js",

No alert changes

Improved metrics

Total package byte prevSize

47774

increased by0.23%

Lines of code

111

increased by3.74%

No dependency changes