lincd-cli 0.2.29 → 0.2.31

package/defaults/app-with-backend/.env-cmdrc.json

@@ -1,12 +1,15 @@
 {
+  "_main" : {
+    "DATA_ROOT": "https://app.${hyphen_name}.com/data",
+    "APP_NAME": "${name}",
+    "SOURCE_PATH" : "./src"
+  },
   "development": {
     "NODE_ENV": "development",
-    "SITE_ROOT": "http://localhost:4000",
-    "DATA_ROOT": "http://localhost:4000/data"
+    "SITE_ROOT": "http://localhost:4000"
   },
   "production": {
     "NODE_ENV": "production",
-    "SITE_ROOT": "[define me in .env-cmdrc.json]",
-    "DATA_ROOT": "http://localhost:4000/data"
+    "SITE_ROOT": "https://app.${hyphen_name}.com/data"
   }
-}
+}

package/defaults/app-with-backend/.eslintignore

@@ -0,0 +1,3 @@
+node_modules
+public
+build

package/defaults/app-with-backend/.eslintrc.json

@@ -0,0 +1,42 @@
+{
+    "env": {
+      "browser": true,
+      "es2021": true,
+      "jest": true
+    },
+    "extends": [
+      "plugin:react/recommended",
+      "plugin:@typescript-eslint/recommended",
+      "prettier",
+      "plugin:import/recommended"
+    ],
+    "overrides": [],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+      "ecmaFeatures": {
+        "jsx": true
+      },
+      "ecmaVersion": 12,
+      "sourceType": "module"
+    },
+    "plugins": [ "react", "@typescript-eslint", "react-hooks" ],
+    "rules": {
+      "no-use-before-define": "off",
+      "@typescript-eslint/no-use-before-define": [ "error" ],
+      "react/jsx-filename-extension": [ "warn", { "extensions": [ ".tsx" ] } ],
+      "import/extensions": [ "error", "ignorePackages", { "ts": "never", "tsx": "never" } ],
+      "no-shadow": "off",
+      "@typescript-eslint/no-shadow": [ "error" ],
+      "@typescript-eslint/explicit-function-return-type": [ "error", { "allowExpressions": true } ],
+      "max-len": [ "warn", { "code": 100, "ignoreComments": true, "ignoreUrls": true } ],
+      "react-hooks/rules-of-hooks": "error",
+      "react-hooks/exhaustive-deps": "warn",
+      "import/prefer-default-export": "off",
+      "react/prop-types": "off"
+    },
+    "settings": {
+      "import/resolver": {
+        "typescript": {}
+      }
+    }
+  }

package/defaults/app-with-backend/.husky/post-merge

@@ -0,0 +1,4 @@
+#!/bin/zsh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn

package/defaults/app-with-backend/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged

package/defaults/app-with-backend/.prettierignore

@@ -0,0 +1,4 @@
+node_modules
+*.scss.json
+# Ignore artifacts:
+build

package/defaults/app-with-backend/.prettierrc.json

@@ -0,0 +1,24 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "bracketSpacing": false,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "endOfLine": "auto",
+  "overrides": [
+    {
+      "files": "*.json",
+      "options": {
+        "printWidth": 200
+      }
+    },
+    {
+      "files": "*.jsonld",
+      "options": {
+        "parser": "json"
+      }
+    }
+  ]
+}

package/defaults/app-with-backend/lincd.config.js

@@ -1,4 +1,7 @@
 module.exports = {
   cssMode: 'scss-modules',
   cacheWebpack:true,
+  cssGlobalModulePaths:[/global-overwrites.scss/],
+  analyse:false,
+
 };

package/defaults/app-with-backend/package.json

