lincd-cli 0.2.77 → 0.2.79

package/babel.config.js

@@ -0,0 +1,11 @@
+module.exports = {
+  presets: [
+    '@babel/preset-env',
+    ['@babel/preset-react', {runtime: 'automatic'}],
+    '@babel/preset-typescript',
+  ],
+  plugins: [
+    '@babel/plugin-transform-runtime',
+    ['@babel/plugin-proposal-decorators', {legacy: true}],
+  ],
+};

package/defaults/app-static/src/index-static.tsx

@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom/client';
 import {BrowserRouter} from 'react-router-dom';
 import App from './App';
 import {BackendAPIStore} from 'lincd-server/lib/shapes/BackendAPIStore';
-import {Storage} from 'lincd/lib/utils/Storage';
+import {LinkedStorage} from 'lincd/lib/utils/LinkedStorage';
 import {AppContextProvider} from 'lincd-server-utils/lib/components/AppContext';
 
 const root = ReactDOM.createRoot(
@@ -14,7 +14,7 @@ const root = ReactDOM.createRoot(
 //store all quads in a file on the backend named 'main'
 // export const store = new BackendFileStore('main');
 export const store = new BackendAPIStore();
-Storage.setDefaultStore(store);
+LinkedStorage.setDefaultStore(store);
 
 
 root.render(

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

@@ -1,18 +1,18 @@
-import {initFrontend} from 'lincd-server-utils/lib/utils/Frontend';
-import {hydrateRoot} from 'react-dom/client';
-import {BrowserRouter} from 'react-router-dom';
+import { initFrontend } from 'lincd-server-utils/lib/utils/Frontend';
+import { hydrateRoot } from 'react-dom/client';
+import { BrowserRouter } from 'react-router-dom';
 import App from './App';
 import React from 'react';
-import {Storage} from 'lincd/lib/utils/Storage';
-import {BackendAPIStore} from 'lincd-server/lib/shapes/BackendAPIStore';
-import {AppContextProvider} from 'lincd-server-utils/lib/components/AppContext';
+import { LinkedStorage } from 'lincd/lib/utils/LinkedStorage';
+import { BackendAPIStore } from 'lincd-server/lib/shapes/BackendAPIStore';
+import { AppContextProvider } from 'lincd-server-utils/lib/components/AppContext';
 
 window['$RefreshReg$'] = () => {};
 window['$RefreshSig$'] = () => () => {};
 
 //forward all storage requests to the backend
 export const store = new BackendAPIStore();
-Storage.setDefaultStore(store);
+LinkedStorage.setDefaultStore(store);
 
 initFrontend().then(() => {
   hydrateRoot(

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.depCheckStaged = exports.checkImports = 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.startServer = exports.depCheck = exports.depCheckStaged = 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 chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const depcheck_1 = __importDefault(require("depcheck"));
@@ -819,12 +819,14 @@ const depCheck = (path = process.cwd()) => __awaiter(void 0, void 0, void 0, fun
             });
             //currently just missing LINCD packages cause a hard failure exit code
             if (missingLincdPackages.length > 0) {
-                console.warn(chalk_1.default.red('[ERROR] These LINCD packages are imported but they are not listed in package.json:\n- ' +
+                console.warn(chalk_1.default.red(path +
+                    '\n[ERROR] These LINCD packages are imported but they are not listed in package.json:\n- ' +
                     missingLincdPackages.join(',\n- ')));
                 process.exit(1);
             }
             else if (missing.length > 0) {
-                console.warn(chalk_1.default.magenta('Missing dependencies (for now a warning, soon an error):\n\t' +
+                console.warn(chalk_1.default.magenta(path +
+                    '\nMissing dependencies (for now a warning, soon an error):\n\t' +
                     missing.join(',\n\t')));
             }
         }
@@ -840,6 +842,64 @@ const depCheck = (path = process.cwd()) => __awaiter(void 0, void 0, void 0, fun
     });
 });
 exports.depCheck = depCheck;
+const ensureEnvironmentLoaded = () => __awaiter(void 0, void 0, void 0, function* () {
+    if (!process.env.NODE_ENV) {
+        //load env-cmd for development environment
+        let { GetEnvVars } = require('env-cmd');
+        let envCmdrcPath = path_1.default.join(process.cwd(), '.env-cmdrc.json');
+        if (!fs_extra_1.default.existsSync(envCmdrcPath)) {
+            console.warn('No .env-cmdrc.json found in this folder. Are you running this command from the root of a LINCD app?');
+            process.exit();
+        }
+        let vars = yield GetEnvVars({
+            envFile: {
+                filePath: envCmdrcPath,
+            },
+        });
+        let environments = Object.keys(vars);
+        //if _main is present, load it first
+        if (environments.includes('_main')) {
+            process.env = Object.assign(Object.assign({}, process.env), vars._main);
+        }
+        //if --env is passed, load that environment
+        let args = process.argv.splice(2);
+        if (args.includes('--env')) {
+            let envIndex = args.indexOf('--env');
+            let env = args[envIndex + 1];
+            if (environments.includes(env)) {
+                console.log('Environment: ' + env);
+                process.env = Object.assign(Object.assign({}, process.env), vars[env]);
+            }
+            else {
+                console.warn('Environment ' +
+                    env +
+                    ' not found in .env-cmdrc.json. Available environments: ' +
+                    environments.join(', '));
+            }
+        }
+        else {
+            //chose development by default
+            process.env = Object.assign(Object.assign({}, process.env), vars.development);
+            console.log('No environment specified, using development');
+        }
+    }
+});
+const startServer = (initOnly = false) => __awaiter(void 0, void 0, void 0, function* () {
+    yield ensureEnvironmentLoaded();
+    const LincdServer = require('lincd-server/lib/shapes/LincdServer');
+    let lincdConfig = require(path_1.default.join(process.cwd(), 'lincd.config'));
+    require(path_1.default.join(process.cwd(), 'scripts', 'storage-config'));
+    let server = new LincdServer.LincdServer(Object.assign({ loadAppComponent: () => require(path_1.default.join(process.cwd(), 'src', 'App')).default }, lincdConfig));
+    let args = process.argv.splice(2);
+    //if --initOnly is passed, only initialize the server and don't start it
+    if (args.includes('--initOnly') || initOnly) {
+        return server.initOnly();
+    }
+    else {
+        return server.start();
+    }
+});
+exports.startServer = startServer;
 const createPackage = (name, uriBase, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
     //if ran with npx, basePath will be the root directory of the repository, even if we're executing from a sub folder (the root directory is where node_modules lives and package.json with workspaces)
     //so we manually find a packages folder, if it exists we go into that.

package/lib/cli.js

@@ -1,6 +1,11 @@
 #!/usr/bin/env node
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const register_1 = __importDefault(require("@babel/register"));
+(0, register_1.default)({ extensions: ['.ts', '.tsx'] });
 const cli_methods_1 = require("./cli-methods");
 const metadata_1 = require("./metadata");
 require('require-extensions');
@@ -14,6 +19,13 @@ program
 })
     .description('Creates a new folder with all the required files for a LINCD app')
     .argument('<name>', 'the name of your LINCD app. To use spaces, wrap the name in double quotes.');
+program
+    .command('start')
+    .action(() => {
+    return (0, cli_methods_1.startServer)();
+})
+    .option('--env', 'The node environment to use. Default is "development"')
+    .description('Start the LINCD node.js server. Use --initOnly to start the backend without http server');
 program
     .command('create-package')
     .action((name, uriBase) => {

package/lib/config-grunt.js

@@ -158,9 +158,9 @@ function setupGrunt(grunt, moduleName, config) {
         },
         postcss: {
             options: {
-                map: true,
+                map: true, // inline sourcemaps
                 // parser: require('postcss-scss'), //require('postcss-comment'),
-                syntax: require('postcss-scss'),
+                syntax: require('postcss-scss'), //for accepting comments
                 processors: [
                     require('postcss-preset-env'),
                     require('postcss-strip-inline-comments'),

package/lib/config-webpack.js

@@ -357,8 +357,8 @@ function generateWebpackConfig(buildName, moduleName, config = {}) {
         },
         resolveLoader: {
             modules: [
-                path.join(__dirname, 'plugins'),
-                path.join(__dirname, '..', 'node_modules'),
+                path.join(__dirname, 'plugins'), //load webpack our own custom-made loaders from the plugin folder
+                path.join(__dirname, '..', 'node_modules'), //load webpack loaders from this lincd-cli library instead of the library that's using it to build its project
                 'node_modules',
             ],
         },
@@ -388,7 +388,7 @@ function generateWebpackConfig(buildName, moduleName, config = {}) {
         externals: (0, externalise_modules_1.default)(config, es5),
         plugins: plugins,
         stats: {
-            errorDetails: true,
+            errorDetails: true, //config.debug,
             chunks: false,
             children: true,
             version: true,

package/lib/utils.js

@@ -51,7 +51,7 @@ const tsHost = typescript_1.default.createCompilerHost({
     noEmit: true,
     isolatedModules: true,
     resolveJsonModule: false,
-    moduleResolution: typescript_1.default.ModuleResolutionKind.Classic,
+    moduleResolution: typescript_1.default.ModuleResolutionKind.Classic, // we don't want node_modules
     incremental: true,
     noLib: true,
     noResolve: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.77",
+  "version": "0.2.79",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -41,12 +41,14 @@
     "lincd-cli": "lib/cli.js"
   },
   "dependencies": {
-    "@babel/core": "^7.19.3",
-    "@babel/plugin-proposal-decorators": "^7.19.3",
-    "@babel/plugin-transform-runtime": "^7.19.1",
-    "@babel/preset-env": "^7.19.3",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.18.6",
+    "@babel/cli": "^7.22.9",
+    "@babel/core": "^7.22.9",
+    "@babel/plugin-proposal-decorators": "^7.22.7",
+    "@babel/plugin-transform-runtime": "^7.22.9",
+    "@babel/preset-env": "^7.22.9",
+    "@babel/preset-react": "^7.22.5",
+    "@babel/preset-typescript": "^7.22.5",
+    "@babel/register": "^7.22.5",
     "@lodder/grunt-postcss": "^3.1.1",
     "@types/node": "^18.11.10",
     "@types/react": "^18.0.17",