lincd-cli 0.2.34 → 0.2.37

package/defaults/app-static/capacitor.config.ts

@@ -4,7 +4,95 @@ const config: CapacitorConfig = {
   appId: 'com.mydomain.FILL_IN_YOUR_OWN',
   appName: 'FILL_IN_YOUR_OWN',
   webDir: 'frontend/web',
-  bundledWebRuntime: false
+  server: {
+    allowNavigation: ['DOMAIN', 'APP_DOMAIN'],
+  },
+  bundledWebRuntime: false,
+  //Add or remove plugins that you need. Here is a starter list
+  plugins: {
+    CapacitorHttp: {
+      enabled: true,
+    },
+    FirebaseMessaging: {
+      presentationOptions: ['badge', 'sound', 'alert'],
+    },
+    GoogleAuth: {
+      scopes: ['profile', 'email'],
+      //self created production web client
+      clientId: '734627482469-37q563qta2jt6bmhksemmvco8si0pmai.apps.googleusercontent.com',
+      //For these lines use the auto generated web client "Web client  (auto created by Google Service)"
+      serverClientId: '580968717451-68kpj51ulab8q7drbd3sr7imodai81lp.apps.googleusercontent.com',
+      androidClientId: '580968717451-68kpj51ulab8q7drbd3sr7imodai81lp.apps.googleusercontent.com',
+      iosClientId: '580968717451-aoj80o3e8qfjlmbrgabf916mfk4t3ntr.apps.googleusercontent.com',
+      forceCodeForRefreshToken: true,
+    },
+    SplashScreen: {
+      launchShowDuration: 400,
+      launchAutoHide: true,
+      // launchFadeOutDuration: 500,
+      backgroundColor: '#F7E5FF',
+      androidSplashResourceName: 'splash',
+      // androidScaleType: 'CENTER',
+      showSpinner: false,
+      // androidSpinnerStyle: 'large',
+      // iosSpinnerStyle: 'small',
+      // spinnerColor: '#999999',
+      splashFullScreen: true,
+      splashImmersive: true,
+      // layoutName: 'launch_screen',
+      // useDialog: true,
+    },
+  },
+};
+
+export default config;
+
+import {CapacitorConfig} from '@capacitor/cli';
+
+const config: CapacitorConfig = {
+  appId: 'com.spiritualplaymates.app',
+  appName: 'Spiritual Playmates',
+  webDir: 'frontend/web',
+  server: {
+    allowNavigation: ['spiritualplaymates.com', 'app.spiritualplaymates.com', 'http://reborn-pro.local:4000'],
+  },
+  cordova: {},
+  plugins: {
+    FirebaseMessaging: {
+      presentationOptions: ['badge', 'sound', 'alert'],
+    },
+    GoogleAuth: {
+      scopes: ['profile', 'email'],
+      //self created production web client
+      clientId: '734627482469-37q563qta2jt6bmhksemmvco8si0pmai.apps.googleusercontent.com',
+      serverClientId: '580968717451-68kpj51ulab8q7drbd3sr7imodai81lp.apps.googleusercontent.com',
+      //auto generated web client
+      //clientId: '580968717451-68kpj51ulab8q7drbd3sr7imodai81lp.apps.googleusercontent.com ',
+      androidClientId: '580968717451-68kpj51ulab8q7drbd3sr7imodai81lp.apps.googleusercontent.com',
+
+      iosClientId: '580968717451-aoj80o3e8qfjlmbrgabf916mfk4t3ntr.apps.googleusercontent.com',
+      forceCodeForRefreshToken: true,
+    },
+    CapacitorHttp: {
+      enabled: true,
+    },
+    SplashScreen: {
+      launchShowDuration: 400,
+      launchAutoHide: true,
+      // launchFadeOutDuration: 500,
+      backgroundColor: '#F7E5FF',
+      androidSplashResourceName: 'splash',
+      // androidScaleType: 'CENTER',
+      showSpinner: false,
+      // androidSpinnerStyle: 'large',
+      // iosSpinnerStyle: 'small',
+      // spinnerColor: '#999999',
+      splashFullScreen: true,
+      splashImmersive: true,
+      // layoutName: 'launch_screen',
+      // useDialog: true,
+    },
+  },
 };
 
 export default config;

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

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

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

