Merge branch 'master' into next-component-testing-compiler

nrwl · Nov 3, 2023 · 643fa2a · 643fa2a
2 parents f1f56dc + 9c0e6a1
commit 643fa2a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/packages/js/src/utils/add-local-registry-scripts.spec.ts b/packages/js/src/utils/add-local-registry-scripts.spec.ts
@@ -0,0 +1,33 @@
+import { addLocalRegistryScripts } from './add-local-registry-scripts';
+import { Tree, writeJson } from '@nx/devkit';
+import { createTree } from '@nx/devkit/testing';
+
+describe('addLocalRegistryScripts', () => {
+  let tree: Tree;
+  const startLocalRegistryPath = 'tools/scripts/start-local-registry.ts';
+  const stopLocalRegistryPath = 'tools/scripts/stop-local-registry.ts';
+
+  beforeEach(() => {
+    tree = createTree();
+    writeJson(tree, 'project.json', {
+      name: 'mylib',
+    });
+  });
+
+  it('should add "start-local-registry.ts" and "stop-local-registry.ts" in workspace\'s "tools/scripts" folder', () => {
+    expect(addLocalRegistryScripts(tree)).toEqual({
+      startLocalRegistryPath,
+      stopLocalRegistryPath,
+    });
+
+    expect(tree.exists(startLocalRegistryPath)).toBe(true);
+    expect(tree.exists(stopLocalRegistryPath)).toBe(true);
+  });
+
+  it('should set published version to "0.0.0-e2e"', () => {
+    addLocalRegistryScripts(tree);
+
+    const startLocalRegistry = tree.read(startLocalRegistryPath, 'utf-8');
+    expect(/'0\.0\.0-e2e'/.test(startLocalRegistry)).toBe(true);
+  });
+});
diff --git a/packages/js/src/utils/add-local-registry-scripts.ts b/packages/js/src/utils/add-local-registry-scripts.ts
@@ -22,7 +22,7 @@ export default async () => {
   const nx = require.resolve('nx');
   execFileSync(
     nx,
-    ['run-many', '--targets', 'publish', '--ver', '1.0.0', '--tag', 'e2e'],
+    ['run-many', '--targets', 'publish', '--ver', '0.0.0-e2e', '--tag', 'e2e'],
     { env: process.env, stdio: 'inherit' }
   );
 };

diff --git a/packages/nx/src/project-graph/utils/retrieve-workspace-files.ts b/packages/nx/src/project-graph/utils/retrieve-workspace-files.ts
@@ -258,7 +258,9 @@ function buildAllWorkspaceFiles(
 ): FileData[] {
   performance.mark('get-all-workspace-files:start');
   let fileData: FileData[] = Object.values(projectFileMap).flat();
-  fileData = fileData.concat(globalFiles).sort();
+  fileData = fileData
+    .concat(globalFiles)
+    .sort((a, b) => a.file.localeCompare(b.file));
   performance.mark('get-all-workspace-files:end');
   performance.measure(
     'get-all-workspace-files',