lincd-cli 0.2.38 → 0.2.41

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

@@ -1,8 +1,9 @@
 {
-  "_main" : {
+  "_main": {
     "DATA_ROOT": "https://app.${hyphen_name}.com/data",
+    "APP_PREFIX": "${underscore_name}",
     "APP_NAME": "${name}",
-    "SOURCE_PATH" : "./src"
+    "SOURCE_PATH": "./src"
   },
   "development": {
     "NODE_ENV": "development",
@@ -10,6 +11,6 @@
   },
   "production": {
     "NODE_ENV": "production",
-    "SITE_ROOT": "https://app.${hyphen_name}.com/data"
+    "SITE_ROOT": "https://app.${hyphen_name}.com"
   }
-}
+}

package/defaults/app-with-backend/gitignore.template

@@ -18,5 +18,6 @@ packages/**/.yarn/*
 !packages/**/.yarn/releases
 !packages/**/.yarn/sdks
 !packages/**/.yarn/versions
+.idea
 android/app/build
 ios/App/App/public

package/defaults/app-with-workspace/gitignore.template

@@ -0,0 +1 @@
+mrgit.json

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.depCheck = exports.createComponent = exports.createSetComponent = exports.createShape = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.createApp = void 0;
+exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = 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.setNameVariables = 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");
@@ -56,7 +56,7 @@ const createApp = (name, basePath = process.cwd()) => __awaiter(void 0, void 0,
     if (!name) {
         console.warn('Please provide a name as the first argument');
     }
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     let targetFolder = path_1.default.join(basePath, hyphenName);
     if (!fs_extra_1.default.existsSync(targetFolder)) {
         fs_extra_1.default.mkdirSync(targetFolder);
@@ -64,6 +64,7 @@ const createApp = (name, basePath = process.cwd()) => __awaiter(void 0, void 0,
     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_extra_1.default.mkdirSync(path_1.default.join(targetFolder, 'data/uploads/resized'), { recursive: true });
     fs_extra_1.default.renameSync(path_1.default.join(targetFolder, 'gitignore.template'), path_1.default.join(targetFolder, '.gitignore'));
     fs_extra_1.default.renameSync(path_1.default.join(targetFolder, 'yarnrc.yml.template'), path_1.default.join(targetFolder, '.yarnrc.yml'));
     // fs.copySync(path.join(__dirname, '..', 'defaults', 'app'), targetFolder);
@@ -71,7 +72,9 @@ const createApp = (name, basePath = process.cwd()) => __awaiter(void 0, void 0,
     //replace variables in some copied files
     yield replaceVariablesInFolder(targetFolder);
     let hasYarn = yield hasYarnInstalled();
-    let installCommand = hasYarn ? 'yarn install' : 'npm install';
+    let installCommand = hasYarn
+        ? 'export NODE_OPTIONS="--no-network-family-autoselection" && yarn install'
+        : 'npm install';
     yield (0, utils_1.execp)(`cd ${hyphenName} && ${installCommand}`, true).catch((err) => {
         console.warn('Could not install dependencies or start application');
     });
@@ -102,11 +105,11 @@ function debugInfo(...messages) {
     //   console.log(gruntConfig);
     //   process.exit();
     // }
-    // if (gruntConfig && gruntConfig.analyse === true) {
-    messages.forEach((message) => {
-        console.log(chalk_1.default.cyan('Info: ') + message);
-    });
-    // }
+    if (gruntConfig && gruntConfig.analyse === true) {
+        messages.forEach((message) => {
+            console.log(chalk_1.default.cyan('Info: ') + message);
+        });
+    }
 }
 function warn(...messages) {
     messages.forEach((message) => {
@@ -538,7 +541,7 @@ const createOntology = (prefix, uriBase, basePath = process.cwd()) => __awaiter(
         uriBase = 'http://lincd.org/ont/' + prefix + '/';
     }
     setVariable('uri_base', uriBase);
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(prefix);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(prefix);
     //copy ontology accessor file
     log("Creating files for ontology '" + prefix + "'");
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.ts');
@@ -652,6 +655,7 @@ const setNameVariables = function (name) {
     setVariable('plain_name', plainName);
     return { hyphenName, camelCaseName, underscoreName, plainName };
 };
+exports.setNameVariables = setNameVariables;
 function getSourceFolder(basePath = process.cwd()) {
     //LINCD App
     if (fs_extra_1.default.existsSync(path_1.default.join(basePath, 'frontend', 'src'))) {
@@ -669,7 +673,7 @@ function getSourceFolder(basePath = process.cwd()) {
 const createShape = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
     let sourceFolder = getSourceFolder(basePath);
     let targetFolder = ensureFolderExists(sourceFolder, 'shapes');
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     //copy default shape file
     // log("Creating files for shape '" + name + "'");
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.ts');
@@ -687,7 +691,7 @@ const createShape = (name, basePath = process.cwd()) => __awaiter(void 0, void 0
 exports.createShape = createShape;
 const createSetComponent = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
     let targetFolder = ensureFolderExists(basePath, 'src', 'components');
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     //copy default shape file
     log("Creating files for set component '" + name + "'");
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.tsx');
@@ -703,7 +707,7 @@ exports.createSetComponent = createSetComponent;
 const createComponent = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
     let sourceFolder = getSourceFolder(basePath);
     let targetFolder = ensureFolderExists(sourceFolder, 'components');
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     //copy default shape file
     log("Creating files for component '" + name + "'");
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.tsx');
@@ -769,7 +773,7 @@ const createPackage = (name, uriBase, basePath = process.cwd()) => __awaiter(voi
     setVariable('package_name', name);
     //extra variable for clarity (will be same as 'name')
     setVariable('output_file_name', name);
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(cleanPackageName);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(cleanPackageName);
     log("Creating new LINCD package '" + name + "'");
     fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package'), targetFolder);
     //replace variables in some of the copied files
@@ -1483,7 +1487,7 @@ 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);
+    (0, exports.addLinesToFile)(gitIgnorePath, entries);
 };
 var addLinesToFile = function (filePath, entries) {
     let fileContents = fs_extra_1.default.readFileSync(filePath, { encoding: 'utf8' });
@@ -1492,6 +1496,7 @@ var addLinesToFile = function (filePath, entries) {
     });
     fs_extra_1.default.writeFileSync(filePath, fileContents);
 };
+exports.addLinesToFile = addLinesToFile;
 var addCapacitor = function (basePath = process.cwd()) {
     return __awaiter(this, void 0, void 0, function* () {
         let targetFolder = ensureFolderExists(basePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.38",
+  "version": "0.2.41",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -41,13 +41,13 @@
     "chalk": "4.1.0",
     "child-process-promise": "^2.2.1",
     "colors": "^1.4.0",
-    "commander": "^9.4.0",
+    "commander": "^11.0.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",
+    "fs-extra": "^11.1.1",
     "glob": "^7.1.6",
     "grunt": "^1.3.0",
     "grunt-cli": "^1.4.3",
@@ -59,7 +59,7 @@
     "grunt-webpack": "^5.0.0",
     "license-info-webpack-plugin": "^3.0.0",
     "lincd": "^0.5",
-    "lincd-jsonld": "^0.1.21",
+    "lincd-jsonld": "^0.1.22",
     "lincd-modules": "^0.1",
     "load-grunt-tasks": "^5.1.0",
     "mini-css-extract-plugin": "^2.7.5",

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

@@ -1,16 +0,0 @@
-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);
-});