lincd-cli 0.2.18 → 0.2.20

package/defaults/app-with-backend/frontend/src/index.tsx

@@ -6,10 +6,10 @@ import {BrowserRouter} from 'react-router-dom';
 import App from './App';
 import React from 'react';
 import {Storage} from 'lincd/lib/utils/Storage';
-import {FrontendFileStore} from 'lincd-server/lib/shapes/FrontendFileStore';
+import {BackendFileStore} from 'lincd-server/lib/shapes/BackendFileStore';
 
 //store all quads in a file on the backend named 'main'
-export const store = new FrontendFileStore('main');
+export const store = new BackendFileStore('main');
 Storage.setDefaultStore(store);
 
 hydrateRoot(

package/lib/cli-methods.js

@@ -75,7 +75,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.executeCommandForPackage = exports.addCapacitor = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishUpdated = exports.buildPackage = exports.buildMetadata = exports.register = exports.createPackage = exports.createComponent = exports.createSetComponent = exports.createShape = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.createApp = void 0;
+exports.executeCommandForPackage = exports.addCapacitor = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.buildMetadata = exports.register = exports.createPackage = exports.createComponent = exports.createSetComponent = exports.createShape = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.createApp = void 0;
 var path_1 = __importDefault(require("path"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var utils_1 = require("./utils");
@@ -88,6 +88,7 @@ var env_cmd_1 = require("env-cmd");
 var JSONLDWriter_1 = require("lincd-jsonld/lib/utils/JSONLDWriter");
 var NameSpace_1 = require("lincd/lib/utils/NameSpace");
 var Prefix_1 = require("lincd/lib/utils/Prefix");
+var get_env_vars_1 = require("env-cmd/dist/get-env-vars");
 var glob = require('glob');
 var variables = {};
 var open = require('open');
@@ -1274,7 +1275,7 @@ var publishUpdated = function (test) {
                             return [2 /*return*/, chalk_1["default"].red(pckg.packageName + ' failed: ' + err_1.message)];
                         case 4:
                             if (shouldPublish) {
-                                res = publishPackage(pckg, test, info, version);
+                                res = (0, exports.publishPackage)(pckg, test, info, version);
                                 if (pckg.packageName == 'browser-core') {
                                     browserCoreBuilt = true;
                                 }
@@ -1283,7 +1284,7 @@ var publishUpdated = function (test) {
                                     browserModule = packages.find(function (m) { return m.packageName == 'browser-core'; });
                                     return [2 /*return*/, Promise.resolve(res).then(function (previousResult) {
                                             log('# Automatically also publishing package browser-core');
-                                            return publishPackage(browserModule, test);
+                                            return (0, exports.publishPackage)(browserModule, test);
                                         })];
                                 }
                                 return [2 /*return*/, res];
@@ -1329,38 +1330,68 @@ var publishUpdated = function (test) {
 };
 exports.publishUpdated = publishUpdated;
 var publishPackage = function (pkg, test, info, publishVersion) {
-    if (!publishVersion) {
-        // publishVersion = info ? getNextVersion(info.data.version) : '';
-        publishVersion = info ? getNextVersion(info.version) : '';
-    }
-    if (test) {
-        debugInfo('should publish ' + pkg.packageName + ' ' + publishVersion);
-    }
-    else {
-        console.log(chalk_1["default"].blue('publishing ' + pkg.packageName + ' ' + publishVersion));
-    }
-    if (!test) {
-        return (0, utils_1.execPromise)("cd ".concat(pkg.path, " && yarn version ").concat(publishVersion, " && yarn npm publish"), true, false, {}, 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(res);
-                return chalk_1["default"].red(pkg.packageName + ' failed\n');
+    return __awaiter(this, void 0, void 0, function () {
+        var localPackageJson, path, envCmdFile, i, envFile;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!pkg) {
+                        localPackageJson = (0, utils_1.getPackageJSON)();
+                        pkg = {
+                            path: process.cwd(),
+                            packageName: localPackageJson.name
+                        };
+                    }
+                    if (!publishVersion) {
+                        publishVersion = info ? getNextVersion(info.version) : 'patch';
+                    }
+                    if (test) {
+                        debugInfo('should publish ' + pkg.packageName + ' ' + publishVersion);
+                        //when testing what needs to be published
+                        return [2 /*return*/, chalk_1["default"].blue(pkg.packageName + ' should publish')];
+                    }
+                    console.log(chalk_1["default"].blue('publishing ' + pkg.packageName + ' ' + publishVersion));
+                    path = './';
+                    envCmdFile = '';
+                    i = 0;
+                    _a.label = 1;
+                case 1:
+                    if (!(i <= 10)) return [3 /*break*/, 4];
+                    return [4 /*yield*/, (0, get_env_vars_1.getEnvFile)({ filePath: path + '.env.json' })["catch"](function (err) {
+                            return null;
+                        })];
+                case 2:
+                    envFile = _a.sent();
+                    if (envFile) {
+                        //note: we're getting the actual contents here, so we could also use that more directly?
+                        envCmdFile = path + '.env.json';
+                        return [3 /*break*/, 4];
+                    }
+                    path += '../';
+                    _a.label = 3;
+                case 3:
+                    i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/, (0, utils_1.execPromise)("cd ".concat(pkg.path, " && ").concat(envCmdFile ? "env-cmd -f ".concat(envCmdFile, " --use-shell \"") : '', "yarn version ").concat(publishVersion, " && yarn npm publish").concat(envCmdFile ? "\"" : ''), true, false, {}, 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(res);
+                            return chalk_1["default"].red(pkg.packageName + ' failed\n');
+                        }
+                        console.log(chalk_1["default"].green('Successfully published ' + pkg.path + ' ' + publishVersion));
+                        return chalk_1["default"].green(pkg.packageName + ' published ' + publishVersion + '\n');
+                    })["catch"](function (_a) {
+                        var error = _a.error, stdout = _a.stdout, stderr = _a.stderr;
+                        console.log(chalk_1["default"].red('Failed to publish: ' + error.message));
+                        return chalk_1["default"].red(pkg.packageName + ' failed to publish\n');
+                    })];
             }
-            console.log(chalk_1["default"].green('Successfully published ' + pkg.path + ' ' + publishVersion));
-            return chalk_1["default"].green(pkg.packageName + ' published ' + publishVersion + '\n');
-        })["catch"](function (_a) {
-            var error = _a.error, stdout = _a.stdout, stderr = _a.stderr;
-            console.log(chalk_1["default"].red('Failed to publish: ' + error.message));
-            return chalk_1["default"].red(pkg.packageName + ' failed to publish\n');
         });
-    }
-    else {
-        //when testing what needs to be published
-        return chalk_1["default"].blue(pkg.packageName + ' should publish');
-    }
+    });
 };
