Merge remote-tracking branch 'upstream/master' into nest-simple-name

nrwl · Mar 31, 2023 · 8f5077d · 8f5077d
2 parents d49e671 + 6e7234c
commit 8f5077d
Show file tree

Hide file tree

Showing 46 changed files with 793 additions and 698 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -8,7 +8,8 @@
   "plugins": ["@typescript-eslint", "@nrwl/nx"],
   "extends": [],
   "rules": {
-    "@typescript-eslint/explicit-module-boundary-types": "off"
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "no-restricted-imports": ["error", "create-nx-workspace"]
   },
   "overrides": [
     {

diff --git a/docs/generated/manifests/menus.json b/docs/generated/manifests/menus.json
@@ -5512,6 +5512,14 @@
                 "children": [],
                 "isExternal": false,
                 "disableCollapsible": false
+              },
+              {
+                "id": "preset",
+                "path": "/packages/nx-plugin/generators/preset",
+                "name": "preset",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
               }
             ],
             "isExternal": false,

diff --git a/docs/generated/manifests/packages.json b/docs/generated/manifests/packages.json
@@ -1964,6 +1964,15 @@
         "originalFilePath": "/packages/nx-plugin/src/generators/lint-checks/schema.json",
         "path": "/packages/nx-plugin/generators/plugin-lint-checks",
         "type": "generator"
+      },
+      "/packages/nx-plugin/generators/preset": {
+        "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-workspace --preset @nrwl/nx-plugin`.",
+        "file": "generated/packages/nx-plugin/generators/preset.json",
+        "hidden": true,
+        "name": "preset",
+        "originalFilePath": "/packages/nx-plugin/src/generators/preset/schema.json",
+        "path": "/packages/nx-plugin/generators/preset",
+        "type": "generator"
       }
     },
     "path": "/packages/nx-plugin"

diff --git a/docs/generated/packages-metadata.json b/docs/generated/packages-metadata.json
@@ -1939,6 +1939,15 @@
         "originalFilePath": "/packages/nx-plugin/src/generators/lint-checks/schema.json",
         "path": "nx-plugin/generators/plugin-lint-checks",
         "type": "generator"
+      },
+      {
+        "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-workspace --preset @nrwl/nx-plugin`.",
+        "file": "generated/packages/nx-plugin/generators/preset.json",
+        "hidden": true,
+        "name": "preset",
+        "originalFilePath": "/packages/nx-plugin/src/generators/preset/schema.json",
+        "path": "nx-plugin/generators/preset",
+        "type": "generator"
       }
     ],
     "githubRoot": "https://github.com/nrwl/nx/blob/master",

diff --git a/docs/generated/packages/nx-plugin/generators/preset.json b/docs/generated/packages/nx-plugin/generators/preset.json
@@ -0,0 +1,28 @@
+{
+  "name": "preset",
+  "factory": "./src/generators/preset/generator",
+  "schema": {
+    "$schema": "http://json-schema.org/schema",
+    "cli": "nx",
+    "$id": "NxPluginPreset",
+    "title": "Generator ran by create-nx-plugin",
+    "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-plugin` or `create-nx-workspace --preset @nrwl/nx-plugin`.",
+    "type": "object",
+    "properties": {
+      "pluginName": {
+        "type": "string",
+        "description": "Plugin name",
+        "aliases": ["name"]
+      }
+    },
+    "required": ["pluginName"],
+    "presets": []
+  },
+  "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-workspace --preset @nrwl/nx-plugin`.",
+  "hidden": true,
+  "x-use-standalone-layout": true,
+  "implementation": "/packages/nx-plugin/src/generators/preset/generator.ts",
+  "aliases": [],
+  "path": "/packages/nx-plugin/src/generators/preset/schema.json",
+  "type": "generator"
+}
diff --git a/e2e/utils/create-project-utils.ts b/e2e/utils/create-project-utils.ts
@@ -235,7 +235,7 @@ export function runCreatePlugin(
   } create-nx-plugin@${getPublishedVersion()} ${name}`;
 
   if (pluginName) {
-    command += ` --pluginName=${pluginName}`;
+    command += ` --pluginName=${pluginName} --no-nxCloud`;
   }
 
   if (packageManager && !useDetectedPm) {

diff --git a/e2e/workspace-create/src/create-nx-plugin.test.ts b/e2e/workspace-create/src/create-nx-plugin.test.ts
@@ -6,15 +6,15 @@ import {
   uniq,
   runCreatePlugin,
   cleanupProject,
+  tmpProjPath,
 } from '@nrwl/e2e/utils';
 
 describe('create-nx-plugin', () => {
   const packageManager = getSelectedPackageManager() || 'pnpm';
 
   afterEach(() => cleanupProject());
 
-  // TODO: Re-enable to work with pnpm
-  xit('should be able to create a plugin repo and run plugin e2e', () => {
+  it('should be able to create a plugin repo and run plugin e2e', () => {
     const wsName = uniq('ws-plugin');
     const pluginName = uniq('plugin');
 
@@ -26,10 +26,11 @@ describe('create-nx-plugin', () => {
     checkFilesExist(
       'package.json',
       packageManagerLockFile[packageManager],
-      `packages/${pluginName}/package.json`,
-      `packages/${pluginName}/project.json`
+      `project.json`,
+      `generators.json`,
+      `executors.json`
     );
 
-    expect(() => runCLI(`e2e ${pluginName}-e2e`)).not.toThrow();
+    expect(() => runCLI(`e2e e2e`)).not.toThrow();
   });
 });
diff --git a/packages/create-nx-plugin/.eslintrc.json b/packages/create-nx-plugin/.eslintrc.json
@@ -1,6 +1,16 @@
 {
   "extends": "../../.eslintrc",
-  "rules": {},
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      "@nrwl/workspace",
+      "@angular-devkit/core",
+      "@angular-devkit/architect",
+      "@angular-devkit/schematics",
+      "nx",
+      "@nrwl/devkit"
+    ]
+  },
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {