@loopback/cli 5.0.0 → 5.1.0

package/generators/copyright/header.js

@@ -3,11 +3,12 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-const {Project} = require('@lerna/project');
+const path = require('node:path');
 const {Minimatch} = require('minimatch');
 const _ = require('lodash');
-const path = require('path');
 const chalk = require('chalk');
+const pkgJson = require('@npmcli/package-json');
+const mapWorkspaces = require('@npmcli/map-workspaces');
 const {git, getYears} = require('./git');
 const {FSE, jsOrTsFiles} = require('./fs');
 const {spdxLicenseList} = require('./license');
@@ -31,8 +32,7 @@ function getCustomTemplate(customLicenseLines = []) {
   if (typeof customLicenseLines === 'string') {
     customLicenseLines = [customLicenseLines];
   }
-  const UNLICENSED = _.template(COPYRIGHT.join('\n'));
-  let CUSTOM = UNLICENSED;
+  let CUSTOM = _.template(COPYRIGHT.join('\n'));
   if (customLicenseLines.length) {
     let copyrightLines = COPYRIGHT;
     if (customLicenseLines.some(line => line.includes('Copyright'))) {
@@ -59,10 +59,9 @@ function getHeaderRegEx(customLicenseLines) {
     customLicenseLines != null && customLicenseLines.length
       ? customLicenseLines
       : COPYRIGHT.concat(LICENSE, customLicenseLines);
-  const regExp = lines.map(
+  return lines.map(
     l => new RegExp(escapeRegExp(l).replace(/<%[^>]+%>/g, '.*')),
   );
-  return regExp;
 }
 
 /**
@@ -108,7 +107,8 @@ function getCopyrightOwner(pkg, options) {
 
 /**
  * Build the license template params
- * @param {string|object} spdxLicense - SPDX license id or object
+ * @param {String|Object} spdxLicense - SPDX license id or object
+ * @param {Array} customLicenseLines
  */
 function expandLicense(spdxLicense, customLicenseLines = []) {
   if (typeof spdxLicense === 'string') {
@@ -202,13 +202,13 @@ async function updateFileHeaders(projectRoot, options = {}) {
     ...options,
   };
 
-  const fs = options.fs || FSE;
-  const isMonorepo = await fs.exists(path.join(projectRoot, 'lerna.json'));
-  if (isMonorepo) {
-    // List all packages for the monorepo
-    const project = new Project(projectRoot);
-    debug('Lerna monorepo', project);
-    const packages = await project.getPackages();
+  const {content: rootPkg} = await pkgJson.load(projectRoot);
+  if ('workspaces' in rootPkg) {
+    const workspaces = await mapWorkspaces({cwd: projectRoot, pkg: rootPkg});
+    const packages = Array.from(workspaces, ([name, location]) => ({
+      name,
+      location,
+    }));
 
     // Update file headers for each package
     const visited = [];

package/generators/datasource/index.js

@@ -67,6 +67,7 @@ module.exports = class DataSourceGenerator extends ArtifactGenerator {
     if (this.options.config) {
       delete this.options?.env;
     }
+    this.artifactInfo.connector = this.options.connector;
     return super.setOptions();
   }
 

package/generators/discover/index.js

@@ -383,7 +383,9 @@ module.exports = class DiscoveryGenerator extends ArtifactGenerator {
             Object.assign(templateData.properties[relation.foreignKey], {
               relation,
             });
-            relationImports.push(relation.type);
+            if (!relationImports.includes(relation.type)) {
+              relationImports.push(relation.type);
+            }
             relationDestinationImports.push(relation.model);
 
             foreignKeys[relationName] = {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loopback/cli",
   "description": "Yeoman generator for LoopBack 4",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "keywords": [
     "LoopBack",
     "CLI",
@@ -39,7 +39,8 @@
     ".yo-rc.json"
   ],
   "dependencies": {
-    "@lerna/project": "^6.4.1",
+    "@npmcli/map-workspaces": "^3.0.4",
+    "@npmcli/package-json": "^3.1.1",
     "@openapi-contrib/openapi-schema-to-json-schema": "^3.3.2",
     "@phenomnomnominal/tsquery": "^5.0.1",
     "camelcase-keys": "^7.0.2",
@@ -47,19 +48,19 @@
     "change-case": "^4.1.2",
     "debug": "^4.3.4",
     "fs-extra": "^11.1.1",
-    "glob": "^10.2.4",
+    "glob": "^10.3.1",
     "inquirer-autocomplete-prompt": "^2.0.0",
     "json5": "^2.2.3",
     "latest-version": "^5.1.0",
     "lodash": "^4.17.21",
-    "minimatch": "^9.0.0",
+    "minimatch": "^9.0.2",
     "minimist": "^1.2.8",
     "mkdirp": "^3.0.1",
     "natural-compare": "^1.4.0",
-    "pacote": "^15.1.3",
+    "pacote": "^15.2.0",
     "pluralize": "^8.0.0",
     "regenerate": "^1.4.2",
-    "semver": "^7.5.1",
+    "semver": "^7.5.3",
     "slash": "^3.0.0",
     "spdx-license-list": "^6.6.0",
     "stringify-object": "^3.3.0",
@@ -70,34 +71,33 @@
     "terminal-link": "^2.1.1",
     "tildify": "^2.0.0",
     "ts-morph": "^17.0.1",
-    "typescript": "~4.9.5",
+    "typescript": "~5.1.5",
     "unicode-10.0.0": "^0.7.5",
     "untildify": "^4.0.0",
     "update-notifier": "^5.1.0",
-    "url-slug": "^3.0.4",
+    "url-slug": "^3.0.6",
     "validate-npm-package-name": "^5.0.0",
     "write-file-atomic": "^5.0.1",
-    "yeoman-environment": "^3.16.2",
-    "yeoman-generator": "^5.8.0"
+    "yeoman-environment": "^3.19.3",
+    "yeoman-generator": "^5.9.0"
   },
   "devDependencies": {
-    "@lerna/bootstrap": "6.5.1",
-    "@loopback/build": "^10.0.0",
-    "@loopback/eslint-config": "^14.0.0",
-    "@loopback/testlab": "^6.0.0",
+    "@loopback/build": "^10.1.0",
+    "@loopback/eslint-config": "^14.0.1",
+    "@loopback/testlab": "^6.1.0",
     "@types/ejs": "^3.1.2",
     "@types/fs-extra": "^11.0.1",
     "@types/minimatch": "^5.1.2",
-    "@types/node": "^14.18.47",
+    "@types/node": "^16.18.37",
     "@types/yeoman-environment": "^2.10.8",
     "@types/yeoman-generator": "^5.2.11",
     "loopback": "^3.28.0",
-    "loopback-datasource-juggler": "^4.28.5",
+    "loopback-datasource-juggler": "^4.28.7",
     "mem-fs": "^2.3.0",
     "mem-fs-editor": "^9.7.0",
     "mock-stdin": "^1.0.0",
-    "rimraf": "^5.0.0",
-    "sinon": "^15.0.4",
+    "rimraf": "^5.0.1",
+    "sinon": "^15.2.0",
     "strong-globalize-cli": "7.1.0",
     "yeoman-assert": "^3.1.1",
     "yeoman-test": "^6.3.0"
@@ -198,5 +198,5 @@
       "@loopback/sequelize": "^0.3.0"
     }
   },
-  "gitHead": "97a26bd5973830a1d5f28aa2f58040f953995c17"
+  "gitHead": "10a8fa7fbd00ac77c4aee3e7f40884b07fe1919c"
 }