+exports.publishPackage = publishPackage;
 var buildUpdated = function (back, target, target2, test) {
     if (test === void 0) { test = false; }
     return __awaiter(this, void 0, void 0, function () {

package/lib/cli.js

@@ -82,6 +82,9 @@ program.command('build-metadata').action(function () {
 program.command('publish-updated').action(function () {
     return (0, cli_methods_1.publishUpdated)();
 });
+program.command('publish [version]').action(function (version) {
+    return (0, cli_methods_1.publishPackage)(null, false, null, version);
+});
 program.command('status').action(function () {
     //log which packages need to be published
     return (0, cli_methods_1.publishUpdated)(true).then(function () {

package/lib/config-webpack.js

@@ -69,6 +69,7 @@ var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlug
 var TerserPlugin = require('terser-webpack-plugin');
 var exec = require('child_process').exec;
 var CopyPlugin = require('copy-webpack-plugin');
+var tailwindPlugin = require('tailwindcss/plugin');
 var NODE_ENV = process.env.NODE_ENV;
 var nodeProduction = NODE_ENV == 'production';
 // const libraryName = 'lincd';
@@ -245,6 +246,7 @@ function generateWebpackConfig(buildName, moduleName, config) {
         postcssPlugins.push([
             'tailwindcss',
             {
+                content: __spreadArray(['./src/**/*.{tsx,ts}'], __read(lincdPackagePaths), false),
                 safelist: productionMode
                     ? {}
                     : {
@@ -252,7 +254,22 @@ function generateWebpackConfig(buildName, moduleName, config) {
                         pattern: /./,
                         variants: ['sm', 'md', 'lg', 'xl', '2xl']
                     },
-                content: __spreadArray(['./src/**/*.{tsx,ts}'], __read(lincdPackagePaths), false)
+                theme: {
+                    extend: {
+                        colors: (0, utils_1.getLinkedTailwindColors)()
+                    }
+                },
+                plugins: [
+                    tailwindPlugin(function (_a) {
+                        var addBase = _a.addBase, config = _a.config;
+                        //we can use LINCD CSS variables for default font color, size etc.
+                        // addBase({
+                        //   'h1': { fontSize: config('theme.fontSize.2xl') },
+                        //   'h2': { fontSize: config('theme.fontSize.xl') },
+                        //   'h3': { fontSize: config('theme.fontSize.lg') },
+                        // })
+                    }),
+                ]
             },
         ]);
     }

package/lib/utils.js

@@ -73,7 +73,7 @@ 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.execPromise = exports.execp = exports.getGruntConfig = exports.getModulePackageJSON = exports.getLINCDDependencies = exports.getPackageJSON = void 0;
+exports.getLinkedTailwindColors = exports.flatten = exports.warn = exports.debug = exports.log = exports.generateScopedName = exports.execPromise = exports.execp = exports.getGruntConfig = exports.getModulePackageJSON = exports.getLINCDDependencies = exports.getPackageJSON = void 0;
 var fs = __importStar(require("fs"));
 var path = __importStar(require("path"));
 var chalk_1 = __importDefault(require("chalk"));
@@ -339,3 +339,10 @@ function flatten(arr) {
     }, []);
 }
 exports.flatten = flatten;
+function getLinkedTailwindColors() {
+    return {
+        'primary-color': 'var(--primary-color)',
+        'font-color': 'var(--font-color)'
+    };
+}
+exports.getLinkedTailwindColors = getLinkedTailwindColors;

package/package.json

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