From 10bfa61c2f7eff2bab5a03b786705181f46c03c3 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Fri, 21 Jul 2023 22:15:52 +1200 Subject: [PATCH] chore: upgrade to `dedent` v1 (#14333) --- e2e/Utils.ts | 2 +- e2e/runJest.ts | 2 +- package.json | 3 +- packages/jest-circus/package.json | 3 +- packages/jest-circus/src/utils.ts | 2 +- packages/jest-transform/package.json | 2 +- .../src/__tests__/ScriptTransformer.test.ts | 6 +-- yarn.lock | 37 ++++++++++++------- 8 files changed, 33 insertions(+), 24 deletions(-) diff --git a/e2e/Utils.ts b/e2e/Utils.ts index b15fd4e0eeea..3f0eaf20f4b1 100644 --- a/e2e/Utils.ts +++ b/e2e/Utils.ts @@ -7,7 +7,7 @@ import * as path from 'path'; import * as util from 'util'; -import dedent = require('dedent'); +import dedent from 'dedent'; import { ExecaSyncError, SyncOptions as ExecaSyncOptions, diff --git a/e2e/runJest.ts b/e2e/runJest.ts index 996d6f98de6d..8de50ea7f2ea 100644 --- a/e2e/runJest.ts +++ b/e2e/runJest.ts @@ -8,7 +8,7 @@ import * as path from 'path'; import {Writable} from 'stream'; -import dedent = require('dedent'); +import dedent from 'dedent'; import execa = require('execa'); import * as fs from 'graceful-fs'; import stripAnsi = require('strip-ansi'); diff --git a/package.json b/package.json index 66b5f9a7fe5b..5634746093aa 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "@types/babel__core": "^7.1.14", "@types/babel__generator": "^7.0.0", "@types/babel__template": "^7.0.2", - "@types/dedent": "^0.7.0", "@types/node": "~14.14.45", "@types/which": "^3.0.0", "@typescript-eslint/eslint-plugin": "^5.14.0", @@ -30,7 +29,7 @@ "camelcase": "^6.2.0", "chalk": "^4.0.0", "chokidar": "^3.3.0", - "dedent": "^0.7.0", + "dedent": "^1.0.0", "eslint": "^8.8.0", "eslint-config-prettier": "^8.1.0", "eslint-import-resolver-typescript": "^3.2.5", diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json index 7b6114d0b8f5..dfc98839044c 100644 --- a/packages/jest-circus/package.json +++ b/packages/jest-circus/package.json @@ -25,7 +25,7 @@ "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", - "dedent": "^0.7.0", + "dedent": "^1.0.0", "is-generator-fn": "^2.0.0", "jest-each": "workspace:^", "jest-matcher-utils": "workspace:^", @@ -43,7 +43,6 @@ "@babel/core": "^7.11.6", "@babel/register": "^7.0.0", "@types/co": "^4.6.2", - "@types/dedent": "^0.7.0", "@types/graceful-fs": "^4.1.3", "@types/stack-utils": "^2.0.0", "execa": "^5.0.0", diff --git a/packages/jest-circus/src/utils.ts b/packages/jest-circus/src/utils.ts index ff8f3bd55022..9e1c8d74838b 100644 --- a/packages/jest-circus/src/utils.ts +++ b/packages/jest-circus/src/utils.ts @@ -7,7 +7,7 @@ import * as path from 'path'; import co from 'co'; -import dedent = require('dedent'); +import dedent from 'dedent'; import isGeneratorFn from 'is-generator-fn'; import slash = require('slash'); import StackUtils = require('stack-utils'); diff --git a/packages/jest-transform/package.json b/packages/jest-transform/package.json index 4edf00264894..6274f920af72 100644 --- a/packages/jest-transform/package.json +++ b/packages/jest-transform/package.json @@ -40,7 +40,7 @@ "@types/graceful-fs": "^4.1.3", "@types/micromatch": "^4.0.1", "@types/write-file-atomic": "^4.0.0", - "dedent": "^0.7.0" + "dedent": "^1.0.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" diff --git a/packages/jest-transform/src/__tests__/ScriptTransformer.test.ts b/packages/jest-transform/src/__tests__/ScriptTransformer.test.ts index 1bb749267639..47fcb9f5aa8f 100644 --- a/packages/jest-transform/src/__tests__/ScriptTransformer.test.ts +++ b/packages/jest-transform/src/__tests__/ScriptTransformer.test.ts @@ -81,7 +81,7 @@ jest.mock( const transformer: Transformer = { getCacheKey: jest.fn(() => 'ab'), process: (content, filename, config) => ({ - code: (require('dedent') as typeof import('dedent'))` + code: (require('dedent') as typeof import('dedent').default)` const TRANSFORMED = { filename: '${escapeStrings(filename)}', script: '${escapeStrings(content)}', @@ -105,7 +105,7 @@ jest.mock( getCacheKeyAsync: jest.fn(() => Promise.resolve('ab')), processAsync: (content, filename, config) => Promise.resolve({ - code: (require('dedent') as typeof import('dedent'))` + code: (require('dedent') as typeof import('dedent').default)` const TRANSFORMED = { filename: '${escapeStrings(filename)}', script: '${escapeStrings(content)}', @@ -178,7 +178,7 @@ jest.mock( const transformer: Transformer = { getCacheKey: jest.fn(() => 'cd'), process: (content, filename) => ({ - code: (require('dedent') as typeof import('dedent'))` + code: (require('dedent') as typeof import('dedent').default)` module.exports = { filename: ${filename}, rawFirstLine: ${content.split('\n')[0]}, diff --git a/yarn.lock b/yarn.lock index 7c211185ba41..7ef254fdce58 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2851,7 +2851,6 @@ __metadata: "@types/babel__core": ^7.1.14 "@types/babel__generator": ^7.0.0 "@types/babel__template": ^7.0.2 - "@types/dedent": ^0.7.0 "@types/node": ~14.14.45 "@types/which": ^3.0.0 "@typescript-eslint/eslint-plugin": ^5.14.0 @@ -2862,7 +2861,7 @@ __metadata: camelcase: ^6.2.0 chalk: ^4.0.0 chokidar: ^3.3.0 - dedent: ^0.7.0 + dedent: ^1.0.0 eslint: ^8.8.0 eslint-config-prettier: ^8.1.0 eslint-import-resolver-typescript: ^3.2.5 @@ -3054,7 +3053,7 @@ __metadata: babel-plugin-istanbul: ^6.1.1 chalk: ^4.0.0 convert-source-map: ^2.0.0 - dedent: ^0.7.0 + dedent: ^1.0.0 fast-json-stable-stringify: ^2.1.0 graceful-fs: ^4.2.9 jest-haste-map: "workspace:^" @@ -4616,13 +4615,6 @@ __metadata: languageName: node linkType: hard -"@types/dedent@npm:^0.7.0": - version: 0.7.0 - resolution: "@types/dedent@npm:0.7.0" - checksum: b9b7f0c42d99da764be75dd00b2f2be162f5a0ca43aafe0c740efa76b5f37f8a4f4e2ccc84883054e06e05c1169733aa8ee7750da0334c9cba26d9e10ae844f1 - languageName: node - linkType: hard - "@types/eslint-scope@npm:^3.7.3": version: 3.7.4 resolution: "@types/eslint-scope@npm:3.7.4" @@ -6306,6 +6298,17 @@ __metadata: languageName: unknown linkType: soft +"babel-plugin-macros@npm:^3.1.0": + version: 3.1.0 + resolution: "babel-plugin-macros@npm:3.1.0" + dependencies: + "@babel/runtime": ^7.12.5 + cosmiconfig: ^7.0.0 + resolve: ^1.19.0 + checksum: 765de4abebd3e4688ebdfbff8571ddc8cd8061f839bb6c3e550b0344a4027b04c60491f843296ce3f3379fb356cc873d57a9ee6694262547eb822c14a25be9a6 + languageName: node + linkType: hard + "babel-plugin-polyfill-corejs2@npm:^0.3.3": version: 0.3.3 resolution: "babel-plugin-polyfill-corejs2@npm:0.3.3" @@ -7864,7 +7867,7 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^7.0.1": +"cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1": version: 7.1.0 resolution: "cosmiconfig@npm:7.1.0" dependencies: @@ -8299,6 +8302,15 @@ __metadata: languageName: node linkType: hard +"dedent@npm:^1.0.0": + version: 1.0.2 + resolution: "dedent@npm:1.0.2" + dependencies: + babel-plugin-macros: ^3.1.0 + checksum: fa51be386f9ddc37d05a30dc5433c683873425c1e445ba4c35c310bbf2c17dcaae7174e65a11cdbde344a56f6c9e19c0410f2f3a8d2b5bf2c7b88525498d9637 + languageName: node + linkType: hard + "deep-equal@npm:^2.0.5": version: 2.2.0 resolution: "deep-equal@npm:2.2.0" @@ -12464,13 +12476,12 @@ __metadata: "@jest/test-result": "workspace:^" "@jest/types": "workspace:^" "@types/co": ^4.6.2 - "@types/dedent": ^0.7.0 "@types/graceful-fs": ^4.1.3 "@types/node": "*" "@types/stack-utils": ^2.0.0 chalk: ^4.0.0 co: ^4.6.0 - dedent: ^0.7.0 + dedent: ^1.0.0 execa: ^5.0.0 graceful-fs: ^4.2.9 is-generator-fn: ^2.0.0