@@ -13,13 +13,21 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "main": "backend/src/server.js",
+  "main": "scripts/start-server.js",
   "license": "MIT",
   "scripts": {
     "start": "npm run server:dev",
-    "build": "env-cmd -e production node frontend/scripts/build.js",
-    "server:dev": "env-cmd -e development nodemon --watch ../../modules/lincd-server/lib --watch ../../modules/lincd-server/site.webpack.config.js ./backend/server.js",
-    "server:prod": "env-cmd -e production nodemon -e js,json s ./backend/server.js"
+    "build": "env-cmd -e _main,production node scripts/build.js",
+    "postinstall": "husky install && echo 'Please run this command manually: node scripts/prepare.js'",
+    "server:dev": "env-cmd -e _main,development nodemon --quiet --watch ./src/index.tsx ./scripts/start-server.js",
+    "server:prod": "env-cmd -e _main,production node ./scripts/start-server.js",
+    "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\""
+  },
+  "lint-staged": {
+    "*.{js,ts,scss,css}": [
+      "prettier --write",
+      "yarn lint"
+    ]
   },
   "workspaces" : [
     "packages/*"
@@ -34,18 +42,19 @@
     "web3"
   ],
   "dependencies": {
-    "@babel/cli": "^7.18.10",
-    "@babel/core": "^7.19.1",
-    "@babel/plugin-proposal-decorators": "^7.21.0",
-    "@babel/plugin-transform-runtime": "^7.19.1",
-    "@babel/preset-env": "^7.19.1",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.18.6",
-    "@babel/register": "^7.18.9",
-    "lincd": "^0.5",
-    "lincd-jsonld": "^0.1.5",
-    "lincd-server": "^0.1.19",
-    "lincd-server-utils": "^0.1",
+    "@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",
+    "chalk": "4.1.2",
+    "lincd": "^0.5.22",
+    "lincd-jsonld": "^0.1.21",
+    "lincd-server": "^0.1.39",
+    "lincd-server-utils": "^0.1.7",
     "react": "^18.2",
     "react-dom": "^18.2",
     "react-error-boundary": "^3.1.3",
@@ -56,8 +65,10 @@
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
     "env-cmd": "^10.1.0",
+    "husky": "^8.0.0",
     "lincd-cli": "^0.2",
-    "nodemon": "^2.0.6",
-    "pm2": "^5.3.0"
+    "nodemon": "^2.0.22",
+    "pm2": "^5.3.0",
+    "which": "^3.0.1"
   }
 }

package/defaults/app-with-backend/{frontend/scripts → scripts}/build.js

@@ -35,8 +35,8 @@ webpack(config, async (err, stats) => {
     // );
 
     //build metadata (JSON-LD files containing metadata about the lincd components, shapes & ontologies in this app or its packages)
-    let updatedPaths = await buildMetadata();
-    console.log(chalk.green("Updated metadata:\n")+" - "+updatedPaths.map(p => chalk.magenta(p.replace(process.cwd(),''))).join("\n - "));
+    // let updatedPaths = await buildMetadata();
+    // console.log(chalk.green("Updated metadata:\n")+" - "+updatedPaths.map(p => chalk.magenta(p.replace(process.cwd(),''))).join("\n - "));
   }
   process.exit();
 });

package/defaults/app-with-backend/scripts/prepare.js

@@ -0,0 +1,16 @@
+const fs = require('fs');
+const which = require('which');
+const homedir = require('os').homedir();
+const path = require('path');
+
+which('node').then(resolved => {
+  try {
+    fs.writeFileSync(
+      path.join(homedir, '.huskyrc'),
+      `export PATH="${path.join(resolved, '..')}:$PATH"`,
+    );
+  } catch (err) {
+    console.log(err);
+  }
+  console.log('created .huskyrc in ' + homedir);
+});

package/defaults/app-with-backend/scripts/start-server.js

@@ -0,0 +1,13 @@
+'use strict';
+require('@babel/register')({extensions: ['.ts', '.tsx']});
+const LincdServer = require('lincd-server/lib/shapes/LincdServer');
+let lincdConfig = require("../lincd.config");
+const {NodeFileStore} = require('lincd-server/lib/shapes/NodeFileStore');
+const {Storage} = require('lincd/lib/utils/Storage');
+
+//on the backend, we use a file store which stores all data as JSON-LD
+let fileStore = new NodeFileStore(process.env.NODE_ENV+'-main');
+Storage.setDefaultStore(fileStore);
+
+let server = new LincdServer.LincdServer({loadAppComponent: () => require('../src/App').default,...lincdConfig});
+server.start();

package/defaults/app-with-backend/src/App.scss

@@ -0,0 +1,6 @@
+@import 'scss/variables.scss';
+
+.App {
+  display: block;
+  color: $textColor;
+}

package/defaults/app-with-backend/src/App.scss.json

@@ -0,0 +1 @@
+{"App":"${underscore_name}_App_App","error":"${underscore_name}_App_error","content":"${underscore_name}_App_content","main":"${underscore_name}_App_main","header":"${underscore_name}_App_header","menu":"${underscore_name}_App_menu"}

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

