@carbon/cli 10.28.0 → 10.32.0-rc.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/cli",
   "description": "Task automation for working with the Carbon Design System",
-  "version": "10.28.0",
+  "version": "10.32.0-rc.0",
   "license": "Apache-2.0",
   "bin": {
     "carbon-cli": "./bin/carbon-cli.js"
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@babel/core": "^7.14.6",
+    "@babel/core": "^7.16.7",
     "@carbon/cli-reporter": "^10.5.0",
     "@octokit/plugin-retry": "^3.0.7",
     "@octokit/plugin-throttling": "^2.6.0",
@@ -37,7 +37,7 @@
     "clipboardy": "^2.1.0",
     "enquirer": "^2.3.6",
     "fast-glob": "^3.2.7",
-    "fs-extra": "^8.0.1",
+    "fs-extra": "^10.0.0",
     "inquirer": "^6.4.1",
     "klaw-sync": "^6.0.0",
     "lodash.template": "^4.5.0",
@@ -48,9 +48,9 @@
     "remark": "^10.0.1",
     "replace-in-file": "^6.1.0",
     "rollup": "^2.46.0",
-    "sass": "^1.36.0",
+    "sass": "^1.43.3",
     "sassdoc": "^2.7.3",
     "yargs": "^17.0.1"
   },
-  "gitHead": "1b4811e1ef0be1d058e63a90242d9d48f0bff445"
+  "gitHead": "a8bade7e1200220296e8ed13621c7a1a88206f0e"
 }

package/src/workspace.js

@@ -11,23 +11,26 @@ const execa = require('execa');
 const fs = require('fs-extra');
 const glob = require('fast-glob');
 const path = require('path');
-const packageJson = require('../../../package.json');
-
-const WORKSPACE_ROOT = path.resolve(__dirname, '../../../');
-const packagePaths = glob
-  .sync(packageJson.workspaces.map((pattern) => `${pattern}/package.json`))
-  .map((match) => {
-    const packageJsonPath = path.join(WORKSPACE_ROOT, match);
-    return {
-      packageJsonPath,
-      packageJson: fs.readJsonSync(packageJsonPath),
-      packagePath: path.dirname(packageJsonPath),
-      packageFolder: path.relative(
-        WORKSPACE_ROOT,
-        path.dirname(packageJsonPath)
-      ),
-    };
-  });
+
+const { root: ROOT_DIR } = path.parse(__dirname);
+const WORKSPACE_ROOT = getProjectRoot(__dirname);
+const packageJson = fs.readJsonSync(path.join(WORKSPACE_ROOT, 'package.json'));
+const packagePaths = Array.isArray(packageJson.workspaces)
+  ? glob
+      .sync(packageJson.workspaces.map((pattern) => `${pattern}/package.json`))
+      .map((match) => {
+        const packageJsonPath = path.join(WORKSPACE_ROOT, match);
+        return {
+          packageJsonPath,
+          packageJson: fs.readJsonSync(packageJsonPath),
+          packagePath: path.dirname(packageJsonPath),
+          packageFolder: path.relative(
+            WORKSPACE_ROOT,
+            path.dirname(packageJsonPath)
+          ),
+        };
+      })
+  : [];
 
 const env = {
   root: {
@@ -54,6 +57,53 @@ async function getPackages() {
   return JSON.parse(lernaListOutput).filter((pkg) => !pkg.private);
 }
 
+/**
+ * Returns the root directory of a project, either as a workspace root with a
+ * collection of packages or a single project with a `package.json`
+ * @param {string} directory
+ * @returns {string}
+ */
+function getProjectRoot(directory) {
+  const packageJsonPaths = ancestors(directory).filter((directory) => {
+    return fs.existsSync(path.join(directory, 'package.json'));
+  });
+
+  const rootDirectory =
+    packageJsonPaths.length > 0
+      ? packageJsonPaths[packageJsonPaths.length - 1]
+      : null;
+
+  if (!rootDirectory) {
+    throw new Error(
+      `Unable to find a \`package.json\` file from directory: ${directory}`
+    );
+  }
+
+  return rootDirectory;
+}
+
+/**
+ * Returns an array of the the directory and its ancestors
+ * @param {string} directory
+ * @returns {Array<string>}
+ */
+function ancestors(directory) {
+  const result = [directory];
+  let current = directory;
+
+  while (current !== '') {
+    result.push(current);
+
+    if (current !== ROOT_DIR) {
+      current = path.dirname(current);
+    } else {
+      current = '';
+    }
+  }
+
+  return result;
+}
+
 module.exports = {
   workspace,
   getPackages,