lincd-cli 0.1.1 → 0.1.2

package/README.md

@@ -1,13 +1,23 @@
-# Setup a new dacore module
+#LINCD CLI
+Command Line Interface for the [lincd.js](https://www.lincd.org) library
 
-`npm install lincd-cli`
+### Installation
+
+```
+npm install lincd-cli
+```
 
 or
 
-`yarn add lincd-cli`
+```
+yarn add lincd-cli
+```
 
-Then type 
+### Usage
+type 
 
-`npm exec lincd help`
+```
+npm exec lincd help
+```
 
 for available commands

package/cli.js

@@ -39,6 +39,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 exports.__esModule = true;
 var lib_1 = require("lincd/lib");
 var JSONLDWriter_1 = require("lincd-jsonld/lib/JSONLDWriter");
+var utils_1 = require("./utils");
 var program = require('commander');
 var exec = require('child_process').exec;
 var chalk = require('chalk');
@@ -105,7 +106,7 @@ function getLincdModules(rootPath) {
     //TODO: read from package.json what the workspaces are. for each, follow up all the folders inside that path
     //TODO: then return an array with objects that have both the module name + the path. And then use that path across this whenever this function is called
     //TODO: this way it will work with websites as well, instead of just from the main LINCD repository
-    var pack = getPackageJSON();
+    var pack = utils_1.getPackageJSON();
     var res = [];
     if (!pack.workspaces) {
         warn(chalk.red('Could not find package workspaces. Make sure you run this command from a yarn workspace.'));
@@ -501,29 +502,37 @@ program.command('shapes').action(function () { return __awaiter(void 0, void 0,
 program.command('publish [version]').action(function (newVersion) {
     if (fs.existsSync(process.cwd() + '/package.json')) {
         var pack = JSON.parse(fs.readFileSync(process.cwd() + '/package.json', 'utf8'));
-        var version_1 = pack.version;
-        var moduleName_1 = pack.name;
-        if (newVersion == 'same') {
-            newVersion = version_1;
-        }
-        else if (newVersion == 'minor') {
-            newVersion = getNextMinorVersion(version_1);
-            console.log(chalk.cyan('Increasing version number for minor release: ' + newVersion));
-        }
-        else if (newVersion == 'major') {
-            newVersion = getNextMajorVersion(version_1);
-            console.log(chalk.cyan('Increasing version number for major release: ' + newVersion));
-        }
-        else if (!newVersion || newVersion == 'patch') {
-            newVersion = getNextVersion(version_1);
-            console.log(chalk.cyan('Increasing version number for patch release: ' + newVersion));
-        }
-        else {
-            newVersion = version_1;
+        var version = pack.version;
+        var moduleName = pack.name;
+        /*if (newVersion == 'same') {
+            newVersion = version;
+        } else if (newVersion == 'minor') {
+            newVersion = getNextMinorVersion(version);
+            console.log(
+                chalk.cyan(
+                    'Increasing version number for minor release: ' + newVersion,
+                ),
+            );
+        } else if (newVersion == 'major') {
+            newVersion = getNextMajorVersion(version);
+            console.log(
+                chalk.cyan(
+                    'Increasing version number for major release: ' + newVersion,
+                ),
+            );
+        } else if (!newVersion || newVersion == 'patch') {
+            newVersion = getNextVersion(version);
+            console.log(
+                chalk.cyan(
+                    'Increasing version number for patch release: ' + newVersion,
+                ),
+            );
+        } else {
+            newVersion = version;
             console.log(chalk.cyan('using given version as is: ' + newVersion));
-        }
+        }*/
         // message = "%s " + message;
-        console.log(chalk.cyan('preparing to publish ' + moduleName_1 + ' ' + newVersion));
+        console.log(chalk.cyan('publishing ' + moduleName + ' ' + version + ' to LINCD registry'));
         //temporary test code
         return fetch('http://localhost:3000/publish', {
             method: 'POST',
@@ -531,70 +540,71 @@ program.command('publish [version]').action(function (newVersion) {
                 Accept: 'application/json, text/plain, */*',
                 'Content-Type': 'application/json'
             },
-            body: JSON.stringify({ package: moduleName_1 })
+            body: JSON.stringify({ package: moduleName })
         })
             .then(function (res) { return res.text(); })
             .then(function (text) {
             console.log(text);
-        });
-        console.log(chalk.cyan('building production bundles'));
-        return execPromise('yarn lincd build production', false, true)
-            .then(function (output) {
-            if (buildFailed(output)) {
-                // console.warn("Build failed:");
-                console.log(output);
-                throw new Error('build failed');
-            }
-            pack.version = newVersion;
-            //save package.json
-            return fs.writeFileSync(path.join(process.cwd(), 'package.json'), JSON.stringify(pack, null, 2));
-        })
-            .then(function (version) {
-            console.log(chalk.cyan('Committing to git'));
-            //we have just changed package.json, so there will be things "uncommitted"
-            //to make sure this module does not automatically come up as "needing to be published" we need to commit this change here straight away
-            //so: add all files not added yet in the folder of this module
-            //then commit all changes (including new version number in package.json)
-            //then add a version commit git flag
-            return execPromise("git add -- ./ & git commit -m \"publishing ".concat(moduleName_1, " ").concat(newVersion, "\" -- ./ & git tag ").concat(moduleName_1, "@").concat(newVersion, "\""));
-        })
-            .then(function (version) {
-            console.log(chalk.cyan('Publishing ' + moduleName_1 + ' ' + newVersion));
-            // let tag = moduleName+'@'+version;
-            return execPromise('yarn publish --new-version ' + newVersion, true);
-        })
-            .then(function (res) {
-            if (res.indexOf('Aborted due to warnings') !== -1 ||
-                res.indexOf('Could not publish') !== -1 ||
-                res.indexOf("Couldn't publish") !== -1) {
-                console.log(chalk.red('Failed to publish'));
-                return false;
-            }
-            else {
-                var pack = JSON.parse(fs.readFileSync(process.cwd() + '/package.json', 'utf8'));
-                version_1 = pack.version;
-                console.log(chalk.green('Published ' + version_1));
-                return true;
-            }
         })["catch"](function (err) {
-            console.warn(chalk.red('Could not publish: ' + err));
+            console.warn("Could not connect to LINCD registry");
         });
+        /*console.log(chalk.cyan('building production bundles'));
+        return execPromise('yarn lincd build production', false, true)
+            .then((output: string) => {
+                if (buildFailed(output)) {
+                    // console.warn("Build failed:");
+                    console.log(output);
+                    throw new Error('build failed');
+                }
+                pack.version = newVersion;
+                //save package.json
+                return fs.writeFileSync(
+                    path.join(process.cwd(), 'package.json'),
+                    JSON.stringify(pack, null, 2),
+                );
+            })
+            .then((version) => {
+                console.log(chalk.cyan('Committing to git'));
+                //we have just changed package.json, so there will be things "uncommitted"
+                //to make sure this module does not automatically come up as "needing to be published" we need to commit this change here straight away
+                //so: add all files not added yet in the folder of this module
+                //then commit all changes (including new version number in package.json)
+                //then add a version commit git flag
+                return execPromise(
+                    `git add -- ./ & git commit -m "publishing ${moduleName} ${newVersion}" -- ./ & git tag ${moduleName}@${newVersion}"`,
+                );
+            })
+            .then((version) => {
+                console.log(chalk.cyan('Publishing ' + moduleName + ' ' + newVersion));
+
+                // let tag = moduleName+'@'+version;
+                return execPromise('yarn publish --new-version ' + newVersion, true);
+            })
+            .then((res) => {
+                if (
+                    res.indexOf('Aborted due to warnings') !== -1 ||
+                    res.indexOf('Could not publish') !== -1 ||
+                    res.indexOf("Couldn't publish") !== -1
+                ) {
+                    console.log(chalk.red('Failed to publish'));
+                    return false;
+                } else {
+                    var pack = JSON.parse(
+                        fs.readFileSync(process.cwd() + '/package.json', 'utf8'),
+                    );
+                    version = pack.version;
+                    console.log(chalk.green('Published ' + version));
+                    return true;
+                }
+            })
+            .catch((err) => {
+                console.warn(chalk.red('Could not publish: ' + err));
+            });*/
     }
     else {
         console.warn('not found: ' + process.cwd() + '/package.json');
     }
 });
-var getPackageJSON = function (root) {
-    if (root === void 0) { root = process.cwd(); }
-    var packagePath = path.join(root, 'package.json');
-    if (fs.existsSync(packagePath)) {
-        return JSON.parse(fs.readFileSync(packagePath, 'utf8'));
-    }
-    else if (root === process.cwd()) {
-        console.warn('Could not find package.json. Make sure you run this command from the root of a lincd module or a lincd yarn workspace');
-        process.exit();
-    }
-};
 // program.command('create [action] [value]').action((action, prefixedUri) => {
 //
 // 	let [ontology,label] = typeof prefixedUri !== 'undefined' ? prefixedUri.split(":") : [];
@@ -651,7 +661,7 @@ var buildModule = function (target, target2, modulePath, logResults) {
         target == 'es6' ||
         !target) {
         if (!fs.existsSync(path.join(modulePath, 'Gruntfile.js'))) {
-            console.warn("No Gruntfile found at ".concat(modulePath, "\\Gruntfile.js. Cannot build."));
+            console.warn("No Gruntfile found at " + modulePath + "\\Gruntfile.js. Cannot build.");
             return;
         }
         var nodeEnv = '';
@@ -705,7 +715,7 @@ var getLastModifiedSourceTime = function (modulePath) {
 var getLastCommitTime = function (modulePath) {
     // console.log(`git log -1 --format=%ci -- ${modulePath}`);
     // process.exit();
-    return execPromise("git log -1 --format=%ci -- ".concat(modulePath)).then(function (result) {
+    return execPromise("git log -1 --format=%ci -- " + modulePath).then(function (result) {
         var lastCommit = new Date(result);
         // console.log(modulePath,result,lastCommit);
         return lastCommit;
@@ -880,7 +890,7 @@ program
 var buildUpdated = function (back, target, target2, test) {
     if (test === void 0) { test = false; }
     back = back || 1;
-    return execPromise("git log -".concat(back, " --format=%ci")).then(function (result) {
+    return execPromise("git log -" + back + " --format=%ci").then(function (result) {
         var lastCommit = new Date(result);
         var previousResult = '';
         log((test ? 'Checking which modules' : 'Building all modules that') +
@@ -948,7 +958,7 @@ program.command('build-all [target] [target2]').action(function (target, target2
     //get dependencies of each module
     var leastDependentModule;
     modules.forEach(function (module) {
-        var pack = getPackageJSON(module.path);
+        var pack = utils_1.getPackageJSON(module.path);
         if (pack) {
             //get lincd related dependencies and get the actual module details from the module map by removing '@dacore/' from the package name
             var moduleDependencies = Object.keys(pack.dependencies)

package/config-generator.js

@@ -1,12 +1,8 @@
 "use strict";
-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 __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 exports.__esModule = true;
 exports.generateWebpackConfig = exports.setupGrunt = void 0;
@@ -14,12 +10,14 @@ var declaration_plugin_1 = require("./plugins/declaration-plugin");
 var externalise_modules_1 = require("./plugins/externalise-modules");
 var watch_run_1 = require("./plugins/watch-run");
 var colors = require("colors");
+var utils_1 = require("./utils");
 var fs = require('fs');
 var MiniCssExtractPlugin = require('mini-css-extract-plugin');
 var chalk = require('chalk');
 var webpack = require('webpack');
 var path = require('path');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var WebpackLicencePlugin = require('webpack-license-plugin');
 var TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 var TerserPlugin = require('terser-webpack-plugin');
@@ -132,7 +130,7 @@ function setupGrunt(grunt, moduleName, config) {
     if (buildFrontend) {
         grunt.registerTask('build-frontend', __spreadArray([
             'prepare-build'
-        ], targets.map(function (target) { return 'webpack:build-' + target; }), true));
+        ], targets.map(function (target) { return 'webpack:build-' + target; })));
     }
     grunt.registerTask('build-production', flatten([
         'clean:lib',
@@ -309,7 +307,7 @@ function setupGrunt(grunt, moduleName, config) {
             grunt.task.loadTasks(nestedWorkspacePath);
         }
         else {
-            warn("Could not load grunt task module ".concat(taskName, "\nCould not find task at any of these paths:\n").concat(localPath, "\n").concat(localPath2, "\n").concat(workspacePath, "\n").concat(nestedWorkspacePath));
+            warn("Could not load grunt task module " + taskName + "\nCould not find task at any of these paths:\n" + localPath + "\n" + localPath2 + "\n" + workspacePath + "\n" + nestedWorkspacePath);
         }
     });
 }
@@ -335,6 +333,7 @@ function generateWebpackConfig(buildName, moduleName, config) {
         warn('Cannot find ' + configFile);
         process.exit();
     }
+    var pack = utils_1.getPackageJSON();
     var plugins = [
         new webpack.DefinePlugin({
             'process.env.BROWSER': JSON.stringify(true),
@@ -350,6 +349,14 @@ function generateWebpackConfig(buildName, moduleName, config) {
                 ? config.cssFileName
                 : libraryName + '.' + moduleName + '.css'
         }),
+        new WebpackLicencePlugin(
+        //output sometimes includes things like webpack, which seems not needed? this doesn't work though
+        // 	{
+        // 	excludedPackageTest:((packageName, packageVersion) => {
+        // 		return pack.devDependencies && packageName in pack.devDependencies;
+        // 	})
+        // }
+        ),
     ];
     if (config.debug) {
         plugins.push(new watch_run_1["default"]());
@@ -508,7 +515,14 @@ function generateWebpackConfig(buildName, moduleName, config) {
         },
         optimization: {
             minimize: productionMode,
-            minimizer: [new TerserPlugin()]
+            minimizer: [new TerserPlugin({
+                    extractComments: {
+                        condition: /^\**!|@preserve|@license|@cc_on/i,
+                        banner: function (licenseFile) {
+                            return "License information can be found in " + licenseFile + " and oss-licences.json";
+                        }
+                    }
+                })]
         },
         watch: watch,
         module: {
@@ -516,7 +530,7 @@ function generateWebpackConfig(buildName, moduleName, config) {
         },
         //See plugins/externalise-modules.ts We're passing in a function here that determines what to exclude from the bundle and what not
         //See also https://webpack.js.org/configuration/externals/
-        externals: (0, externalise_modules_1["default"])(config, es5),
+        externals: externalise_modules_1["default"](config, es5),
         plugins: plugins,
         stats: {
             errorDetails: config.debug,

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "lincd-cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Command line tools for the lincd.js library",
   "main": "index.js",
   "scripts": {
-    "publish-build-tools": "tsc && npm version patch && npm publish",
+    "prepare": "tsc",
     "build": "tsc"
   },
   "keywords": [
@@ -38,8 +38,9 @@
     "grunt-exec": "^3.0.0",
     "grunt-ts": "^6.0.0-beta.17",
     "grunt-webpack": "^4.0.2",
+    "license-info-webpack-plugin": "^3.0.0",
     "lincd": "*",
-    "lincd-cli": "*",
+    "lincd-jsonld": "*",
     "load-grunt-tasks": "^5.1.0",
     "mini-css-extract-plugin": "^1.3.3",
     "postcss": "^8.2.1",
@@ -59,7 +60,8 @@
     "tsconfig-paths-webpack-plugin": "^3.3.0",
     "typescript": "4.2.2",
     "webpack": "^4.0.0",
-    "webpack-bundle-analyzer": "^3.0.0"
+    "webpack-bundle-analyzer": "^3.0.0",
+    "webpack-license-plugin": "^4.2.1"
   },
   "devDependencies": {
     "optimize-css-assets-webpack-plugin": "^5.0.4"

package/plugins/watch-run.js

@@ -12,7 +12,7 @@ var WatchRunPlugin = /** @class */ (function () {
         compiler.hooks.watchRun.tap('WatchRun', function (comp) {
             var changedTimes = comp.watchFileSystem.watcher.mtimes;
             var changedFiles = Object.keys(changedTimes)
-                .map(function (file) { return "\n  ".concat(file); })
+                .map(function (file) { return "\n  " + file; })
                 .join('');
             if (changedFiles.length) {
                 console.log('====================================');

package/utils.js

@@ -0,0 +1,17 @@
+"use strict";
+exports.__esModule = true;
+exports.getPackageJSON = void 0;
+var fs = require("fs");
+var path = require("path");
+var getPackageJSON = function (root) {
+    if (root === void 0) { root = process.cwd(); }
+    var packagePath = path.join(root, 'package.json');
+    if (fs.existsSync(packagePath)) {
+        return JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+    }
+    else if (root === process.cwd()) {
+        console.warn('Could not find package.json. Make sure you run this command from the root of a lincd module or a lincd yarn workspace');
+        process.exit();
+    }
+};
+exports.getPackageJSON = getPackageJSON;