@@ -0,0 +1,31 @@
+import React, {Suspense} from 'react';
+import {ErrorBoundary} from 'react-error-boundary';
+import {Spinner} from './components/Spinner';
+import {Error} from './components/Error';
+import {AppRoot} from 'lincd-server-utils/lib/components/AppRoot';
+import {Head} from 'lincd-server-utils/lib/components/Head';
+import {Body} from 'lincd-server-utils/lib/components/Body';
+import AppRoutes, {ROUTES} from './routes';
+
+//Note that by default LINCD apps are set up with support for SCSS (sass) and CSS Modules
+//So any .scss file needs to be imported by itself
+import './App.scss';
+//and then the .scss.json file needs to be imported to access the class names (this file will be automatically generated)
+import style from './App.scss.json';
+
+export default function App() {
+  return (
+    <AppRoot>
+      <Head>
+        {/*  Add tags to html <head> here, for example, a font <link href='https://fonts.someapi.com/...' />*/}
+      </Head>
+      <Body routes={ROUTES} pageStyles={style} className={style.App}>
+        <Suspense fallback={<Spinner />}>
+          <ErrorBoundary FallbackComponent={Error}>
+            <AppRoutes />
+          </ErrorBoundary>
+        </Suspense>
+      </Body>
+    </AppRoot>
+  );
+}

package/defaults/app-with-backend/{frontend/src → src}/backend.ts

@@ -1 +1 @@
-//import all ShapeProviders here or define a generic BackendProvider, see documentation on https://docs.lincd.org
+//import all ShapeProviders here or define a generic BackendProvider, see documentation on https://docs.lincd.org

package/defaults/app-with-backend/src/components/Error.scss

@@ -0,0 +1,9 @@
+.error {
+  color: white;
+  margin: 2rem;
+
+  pre {
+    white-space: pre-wrap;
+    padding: 1rem;
+  }
+}

package/defaults/app-with-backend/src/components/Error.scss.json

@@ -0,0 +1 @@
+{"error":"${underscore_name}_Error_error"}

package/defaults/app-with-backend/src/components/Error.tsx

@@ -0,0 +1,14 @@
+import React from 'react';
+import style from './Error.scss.json';
+import './Error.scss';
+
+export function Error({error}) {
+  return (
+    <div className={style.error}>
+      <h1>Application Error</h1>
+      <pre>{error.stack}</pre>
+    </div>
+  );
+}
+
+

package/defaults/app-with-backend/{frontend/src → src}/components/Spinner.scss

@@ -6,6 +6,7 @@
   height: 16px;
   animation: spin 1s linear infinite;
 }
