Merge remote-tracking branch 'origin/main' into feature/v4.2

jpmorganchase · Mar 3, 2023 · 8439691 · 8439691
2 parents 17bad58 + 348da35
commit 8439691
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/packages/modular-scripts/src/__tests__/utils/__snapshots__/getWorkspaceInfo.test.ts.snap b/packages/modular-scripts/src/__tests__/utils/__snapshots__/getWorkspaceInfo.test.ts.snap
@@ -7,15 +7,13 @@ exports[`getWorkspaceInfo 1`] = `
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "unknown",
-    "version": "1.2.0",
     "workspaceDependencies": [],
   },
   "@modular-scripts/remote-view": {
     "location": "packages/remote-view",
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "package",
-    "version": "0.1.2",
     "workspaceDependencies": [
       "@modular-scripts/modular-types",
     ],
@@ -25,7 +23,6 @@ exports[`getWorkspaceInfo 1`] = `
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "unknown",
-    "version": "1.2.0",
     "workspaceDependencies": [
       "@modular-scripts/modular-types",
     ],
@@ -35,23 +32,20 @@ exports[`getWorkspaceInfo 1`] = `
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "unknown",
-    "version": "4.0.0",
     "workspaceDependencies": [],
   },
   "eslint-config-modular-app": {
     "location": "packages/eslint-config-modular-app",
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "unknown",
-    "version": "4.0.0",
     "workspaceDependencies": [],
   },
   "modular-scripts": {
     "location": "packages/modular-scripts",
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "unknown",
-    "version": "4.1.0",
     "workspaceDependencies": [
       "@modular-scripts/modular-types",
       "@modular-scripts/workspace-resolver",
@@ -62,63 +56,55 @@ exports[`getWorkspaceInfo 1`] = `
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "template",
-    "version": "1.2.0",
     "workspaceDependencies": [],
   },
   "modular-template-esm-view": {
     "location": "packages/modular-template-esm-view",
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "template",
-    "version": "1.1.0",
     "workspaceDependencies": [],
   },
   "modular-template-node-env-app": {
     "location": "packages/modular-template-node-env-app",
     "mismatchedWorkspaceDependencies": [],
     "public": false,
     "type": "template",
-    "version": "0.2.1",
     "workspaceDependencies": [],
   },
   "modular-template-package": {
     "location": "packages/modular-template-package",
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "template",
-    "version": "1.2.0",
     "workspaceDependencies": [],
   },
   "modular-template-source": {
     "location": "packages/modular-template-source",
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "template",
-    "version": "1.1.0",
     "workspaceDependencies": [],
   },
   "modular-template-view": {
     "location": "packages/modular-template-view",
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "template",
-    "version": "1.2.0",
     "workspaceDependencies": [],
   },
   "modular-views.macro": {
     "location": "packages/modular-views.macro",
     "mismatchedWorkspaceDependencies": [],
     "public": true,
     "type": "unknown",
-    "version": "3.1.1",
     "workspaceDependencies": [],
   },
   "remote-view-demos": {
     "location": "packages/remote-view-demos",
     "mismatchedWorkspaceDependencies": [],
     "public": false,
     "type": "esm-view",
-    "version": "0.0.0",
     "workspaceDependencies": [
       "@modular-scripts/remote-view",
     ],
@@ -128,7 +114,6 @@ exports[`getWorkspaceInfo 1`] = `
     "mismatchedWorkspaceDependencies": [],
     "public": false,
     "type": "unknown",
-    "version": "2.0.1",
     "workspaceDependencies": [],
   },
 }

diff --git a/packages/modular-scripts/src/__tests__/utils/getWorkspaceInfo.test.ts b/packages/modular-scripts/src/__tests__/utils/getWorkspaceInfo.test.ts
@@ -1,9 +1,18 @@
 import { getWorkspaceInfo } from '../../utils/getWorkspaceInfo';
 
+import type { WorkspaceInfo } from '../../utils/getWorkspaceInfo';
+
 test('getWorkspaceInfo', async () => {
+  const collected: WorkspaceInfo = {};
   const workspace = await getWorkspaceInfo();
-  Object.entries(workspace).forEach(([_, workspaceRecord]) => {
-    expect(typeof workspaceRecord.version).toBe('string');
+
+  // Check that a version string exists but, exclude the version
+  // from the snapshot comparison, to avoid intefering when version bumping happens
+  Object.entries(workspace).forEach(([key, workspaceRecord]) => {
+    const { version, ...record } = workspaceRecord;
+    expect(typeof version).toBe('string');
+    collected[key] = { ...record };
   });
-  expect(workspace).toMatchSnapshot();
+
+  expect(collected).toMatchSnapshot();
 });