fix(nx-plugin): cleanup some paths that are strange when root project (…

…#16548)
nrwl · Apr 25, 2023 · b409095 · b409095
1 parent 3fca88c
commit b409095
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 3 deletions.
diff --git a/packages/plugin/src/generators/plugin/plugin.spec.ts b/packages/plugin/src/generators/plugin/plugin.spec.ts
@@ -107,6 +107,77 @@ describe('NxPlugin Plugin Generator', () => {
     expect(projectE2e.root).toEqual('apps/plugins/my-plugin-e2e');
   });
 
+  describe('asset paths', () => {
+    it('should generate normalized asset paths for plugin in monorepo', async () => {
+      await pluginGenerator(
+        tree,
+        getSchema({
+          name: 'myPlugin',
+        })
+      );
+      const project = readProjectConfiguration(tree, 'my-plugin');
+      const assets = project.targets.build.options.assets;
+      expect(assets).toEqual([
+        'libs/my-plugin/*.md',
+        {
+          input: './libs/my-plugin/src',
+          glob: '**/!(*.ts)',
+          output: './src',
+        },
+        {
+          input: './libs/my-plugin/src',
+          glob: '**/*.d.ts',
+          output: './src',
+        },
+        {
+          input: './libs/my-plugin',
+          glob: 'generators.json',
+          output: '.',
+        },
+        {
+          input: './libs/my-plugin',
+          glob: 'executors.json',
+          output: '.',
+        },
+      ]);
+    });
+
+    it('should generate normalized asset paths for plugin in standalone workspace', async () => {
+      await pluginGenerator(
+        tree,
+        getSchema({
+          name: 'myPlugin',
+          rootProject: true,
+        })
+      );
+      const project = readProjectConfiguration(tree, 'my-plugin');
+      const assets = project.targets.build.options.assets;
+      expect(assets).toEqual([
+        '*.md',
+        {
+          input: './src',
+          glob: '**/!(*.ts)',
+          output: './src',
+        },
+        {
+          input: './src',
+          glob: '**/*.d.ts',
+          output: './src',
+        },
+        {
+          input: '.',
+          glob: 'generators.json',
+          output: '.',
+        },
+        {
+          input: '.',
+          glob: 'executors.json',
+          output: '.',
+        },
+      ]);
+    });
+  });
+
   describe('--unitTestRunner', () => {
     describe('none', () => {
       it('should not generate test files', async () => {

diff --git a/packages/plugin/src/generators/plugin/plugin.ts b/packages/plugin/src/generators/plugin/plugin.ts
@@ -44,8 +44,7 @@ function updatePluginConfig(host: Tree, options: NormalizedSchema) {
   if (project.targets.build) {
     project.targets.build.options.assets ??= [];
 
-    const root =
-      options.projectRoot === '.' ? './' : './' + options.projectRoot;
+    const root = options.projectRoot === '.' ? '.' : './' + options.projectRoot;
     project.targets.build.options.assets = [
       ...project.targets.build.options.assets,
       {

diff --git a/packages/plugin/src/generators/plugin/utils/normalize-schema.ts b/packages/plugin/src/generators/plugin/utils/normalize-schema.ts
@@ -40,7 +40,9 @@ export function normalizeOptions(
     ? name
     : fullProjectDirectory.replace(new RegExp('/', 'g'), '-');
   const fileName = projectName;
-  const projectRoot = joinPathFragments(libsDir, fullProjectDirectory);
+  const projectRoot = options.rootProject
+    ? fullProjectDirectory
+    : joinPathFragments(libsDir, fullProjectDirectory);
 
   const parsedTags = options.tags
     ? options.tags.split(',').map((s) => s.trim())