+
 @keyframes spin {
   0% {
     transform: rotate(0deg);

package/defaults/app-with-backend/src/components/Spinner.scss.json

@@ -0,0 +1 @@
+{"spinner":"${underscore_name}_Spinner_spinner","active":"${underscore_name}_Spinner_active","spin":"${underscore_name}_Spinner_spin"}

package/defaults/app-with-backend/{frontend/src → src}/components/Spinner.tsx

@@ -1,6 +1,7 @@
 import './Spinner.scss';
 import * as style from './Spinner.scss.json';
-export default function Spinner({active = true}) {
+
+export function Spinner({active = true}) {
   return (
     <div
       className={[style.spinner, active && style.active].join(' ')}
@@ -8,4 +9,4 @@ export default function Spinner({active = true}) {
       aria-busy={active ? 'true' : 'false'}
     />
   );
-}
+}

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

@@ -1,27 +1,32 @@
 import {initFrontend} from 'lincd-server-utils/lib/utils/Frontend';
-
-window['$RefreshReg$'] = () => {};
-window['$RefreshSig$'] = () => () => {};
-
 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 {BackendFileStore} from 'lincd-server/lib/shapes/BackendFileStore';
+import {BackendAPIStore} from 'lincd-server/lib/shapes/BackendAPIStore';
+import {AppContextProvider} from 'lincd-server-utils/lib/components/AppContext';
 
-//store all quads in a file on the backend named 'main'
-export const store = new BackendFileStore('main');
-Storage.setDefaultStore(store);
+window['$RefreshReg$'] = () => {};
+window['$RefreshSig$'] = () => () => {};
 
+//forward all storage requests to the backend
+export const store = new BackendAPIStore();
+Storage.setDefaultStore(store);
 
 initFrontend().then(() => {
   hydrateRoot(
     document,
     <React.StrictMode>
       <BrowserRouter>
-        <App assets={window['assetManifest']} />
+        <AppContextProvider
+          assets={window['assetManifest']}
+          requestLD={document.getElementById('request-ld')?.innerText}
+          requestObject={document.getElementById('request-json')?.innerText}
+        >
+          <App />
+        </AppContextProvider>
       </BrowserRouter>
     </React.StrictMode>,
   );
-});
+});

package/defaults/app-with-backend/src/layout/DefaultLayout.scss

@@ -0,0 +1,6 @@
+.main {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
+  Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+  width: 66.6%;
+  margin: auto;
+}

package/defaults/app-with-backend/src/layout/DefaultLayout.scss.json

@@ -0,0 +1 @@
+{"main":"${underscore_name}_DefaultLayout_main"}

package/defaults/app-with-backend/src/layout/DefaultLayout.tsx

@@ -0,0 +1,13 @@
+import React from 'react';
+import {Header} from './Header';
+import './DefaultLayout.scss';
+import style from './DefaultLayout.scss.json';
+
+export function DefaultLayout({children}) {
+  return (
+    <main className={style.main}>
+      <Header />
+      {children}
+    </main>
+  );
+}

package/defaults/app-with-backend/src/layout/Header.scss

@@ -0,0 +1,10 @@
+.header {
+  display: block;
+}
+
+.menu {
+  margin: 1rem 0;
+  display: grid;
+  grid-template-columns: repeat(6, 1fr);
+  grid-gap: 1rem;
+}

package/defaults/app-with-backend/src/layout/Header.scss.json

@@ -0,0 +1 @@
+{"header":"${underscore_name}_Header_header","menu":"${underscore_name}_Header_menu"}

package/defaults/app-with-backend/src/layout/Header.tsx

@@ -0,0 +1,16 @@
+import {Link} from 'react-router-dom';
+import React from 'react';
+import style from './Header.scss.json';
+import './Header.scss';
+
+export function Header() {
+  return (
+    <header className={style.header}>
+      <h1>${name}</h1>
+      <nav className={style.menu}>
+        <Link to="/">Home</Link>
+        <Link to="/page1">Page 1</Link>
+      </nav>
+    </header>
+  );
+}

package/defaults/app-with-backend/src/package.ts

@@ -0,0 +1,14 @@
+import {linkedPackage} from 'lincd/lib/utils/Module';
+
+export const {
+  linkedComponent,
+  linkedSetComponent,
+  linkedComponentClass,
+  linkedShape,
+  linkedUtil,
+  linkedOntology,
+  registerPackageExport,
+  registerPackageModule,
+  packageExports,
+  packageName,
+} = linkedPackage('${hyphen_name}');

package/defaults/app-with-backend/src/pages/Home.scss

@@ -0,0 +1,15 @@
+.Home {
+  display: block;
+  margin: 1rem 0;
+
+  code {
+    font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
+    margin: 0.5rem 0;
+
+    pre {
+      padding: 1rem;
+      background-color: #bfe7fc;
+    }
+  }
+}

package/defaults/app-with-backend/src/pages/Home.scss.json

@@ -0,0 +1 @@
+{"Home":"${underscore_name}_Home_Home"}

package/defaults/app-with-backend/src/pages/Home.tsx

@@ -0,0 +1,21 @@
+import {DefaultLayout} from '../layout/DefaultLayout';
+import './Home.scss';
+import style from './Home.scss.json';
+
+export default function Home() {
+  return (
+    <DefaultLayout>
+      <div className={style.Home}>
+        <h2>Get started</h2>
+        <p>
+          Your LINCD App is ready to go!
+          <br />
+          To edit this file, open:
+        </p>
+        <code>
+          <pre>/src/pages/Home.tsx</pre>
+        </code>
+      </div>
+    </DefaultLayout>
+  );
+}

package/defaults/app-with-backend/src/pages/Page1.tsx

@@ -0,0 +1,11 @@
+import {DefaultLayout} from '../layout/DefaultLayout';
+
+export default function Page1() {
+  return (
+    <DefaultLayout>
+      <div>
+        <h2>Page 1</h2>
+      </div>
+    </DefaultLayout>
+  );
+}

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

@@ -0,0 +1,40 @@
+import React,{lazy,Suspense} from 'react';
+import {Route,Routes} from 'react-router-dom';
+import {Spinner} from './components/Spinner';
+
+//In React 18 you can use 'lazy' to import pages only when you need them.
+//This will cause webpack to create multiple bundles, and the right bundles are automatically loaded
+
+export const ROUTES = {
+  index: {
+    path: '/',
+    component: lazy(() => import('./pages/Home' /* webpackPrefetch: true */)),
+    requireAuth: true,
+  },
+  page1: {
+    path: '/page1',
+    component: lazy(() => import('./pages/Page1' /* webpackPrefetch: true */)),
+  },
+};
+
+export default function AppRoutes() {
+  return (
+    <Routes>
+      {Object.keys(ROUTES).map((routeName) => {
+        let route = ROUTES[routeName];
+        let Component = route.component;
+        return (
+          <Route
+            key={route.path}
+            path={route.path}
+            element={
+              <Suspense fallback={<Spinner />}>
+                <Component />
+              </Suspense>
+            }
+          />
+        );
+      })}
+    </Routes>
+  );
+}

package/defaults/app-with-backend/src/scss/global-overwrites.scss

@@ -0,0 +1,11 @@
+/**
+This file allows you to overwrite specific css classes.
+It is configured in such a way that the classes will not be converted to css modules, like the other .scss files.
+If you need to target specific classes of your app that you have defined yourself, you'll need to use the converted class name from the .scss.json file
+
+Example: lets say Matches.tsx renders a Material UI component that uses a class "MuiBox-root"
+It also imports Matches.scss, which has a class .matchesContainer
+If you check the Matches.scss.json file, you'll see that the class name has been converted to .appname_Matches_matchesContainer
+So to overwrite styles of "MuiBox-root" you would use:
+.appname_Matches_matchesContainer .MuiBox-root {
+ */

package/defaults/app-with-backend/src/scss/variables.scss

@@ -0,0 +1,23 @@
+$primaryColor: #b872da;
+$primaryColorDark: #8e39b8;
+$secondaryColor: #4ddad7;
+$textColorGrey: #5f6d7e;
+$textColor: #141414;
+$textColorSmall: #6d6d6d;
+$borderRadius: 8px;
+$gray200: #e5e5e5;
+$gray50: #f3f3f3;
+$boxPadding: 8px;
+$errorColor: #ff0000;
+$warningColor: #ffa500;
+$infoColor: #0000ff;
+$successColor: #008000;
+$backgroundColor: #ffffff;
+$grayColor: #cccccc;
+
+// breakpoints
+$breakpoint-xs: 320px;
+$breakpoint-sm: 640px;
+$breakpoint-md: 768px;
+$breakpoint-lg: 1024px;
+$breakpoint-xl: 1300px;

package/defaults/app-with-backend/tsconfig.json

@@ -16,6 +16,6 @@
     },
     "pretty": true
   },