@@ -2,14 +2,16 @@ import {Link} from 'react-router-dom';
 import React from 'react';
 import style from './Header.scss.json';
 import './Header.scss';
+import {ROUTES} from '../routes';
 
 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>
+        {Object.keys(ROUTES).map(key => {
+          return <Link key={key} to={ROUTES[key].path}>{ROUTES[key].label || key}</Link>
+        })}
       </nav>
     </header>
   );

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

@@ -10,10 +10,12 @@ export const ROUTES = {
     path: '/',
     component: lazy(() => import('./pages/Home' /* webpackPrefetch: true */)),
     requireAuth: true,
+    label:"Home",
   },
   page1: {
     path: '/page1',
     component: lazy(() => import('./pages/Page1' /* webpackPrefetch: true */)),
+    label:"Page 1",
   },
 };
 

package/lib/cli-methods.js

@@ -35,7 +35,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.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;
+exports.executeCommandForPackage = exports.addCapacitor = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.buildMetadata = exports.register = exports.createPackage = exports.depCheck = exports.createComponent = exports.createSetComponent = exports.createShape = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.createApp = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const utils_1 = require("./utils");
@@ -47,6 +47,7 @@ const JSONLDWriter_1 = require("lincd-jsonld/lib/utils/JSONLDWriter");
 const NameSpace_1 = require("lincd/lib/utils/NameSpace");
 const Prefix_1 = require("lincd/lib/utils/Prefix");
 const get_env_vars_1 = require("env-cmd/dist/get-env-vars");
+const depcheck_1 = __importDefault(require("depcheck"));
 var glob = require('glob');
 var variables = {};
 var open = require('open');
@@ -706,6 +707,28 @@ const createComponent = (name, basePath = process.cwd()) => __awaiter(void 0, vo
     }
 });
 exports.createComponent = createComponent;
+const depCheck = () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, depcheck_1.default)(process.cwd(), {}, (results) => {
+        if (results.missing) {
+            let missing = Object.keys(results.missing);
+            //currently react is not an explicit dependency, but we should add it as a peer dependency
+            missing.splice(missing.indexOf("react"));
+            if (missing.length > 0) {
+                console.warn(chalk_1.default.red("Missing dependencies:\n\t" + missing.join(",\n\t")));
+            }
+        }
+        // if(Object.keys(results.invalidFiles).length > 0) {
+        //   console.warn(chalk.red("Invalid files:\n")+Object.keys(results.invalidFiles).join(",\n"));
+        // }
+        // if(Object.keys(results.invalidDirs).length > 0) {
+        //   console.warn(chalk.red("Invalid dirs:\n")+results.invalidDirs.toString());
+        // }
+        // if(results.unused) {
+        //   console.warn("Unused dependencies: "+results.missing.join(", "));
+        // }
+    });
+});
+exports.depCheck = depCheck;
 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.
@@ -1440,6 +1463,18 @@ var executeCommandForEachPackage = function (packages, command, filterMethod, fi
     return p;
 };
 exports.executeCommandForEachPackage = executeCommandForEachPackage;
