lincd-cli 0.2.57 → 0.2.58

package/lib/cli-methods.js

@@ -971,6 +971,14 @@ const buildPackage = (target, target2, packagePath = process.cwd(), logResults =
             (target2 ? '-' + target2 : '') +
             ' --color');
         let method = logResults ? utils_1.execp : utils_1.execPromise;
+        //NOTE: we moved SCSS:JSON out of webpack and grunt, into this file
+        //this is the beginning of a transition away from grunt
+        //but for the time being it's perhaps a bit strange that we
+        // let x = postcss([
+        //   postcssModules({
+        //     generateScopedName,
+        //   }),
+        // ]);
         //execute the command to build the method, and provide the current work directory as option
         return method(nodeEnv +
             'grunt build' +

package/lib/config-grunt.js

@@ -143,9 +143,21 @@ function setupGrunt(grunt, moduleName, config) {
         postcss: {
             options: {
                 map: true,
-                processors: [require('postcss-modules')({ generateScopedName: utils_1.generateScopedName })],
+                // parser: require('postcss-scss'), //require('postcss-comment'),
                 syntax: require('postcss-scss'),
-                writeDest: false,
+                processors: [
+                    require('postcss-preset-env'),
+                    require('postcss-strip-inline-comments'),
+                    require('postcss-modules')({
+                        generateScopedName: utils_1.generateScopedName.bind(this, config.prod, false),
+                        globalModulePaths: [
+                            /tailwind/,
+                            /tailwindcss/,
+                            config.cssGlobalModulePaths,
+                        ].filter(Boolean),
+                    }),
+                ],
+                // writeDest: false,
             },
             cssjson: {
                 src: 'src/**/*.scss',

package/lib/config-webpack.js

@@ -175,7 +175,7 @@ function generateWebpackConfig(buildName, moduleName, config = {}) {
             postcssPlugins.push([
                 'postcss-modules',
                 {
-                    generateScopedName: utils_1.generateScopedName.bind(null, moduleName),
+                    generateScopedName: utils_1.generateScopedName.bind(null, config.prod, true),
                     globalModulePaths: [
                         /tailwind/,
                         /tailwindcss/,

package/lib/utils.js

@@ -275,41 +275,28 @@ function execPromise(command, log = false, allowError = false, options, pipeOutp
 }
 exports.execPromise = execPromise;
 // export function generateScopedName(moduleName,name, filename, css) {
-function generateScopedName(moduleName, name, filename, css) {
-    // console.log(moduleName,name,filename,css);
-    var file = path.basename(filename, '.scss');
+function generateScopedName(isProduction, isWebpack, cssClassName, filepath, css) {
+    //for app development we can use short unique hashes
+    //but for webpack bundles of lincd modules, we need to ensure unique class names across bundles of many packages
+    if (isProduction && !isWebpack) {
+        //generate a short unique hash based on cssClassName and filepath
+        let hash = require('crypto')
+            .createHash('md5')
+            .update(cssClassName + filepath)
+            .digest('hex')
+            .substring(0, 6);
+        return hash;
+    }
+    var filename = path.basename(filepath, '.scss');
     let nearestPackageJson = findNearestPackageJsonSync(filename);
     let packageName = nearestPackageJson
         ? nearestPackageJson.data.name
-        : moduleName;
-    return packageName.replace(/[^a-zA-Z0-9_]+/g, '_') + '_' + file + '_' + name;
-    // process.exit();
-    // var path = require('path');
-    var file = path.basename(filename, '.scss');
-    var module = filename.match(/[\\\/]modules[\\\/]([\w\-_]+)/);
-    var moduleName;
-    if (module) {
-        moduleName = module[1];
-    }
-    else {
-        //if we cant find module name from path, we'll use a hash
-        //https://stackoverflow.com/questions/6122571/simple-non-secure-hash-function-for-javascript
-        var hash = 0;
-        if (filename.length == 0) {
-            moduleName = '_unknown';
-        }
-        else {
-            for (var i = 0; i < filename.length; i++) {
-                var char = filename.charCodeAt(i);
-                hash = (hash << 5) - hash + char;
-                hash = hash & hash; // Convert to 32bit integer
-            }
-            moduleName = hash;
-        }
-    }
-    // console.log("Module name: "+moduleName);
-    // console.log("Returning: " + moduleName + "_" + file + "_" + name);
-    return moduleName + '_' + file + '_' + name;
+        : 'unknown';
+    return (packageName.replace(/[^a-zA-Z0-9_]+/g, '_') +
+        '_' +
+        filename +
+        '_' +
+        cssClassName);
 }
 exports.generateScopedName = generateScopedName;
 function log(...messages) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.57",
+  "version": "0.2.58",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
     "prepublishOnly": "npm exec tsc",
     "build": "npm exec tsc",
     "_postinstall": "husky install",
-    "prepack": "yarn version patch && npm exec tsc && pinst --disable",
+    "prepack": "npm exec tsc && pinst --disable && yarn version patch",
     "postpack": "pinst --enable",
     "dev": "npm exec tsc -w",
     "prettier": "prettier \"src/**/*.{js,jsx,ts,tsx,css,scss}\" --check",
@@ -63,10 +63,10 @@
     "find-nearest-package-json": "^2.0.1",
     "fs-extra": "^11.1.1",
     "glob": "^7.1.6",
-    "grunt": "^1.3.0",
+    "grunt": "^1.6.1",
     "grunt-cli": "^1.4.3",
     "grunt-concurrent": "^3.0.0",
-    "grunt-contrib-clean": "^2.0.0",
+    "grunt-contrib-clean": "^2.0.1",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-exec": "^3.0.0",
     "grunt-ts": "^6.0.0-beta.22",
@@ -78,12 +78,14 @@
     "load-grunt-tasks": "^5.1.0",
     "mini-css-extract-plugin": "^2.7.5",
     "open": "^8.4.0",
-    "postcss": "^8.4.17",
-    "postcss-import": "^15.0.0",
-    "postcss-loader": "^7.0.1",
+    "postcss": "^8.4.31",
+    "postcss-comment": "^2.0.0",
+    "postcss-import": "^15.1.0",
+    "postcss-loader": "^7.3.3",
     "postcss-modules": "^6.0.0",
-    "postcss-nested": "^5.0.6",
-    "postcss-scss": "^4.0.5",
+    "postcss-nested": "^6.0.1",
+    "postcss-scss": "^4.0.9",
+    "postcss-strip-inline-comments": "^0.1.5",
     "require-extensions": "^0.0.4",
     "sass": "^1.55.0",
     "sass-loader": "^13.0.2",