-  "files": ["./frontend/src/index.tsx"],
-  "include": ["./frontend/src/backend.ts"]
+  "files": ["./src/index.tsx"],
+  "include": ["./src/backend.ts"]
 }

package/lib/cli-methods.js

@@ -130,19 +130,24 @@ var createApp = function (name, basePath) {
                         fs_extra_1["default"].mkdirSync(targetFolder);
                     }
                     fs_extra_1["default"].copySync(path_1["default"].join(__dirname, '..', 'defaults', 'app-with-backend'), targetFolder);
+                    //make sure the data folder exists (even though its empty).. copying empty folders does not work with fs.copySync
+                    fs_extra_1["default"].mkdirSync(path_1["default"].join(targetFolder, 'data'), { recursive: true });
                     // fs.renameSync(path.join(targetFolder, '.yarnrc.yml.template'), path.join(targetFolder, '.yarnrc.yml'));
                     // fs.copySync(path.join(__dirname, '..', 'defaults', 'app'), targetFolder);
                     log("Creating new LINCD application '" + name + "'");
                     //replace variables in some copied files
-                    replaceVariablesInFilesWithRoot(targetFolder, 'package.json', 'pm2.config.js', 'frontend/src/App.tsx', 'frontend/src/package.ts', 'frontend/src/App.scss.json', '.vscode/launch.json', 'frontend/src/components/Spinner.scss.json');
-                    return [4 /*yield*/, hasYarnInstalled()];
+                    return [4 /*yield*/, replaceVariablesInFolder(targetFolder)];
                 case 1:
