fix(core): allow npmScope to be single @

nrwl · Apr 3, 2023 · 30ab78e · 30ab78e
1 parent 9b60863
commit 30ab78e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/packages/nx/src/utils/path.spec.ts b/packages/nx/src/utils/path.spec.ts
@@ -1,4 +1,4 @@
-import { normalizePath, joinPathFragments } from './path';
+import { getImportPath, joinPathFragments, normalizePath } from './path';
 
 describe('normalizePath', () => {
   it('should remove drive letters', () => {
@@ -21,3 +21,17 @@ describe('joinPathFragments', () => {
     );
   });
 });
+
+describe('getImportPath', () => {
+  it('should use the npmScope if it is set to anything other than @', () => {
+    expect(getImportPath('myorg', 'my-package')).toEqual('@myorg/my-package');
+  });
+
+  it('should allow for a single @ to be used as the npmScope', () => {
+    expect(getImportPath('@', 'my-package')).toEqual('@/my-package');
+  });
+
+  it('should just use the package name if npmScope is empty', () => {
+    expect(getImportPath('', 'my-package')).toEqual('my-package');
+  });
+});
diff --git a/packages/nx/src/utils/path.ts b/packages/nx/src/utils/path.ts
@@ -36,5 +36,7 @@ export function getImportPath(
   npmScope: string,
   projectDirectory: string
 ): string {
-  return npmScope ? `@${npmScope}/${projectDirectory}` : projectDirectory;
+  return npmScope
+    ? `${npmScope === '@' ? '' : '@'}${npmScope}/${projectDirectory}`
+    : projectDirectory;
 }