feat: bump m-css

Author: jquense

README.md

@@ -122,39 +122,6 @@ as global.
 
 **How to migrate:** Change to the parameterized form `:global(.token) {}`
 
-#### `valueAliasing`
-
-`css-modules` version of `@value`s allows for individually aliasing imported names:
-
-```css
-@value primary as utilsPrimary from './utils.css';
-
-.foo {
-  color: utilsPrimary;
-}
-```
-
-`modular-css` only (currently) allows importing by the exact name OR namespacing the entire import
-like: `@value * as utils from './utils.css';`
-
-> Note: enabling this will also enable `icssImports` which is used to implement it.
-
-**When to enable:** If you `@value` aliases, e.g.
-
-```css
-@value primary as utilsPrimary from './utils.css';
-```
-
-**How to migrate:** Switch to using `@value * as ns` to handle conflicts (see: https://m-css.com/guide/#namespaces)
-
-```css
-@value * as utils from './utils.css';
-
-.foo {
-  color: utils.primary;
-}
-```
-
 #### `icssExports`
 
 A very niche feature of css-modules that you may not even know is possible.

lib/Utils.js

@@ -1,5 +1,5 @@
-const mapValues = require('lodash/mapValues');
 const findLast = require('lodash/findLast');
+const mapValues = require('lodash/mapValues');
 
 function getExports(file, messages, opts = {}) {
   const lastClsMsg = findLast(messages, 'classes');
@@ -9,8 +9,8 @@ function getExports(file, messages, opts = {}) {
     opts.exportValues ? mapValues(file.values, ({ value }) => value) : null,
     lastClsMsg.classes,
     ...messages
-      .filter(m => m.plugin && m.plugin.startsWith('modular-css-export'))
-      .map(m => m.exports),
+      .filter((m) => m.plugin && m.plugin.startsWith('modular-css-export'))
+      .map((m) => m.exports),
   );
 }
 

lib/getLocalName.js

@@ -1,6 +1,7 @@
 /** Taken from css-loader */
 
 const path = require('path');
+
 const cssesc = require('cssesc');
 const loaderUtils = require('loader-utils');
 

lib/loader.js

@@ -1,16 +1,17 @@
 const path = require('path');
+const { promisify } = require('util');
 
 const Processor = require('@modular-css/processor');
-const { promisify } = require('util');
 const { getOptions } = require('loader-utils');
+
 const getLocalName = require('./getLocalName');
 
 const PROCESSOR = Symbol('@modular-css processor');
 const CACHE = Symbol('loadModule cache module');
 
 const compatPlugins = {
   scoping: require('./plugins/compat-scope-pseudos'),
-  valueAliasing: require('./plugins/compat-value-aliasing'),
+  // valueAliasing: require('./plugins/compat-value-aliasing'),
   icssImport: require('./plugins/compat-icss-import'),
   icssExport: require('./plugins/compat-icss-export'),
 };
@@ -19,7 +20,7 @@ function getLoadFilePrefix(loaderContext) {
   // loads a file with all loaders configured after this one
   const loadersRequest = loaderContext.loaders
     .slice(loaderContext.loaderIndex + 1)
-    .map(x => x.request)
+    .map((x) => x.request)
     .join('!');
 
   return `-!${require.resolve('./stringifyLoader')}!${loadersRequest}!`;
@@ -77,11 +78,11 @@ function loader(src) {
     if (typeof options.compat === 'object') {
       const names = new Set(
         Object.entries(options.compat)
-          .filter(e => e[1])
-          .map(e => e[0]),
+          .filter((e) => e[1])
+          .map((e) => e[0]),
       );
 
-      compat = compat.filter(e => names.has(e[0]));
+      compat = compat.filter((e) => names.has(e[0]));
     }
 
     compat = compat.map(([, plugin]) => plugin);
@@ -97,11 +98,11 @@ function loader(src) {
       namer: (filename, localName) =>
         getLocalName(filename, localName, this, options),
       before: compat
-        .filter(p => p.phase === 'before')
+        .filter((p) => p.phase === 'before')
         .concat(options.before)
         .filter(Boolean),
       processing: []
-        .concat(compat.filter(p => p.phase === 'processing'))
+        .concat(compat.filter((p) => p.phase === 'processing'))
         .concat(require('./plugins/icss-import-export'), options.processing)
         .filter(Boolean),
     };
@@ -124,7 +125,7 @@ function loader(src) {
         },
       });
     },
-    err => {
+    (err) => {
       cb(err);
     },
   );

lib/plugins/compat-icss-export.js