+                    //replace variables in some copied files
+                    _b.sent();
+                    return [4 /*yield*/, hasYarnInstalled()];
+                case 2:
                     hasYarn = _b.sent();
                     installCommand = hasYarn ? 'yarn install' : 'npm install';
                     return [4 /*yield*/, (0, utils_1.execp)("cd ".concat(hyphenName, " && ").concat(installCommand), true)["catch"](function (err) {
                             console.warn('Could not install dependencies or start application');
                         })];
-                case 2:
+                case 3:
                     _b.sent();
                     log("Your LINCD App is ready at ".concat(chalk_1["default"].blueBright(targetFolder)), "To start, run\n".concat(chalk_1["default"].blueBright("cd ".concat(hyphenName)), " and then ").concat(chalk_1["default"].blueBright((hasYarn ? 'yarn' : 'npm') + ' start')));
                     return [2 /*return*/];
@@ -152,7 +157,7 @@ var createApp = function (name, basePath) {
 };
 exports.createApp = createApp;
 function logHelp() {
-    (0, utils_1.execp)('yarn lincd help');
+    (0, utils_1.execp)('yarn exec lincd help');
 }
 function log() {
     var messages = [];
@@ -450,7 +455,7 @@ function buildAll(target, target2, target3) {
                 }
                 //unless told otherwise, build the package
                 if (!command) {
-                    command = (0, utils_1.execPromise)('cd ' + pkg.path + ' && yarn lincd build' + (target ? ' ' + target : '') + (target2 ? ' ' + target2 : ''), false, false, {}, false);
+                    command = (0, utils_1.execPromise)('cd ' + pkg.path + ' && yarn exec lincd build' + (target ? ' ' + target : '') + (target2 ? ' ' + target2 : ''), false, false, {}, false);
                     debugInfo(chalk_1["default"].cyan('Building ' + pkg.packageName));
                 }
                 return [2 /*return*/, command["catch"](function (_a) {
@@ -591,7 +596,9 @@ var replaceVariablesInFile = function (filePath) { return __awaiter(void 0, void
     var fileContent, newContent;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, fs_extra_1["default"].readFile(filePath, 'utf8')];
+            case 0: return [4 /*yield*/, fs_extra_1["default"].readFile(filePath, 'utf8')["catch"](function (err) {
+                    console.warn(chalk_1["default"].red("Could not read file " + filePath));
+                })];
             case 1:
                 fileContent = _a.sent();
                 newContent = replaceCurlyVariables(fileContent);
@@ -692,6 +699,20 @@ var replaceVariablesInFiles = function () {
         return replaceVariablesInFile(file);
     }));
 };
+var replaceVariablesInFolder = function (folder) {
+    //get all files in folder, including files that start with a dot
+    glob(folder + '/**/*', { dot: true, nodir: true }, function (err, files) {
+        if (err) {
+            console.log('Error', err);
+        }
+        else {
+            // console.log(files);
+            return Promise.all(files.map(function (file) {
+                return replaceVariablesInFile(file);
+            }));
+        }
+    });
+};
 var replaceVariablesInFilesWithRoot = function (root) {
     var files = [];
     for (var _i = 1; _i < arguments.length; _i++) {
@@ -745,12 +766,14 @@ var setNameVariables = function (name) {
     var hyphenName = name.replace(/[-_\s]+/g, '-');
     var camelCaseName = camelCase(name); //some-package --> someModule
     var underscoreName = name.replace(/[-\s]+/g, '_');
+    var plainName = name.replace(/[-\s]+/g, '');
     //longer similar variables names should come before the shorter ones
     setVariable('underscore_name', underscoreName);
     setVariable('hyphen_name', hyphenName);
     setVariable('camel_name', camelCaseName);
     setVariable('name', name);
-    return { hyphenName: hyphenName, camelCaseName: camelCaseName, underscoreName: underscoreName };
+    setVariable('plain_name', plainName);
+    return { hyphenName: hyphenName, camelCaseName: camelCaseName, underscoreName: underscoreName, plainName: plainName };
 };
 function getSourceFolder(basePath) {
     if (basePath === void 0) { basePath = process.cwd(); }
@@ -1077,6 +1100,10 @@ var buildMetadata = function () { return __awaiter(void 0, void 0, void 0, funct
                                                     errors = true;
                                                     return [3 /*break*/, 3];
                                                 case 1:
+                                                    if (!response.packageUri) {
+                                                        console.warn("No package URI from meta data. Not building meta data for this package");
+                                                        return [2 /*return*/];
+                                                    }
                                                     pkgNode = models_1.NamedNode.getOrCreate(response.packageUri);
                                                     lincdApp = (0, NameSpace_1.createNameSpace)('http://lincd.org/ont/lincd-app/');
                                                     Prefix_1.Prefix.add('lincdApp', 'http://lincd.org/ont/lincd-app/');
@@ -1663,8 +1690,8 @@ var executeCommandForPackage = function (packageName, command) {
         return modDetails.packageName.indexOf(packageName) !== -1 || modDetails.packageName.indexOf(packageName) !== -1;
     });
     if (packageDetails) {
-        log("Executing 'cd " + packageDetails.path + ' && yarn lincd' + (command ? ' ' + command : '') + "'");
-        return (0, utils_1.execp)('cd ' + packageDetails.path + ' && yarn lincd' + (command ? ' ' + command : ''));
+        log("Executing 'cd " + packageDetails.path + ' && yarn exec lincd' + (command ? ' ' + command : '') + "'");
+        return (0, utils_1.execp)('cd ' + packageDetails.path + ' && yarn exec lincd' + (command ? ' ' + command : ''));
     }
     else {
         warn("Could not find a pkg who's name (partially) matched " + chalk_1["default"].cyan(packageName));

package/package.json

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

package/defaults/app-with-backend/backend/server.js

@@ -1,6 +0,0 @@
-'use strict';
-require('@babel/register')({extensions: ['.ts', '.tsx']});
-const LincdServer = require('lincd-server/lib/shapes/LincdServer');
-let lincdConfig = require("../lincd.config");
-let server = new LincdServer.LincdServer({loadAppComponent: () => require('../frontend/src/App').default,...lincdConfig});
-server.start();

package/defaults/app-with-backend/frontend/src/App.scss

@@ -1,42 +0,0 @@
-.error {
-  color: white;
-  margin: 2rem;
-
-  pre {
-    white-space: pre-wrap;
-    padding: 1rem;
-  }
-}
-
-.content {
-  display: block;
-  margin: 1rem 0;
-
-  code {
-    font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
-    margin: 0.5rem 0;
-
-    pre {
-      padding: 1rem;
-      background-color: #bfe7fc;
-    }
-  }
-}
-
-.main {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans',
-    'Droid Sans', 'Helvetica Neue', sans-serif;
-  width: 66.6%;
-  margin: auto;
-}
-
-.header {
-  display: block;
-}
-
-.menu {
-  margin: 1rem 0;
-  display: grid;
-  grid-template-columns: repeat(6, 1fr);
-  grid-gap: 1rem;
-}

package/defaults/app-with-backend/frontend/src/App.scss.json

@@ -1 +0,0 @@
-{"error":"${name}_App_error","content":"${name}_App_content","main":"${name}_App_main","header":"${name}_App_header","menu":"${name}_App_menu"}

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

@@ -1,130 +0,0 @@
-import {Link} from 'react-router-dom';
-import React,{lazy, Suspense} from 'react';
-import {ErrorBoundary} from 'react-error-boundary';
-import Spinner from './components/Spinner';
-import {Route, Routes} from 'react-router-dom';
-
-//Note that by default LINCD apps are set up with support for SCSS (sass) and CSS Modules
-//So any .scss file needs to be imported by itself
-import './App.scss';
-//and then the .scss.json file needs to be imported to access the class names (this file will be automatically generated)
-import style from './App.scss.json';
-
-//In React 18 you can use 'lazy' to import pages only when you need them.
-//This will cause webpack to create multiple bundles, and the right one is automatically loaded
-const Home = lazy(() => import('./pages/Home' /* webpackPrefetch: true */));
-const Page1 = lazy(() => import('./pages/Page1' /* webpackPrefetch: true */));
-
-declare var window;
-export default function App({
-  assets = typeof window !== 'undefined' ? window['assetManifest'] : {},
-  //on the frontend data will not be set yet, but it will be present in the initial HTML as a script tag with JSON-LD inside, with the ID: request-ld
-  //so here we read that back to the data variable, so that the rendering (of that same <script> tag) will be identical as the backend
-  requestLD = typeof document !== 'undefined' ? document.getElementById('request-ld')?.innerText : null,
-  requestObject = typeof document !== 'undefined' ? document.getElementById('request-json')?.innerText : null,
-}) {
-    return (
-    <Html assets={assets} requestObject={requestObject} requestLD={requestLD} title="${name} - LINCD App">
-      <Suspense fallback={<Spinner />}>
-        <ErrorBoundary FallbackComponent={Error}>
-          <Content />
-        </ErrorBoundary>
-      </Suspense>
-    </Html>
-  );
-}
-
-function Content() {
-  return (
-    <Layout>
-      <div className={style.content}>
-        <Routes>
-          <Route
-            path="/"
-            element={
-              <Suspense fallback={<Spinner />}>
-                <Home />
-              </Suspense>
-            }
-          />
-          <Route
-            path="/page1"
-            element={
-              <Suspense fallback={<Spinner />}>
-                <Page1 />
-              </Suspense>
-            }
-          />
-        </Routes>
-      </div>
-    </Layout>
-  );
-}
-
-function Error({error}) {
-  return (
-    <div className={style.error}>
-      <h1>Application Error</h1>
-      <pre>{error.stack}</pre>
-    </div>
-  );
-}
-
-function Layout({children}) {
-  return (
-    <main className={style.main}>
-      <Header />
-      {children}
-    </main>
-  );
-}
-
-function Header() {
-  return (
-    <header className={style.header}>
-      <h1>${name}</h1>
-      <nav className={style.menu}>
-        <Link to="/">Home</Link>
-        <Link to="/page1">Page 1</Link>
-      </nav>
-    </header>
-  );
-}
-
-function Html({assets,requestObject,requestLD,children,title}) {
-  return (
-    <html lang="en">
-      {globalThis.document?.head ? (
-        <head dangerouslySetInnerHTML={{__html: document.head.innerHTML}} />
-      ) : (
-        <head>
-          <title>{title}</title>
-
-          <meta charSet="utf-8" />
-          <meta name="viewport" content="width=device-width, initial-scale=1" />
-
-          <link rel="shortcut icon" href="/static/favicon.ico" />
-          <link rel="stylesheet" href={assets['main.css']} />
-
-          {assets['tailwind-cdn'] && <script src={assets['tailwind-cdn']}></script>}
-          <script id='request-ld' type='application/ld+json' dangerouslySetInnerHTML={{__html: requestLD}} />
-          <script id='request-json' type='application/json' dangerouslySetInnerHTML={{__html: requestObject}} />
-
-        </head>
-      )}
-      <body>
-        <noscript
-          dangerouslySetInnerHTML={{
-            __html: `<b>Enable JavaScript to run this app.</b>`,
-          }}
-        />
-        {children}
-        <script
-          dangerouslySetInnerHTML={{
-            __html: `assetManifest = ${JSON.stringify(assets)};`,
-          }}
-        />
-      </body>
-    </html>
-  );
-}

package/defaults/app-with-backend/frontend/src/components/Spinner.scss.json

@@ -1 +0,0 @@
-{"spinner":"${name}_Spinner_spinner","active":"${name}_Spinner_active","spin":"${name}_Spinner_spin"}

package/defaults/app-with-backend/frontend/src/package.ts

@@ -1,3 +0,0 @@
-import {linkedPackage} from 'lincd/lib/utils/Module';
-export const {linkedComponent, linkedSetComponent, linkedComponentClass, linkedShape, linkedUtil, linkedOntology, registerPackageExport, registerPackageModule, packageExports, packageName} =
-  linkedPackage('${hyphen_name}');

package/defaults/app-with-backend/frontend/src/pages/Home.tsx

@@ -1,15 +0,0 @@
-export default function Home() {
-  return (
-    <div>
-      <h2>Get started</h2>
-      <p>
-        Your LINCD App is ready to go!
-        <br />
-        To edit this file, open:
-      </p>
-      <code>
-        <pre>/frontend/src/pages/Home.tsx</pre>
-      </code>
-    </div>
-  );
-}

package/defaults/app-with-backend/frontend/src/pages/Page1.tsx

@@ -1,7 +0,0 @@
-export default function Page1() {
-  return (
-    <div>
-      <h2>Page 1</h2>
-    </div>
-  );
-}