+var gitIgnore = function (...entries) {
+    //add each entry to the .gitignore file
+    let gitIgnorePath = path_1.default.resolve(process.cwd(), '.gitignore');
+    addLinesToFile(gitIgnorePath, entries);
+};
+var addLinesToFile = function (filePath, entries) {
+    let fileContents = fs_extra_1.default.readFileSync(filePath, { encoding: 'utf8' });
+    entries.forEach(entry => {
+        fileContents += '\n' + entry;
+    });
+    fs_extra_1.default.writeFileSync(filePath, fileContents);
+};
 var addCapacitor = function (basePath = process.cwd()) {
     return __awaiter(this, void 0, void 0, function* () {
         let targetFolder = ensureFolderExists(basePath);
@@ -1458,6 +1493,7 @@ var addCapacitor = function (basePath = process.cwd()) {
         };
         fs_extra_1.default.writeFile(envCmdPath, JSON.stringify(envCmd, null, 2));
         log('Edited .env-cmdrc.json');
+        gitIgnore('android/app/build', 'android/**/capacitor.build.gradle', 'ios/App/App/public', 'ios/App/Podfile');
         //update package.json scripts
         let pack = (0, utils_1.getPackageJSON)(basePath);
         pack.scripts['build-static'] = 'env-cmd -e static-dev node frontend/scripts/build.js';

package/lib/cli.js

@@ -110,6 +110,9 @@ program.command('all [action] [filter] [filter-value]').action((command, filter,
 program.command('dev [target] [mode]').action((target, mode) => {
     (0, cli_methods_1.developPackage)(target, mode);
 });
+program.command('depcheck').action((target, mode) => {
+    (0, cli_methods_1.depCheck)();
+});
 program
     .command('package')
     .action((name, command, args) => {

package/lib/config-grunt.js

@@ -75,7 +75,7 @@ function setupGrunt(grunt, moduleName, config) {
     grunt.registerTask('build-es6', (0, utils_1.flatten)([
         'prepare-build',
         buildFrontend ? 'webpack:build-es6' : null,
-        buildServer ? ['clean:lib', 'exec:build-lib', 'copy:lib'] : null,
+        buildServer ? ['clean:lib', 'exec:build-lib', 'copy:lib', 'exec:depcheck'] : null,
         // 'exec:shapes',
     ]));
     grunt.registerTask('build-lib', ['prepare-build', 'exec:build-lib', 'copy:lib']);
@@ -96,6 +96,7 @@ function setupGrunt(grunt, moduleName, config) {
             'build-lib-es5': 'yarn exec tsc --pretty -p tsconfig-es5.json',
             beforeBuildCommand: config.beforeBuildCommand,
             'server-dev': 'tsc -w',
+            depcheck: 'yarn lincd depcheck',
             test: 'tsc -w',
             // shapes: 'lincd shapes',
             'css-declarations': 'tcm -p **/*.scss',

package/lib/utils.js

@@ -53,7 +53,6 @@ exports.getPackageJSON = getPackageJSON;
  * @param packageJson
  */
 var getLINCDDependencies = function (packageJson, checkedPackages = new Set()) {
-    var _a;
     if (!packageJson) {
         packageJson = (0, exports.getPackageJSON)();
     }
@@ -81,33 +80,71 @@ var getLINCDDependencies = function (packageJson, checkedPackages = new Set()) {
         }
     }
     if (firstTime) {
-        let dependencyMap = new Map();
+        // let dependencyMap:Map<string,Set<string>> = new Map();
         let lincdPackageNames = new Set(lincdPackagePaths.map(([packageName, modulePath, pkgDependencies]) => packageName));
         //remove lincd-cli from the list of lincd packages
         lincdPackageNames.delete('lincd-cli');
-        lincdPackagePaths.forEach(([packageName, modulePath, pkgDependencies]) => {
-            dependencyMap.set(packageName, new Set(pkgDependencies.filter(dependency => lincdPackageNames.has(dependency))));
+        lincdPackagePaths.forEach(([packageName, modulePath, pkgDependencies], key) => {
+            let lincdDependencies = pkgDependencies.filter(dependency => lincdPackageNames.has(dependency));
+            if (packageName === 'lincd-cli') {
+                //remove lincd-modules from the dependencies of lincd-cli (it's not a hard dependency, and it messes things up)
+                lincdDependencies.splice(lincdDependencies.indexOf('lincd-modules'), 1);
+            }
+            // dependencyMap.set(packageName, new Set(lincdDependencies));
+            //update dependencies to be the actual lincd package objects
+            lincdPackagePaths[key][2] = lincdDependencies;
         });
-        //remove lincd-modules from the dependencies of lincd-cli (it's not a hard dependency, and it messes things up)
-        (_a = dependencyMap.get('lincd-cli')) === null || _a === void 0 ? void 0 : _a.delete('lincd-modules');
-        //add the nested dependencies for each lincd package
-        for (let [packageName, pkgDependencies] of dependencyMap) {
-            pkgDependencies.forEach((dependency) => {
-                if (dependencyMap.has(dependency)) {
-                    dependencyMap.get(dependency).forEach((nestedDependency) => {
-                        pkgDependencies.add(nestedDependency);
-                    });
+        // //add the nested dependencies for each lincd package
+        // for (let [packageName,pkgDependencies] of dependencyMap) {
+        //   pkgDependencies.forEach((dependency) => {
+        //     if (dependencyMap.has(dependency)) {
+        //       dependencyMap.get(dependency).forEach((nestedDependency) => {
+        //         pkgDependencies.add(nestedDependency);
+        //       });
+        //     }
+        //   });
+        // }
+        //
+        // dependencyMap.forEach((dependencies,packageName) => {
+        //   //check for circular dependencies
+        //   if([...dependencies].some(dependency => {
+        //     return dependencyMap.get(dependency).has(packageName);
+        //   }))
+        //   {
+        //     console.warn(`Circular dependency detected between ${packageName} and ${dependency}`);
+        //   }
+        //
+        // });
+        // a simple sort with dependencyMap doesn't seem to work,so we start with LINCD (least dependencies) and from there add packages that have all their dependencies already added
+        let sortedPackagePaths = [];
+        let addedPackages = new Set(['lincd']);
+        sortedPackagePaths.push(lincdPackagePaths.find(([packageName]) => {
+            return packageName === 'lincd';
+        }));
+        while (addedPackages.size !== lincdPackagePaths.length) {
+            let startSize = addedPackages.size;
+            lincdPackagePaths.forEach(([packageName, modulePath, pkgDependencies]) => {
+                if (!addedPackages.has(packageName) && pkgDependencies.every(dependency => addedPackages.has(dependency))) {
+                    sortedPackagePaths.push([packageName, modulePath, pkgDependencies]);
+                    addedPackages.add(packageName);
                 }
             });
+            if (startSize === addedPackages.size) {
+                console.warn('Could not sort lincd packages, circular dependencies?');
+                break;
+            }
         }
         //sort the lincd packages by least dependent first
-        lincdPackagePaths.sort(([packageNameA, modulePathA, pkgDependenciesA], [packageNameB, modulePathB, pkgDependenciesB]) => {
-            //if package A depends on package B, then package B should come first
-            if (dependencyMap.get(packageNameA).has(packageNameB)) {
-                return 1;
-            }
-            return -1;
-        });
+        // lincdPackagePaths = lincdPackagePaths.sort(([packageNameA],[packageNameB]) => {
+        //   //if package A depends on package B, then package B should come first
+        //   if (dependencyMap.get(packageNameA).has(packageNameB)) {
+        //     console.log(packageNameA+' depends on '+packageNameB+ ' (below)')
+        //       return 1;
+        //   }
+        //   console.log(packageNameA+' above '+packageNameB)
+        //   return -1;
+        // });
+        return sortedPackagePaths;
     }
     return lincdPackagePaths;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.34",
+  "version": "0.2.37",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -8,7 +8,6 @@
     "build": "npm exec tsc",
     "dev": "npm exec tsc -w"
   },
-  "lincd": true,
   "keywords": [
     "lincd",
     "cli",
@@ -45,6 +44,7 @@
     "commander": "^9.4.0",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
+    "depcheck": "^1.4.3",
     "env-cmd": "^10.1.0",
     "find-nearest-package-json": "^2.0.1",
     "fs-extra": "^10.1.0",