@@ -6,8 +6,8 @@ const plugin = 'css-modules-loader-compat-icss-export';
 module.exports = (css, { messages }) => {
   const exported = Object.create(null);
 
-  css.walkRules(':export', rule => {
-    rule.walkDecls(decl => {
+  css.walkRules(':export', (rule) => {
+    rule.walkDecls((decl) => {
       exported[decl.prop] = decl.value;
     });
 

lib/plugins/compat-icss-import.js

@@ -13,7 +13,7 @@ module.exports = (css, { opts }) => {
 
   const replacements = Object.create(null);
   // console.log(files);
-  css.walkRules(/^:import/, rule => {
+  css.walkRules(/^:import/, (rule) => {
     const matches = importPattern.exec(rule.selector);
 
     if (!matches) return;
@@ -22,7 +22,7 @@ module.exports = (css, { opts }) => {
 
     const source = files[resolve(from, path)];
 
-    rule.walkDecls(decl => {
+    rule.walkDecls((decl) => {
       const localName = decl.prop;
       const name = decl.value;
       if (!(name in source.values)) {
@@ -35,7 +35,7 @@ module.exports = (css, { opts }) => {
     rule.remove();
   });
 
-  css.walk(node => {
+  css.walk((node) => {
     if (node.type === 'decl' && node.value) {
       node.value = replaceValueSymbols(node.value.toString(), replacements);
     } else if (node.type === 'atrule' && node.params) {

lib/plugins/compat-scope-pseudos.js

@@ -8,17 +8,17 @@ const selectorParser = require('postcss-selector-parser');
 
 const plugin = 'css-modules-loader-compat-scope-pseudos';
 
-const isSpacing = node => node.type === 'combinator' && node.value === ' ';
+const isSpacing = (node) => node.type === 'combinator' && node.value === ' ';
 
-const isScopePseudo = node =>
+const isScopePseudo = (node) =>
   node.value === ':local' || node.value === ':global';
 
 function normalizeNodeArray(nodes) {
   const array = [];
 
-  nodes.forEach(x => {
+  nodes.forEach((x) => {
     if (Array.isArray(x)) {
-      normalizeNodeArray(x).forEach(item => {
+      normalizeNodeArray(x).forEach((item) => {
         array.push(item);
       });
     } else if (x) {
@@ -46,7 +46,7 @@ function localizeNode(rule) {
       case 'root': {
         let resultingGlobal;
 
-        newNodes = node.nodes.map(n => {
+        newNodes = node.nodes.map((n) => {
           const nContext = {
             global: context.global,
             lastWasSpacing: true,
@@ -71,7 +71,7 @@ function localizeNode(rule) {
         break;
       }
       case 'selector': {
-        newNodes = node.map(childNode => transform(childNode, context));
+        newNodes = node.map((childNode) => transform(childNode, context));
 
         node = node.clone();
         node.nodes = normalizeNodeArray(newNodes);
@@ -117,7 +117,7 @@ function localizeNode(rule) {
             }
 
             newNodes = node
-              .map(childNode => transform(childNode, childContext))
+              .map((childNode) => transform(childNode, childContext))
               .reduce((acc, next) => acc.concat(next.nodes), []);
 
             if (newNodes.length) {
@@ -139,7 +139,7 @@ function localizeNode(rule) {
               inside: context.inside,
               lastWasSpacing: true,
             };
-            newNodes = node.map(childNode =>
+            newNodes = node.map((childNode) =>
               transform(childNode, childContext),
             );
 
@@ -211,15 +211,15 @@ function localizeNode(rule) {
     global: false,
   };
 
-  rootContext.selector = selectorParser(root => {
+  rootContext.selector = selectorParser((root) => {
     transform(root, rootContext);
   }).processSync(rule, { updateSelector: false, lossless: true });
 
   return rootContext;
 }
 
-module.exports = css => {
-  css.walkRules(rule => {
+module.exports = (css) => {
+  css.walkRules((rule) => {
     if (
       rule.parent &&
       rule.parent.type === 'atrule' &&

lib/plugins/compat-value-aliasing.js

@@ -11,7 +11,7 @@ const matchImport = /^([\w-*]+)(?:\s+as\s+([\w-]+))?/;
 module.exports = (css, { messages, opts }) => {
   const importAliases = [];
 
-  css.walkAtRules('value', atRule => {
+  css.walkAtRules('value', (atRule) => {
     const matches = matchImports.exec(atRule.params);
     if (matches) {
       // eslint-disable-next-line prefer-const
@@ -20,7 +20,7 @@ module.exports = (css, { messages, opts }) => {
       const imports = aliases
         .replace(/^\(\s*([\s\S]+)\s*\)$/, '$1')
         .split(/\s*,\s*/)
-        .map(importValue => {
+        .map((importValue) => {
           const tokens = matchImport.exec(importValue);
           if (tokens) {
             const [, name, alias] = tokens;

lib/plugins/icss-import-export.js

@@ -1,5 +1,7 @@
 const path = require('path');
+
 const postcss = require('postcss');
+
 const { getExports } = require('../Utils');
 
 const plugin = 'css-modules-loader-icss-import/exports';
@@ -18,7 +20,7 @@ module.exports = (css, { opts, messages }) => {
   const imported = graph.outgoingEdges[from];
   const exported = getExports(file, messages, opts);
 
-  imported.forEach(dep =>
+  imported.forEach((dep) =>
     css.prepend(
       postcss.rule({
         selector: `:import("${path.relative(path.dirname(from), dep)}")`,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-module-loader",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "main": "lib/loader.js",
   "repository": {
     "type": "git",
@@ -46,48 +46,48 @@
   },
   "release": {},
   "devDependencies": {
-    "@4c/cli": "^1.0.5",
+    "@4c/cli": "^2.1.8",
     "@4c/import-sort": "^4.3.6",
-    "@4c/jest-preset": "^1.4.4",
+    "@4c/jest-preset": "^1.5.0",
     "@4c/prettier-config": "^1.1.0",
-    "css-loader": "^3.4.2",
+    "css-loader": "^3.5.3",
     "eslint": "^6.8.0",
-    "eslint-config-4catalyzer": "^1.0.2",
-    "eslint-config-4catalyzer-jest": "^2.0.3",
-    "eslint-config-prettier": "^6.10.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jest": "^23.6.0",
-    "eslint-plugin-prettier": "^3.1.2",
-    "husky": "^4.2.1",
-    "jest": "^25.1.0",
+    "eslint-config-4catalyzer": "^1.1.1",
+    "eslint-config-4catalyzer-jest": "^2.0.6",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-jest": "^23.8.2",
+    "eslint-plugin-prettier": "^3.1.3",
+    "husky": "^4.2.5",
+    "jest": "^25.5.1",
     "jest-file-snapshot": "^0.3.8",
-    "lint-staged": "^10.0.7",
-    "memfs": "^3.0.4",
+    "lint-staged": "^10.2.0",
+    "memfs": "^3.1.2",
     "mini-css-extract-plugin": "^0.9.0",
-    "prettier": "^1.19.1",
-    "sass": "^1.25.0",
+    "prettier": "^2.0.5",
+    "sass": "^1.26.5",
     "strip-ansi": "^6.0.0",
-    "webpack-atoms": "^12.1.0",
-    "webpack-cli": "^3.3.10",
+    "webpack-atoms": "^13.0.1",
+    "webpack-cli": "^3.3.11",
     "webpack-dev-server": "^3.10.3"
   },
   "dependencies": {
-    "@modular-css/processor": "^25.3.1",
+    "@modular-css/processor": "^25.6.0",
     "cssesc": "^3.0.0",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^9.0.0",
     "icss-utils": "^4.1.1",
-    "loader-utils": "^1.2.3",
+    "loader-utils": "^2.0.0",
     "lodash": "^4.17.15",
     "memory-fs": "^0.5.0",
-    "postcss": "^7.0.26",
+    "postcss": "^7.0.27",
     "postcss-selector-parser": "^6.0.2",
     "sass-loader": "^8.0.2",
-    "webpack": "^4.41.5"
+    "webpack": "^4.43.0"
   },
   "bugs": {
     "url": "https://github.com/4Catalyzer/css-module-loader/issues"
   },
   "readme": "ERROR: No README data found!",
   "homepage": "https://github.com/4Catalyzer/css-module-loader#readme",
-  "_id": "css-module-loader@1.0.0-beta.2"
+  "_id": "css-module-loader@1.0.0-beta.3"
 }

test/__file_snapshots__/compat-all-js.js

@@ -10,7 +10,7 @@
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 // extracted by mini-css-extract-plugin
-/* harmony default export */ __webpack_exports__["default"] = ({"base":"base--base--1uAtd"});
+/* harmony default export */ __webpack_exports__["default"] = ({"base":"base--base--61APe"});
 
 /***/ }),
 
@@ -24,7 +24,7 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 // extracted by mini-css-extract-plugin
-/* harmony default export */ __webpack_exports__["default"] = ({"button":"base--base--1uAtd button--button--32Qrn"});
+/* harmony default export */ __webpack_exports__["default"] = ({"button":"base--base--61APe button--button--3RyHa"});
 
 /***/ }),
 

test/__file_snapshots__/compat-all-styles.css

@@ -1,6 +1,6 @@
-.base--base--1uAtd {
+.base--base--61APe {
   color: blue;
 }
-.button--button--32Qrn {
+.button--button--3RyHa {
   color: red;
 }

test/__file_snapshots__/externals-js.js

@@ -10,7 +10,7 @@
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 // extracted by mini-css-extract-plugin
-/* harmony default export */ __webpack_exports__["default"] = ({"toolbar":"externals--toolbar--3HGQb"});
+/* harmony default export */ __webpack_exports__["default"] = ({"toolbar":"externals--toolbar--3bNYz"});
 
 /***/ }),