lincd-cli 0.2.9 → 0.2.11

package/lib/config-webpack.js

@@ -10,6 +10,42 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -37,6 +73,37 @@ var NODE_ENV = process.env.NODE_ENV;
 var nodeProduction = NODE_ENV == 'production';
 // const libraryName = 'lincd';
 process.traceDeprecation = true;
+function getLincdPackagePaths(packages) {
+    var e_1, _a;
+    if (!packages) {
+        var pkgJson = (0, utils_1.getPackageJSON)();
+        packages = __assign(__assign({}, pkgJson.dependencies), pkgJson.devDependencies);
+    }
+    var lincdPackagePaths = [];
+    try {
+        for (var _b = __values(Object.keys(packages)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var dependency = _c.value;
+            try {
+                var pkgJson = require(dependency + '/package.json');
+                if (pkgJson.lincd) {
+                    var pkgPath = require.resolve(dependency + '/package.json');
+                    lincdPackagePaths.push(pkgPath.substring(0, pkgPath.length - 13));
+                }
+            }
+            catch (err) {
+                // console.log("could not find "+dependency);
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b["return"])) _a.call(_b);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return lincdPackagePaths;
+}
 function generateWebpackConfig(buildName, moduleName, config) {
     if (config === void 0) { config = {}; }
     if (!config.externals)
@@ -143,6 +210,52 @@ function generateWebpackConfig(buildName, moduleName, config) {
     // }),
     // ];
     var aliases = config.alias || {};
+    var postcssPlugins = [];
+    if (!config.cssMode) {
+        config.cssMode = 'mixed';
+    }
+    if (config.cssMode === 'scss-modules' || config.cssMode === 'scss' || config.cssMode === 'mixed') {
+        postcssPlugins = postcssPlugins.concat(['postcss-preset-env', productionMode && 'cssnano']);
+        //we once had:
+        // 'postcss-import': {},
+        // // 'postcss-cssnext': {},
+        // 'postcss-nested': {},
+        // // "postcss-scss": {}, //<-- only add this back if the build gets stuck on //comments in scss files, but I dont think that will be the case anymore
+        if (config.cssMode === 'scss-modules' || config.cssMode === 'mixed') {
+            postcssPlugins.push([
+                'postcss-modules',
+                {
+                    generateScopedName: utils_1.generateScopedName.bind(null, moduleName),
+                    globalModulePaths: [/tailwind/, /tailwindcss/, config.cssGlobalModulePaths].filter(Boolean)
+                },
+            ]);
+        }
+    }
+    if (config.cssMode === 'tailwind' || config.cssMode === 'mixed') {
+        var lincdPackagePaths = void 0;
+        //IF this package is including sources from another lincd package in its bundle (usually not the case)
+        if (config.internals) {
+            //THEN make sure that we also look for tailwind classes in those packages
+            //pass the list of internal packages, or if all, pass null because it will look up all the package.json:dependencies
+            lincdPackagePaths = getLincdPackagePaths(config.internals !== '*' ? config.internals : null).map(function (path) {
+                return path + '/lib/**/*.{js,mjs}';
+            });
+        }
+        // console.log(chalk.blueBright('tailwind content: ')+chalk.magenta(['./frontend/src/**/*.{tsx,ts}',...lincdPackagePaths]));
+        postcssPlugins.push([
+            'tailwindcss',
+            {
+                safelist: productionMode
+                    ? {}
+                    : {
+                        //in development mode we allow all classes here, so that you can easily develop
+                        pattern: /./,
+                        variants: ['sm', 'md', 'lg', 'xl', '2xl']
+                    },
+                content: __spreadArray(['./src/**/*.{tsx,ts}'], __read(lincdPackagePaths), false)
+            },
+        ]);
+    }
     var rules = [
         {
             test: /\.(scss|css)$/,
@@ -158,39 +271,7 @@ function generateWebpackConfig(buildName, moduleName, config) {
                     loader: 'postcss-loader',
                     options: {
                         postcssOptions: {
-                            plugins: {
-                                'postcss-import': {},
-                                // 'postcss-cssnext': {},
-                                'postcss-nested': {},
-                                // "postcss-scss": {}, //<-- only add this back if the build gets stuck on //comments in scss files, but I dont think that will be the case anymore
-                                'postcss-modules': {
-                                    //   //by default postcss-modules will put out a json file right next to the original css / scss file, this method defines what classnames to use
-                                    //   generateScopedName:generateScopedName.bind(null,moduleName),
-                                    generateScopedName: utils_1.generateScopedName.bind(null, moduleName),
-                                    globalModulePaths: [/tailwind/]
-                                },
-                                tailwindcss: {
-                                    safelist: productionMode
-                                        ? {}
-                                        : {
-                                            //in development mode we allow all classes here, so that you can easily develop
-                                            pattern: /./,
-                                            variants: ['sm', 'md', 'lg', 'xl', '2xl']
-                                        },
-                                    // purge: {
-                                    // 	enabled: productionMode,
-                                    content: [
-                                        './src/**/*.tsx',
-                                        './src/**/*.ts',
-                                        //also include @dacore modules which are internalized with the "internal" config option
-                                        //imports like ... from '@dacore/module/lib/views/SomeView' will
-                                        //these modules should live in the node_modules folder of the root of the site
-                                        //TODO: remake this with multiple lincd modules
-                                        // '../../node_modules/@dacore/*/lib/**/*.js',
-                                        // './node_modules/@dacore/*/lib/**/*.js',
-                                    ]
-                                }
-                            }
+                            plugins: postcssPlugins
                         }
                     }
                 },
@@ -285,7 +366,9 @@ function generateWebpackConfig(buildName, moduleName, config) {
         // },
         resolve: {
             extensions: ['.webpack.js', '.js', '.ts', '.tsx', '.json'],
-            alias: aliases
+            alias: aliases,
+            // plugins: resolvePlugins,
+            fallback: { crypto: false }
         },
         resolveLoader: {
             modules: [
@@ -308,6 +391,10 @@ function generateWebpackConfig(buildName, moduleName, config) {
             ]
         },
         watch: watch,
+        watchOptions: {
+            ignored: ['**/*.d.ts', '**/*.js.map', '**/*.scss.json'],
+            aggregateTimeout: 500
+        },
         module: {
             rules: rules
         },

package/lib/utils.js

@@ -51,10 +51,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.flatten = exports.warn = exports.debug = exports.log = exports.generateScopedName = exports.getGruntConfig = exports.getPackageJSON = void 0;
+exports.flatten = exports.warn = exports.debug = exports.log = exports.generateScopedName = exports.execPromise = exports.execp = exports.getGruntConfig = exports.getPackageJSON = void 0;
 var fs = __importStar(require("fs"));
 var path = __importStar(require("path"));
 var chalk_1 = __importDefault(require("chalk"));
+var child_process_1 = require("child_process");
 var _a = require('find-nearest-package-json'), findNearestPackageJson = _a.findNearestPackageJson, findNearestPackageJsonSync = _a.findNearestPackageJsonSync;
 var getPackageJSON = function (root, error) {
     if (root === void 0) { root = process.cwd(); }
@@ -86,24 +87,95 @@ var getGruntConfig = function (root, error) {
     }
 };
 exports.getGruntConfig = getGruntConfig;
-/*export function getShapesJSONLD(packageExports): Promise<string> {
-  // return JSONLDWriter.stringify(getShapes(packageExports));
+function execp(cmd, log, allowError, options) {
+    if (log === void 0) { log = false; }
+    if (allowError === void 0) { allowError = false; }
+    if (options === void 0) { options = {}; }
+    // opts || (opts = {});
+    if (log)
+        console.log(chalk_1["default"].cyan(cmd));
+    return new Promise(function (resolve, reject) {
+        var child = (0, child_process_1.exec)(cmd, options);
+        child.stdout.pipe(process.stdout);
+        child.stderr.pipe(process.stderr);
+        // process.stdin.pipe(child.stdin);
+        child.on('close', function (code) {
+            if (code === 0) {
+                resolve(null);
+            }
+            else {
+                reject();
+            }
+            // console.log('killing child');
+            // child.kill('SIGHUP');
+            // resolve(code);
+        });
+        // child.on('data', function (result) {
+        // 	// if (log)
+        // 	// {
+        // 	// 	console.log(result);
+        // 	// }
+        // 	resolve(result);
+        // 	console.log('resolve data');
+        //
+        // });
+        child.on('error', function (err) {
+            if (!allowError) {
+                // console.log('reject err');
+                reject(err);
+                return;
+            }
+            else if (log) {
+                console.warn(err);
+            }
+            // console.log('resolve err');
+            resolve(null);
+        });
+        child.on('exit', function (code, signal) {
+            if (code !== 0) {
+                reject('Child process exited with error code ' + code);
+                return;
+            }
+            // console.log('resolve exit');
+            resolve(null);
+        });
+    });
 }
-
-export function getShapes(packageExports): CoreSet<SHACL_Shape> {
-  let shapes = new CoreSet<SHACL_Shape>();
-  for (var key in packageExports) {
-    let moduleExport = packageExports[key];
-    // console.log(key, Object.keys(packageExports[key]));
-    if (moduleExport.shape) {
-      // console.log(Object.keys(moduleExport.shape));
-      if (moduleExport.shape && moduleExport.shape instanceof SHACL_Shape) {
-        shapes.add(moduleExport.shape);
-      }
-    }
-  }
-  return shapes;
-}*/
+exports.execp = execp;
+function execPromise(command, log, allowError, options, pipeOutput) {
+    if (log === void 0) { log = false; }
+    if (allowError === void 0) { allowError = false; }
+    if (pipeOutput === void 0) { pipeOutput = false; }
+    return new Promise(function (resolve, reject) {
+        if (log)
+            console.log(chalk_1["default"].cyan(command));
+        var child = (0, child_process_1.exec)(command, options, function (error, stdout, stderr) {
+            if (error) {
+                if (!allowError) {
+                    reject({ error: error, stdout: stdout, stderr: stderr });
+                    return;
+                }
+                else if (log) {
+                    console.warn(error);
+                }
+            }
+            //TODO: getting a typescript error for 'trim()', this worked before, is it still used? do we log anywhere?
+            var result = stdout['trim']();
+            if (log) {
+                // console.log(chalk"RESOLVING "+command);
+                console.log(result);
+                // console.log('ERRORS:'+(result.indexOf('Aborted due to warnings') !== -1));
+                // console.log('stderr:'+stderr);
+            }
+            resolve(result);
+        });
+        if (pipeOutput) {
+            child.stdout.pipe(process.stdout);
+            child.stderr.pipe(process.stderr);
+        }
+    });
+}
+exports.execPromise = execPromise;
 // export function generateScopedName(moduleName,name, filename, css) {
 function generateScopedName(moduleName, name, filename, css) {
     // console.log(moduleName,name,filename,css);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {