fix(misc): identify workspace schematics correctly using isSchematic …

…option in schema (#14751) Fixes #14641
nrwl · Feb 7, 2023 · 1802e67 · 1802e67 · vercel · Feb 7, 2023
1 parent 5551fcc
commit 1802e67
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/packages/nx/src/command-line/workspace-generators.ts b/packages/nx/src/command-line/workspace-generators.ts
@@ -98,21 +98,29 @@ function compileToolsDir(outDir: string) {
 
 function constructCollection() {
   const generators = {};
+  const schematics = {};
   readdirSync(generatorsDir).forEach((c) => {
     const childDir = path.join(generatorsDir, c);
     if (existsSync(path.join(childDir, 'schema.json'))) {
-      generators[c] = {
+      const generatorOrSchematic = {
         factory: `./${c}`,
         schema: `./${normalizePath(path.join(c, 'schema.json'))}`,
         description: `Schematic ${c}`,
       };
+
+      const { isSchematic } = readJsonFile(path.join(childDir, 'schema.json'));
+      if (isSchematic) {
+        schematics[c] = generatorOrSchematic;
+      } else {
+        generators[c] = generatorOrSchematic;
+      }
     }
   });
   return {
     name: 'workspace-generators',
     version: '1.0',
     generators,
-    schematics: generators,
+    schematics,
   };
 }