Update prettier, husky and lint-staged

madyankin · Jun 23, 2020 · 94749f2 · 94749f2
1 parent 7847a92
commit 94749f2
Show file tree

Hide file tree

Showing 9 changed files with 204 additions and 458 deletions.
diff --git a/package.json b/package.json
@@ -37,10 +37,10 @@
     "eslint": "^7.3.1",
     "eslint-plugin-import": "^2.21.2",
     "eslint-plugin-jest": "^23.17.0",
-    "husky": "^3.0.5",
+    "husky": "^4.2.5",
     "jest": "^26.0.1",
-    "lint-staged": "^9.2.5",
-    "prettier": "^1.18.2"
+    "lint-staged": "^10.2.11",
+    "prettier": "^2.0.5"
   },
   "scripts": {
     "pretest": "$(npm bin)/eslint src test",

diff --git a/src/behaviours.js b/src/behaviours.js
@@ -2,7 +2,7 @@ import Core from "./css-loader-core";
 
 export const behaviours = {
   LOCAL: "local",
-  GLOBAL: "global"
+  GLOBAL: "global",
 };
 
 export function getDefaultPlugins(behaviour, generateScopedName) {
@@ -13,10 +13,10 @@ export function getDefaultPlugins(behaviour, generateScopedName) {
       Core.values,
       Core.localByDefault,
       Core.extractImports,
-      scope
+      scope,
     ],
 
-    [behaviours.GLOBAL]: [Core.values, Core.extractImports, scope]
+    [behaviours.GLOBAL]: [Core.values, Core.extractImports, scope],
   };
 
   return plugins[behaviour];
@@ -25,7 +25,7 @@ export function getDefaultPlugins(behaviour, generateScopedName) {
 export function isValidBehaviour(behaviour) {
   return (
     Object.keys(behaviours)
-      .map(key => behaviours[key])
+      .map((key) => behaviours[key])
       .indexOf(behaviour) > -1
   );
 }
diff --git a/src/css-loader-core/index.js b/src/css-loader-core/index.js
@@ -18,10 +18,10 @@ export default class Core {
 
     return postcss(this.plugins.concat([parser.plugin]))
       .process(sourceString, { from: "/" + sourcePath })
-      .then(result => {
+      .then((result) => {
         return {
           injectableSource: result.css,
-          exportTokens: parser.exportTokens
+          exportTokens: parser.exportTokens,
         };
       });
   }

diff --git a/src/css-loader-core/loader.js b/src/css-loader-core/loader.js
@@ -77,7 +77,7 @@ export default class FileSystemLoader {
 
     return Object.keys(traces)
       .sort(traceKeySorter)
-      .map(key => {
+      .map((key) => {
         const filename = traces[key];
         if (written.has(filename)) {
           return null;

diff --git a/src/css-loader-core/parser.js b/src/css-loader-core/parser.js
@@ -20,7 +20,7 @@ export default class Parser {
 
   fetchAllImports(css) {
     let imports = [];
-    css.each(node => {
+    css.each((node) => {
       if (node.type == "rule" && node.selector.match(importRegexp)) {
         imports.push(
           this.fetchImport(node, css.source.input.from, imports.length)
@@ -35,16 +35,16 @@ export default class Parser {
   }
 
   extractExports(css) {
-    css.each(node => {
+    css.each((node) => {
       if (node.type == "rule" && node.selector == ":export")
         this.handleExport(node);
     });
   }
 
   handleExport(exportNode) {
-    exportNode.each(decl => {
+    exportNode.each((decl) => {
       if (decl.type == "decl") {
-        Object.keys(this.translations).forEach(translation => {
+        Object.keys(this.translations).forEach((translation) => {
           decl.value = decl.value.replace(
             translation,
             this.translations[translation]
@@ -60,15 +60,15 @@ export default class Parser {
     let file = importNode.selector.match(importRegexp)[1],
       depTrace = this.trace + String.fromCharCode(depNr);
     return this.pathFetcher(file, relativeTo, depTrace).then(
-      exports => {
-        importNode.each(decl => {
+      (exports) => {
+        importNode.each((decl) => {
           if (decl.type == "decl") {
             this.translations[decl.prop] = exports[decl.value];
           }
         });
         importNode.remove();
       },
-      err => console.log(err)
+      (err) => console.log(err)
     );
   }
 }
diff --git a/src/generateScopedName.js b/src/generateScopedName.js
@@ -3,9 +3,7 @@ import stringHash from "string-hash";
 export default function generateScopedName(name, filename, css) {
   const i = css.indexOf(`.${name}`);
   const lineNumber = css.substr(0, i).split(/[\r\n]/).length;
-  const hash = stringHash(css)
-    .toString(36)
-    .substr(0, 5);
+  const hash = stringHash(css).toString(36).substr(0, 5);
 
   return `_${name}_${hash}_${lineNumber}`;
 }
diff --git a/src/index.js b/src/index.js
@@ -25,7 +25,7 @@ function getScopedNameGenerator(opts) {
   if (typeof scopedNameGenerator === "function") return scopedNameGenerator;
   return genericNames(scopedNameGenerator, {
     context: process.cwd(),
-    hashPrefix: opts.hashPrefix
+    hashPrefix: opts.hashPrefix,
   });
 }
 
@@ -37,7 +37,7 @@ function getLoader(opts, plugins) {
 }
 
 function isGlobalModule(globalModules, inputFile) {
-  return globalModules.some(regex => inputFile.match(regex));
+  return globalModules.some((regex) => inputFile.match(regex));
 }
 
 function getDefaultPluginsList(opts, inputFile) {
@@ -74,7 +74,7 @@ module.exports = postcss.plugin(PLUGIN_NAME, (opts = {}) => {
     const parser = new Parser(loader.fetch.bind(loader));
 
     await postcss([...plugins, parser.plugin]).process(css, {
-      from: inputFile
+      from: inputFile,
     });
 
     const out = loader.finalSource;
@@ -113,7 +113,7 @@ module.exports = postcss.plugin(PLUGIN_NAME, (opts = {}) => {
     result.messages.push({
       type: "export",
       plugin: "postcss-modules",
-      exportTokens: parser.exportTokens
+      exportTokens: parser.exportTokens,
     });
 
     // getJSON may return a promise

diff --git a/src/saveJSON.js b/src/saveJSON.js
@@ -2,10 +2,8 @@ import { writeFile } from "fs";
 
 export default function saveJSON(cssFile, json) {
   return new Promise((resolve, reject) => {
-    writeFile(
-      `${cssFile}.json`,
-      JSON.stringify(json),
-      e => (e ? reject(e) : resolve(json))
+    writeFile(`${cssFile}.json`, JSON.stringify(json), (e) =>
+      e ? reject(e) : resolve(json)
     );
   });
 }