lincd-cli 0.2.54 → 0.2.58

package/lib/cli-methods.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.register = exports.createPackage = exports.depCheck = exports.createComponent = exports.createSetComponent = exports.createShape = exports.setNameVariables = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.warn = exports.createApp = void 0;
+exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.register = exports.createPackage = exports.depCheck = exports.checkImports = exports.createComponent = exports.createSetComponent = exports.createShape = exports.setNameVariables = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.warn = exports.createApp = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const utils_1 = require("./utils");
@@ -742,6 +742,14 @@ const createComponent = (name, basePath = process.cwd()) => __awaiter(void 0, vo
     }
 });
 exports.createComponent = createComponent;
+const checkImports = () => __awaiter(void 0, void 0, void 0, function* () {
+    //read the source of all ts/tsx files in the src folder
+    //if there is an import that imports a lincd package with /src/ in it, then warn
+    //if there is an import that imports outside of the src folder, then warn
+    //TODO: use dependency-cruiser for this
+    //https://github.com/sverweij/dependency-cruiser/blob/HEAD/doc/api.md
+});
+exports.checkImports = checkImports;
 const depCheck = () => __awaiter(void 0, void 0, void 0, function* () {
     (0, depcheck_1.default)(process.cwd(), {}, (results) => {
         if (results.missing) {
@@ -963,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' +
@@ -1269,8 +1285,6 @@ var buildUpdated = function (back, target, target2, test = false) {
                 if (pkg.packageName === 'lincd-jsonld' && jsonldPkgUpdated) {
                     needRebuild = true;
                 }
-                // console.log(pkg.path,lastModifiedSource.lastModifiedTime,lastModifiedBundle.lastModifiedTime);
-                // console.log(pkg.path,new Date(lastModifiedSource.lastModified).toString(),new Date(lastModifiedBundle.lastModified).toString());
                 if (needRebuild || rebuildAllModules) {
                     //TODO: when building a pkg, also rebuild all packages that depend on this package.. and iteratively build packages that depend on those packages..
                     // log(packageName+' modified since last commit on '+now.toString());
@@ -1313,70 +1327,6 @@ var buildUpdated = function (back, target, target2, test = false) {
             }
         });
         return;
-        var p = Promise.resolve('');
-        packages.forEach((pkg) => {
-            let packageName = pkg.packageName;
-            p = p
-                .then((previousResult) => {
-                let lastModifiedSource = getLastModifiedSourceTime(pkg.path);
-                let lastModifiedBundle = getLastBuildTime(pkg.path);
-                // console.log(pkg.path,lastModifiedSource.lastModifiedTime,lastModifiedBundle.lastModifiedTime);
-                // console.log(pkg.path,new Date(lastModifiedSource.lastModified).toString(),new Date(lastModifiedBundle.lastModified).toString());
-                debugInfo('# Checking package ' + packageName);
-                if (lastModifiedSource.lastModifiedTime >
-                    lastModifiedBundle.lastModifiedTime) {
-                    //TODO: when building a pkg, also rebuild all packages that depend on this package.. and iteratively build packages that depend on those packages..
-                    // log(packageName+' modified since last commit on '+now.toString());
-                    debugInfo(chalk_1.default.cyan('Last modified source: ' +
-                        lastModifiedSource.lastModifiedName +
-                        ' on ' +
-                        lastModifiedSource.lastModified.toString()));
-                    debugInfo(chalk_1.default.cyan('Last build: ' +
-                        (lastModifiedBundle &&
-                            typeof lastModifiedBundle.lastModified !== 'undefined'
-                            ? lastModifiedBundle.lastModified.toString()
-                            : 'never')));
-                    if (test) {
-                        debugInfo('need to build ' + packageName);
-                    }
-                    else {
-                        log('building ' + packageName);
-                    }
-                    if (!test) {
-                        return (0, utils_1.execPromise)('cd ' +
-                            pkg.path +
-                            ' && yarn build' +
-                            (target ? ' ' + target : '') +
-                            (target2 ? ' ' + target2 : '')).then((res) => {
-                            if (res.indexOf('Aborted due to warnings') !== -1 ||
-                                res.indexOf('Fatal error') !== -1) {
-                                console.log(res);
-                                return (previousResult + ' ' + chalk_1.default.red(packageName + ' failed\n'));
-                            }
-                            console.log(chalk_1.default.green(packageName + ' successfully built'));
-                            return (previousResult + ' ' + chalk_1.default.green(packageName + ' built\n'));
-                        });
-                    }
-                    return (previousResult +
-                        ' ' +
-                        chalk_1.default.blue(packageName + ' should be build\n'));
-                }
-                return previousResult;
-            })
-                .catch(({ error, stdout, stderr }) => {
-                console.log(stdout);
-                return previousResult + ' ' + chalk_1.default.red(packageName + ' failed\n');
-            });
-        });
-        return p.then((messages) => {
-            if (messages == '') {
-                console.log(chalk_1.default.green('Nothing to rebuild.'));
-            }
-            else {
-                console.log('Summary: \n' + messages);
-            }
-        });
-        // });
     });
 };
 exports.buildUpdated = buildUpdated;
@@ -1385,11 +1335,11 @@ const needsRebuilding = function (pkg, log = false) {
     let lastModifiedBundle = getLastBuildTime(pkg.path);
     let result = lastModifiedSource.lastModifiedTime > lastModifiedBundle.lastModifiedTime;
     if (log) {
-        debugInfo(chalk_1.default.cyan('Last modified source: ' +
+        console.log(chalk_1.default.cyan('Last modified source: ' +
             lastModifiedSource.lastModifiedName +
             ' on ' +
             lastModifiedSource.lastModified.toString()));
-        debugInfo(chalk_1.default.cyan('Last build: ' +
+        console.log(chalk_1.default.cyan('Last build: ' +
             (lastModifiedBundle &&
                 typeof lastModifiedBundle.lastModified !== 'undefined'
                 ? lastModifiedBundle.lastModified.toString()

package/lib/cli.js

@@ -126,6 +126,9 @@ program.command('dev [target] [mode]').action((target, mode) => {
 program.command('depcheck').action((target, mode) => {
     (0, cli_methods_1.depCheck)();
 });
+program.command('check-imports').action((target, mode) => {
+    (0, cli_methods_1.checkImports)();
+});
 program
     .command('package')
     .action((name, command, args) => {

package/lib/config-grunt.js

@@ -87,7 +87,13 @@ function setupGrunt(grunt, moduleName, config) {
         'prepare-build',
         // buildFrontend ? 'webpack:build-es6' : null,
         buildServer
-            ? ['clean:lib', 'exec:build-lib', 'copy:lib', 'exec:depcheck']
+            ? [
+                'clean:lib',
+                'exec:build-lib',
+                'copy:lib',
+                'exec:depcheck',
+                'exec:check-imports',
+            ]
             : null,
         // 'exec:shapes',
     ]));
@@ -114,6 +120,7 @@ function setupGrunt(grunt, moduleName, config) {
             beforeBuildCommand: config.beforeBuildCommand,
             'server-dev': 'tsc -w',
             depcheck: 'yarn lincd depcheck',
+            'check-imports': 'yarn lincd check-imports',
             test: 'tsc -w',
             // shapes: 'lincd shapes',
             'css-declarations': 'tcm -p **/*.scss',
@@ -136,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',
@@ -149,19 +168,19 @@ function setupGrunt(grunt, moduleName, config) {
         },
         concurrent: {
             dev: (0, utils_1.flatten)([
-                buildFrontend ? 'webpack:dev' : null,
+                // buildFrontend ? 'webpack:dev' : null,
                 buildServer ? 'exec:server-dev' : null,
                 // buildServer ? 'watch:css-module-transforms' : null,
                 // 'exec:css-declarations-watch'
             ]),
             'dev-prod': (0, utils_1.flatten)([
-                buildFrontend ? 'webpack:dev-prod' : null,
+                // buildFrontend ? 'webpack:dev-prod' : null,
                 buildServer ? 'exec:server-dev' : null,
                 // buildServer ? 'watch:css-module-transforms' : null,
                 // 'exec:css-declarations-watch'
             ]),
             'dev-es5': (0, utils_1.flatten)([
-                buildFrontend ? 'webpack:dev-es5' : null,
+                // buildFrontend ? 'webpack:dev-es5' : null,
                 buildServer ? 'exec:server-dev' : null,
                 // buildServer ? 'watch:css-module-transforms' : null,
                 // 'exec:css-declarations-watch'

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/plugins/check-imports.js

@@ -34,15 +34,15 @@ function handler(source) {
     //save as userRequest?
     let resource = this._module.resource;
     let relativePath = this._module.resourceResolveData.relativePath;
-    // console.log('-----');
+    console.log('-----');
     // for (let key in this) {
     //   console.log(key, this[key]);
     // }
     let isRelativeReq = request.indexOf('./') === 0 || request.indexOf('../') === 0;
     // if (isRelativeReq) {
-    // console.log('rootContext', rootContext);
-    // console.log('context', context);
-    // console.log('request', request);
+    console.log('rootContext', rootContext);
+    console.log('context', context);
+    console.log('request', request);
     // // console.log('userRequest', userRequest);
     // // console.log('resource', resource);
     // console.log('relativePath', relativePath);

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.54",
+  "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",