chore(deps): bump chalk from ^1.1.3 to ^4.0.0 (#310)

americanexpress · Sep 14, 2022 · 916e76f · 916e76f
1 parent 52785d7
commit 916e76f
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 65 deletions.
diff --git a/__tests__/index.spec.js b/__tests__/index.spec.js
@@ -22,7 +22,11 @@ describe('toMatchImageSnapshot', () => {
       runDiffImageToSnapshot: jest.fn(() => diffImageToSnapshotResult),
     }));
 
-    jest.mock('supports-color', () => mockSupportsColor);
+    jest.mock('supports-color', () => ({
+      // 1 means basic ANSI 16-color support, 0 means no support
+      stdout: { level: mockSupportsColor ? 1 : 0 },
+      stderr: { level: mockSupportsColor ? 1 : 0 },
+    }));
 
     const mockFs = Object.assign({}, fs, {
       existsSync: jest.fn(),
@@ -36,12 +40,6 @@ describe('toMatchImageSnapshot', () => {
     };
   }
 
-  const ChalkMock = () => ({
-    bold: {
-      red: input => input,
-    },
-  });
-
   beforeEach(() => {
     // In tests, skip reporting (skip snapshotState update to not mess with our test report)
     global.UNSTABLE_SKIP_REPORTING = true;
@@ -432,10 +430,8 @@ describe('toMatchImageSnapshot', () => {
       runDiffImageToSnapshot,
     }));
 
-    const Chalk = jest.fn();
-    jest.doMock('chalk', () => ({
-      constructor: Chalk,
-    }));
+    const Chalk = require('chalk').Instance;
+    jest.mock('chalk');
     const { toMatchImageSnapshot } = require('../src/index');
     const matcherAtTest = toMatchImageSnapshot.bind(mockTestContext);
 
@@ -478,10 +474,8 @@ describe('toMatchImageSnapshot', () => {
       runDiffImageToSnapshot,
     }));
 
-    const Chalk = jest.fn();
-    jest.doMock('chalk', () => ({
-      constructor: Chalk,
-    }));
+    const Chalk = require('chalk').Instance;
+    jest.mock('chalk');
     const { configureToMatchImageSnapshot } = require('../src/index');
     const customDiffConfig = { perceptual: true };
     const customSnapshotIdentifier = ({ defaultIdentifier }) =>
@@ -526,7 +520,7 @@ describe('toMatchImageSnapshot', () => {
       comparisonMethod,
     });
     expect(Chalk).toHaveBeenCalledWith({
-      enabled: false,
+      level: 0, // noColors
     });
   });
 
@@ -549,10 +543,8 @@ describe('toMatchImageSnapshot', () => {
       diffImageToSnapshot,
     }));
 
-    const Chalk = jest.fn();
-    jest.doMock('chalk', () => ({
-      constructor: Chalk,
-    }));
+    const Chalk = require('chalk').Instance;
+    jest.mock('chalk');
     const { configureToMatchImageSnapshot } = require('../src/index');
     const customConfig = { perceptual: true };
     const toMatchImageSnapshot = configureToMatchImageSnapshot({
@@ -588,7 +580,7 @@ describe('toMatchImageSnapshot', () => {
       comparisonMethod: 'pixelmatch',
     });
     expect(Chalk).toHaveBeenCalledWith({
-      enabled: false,
+      level: 0, // noColors
     });
   });
 
@@ -698,10 +690,6 @@ describe('toMatchImageSnapshot', () => {
       const { toMatchImageSnapshot } = require('../src/index');
       expect.extend({ toMatchImageSnapshot });
 
-      jest.doMock('chalk', () => ({
-        constructor: ChalkMock,
-      }));
-
       expect(() => expect('pretendthisisanimagebuffer').toMatchImageSnapshot({ dumpDiffToConsole: true }))
         .toThrowErrorMatchingSnapshot();
     });
@@ -719,10 +707,6 @@ describe('toMatchImageSnapshot', () => {
       const { toMatchImageSnapshot } = require('../src/index');
       expect.extend({ toMatchImageSnapshot });
 
-      jest.doMock('chalk', () => ({
-        constructor: ChalkMock,
-      }));
-
       expect(() => expect('pretendthisisanimagebuffer').toMatchImageSnapshot())
         .toThrowErrorMatchingSnapshot();
     });
@@ -745,10 +729,6 @@ describe('toMatchImageSnapshot', () => {
       const { toMatchImageSnapshot } = require('../src/index');
       expect.extend({ toMatchImageSnapshot });
 
-      jest.doMock('chalk', () => ({
-        constructor: ChalkMock,
-      }));
-
       process.env.TERM_PROGRAM = 'xterm';
 
       expect(() => expect('pretendthisisanimagebuffer').toMatchImageSnapshot({ dumpInlineDiffToConsole: true }))
@@ -771,10 +751,6 @@ describe('toMatchImageSnapshot', () => {
       const { toMatchImageSnapshot } = require('../src/index');
       expect.extend({ toMatchImageSnapshot });
 
-      jest.doMock('chalk', () => ({
-        constructor: ChalkMock,
-      }));
-
       process.env.TERM_PROGRAM = 'iTerm.app';
 
       expect(() => expect('pretendthisisanimagebuffer').toMatchImageSnapshot({ dumpInlineDiffToConsole: true }))
@@ -797,10 +773,6 @@ describe('toMatchImageSnapshot', () => {
       const { toMatchImageSnapshot } = require('../src/index');
       expect.extend({ toMatchImageSnapshot });
 
-      jest.doMock('chalk', () => ({
-        constructor: ChalkMock,
-      }));
-
       process.env.ENABLE_INLINE_DIFF = true;
 
       expect(() => expect('pretendthisisanimagebuffer').toMatchImageSnapshot({ dumpInlineDiffToConsole: true }))

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "semantic-release": "^17.0.4"
   },
   "dependencies": {
-    "chalk": "^1.1.3",
+    "chalk": "^4.0.0",
     "get-stdin": "^5.0.1",
     "glur": "^1.1.2",
     "lodash": "^4.17.4",

diff --git a/src/index.js b/src/index.js
@@ -15,7 +15,7 @@
 const kebabCase = require('lodash/kebabCase');
 const merge = require('lodash/merge');
 const path = require('path');
-const Chalk = require('chalk').constructor;
+const Chalk = require('chalk').Instance;
 const { diffImageToSnapshot, runDiffImageToSnapshot } = require('./diff-snapshot');
 const fs = require('fs');
 const OutdatedSnapshotReporter = require('./outdated-snapshot-reporter');
@@ -174,7 +174,8 @@ function configureToMatchImageSnapshot({
     } = this;
     const chalkOptions = {};
     if (typeof noColors !== 'undefined') {
-      chalkOptions.enabled = !noColors;
+      // 1 means basic ANSI 16-color support, 0 means no support
+      chalkOptions.level = noColors ? 0 : 1;
     }
     const chalk = new Chalk(chalkOptions);