fix tests

parcel-bundler · Jan 13, 2024 · 3f65bd8 · 3f65bd8
1 parent ec304b3
commit 3f65bd8
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 8 deletions.
diff --git a/packages/core/integration-tests/test/macros.js b/packages/core/integration-tests/test/macros.js
@@ -355,10 +355,10 @@ describe('macros', function () {
     } catch (err) {
       assert.deepEqual(err.diagnostics, [
         {
-          message: `Error evaluating macro: Could not resolve module \"./macro.js\" from \"${path.join(
+          message: `Error evaluating macro: Could not resolve module "./macro.js" from "${path.join(
             dir,
             'index.js',
-          )}\"`,
+          )}"`,
           origin: '@parcel/transformer-js',
           codeFrames: [
             {
@@ -410,6 +410,9 @@ describe('macros', function () {
       index.js:
         import { test } from "./macro.ts" with { type: "macro" };
         output = test(1, 2);
+
+      macro.ts:
+        export function test(a: number, b: number) {
           return a + b;
         }
     `;
@@ -429,9 +432,6 @@ describe('macros', function () {
         import { test } from "./macro" with { type: "macro" };
         output = test(1, 2);
 
-      macro.ts:
-        export function test(a: number, b: number) {
-
       macro.ts:
         export function test(a: number, b: number) {
           return a + b;

diff --git a/packages/core/package-manager/test/NodePackageManager.test.js b/packages/core/package-manager/test/NodePackageManager.test.js
@@ -12,6 +12,32 @@ import {MockPackageInstaller, NodePackageManager} from '../src';
 
 const FIXTURES_DIR = path.join(__dirname, 'fixtures');
 
+function normalize(res) {
+  return {
+    ...res,
+    invalidateOnFileCreate:
+      res?.invalidateOnFileCreate?.sort((a, b) => {
+        let ax =
+          a.filePath ??
+          a.glob ??
+          (a.aboveFilePath != null && a.fileName != null
+            ? a.aboveFilePath + a.fileName
+            : '');
+        let bx =
+          b.filePath ??
+          b.glob ??
+          (b.aboveFilePath != null && b.fileName != null
+            ? b.aboveFilePath + b.fileName
+            : '');
+        return ax < bx ? -1 : 1;
+      }) ?? [],
+  };
+}
+
+function check(resolved, expected) {
+  assert.deepEqual(normalize(resolved), normalize(expected));
+}
+
 describe('NodePackageManager', function () {
   let fs;
   let packageManager;
@@ -36,7 +62,7 @@ describe('NodePackageManager', function () {
   });
 
   it('resolves packages that exist', async () => {
-    assert.deepEqual(
+    check(
       await packageManager.resolve(
         'foo',
         path.join(FIXTURES_DIR, 'has-foo/index.js'),
@@ -51,10 +77,26 @@ describe('NodePackageManager', function () {
           path.join(FIXTURES_DIR, 'has-foo/node_modules/foo/package.json'),
         ]),
         invalidateOnFileCreate: [
+          {
+            filePath: path.join(
+              FIXTURES_DIR,
+              'has-foo/node_modules/foo/index.ts',
+            ),
+          },
+          {
+            filePath: path.join(
+              FIXTURES_DIR,
+              'has-foo/node_modules/foo/index.tsx',
+            ),
+          },
           {
             fileName: 'node_modules/foo',
             aboveFilePath: path.join(FIXTURES_DIR, 'has-foo'),
           },
+          {
+            fileName: 'tsconfig.json',
+            aboveFilePath: path.join(FIXTURES_DIR, 'has-foo'),
+          },
         ],
       },
     );
@@ -73,7 +115,7 @@ describe('NodePackageManager', function () {
   it("autoinstalls packages that don't exist", async () => {
     packageInstaller.register('a', fs, path.join(FIXTURES_DIR, 'packages/a'));
 
-    assert.deepEqual(
+    check(
       await packageManager.resolve(
         'a',
         path.join(FIXTURES_DIR, 'has-foo/index.js'),
@@ -89,10 +131,26 @@ describe('NodePackageManager', function () {
           path.join(FIXTURES_DIR, 'has-foo/node_modules/a/package.json'),
         ]),
         invalidateOnFileCreate: [
+          {
+            filePath: path.join(
+              FIXTURES_DIR,
+              'has-foo/node_modules/a/index.ts',
+            ),
+          },
+          {
+            filePath: path.join(
+              FIXTURES_DIR,
+              'has-foo/node_modules/a/index.tsx',
+            ),
+          },
           {
             fileName: 'node_modules/a',
             aboveFilePath: path.join(FIXTURES_DIR, 'has-foo'),
           },
+          {
+            fileName: 'tsconfig.json',
+            aboveFilePath: path.join(FIXTURES_DIR, 'has-foo'),
+          },
         ],
       },
     );
@@ -219,7 +277,7 @@ describe('NodePackageManager', function () {
       );
 
       let spy = sinon.spy(packageInstaller, 'install');
-      assert.deepEqual(
+      check(
         await packageManager.resolve(
           'foo',
           path.join(FIXTURES_DIR, 'has-foo/subpackage/index.js'),
@@ -245,10 +303,26 @@ describe('NodePackageManager', function () {
             ),
           ]),
           invalidateOnFileCreate: [
+            {
+              filePath: path.join(
+                FIXTURES_DIR,
+                'has-foo/subpackage/node_modules/foo/index.ts',
+              ),
+            },
+            {
+              filePath: path.join(
+                FIXTURES_DIR,
+                'has-foo/subpackage/node_modules/foo/index.tsx',
+              ),
+            },
             {
               fileName: 'node_modules/foo',
               aboveFilePath: path.join(FIXTURES_DIR, 'has-foo/subpackage'),
             },
+            {
+              fileName: 'tsconfig.json',
+              aboveFilePath: path.join(FIXTURES_DIR, 'has-foo/subpackage'),
+            },
           ],
         },
       );