From d5e78c441fb624404f4027af6cb1a5d8e2bfed5f Mon Sep 17 00:00:00 2001 From: Daniel Del Core Date: Thu, 19 Sep 2024 10:46:36 +1000 Subject: [PATCH 1/6] Revert "fixes node-entrypoints" This reverts commit d3162aed98e359449a11c2da3c4b98f65b192b96. --- packages/cli-alias/bin/codeshift-cli.js | 4 +++- packages/cli-alias/src/index.ts | 2 +- packages/cli-alias/tsconfig.json | 4 +++- packages/cli/src/index.ts | 8 +++----- packages/cli/src/main.ts | 7 +------ 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/packages/cli-alias/bin/codeshift-cli.js b/packages/cli-alias/bin/codeshift-cli.js index 9ff5293bd..af523d395 100755 --- a/packages/cli-alias/bin/codeshift-cli.js +++ b/packages/cli-alias/bin/codeshift-cli.js @@ -1,2 +1,4 @@ #!/usr/bin/env node -export * from '../dist/index.js'; +const path = require('path'); + +require(path.join('..', 'dist', 'index.js')); diff --git a/packages/cli-alias/src/index.ts b/packages/cli-alias/src/index.ts index 769c40bde..9a747839b 100644 --- a/packages/cli-alias/src/index.ts +++ b/packages/cli-alias/src/index.ts @@ -1 +1 @@ -import '@hypermod/cli'; +export * from '@hypermod/cli'; diff --git a/packages/cli-alias/tsconfig.json b/packages/cli-alias/tsconfig.json index d8ebadead..fa460117d 100644 --- a/packages/cli-alias/tsconfig.json +++ b/packages/cli-alias/tsconfig.json @@ -3,7 +3,9 @@ "compilerOptions": { "rootDir": "src", "outDir": "dist", - "baseUrl": "." + "baseUrl": ".", + "module": "NodeNext", + "moduleResolution": "NodeNext" }, "include": ["src"], "references": [ diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index ed1c513b0..d198539f2 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -9,12 +9,10 @@ import init from './init.js'; import validate from './validate.js'; import { InvalidUserInputError, InvalidConfigError } from './errors.js'; +const __dirname = path.dirname(new URL(import.meta.url).pathname); + const packageJson = readFileSync( - path.join( - path.dirname(new URL(import.meta.url).pathname), - '..', - 'package.json', - ), + path.join(__dirname, '..', 'package.json'), 'utf-8', ); diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.ts index a263d1796..d6a82baa6 100644 --- a/packages/cli/src/main.ts +++ b/packages/cli/src/main.ts @@ -37,7 +37,6 @@ const ExperimentalModuleLoader = () => { }; const install = async (packageName: string) => { - const __dirname = path.dirname(new URL(import.meta.url).pathname); await installPackage(packageName, { cwd: __dirname, packageManager: 'npm', @@ -80,11 +79,7 @@ export default async function main( } const pluginManagerConfig: Partial = { - pluginsPath: path.join( - path.dirname(new URL(import.meta.url).pathname), - '..', - 'node_modules', - ), + pluginsPath: path.join(__dirname, '..', 'node_modules'), }; // If a registry is provided in the CLI flags, use it for the pluginManagers configuration. From 87166a37c7b8b2a7ed2266de72ba8bb4705b6654 Mon Sep 17 00:00:00 2001 From: Daniel Del Core Date: Thu, 19 Sep 2024 10:46:39 +1000 Subject: [PATCH 2/6] Revert "fixes unit tests" This reverts commit be0ed7baea1723781fccb23bca680248e40f6ee2. --- jest.config.js | 2 ++ packages/fetcher/src/index.spec.ts | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/jest.config.js b/jest.config.js index 92fd8ac0f..2f3a21059 100644 --- a/jest.config.js +++ b/jest.config.js @@ -26,7 +26,9 @@ module.exports = { 'jest-watch-typeahead/testname', ], moduleNameMapper: { + // '@hypermod/(.*)\\.js': '/packages/$1/src', '(.+)\\.js$': '$1', + '@hypermod/(.*)$': '/packages/$1/src', '@codeshift/(.*)$': '/packages/$1/src', }, diff --git a/packages/fetcher/src/index.spec.ts b/packages/fetcher/src/index.spec.ts index eaaf38e8f..9fd72464b 100644 --- a/packages/fetcher/src/index.spec.ts +++ b/packages/fetcher/src/index.spec.ts @@ -19,7 +19,7 @@ describe('fetcher', () => { let mockMatchedPaths: string[] = []; beforeEach(() => { - mockMatchedPaths = [path.join(mockBasePath, 'hypermod.config.ts')]; + mockMatchedPaths = [path.join(mockBasePath, 'hypermod.config.js')]; (globby as unknown as jest.Mock).mockImplementation(() => Promise.resolve(mockMatchedPaths), @@ -34,10 +34,10 @@ describe('fetcher', () => { describe('fetchConfig', () => { it('fetches config with default export', async () => { - const mockFilePath = `${__dirname}/path/to/hypermod.config.ts`; + const mockFilePath = `${__dirname}/path/to/hypermod.config.js`; jest.mock( - `${__dirname}/path/to/hypermod.config.ts`, + `${__dirname}/path/to/hypermod.config.js`, () => ({ __esModule: true, default: mockConfig }), { virtual: true }, ); @@ -50,7 +50,7 @@ describe('fetcher', () => { it('fetches config with named export', async () => { jest.mock( - path.join(mockBasePath, 'hypermod.config.ts'), + path.join(mockBasePath, 'hypermod.config.js'), () => mockConfig, { virtual: true, @@ -61,7 +61,7 @@ describe('fetcher', () => { expect(configMeta!.config).toEqual(mockConfig); expect(configMeta!.filePath).toEqual( - path.join(mockBasePath, 'hypermod.config.ts'), + path.join(mockBasePath, 'hypermod.config.js'), ); }); @@ -102,7 +102,7 @@ describe('fetcher', () => { describe('fetchPackage', () => { it('correctly fetches package and returns a config', async () => { - const mockFilePath = 'path/to/config.hypermod.ts'; + const mockFilePath = 'path/to/config.hypermod.js'; const mockPackageManager = { install: jest.fn(), getInfo: jest.fn().mockReturnValue({ location: mockFilePath }), @@ -155,7 +155,7 @@ describe('fetcher', () => { expect(configMeta!.config).toEqual(mockConfig); expect(configMeta!.filePath).toEqual( - mockBasePath + '/hypermod.config.ts', + mockBasePath + '/hypermod.config.js', ); }); From 9ddaf589cdc9c518808b8703cd4e404acb8a670d Mon Sep 17 00:00:00 2001 From: Daniel Del Core Date: Thu, 19 Sep 2024 10:46:41 +1000 Subject: [PATCH 3/6] Revert "updates ts-jest vers" This reverts commit 52fe62a15aa20cfeba5062d5fb7272fa4d94faaa. --- community/@atlaskit__avatar/package.json | 2 +- community/@atlaskit__breadcrumbs/package.json | 2 +- community/@atlaskit__button/package.json | 2 +- community/@atlaskit__calendar/package.json | 2 +- community/@atlaskit__checkbox/package.json | 2 +- community/@atlaskit__icon/package.json | 2 +- community/@atlaskit__menu/package.json | 2 +- community/@atlaskit__popper/package.json | 2 +- community/@atlaskit__popup/package.json | 2 +- .../package.json | 2 +- community/@atlaskit__range/package.json | 2 +- .../@atlaskit__section-message/package.json | 2 +- .../@atlaskit__side-navigation/package.json | 2 +- community/@atlaskit__spinner/package.json | 2 +- community/@atlaskit__tag/package.json | 2 +- community/@atlaskit__textarea/package.json | 2 +- community/@atlaskit__textfield/package.json | 2 +- community/@atlaskit__toggle/package.json | 2 +- community/@emotion__monorepo/package.json | 2 +- community/hypermod/package.json | 2 +- community/javascript/package.json | 2 +- community/memoize-one/package.json | 2 +- community/react/package.json | 2 +- jest.config.js | 20 +--- package.json | 3 +- packages/cli/src/main.ts | 2 + packages/cli/tsconfig.json | 4 +- tsconfig.json | 4 +- tsconfig.test.json | 24 +++++ yarn.lock | 94 ++++--------------- 30 files changed, 80 insertions(+), 117 deletions(-) create mode 100644 tsconfig.test.json diff --git a/community/@atlaskit__avatar/package.json b/community/@atlaskit__avatar/package.json index 6a8a6387e..7980db73d 100644 --- a/community/@atlaskit__avatar/package.json +++ b/community/@atlaskit__avatar/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__avatar" diff --git a/community/@atlaskit__breadcrumbs/package.json b/community/@atlaskit__breadcrumbs/package.json index 093b7cff9..66833b704 100644 --- a/community/@atlaskit__breadcrumbs/package.json +++ b/community/@atlaskit__breadcrumbs/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__breadcrumbs" diff --git a/community/@atlaskit__button/package.json b/community/@atlaskit__button/package.json index 431e0477b..4ca723afb 100644 --- a/community/@atlaskit__button/package.json +++ b/community/@atlaskit__button/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__button" diff --git a/community/@atlaskit__calendar/package.json b/community/@atlaskit__calendar/package.json index 36034c5ad..e8d7c109c 100644 --- a/community/@atlaskit__calendar/package.json +++ b/community/@atlaskit__calendar/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__calendar" diff --git a/community/@atlaskit__checkbox/package.json b/community/@atlaskit__checkbox/package.json index c54aa89f4..89b0f6e40 100644 --- a/community/@atlaskit__checkbox/package.json +++ b/community/@atlaskit__checkbox/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__checkbox" diff --git a/community/@atlaskit__icon/package.json b/community/@atlaskit__icon/package.json index fb7226cf3..c07c4df40 100644 --- a/community/@atlaskit__icon/package.json +++ b/community/@atlaskit__icon/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__icon" diff --git a/community/@atlaskit__menu/package.json b/community/@atlaskit__menu/package.json index 08a015f09..5243633d3 100644 --- a/community/@atlaskit__menu/package.json +++ b/community/@atlaskit__menu/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__menu" diff --git a/community/@atlaskit__popper/package.json b/community/@atlaskit__popper/package.json index 19bc4f32b..5e66c5c55 100644 --- a/community/@atlaskit__popper/package.json +++ b/community/@atlaskit__popper/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__popper" diff --git a/community/@atlaskit__popup/package.json b/community/@atlaskit__popup/package.json index 40f3efbc7..36da388c0 100644 --- a/community/@atlaskit__popup/package.json +++ b/community/@atlaskit__popup/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__popup" diff --git a/community/@atlaskit__progress-indicator/package.json b/community/@atlaskit__progress-indicator/package.json index a80747c01..f2087e370 100644 --- a/community/@atlaskit__progress-indicator/package.json +++ b/community/@atlaskit__progress-indicator/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__progress-indicator" diff --git a/community/@atlaskit__range/package.json b/community/@atlaskit__range/package.json index 37417e60f..4eea92077 100644 --- a/community/@atlaskit__range/package.json +++ b/community/@atlaskit__range/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__range" diff --git a/community/@atlaskit__section-message/package.json b/community/@atlaskit__section-message/package.json index e65f0bb83..b8e508f55 100644 --- a/community/@atlaskit__section-message/package.json +++ b/community/@atlaskit__section-message/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__section-message" diff --git a/community/@atlaskit__side-navigation/package.json b/community/@atlaskit__side-navigation/package.json index 90415c365..1c114c0dc 100644 --- a/community/@atlaskit__side-navigation/package.json +++ b/community/@atlaskit__side-navigation/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__side-navigation" diff --git a/community/@atlaskit__spinner/package.json b/community/@atlaskit__spinner/package.json index 50db6c886..becfbe59e 100644 --- a/community/@atlaskit__spinner/package.json +++ b/community/@atlaskit__spinner/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__spinner" diff --git a/community/@atlaskit__tag/package.json b/community/@atlaskit__tag/package.json index 47f64d2d1..d48cb6423 100644 --- a/community/@atlaskit__tag/package.json +++ b/community/@atlaskit__tag/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__tag" diff --git a/community/@atlaskit__textarea/package.json b/community/@atlaskit__textarea/package.json index f913d2ef6..acf70caf8 100644 --- a/community/@atlaskit__textarea/package.json +++ b/community/@atlaskit__textarea/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__textarea" diff --git a/community/@atlaskit__textfield/package.json b/community/@atlaskit__textfield/package.json index ad841ac63..e7eb70c07 100644 --- a/community/@atlaskit__textfield/package.json +++ b/community/@atlaskit__textfield/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__textfield" diff --git a/community/@atlaskit__toggle/package.json b/community/@atlaskit__toggle/package.json index 4e658ab96..b3033a44c 100644 --- a/community/@atlaskit__toggle/package.json +++ b/community/@atlaskit__toggle/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__toggle" diff --git a/community/@emotion__monorepo/package.json b/community/@emotion__monorepo/package.json index e848d5c2d..1f8b9b080 100644 --- a/community/@emotion__monorepo/package.json +++ b/community/@emotion__monorepo/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@emotion__monorepo" diff --git a/community/hypermod/package.json b/community/hypermod/package.json index dd7f0b5b5..08b564394 100644 --- a/community/hypermod/package.json +++ b/community/hypermod/package.json @@ -21,7 +21,7 @@ "jest": "^29.0.0", "parcel": "^2.8.3", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/hypermod" diff --git a/community/javascript/package.json b/community/javascript/package.json index cbfda621c..761b521da 100644 --- a/community/javascript/package.json +++ b/community/javascript/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/javascript" diff --git a/community/memoize-one/package.json b/community/memoize-one/package.json index 60fb6584e..b349eb17a 100644 --- a/community/memoize-one/package.json +++ b/community/memoize-one/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/memoize-one" diff --git a/community/react/package.json b/community/react/package.json index 8cb627b0c..a966dacfb 100644 --- a/community/react/package.json +++ b/community/react/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.0.0", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/react" diff --git a/jest.config.js b/jest.config.js index 2f3a21059..1ab1de8b7 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,23 +1,15 @@ /** @type {import('ts-jest').JestConfigWithTsJest} */ module.exports = { transform: { - '\\.[jt]sx?$': [ + '^.+\\.ts$': [ 'ts-jest', { - diagnostics: { ignoreCodes: [1343] }, - astTransformers: { - before: [ - { - path: 'node_modules/ts-jest-mock-import-meta', // or, alternatively, 'ts-jest-mock-import-meta' directly, without node_modules. - options: { - metaObjectReplacement: { url: 'https://www.url.com' }, - }, - }, - ], - }, + tsconfig: 'tsconfig.test.json', + useESM: true, }, ], }, + extensionsToTreatAsEsm: ['.ts'], moduleFileExtensions: ['ts', 'js'], testRegex: '^.+\\.(spec|test)\\.(ts|js)$', snapshotSerializers: ['jest-serializer-html-string'], @@ -26,9 +18,7 @@ module.exports = { 'jest-watch-typeahead/testname', ], moduleNameMapper: { - // '@hypermod/(.*)\\.js': '/packages/$1/src', - '(.+)\\.js$': '$1', - + '^(\\.{1,2}/.*)\\.js$': '$1', '@hypermod/(.*)$': '/packages/$1/src', '@codeshift/(.*)$': '/packages/$1/src', }, diff --git a/package.json b/package.json index c54fe1fc3..8f2e12aea 100644 --- a/package.json +++ b/package.json @@ -68,8 +68,7 @@ "rimraf": "^2.6.3", "semver": "^7.3.5", "tar": "^6.1.0", - "ts-jest": "^29.2.5", - "ts-jest-mock-import-meta": "^1.2.0", + "ts-jest": "^29.0.0", "ts-loader": "^6.2.1", "ts-node": "^10.9.1", "tslib": "^2.2.0", diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.ts index d6a82baa6..356253666 100644 --- a/packages/cli/src/main.ts +++ b/packages/cli/src/main.ts @@ -19,6 +19,8 @@ import { } from './utils/file-system.js'; import { getConfigPrompt, getMultiConfigPrompt } from './prompt.js'; +const __dirname = path.dirname(new URL(import.meta.url).pathname); + const ExperimentalModuleLoader = () => { const getInfo = (packageName: string) => { const entryPath = require.resolve(packageName); diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index d8ebadead..fa460117d 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -3,7 +3,9 @@ "compilerOptions": { "rootDir": "src", "outDir": "dist", - "baseUrl": "." + "baseUrl": ".", + "module": "NodeNext", + "moduleResolution": "NodeNext" }, "include": ["src"], "references": [ diff --git a/tsconfig.json b/tsconfig.json index 8d593c628..f31e7316d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,9 +2,9 @@ "compilerOptions": { "strict": true, "skipLibCheck": true, + "moduleResolution": "node", "target": "es6", - "module": "nodenext", - "moduleResolution": "nodenext", + "module": "CommonJS", "resolveJsonModule": true, "esModuleInterop": true, "lib": [ diff --git a/tsconfig.test.json b/tsconfig.test.json new file mode 100644 index 000000000..d813874f9 --- /dev/null +++ b/tsconfig.test.json @@ -0,0 +1,24 @@ +{ + "compilerOptions": { + "strict": true, + "skipLibCheck": true, + "module": "nodenext", + "moduleResolution": "nodenext", + "target": "es6", + "resolveJsonModule": true, + "esModuleInterop": true, + "lib": [ + "es5", + "scripthost", + "es2015.core", + "es2015.collection", + "es2015.symbol", + "es2015.iterable", + "es2015.promise", + "es2016", + "es2017" + ] + }, + "include": ["packages/**/*", "community/**/*", "scripts"], + "exclude": ["./node_modules", "./plugin_packages"] +} diff --git a/yarn.lock b/yarn.lock index bde1586c2..a9af191b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3140,11 +3140,6 @@ astral-regex@^2.0.0: resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async@^3.2.3: - version "3.2.6" - resolved "https://packages.atlassian.com/api/npm/npm-remote/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" - integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" @@ -3336,13 +3331,6 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://packages.atlassian.com/api/npm/npm-remote/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - braces@^2.3.1: version "2.3.2" resolved "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz" @@ -3383,9 +3371,9 @@ browserslist@^4.22.2, browserslist@^4.6.6: node-releases "^2.0.14" update-browserslist-db "^1.0.13" -bs-logger@^0.2.6: +bs-logger@0.x: version "0.2.6" - resolved "https://packages.atlassian.com/api/npm/npm-remote/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" + resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz" integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog== dependencies: fast-json-stable-stringify "2.x" @@ -3490,7 +3478,7 @@ chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -3754,7 +3742,7 @@ cross-spawn@^5.1.0: cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" - resolved "https://packages.atlassian.com/api/npm/npm-remote/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== dependencies: path-key "^3.1.0" @@ -4022,13 +4010,6 @@ duplexer3@^0.1.4: resolved "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz" integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== -ejs@^3.1.10: - version "3.1.10" - resolved "https://packages.atlassian.com/api/npm/npm-remote/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" - integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== - dependencies: - jake "^10.8.5" - electron-to-chromium@^1.4.601: version "1.4.614" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.614.tgz" @@ -4464,13 +4445,6 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -filelist@^1.0.4: - version "1.0.4" - resolved "https://packages.atlassian.com/api/npm/npm-remote/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" - integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== - dependencies: - minimatch "^5.0.1" - fill-range@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz" @@ -5375,16 +5349,6 @@ istanbul-reports@^3.1.3: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jake@^10.8.5: - version "10.9.2" - resolved "https://packages.atlassian.com/api/npm/npm-remote/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f" - integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA== - dependencies: - async "^3.2.3" - chalk "^4.0.2" - filelist "^1.0.4" - minimatch "^3.1.2" - jest-changed-files@^29.7.0: version "29.7.0" resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz" @@ -6167,9 +6131,9 @@ lodash.debounce@^4.0.8: resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== -lodash.memoize@^4.1.2: +lodash.memoize@4.x: version "4.1.2" - resolved "https://packages.atlassian.com/api/npm/npm-remote/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz" integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== lodash.merge@^4.6.2: @@ -6254,9 +6218,9 @@ make-dir@^4.0.0: dependencies: semver "^7.5.3" -make-error@^1.1.1, make-error@^1.3.6: +make-error@1.x, make-error@^1.1.1: version "1.3.6" - resolved "https://packages.atlassian.com/api/npm/npm-remote/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== makeerror@1.0.12: @@ -6382,20 +6346,13 @@ min-indent@^1.0.0: resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: +minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1: version "3.1.2" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" -minimatch@^5.0.1: - version "5.1.6" - resolved "https://packages.atlassian.com/api/npm/npm-remote/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" - integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== - dependencies: - brace-expansion "^2.0.1" - minimist-options@^4.0.2: version "4.1.0" resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz" @@ -7410,11 +7367,6 @@ semver@^7.2.1, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2, semver@^7.5.3, semve dependencies: lru-cache "^6.0.0" -semver@^7.6.3: - version "7.6.3" - resolved "https://packages.atlassian.com/api/npm/npm-remote/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" - integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== - set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" @@ -7981,25 +7933,19 @@ trim-newlines@^3.0.0: resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -ts-jest-mock-import-meta@^1.2.0: - version "1.2.0" - resolved "https://packages.atlassian.com/api/npm/npm-remote/ts-jest-mock-import-meta/-/ts-jest-mock-import-meta-1.2.0.tgz#6fb12a1fa47f70f9335a288e888cbacf592c4dc1" - integrity sha512-r2+TH6d8LHBXqLTXjJh1KfTZoMvGV0hdn9gwickNVcwS2Co2/mewGjj0XDVEPLg5MVfZVHUFQ9O09anURA3KCw== - -ts-jest@^29.2.5: - version "29.2.5" - resolved "https://packages.atlassian.com/api/npm/npm-remote/ts-jest/-/ts-jest-29.2.5.tgz#591a3c108e1f5ebd013d3152142cb5472b399d63" - integrity sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA== +ts-jest@^29.0.0: + version "29.1.1" + resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz" + integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA== dependencies: - bs-logger "^0.2.6" - ejs "^3.1.10" - fast-json-stable-stringify "^2.1.0" + bs-logger "0.x" + fast-json-stable-stringify "2.x" jest-util "^29.0.0" json5 "^2.2.3" - lodash.memoize "^4.1.2" - make-error "^1.3.6" - semver "^7.6.3" - yargs-parser "^21.1.1" + lodash.memoize "4.x" + make-error "1.x" + semver "^7.5.3" + yargs-parser "^21.0.1" ts-loader@^6.2.1: version "6.2.2" @@ -8443,7 +8389,7 @@ yargs-parser@^18.1.2, yargs-parser@^18.1.3: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^21.1.1: +yargs-parser@^21.0.1, yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== From e5499d862ae12809b3bfe36fa692a31e85548f77 Mon Sep 17 00:00:00 2001 From: Daniel Del Core Date: Thu, 19 Sep 2024 10:46:43 +1000 Subject: [PATCH 4/6] Revert "improve types for internal script" This reverts commit 59b3e71bf756570baa4aaf8fd275ec04b59dab63. --- scripts/sync.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/sync.ts b/scripts/sync.ts index 4a84480b7..c333e7250 100644 --- a/scripts/sync.ts +++ b/scripts/sync.ts @@ -21,9 +21,9 @@ async function main() { const directories = communityCodemods.filter(dir => junk.not(dir)); for (const dir of directories) { - const configMeta = await fetchConfig(path.join(COMMUNITY_PATH, dir)); + const { config } = await fetchConfig(path.join(COMMUNITY_PATH, dir)); - if (!configMeta?.config) { + if (!config) { throw new Error(`Unable to locate config for path: ${dir}`); } @@ -31,9 +31,7 @@ async function main() { const rawPkgName = dir.replace('__', '/'); data.push({ pkgName, - targets: - rawPkgName + - (configMeta.config.targets ? `, ${configMeta.config.targets}` : ''), + targets: rawPkgName + (config.targets ? `, ${config.targets}` : ''), }); } From 6e1d67b381bbdd852558c301dc37dc39523a1cdc Mon Sep 17 00:00:00 2001 From: Daniel Del Core Date: Thu, 19 Sep 2024 10:46:44 +1000 Subject: [PATCH 5/6] Revert "adds dedicated esm jest and ts config" This reverts commit 5bf3428ae2ffcca23b721070689e8e9c2eb7c9fb. --- jest.config.js | 6 +----- tsconfig.test.json | 24 ------------------------ 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 tsconfig.test.json diff --git a/jest.config.js b/jest.config.js index 1ab1de8b7..239ff437c 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,15 +1,12 @@ -/** @type {import('ts-jest').JestConfigWithTsJest} */ module.exports = { transform: { '^.+\\.ts$': [ 'ts-jest', { - tsconfig: 'tsconfig.test.json', - useESM: true, + tsconfig: 'tsconfig.json', }, ], }, - extensionsToTreatAsEsm: ['.ts'], moduleFileExtensions: ['ts', 'js'], testRegex: '^.+\\.(spec|test)\\.(ts|js)$', snapshotSerializers: ['jest-serializer-html-string'], @@ -18,7 +15,6 @@ module.exports = { 'jest-watch-typeahead/testname', ], moduleNameMapper: { - '^(\\.{1,2}/.*)\\.js$': '$1', '@hypermod/(.*)$': '/packages/$1/src', '@codeshift/(.*)$': '/packages/$1/src', }, diff --git a/tsconfig.test.json b/tsconfig.test.json deleted file mode 100644 index d813874f9..000000000 --- a/tsconfig.test.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "compilerOptions": { - "strict": true, - "skipLibCheck": true, - "module": "nodenext", - "moduleResolution": "nodenext", - "target": "es6", - "resolveJsonModule": true, - "esModuleInterop": true, - "lib": [ - "es5", - "scripthost", - "es2015.core", - "es2015.collection", - "es2015.symbol", - "es2015.iterable", - "es2015.promise", - "es2016", - "es2017" - ] - }, - "include": ["packages/**/*", "community/**/*", "scripts"], - "exclude": ["./node_modules", "./plugin_packages"] -} From e69f22162ed931b07787281bcc559c1037a876af Mon Sep 17 00:00:00 2001 From: Daniel Del Core Date: Thu, 19 Sep 2024 10:47:11 +1000 Subject: [PATCH 6/6] Revert "initial esm cli migration" This reverts commit fa45fcbbaccf8afa73463ce51da3fc18d4e37d3d. --- .changeset/brown-camels-think.md | 6 ++ community/@atlaskit__avatar/package.json | 2 +- community/@atlaskit__breadcrumbs/package.json | 2 +- community/@atlaskit__button/package.json | 2 +- community/@atlaskit__calendar/package.json | 2 +- community/@atlaskit__checkbox/package.json | 2 +- community/@atlaskit__icon/package.json | 2 +- community/@atlaskit__menu/package.json | 2 +- community/@atlaskit__popper/package.json | 2 +- community/@atlaskit__popup/package.json | 2 +- .../package.json | 2 +- community/@atlaskit__range/package.json | 2 +- .../@atlaskit__section-message/package.json | 2 +- .../@atlaskit__side-navigation/package.json | 2 +- community/@atlaskit__spinner/package.json | 2 +- community/@atlaskit__tag/package.json | 2 +- community/@atlaskit__textarea/package.json | 2 +- community/@atlaskit__textfield/package.json | 2 +- community/@atlaskit__toggle/package.json | 2 +- community/@emotion__monorepo/package.json | 2 +- community/hypermod/package.json | 2 +- community/javascript/package.json | 2 +- community/memoize-one/package.json | 2 +- community/react/package.json | 2 +- package.json | 2 +- packages/cli-alias/package.json | 1 - packages/cli-alias/src/index.ts | 2 +- packages/cli-alias/tsconfig.json | 4 +- packages/cli/bin/hypermod-cli.js | 4 +- packages/cli/package.json | 1 - packages/cli/src/index.ts | 12 ++- packages/cli/src/list.ts | 4 +- packages/cli/src/main.ts | 27 ++---- packages/cli/src/utils/fetch-package.ts | 2 +- packages/cli/tsconfig.json | 4 +- yarn.lock | 87 +++++++++++++++---- 36 files changed, 117 insertions(+), 85 deletions(-) create mode 100644 .changeset/brown-camels-think.md diff --git a/.changeset/brown-camels-think.md b/.changeset/brown-camels-think.md new file mode 100644 index 000000000..5569a07f5 --- /dev/null +++ b/.changeset/brown-camels-think.md @@ -0,0 +1,6 @@ +--- +'@codeshift/cli': patch +'@hypermod/cli': patch +--- + +Reverts ESM support. diff --git a/community/@atlaskit__avatar/package.json b/community/@atlaskit__avatar/package.json index 7980db73d..6a8a6387e 100644 --- a/community/@atlaskit__avatar/package.json +++ b/community/@atlaskit__avatar/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__avatar" diff --git a/community/@atlaskit__breadcrumbs/package.json b/community/@atlaskit__breadcrumbs/package.json index 66833b704..093b7cff9 100644 --- a/community/@atlaskit__breadcrumbs/package.json +++ b/community/@atlaskit__breadcrumbs/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__breadcrumbs" diff --git a/community/@atlaskit__button/package.json b/community/@atlaskit__button/package.json index 4ca723afb..431e0477b 100644 --- a/community/@atlaskit__button/package.json +++ b/community/@atlaskit__button/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__button" diff --git a/community/@atlaskit__calendar/package.json b/community/@atlaskit__calendar/package.json index e8d7c109c..36034c5ad 100644 --- a/community/@atlaskit__calendar/package.json +++ b/community/@atlaskit__calendar/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__calendar" diff --git a/community/@atlaskit__checkbox/package.json b/community/@atlaskit__checkbox/package.json index 89b0f6e40..c54aa89f4 100644 --- a/community/@atlaskit__checkbox/package.json +++ b/community/@atlaskit__checkbox/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__checkbox" diff --git a/community/@atlaskit__icon/package.json b/community/@atlaskit__icon/package.json index c07c4df40..fb7226cf3 100644 --- a/community/@atlaskit__icon/package.json +++ b/community/@atlaskit__icon/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__icon" diff --git a/community/@atlaskit__menu/package.json b/community/@atlaskit__menu/package.json index 5243633d3..08a015f09 100644 --- a/community/@atlaskit__menu/package.json +++ b/community/@atlaskit__menu/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__menu" diff --git a/community/@atlaskit__popper/package.json b/community/@atlaskit__popper/package.json index 5e66c5c55..19bc4f32b 100644 --- a/community/@atlaskit__popper/package.json +++ b/community/@atlaskit__popper/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__popper" diff --git a/community/@atlaskit__popup/package.json b/community/@atlaskit__popup/package.json index 36da388c0..40f3efbc7 100644 --- a/community/@atlaskit__popup/package.json +++ b/community/@atlaskit__popup/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__popup" diff --git a/community/@atlaskit__progress-indicator/package.json b/community/@atlaskit__progress-indicator/package.json index f2087e370..a80747c01 100644 --- a/community/@atlaskit__progress-indicator/package.json +++ b/community/@atlaskit__progress-indicator/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__progress-indicator" diff --git a/community/@atlaskit__range/package.json b/community/@atlaskit__range/package.json index 4eea92077..37417e60f 100644 --- a/community/@atlaskit__range/package.json +++ b/community/@atlaskit__range/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__range" diff --git a/community/@atlaskit__section-message/package.json b/community/@atlaskit__section-message/package.json index b8e508f55..e65f0bb83 100644 --- a/community/@atlaskit__section-message/package.json +++ b/community/@atlaskit__section-message/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__section-message" diff --git a/community/@atlaskit__side-navigation/package.json b/community/@atlaskit__side-navigation/package.json index 1c114c0dc..90415c365 100644 --- a/community/@atlaskit__side-navigation/package.json +++ b/community/@atlaskit__side-navigation/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__side-navigation" diff --git a/community/@atlaskit__spinner/package.json b/community/@atlaskit__spinner/package.json index becfbe59e..50db6c886 100644 --- a/community/@atlaskit__spinner/package.json +++ b/community/@atlaskit__spinner/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__spinner" diff --git a/community/@atlaskit__tag/package.json b/community/@atlaskit__tag/package.json index d48cb6423..47f64d2d1 100644 --- a/community/@atlaskit__tag/package.json +++ b/community/@atlaskit__tag/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__tag" diff --git a/community/@atlaskit__textarea/package.json b/community/@atlaskit__textarea/package.json index acf70caf8..f913d2ef6 100644 --- a/community/@atlaskit__textarea/package.json +++ b/community/@atlaskit__textarea/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__textarea" diff --git a/community/@atlaskit__textfield/package.json b/community/@atlaskit__textfield/package.json index e7eb70c07..ad841ac63 100644 --- a/community/@atlaskit__textfield/package.json +++ b/community/@atlaskit__textfield/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__textfield" diff --git a/community/@atlaskit__toggle/package.json b/community/@atlaskit__toggle/package.json index b3033a44c..4e658ab96 100644 --- a/community/@atlaskit__toggle/package.json +++ b/community/@atlaskit__toggle/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__toggle" diff --git a/community/@emotion__monorepo/package.json b/community/@emotion__monorepo/package.json index 1f8b9b080..e848d5c2d 100644 --- a/community/@emotion__monorepo/package.json +++ b/community/@emotion__monorepo/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@emotion__monorepo" diff --git a/community/hypermod/package.json b/community/hypermod/package.json index 08b564394..dd7f0b5b5 100644 --- a/community/hypermod/package.json +++ b/community/hypermod/package.json @@ -21,7 +21,7 @@ "jest": "^29.0.0", "parcel": "^2.8.3", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/hypermod" diff --git a/community/javascript/package.json b/community/javascript/package.json index 761b521da..cbfda621c 100644 --- a/community/javascript/package.json +++ b/community/javascript/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/javascript" diff --git a/community/memoize-one/package.json b/community/memoize-one/package.json index b349eb17a..60fb6584e 100644 --- a/community/memoize-one/package.json +++ b/community/memoize-one/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/memoize-one" diff --git a/community/react/package.json b/community/react/package.json index a966dacfb..8cb627b0c 100644 --- a/community/react/package.json +++ b/community/react/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.0", "jest": "^29.0.0", "prettier": "^2.0.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "typescript": "^5.2.2" }, "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/react" diff --git a/package.json b/package.json index 8f2e12aea..6a81d8c02 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "rimraf": "^2.6.3", "semver": "^7.3.5", "tar": "^6.1.0", - "ts-jest": "^29.0.0", + "ts-jest": "^29.2.5", "ts-loader": "^6.2.1", "ts-node": "^10.9.1", "tslib": "^2.2.0", diff --git a/packages/cli-alias/package.json b/packages/cli-alias/package.json index f402d4185..47811fef1 100644 --- a/packages/cli-alias/package.json +++ b/packages/cli-alias/package.json @@ -1,7 +1,6 @@ { "name": "@codeshift/cli", "version": "0.23.0", - "type": "module", "source": "src/index.ts", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/cli-alias/src/index.ts b/packages/cli-alias/src/index.ts index 9a747839b..769c40bde 100644 --- a/packages/cli-alias/src/index.ts +++ b/packages/cli-alias/src/index.ts @@ -1 +1 @@ -export * from '@hypermod/cli'; +import '@hypermod/cli'; diff --git a/packages/cli-alias/tsconfig.json b/packages/cli-alias/tsconfig.json index fa460117d..d8ebadead 100644 --- a/packages/cli-alias/tsconfig.json +++ b/packages/cli-alias/tsconfig.json @@ -3,9 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "dist", - "baseUrl": ".", - "module": "NodeNext", - "moduleResolution": "NodeNext" + "baseUrl": "." }, "include": ["src"], "references": [ diff --git a/packages/cli/bin/hypermod-cli.js b/packages/cli/bin/hypermod-cli.js index 9ff5293bd..af523d395 100755 --- a/packages/cli/bin/hypermod-cli.js +++ b/packages/cli/bin/hypermod-cli.js @@ -1,2 +1,4 @@ #!/usr/bin/env node -export * from '../dist/index.js'; +const path = require('path'); + +require(path.join('..', 'dist', 'index.js')); diff --git a/packages/cli/package.json b/packages/cli/package.json index b2142145a..6ff614661 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,6 @@ { "name": "@hypermod/cli", "version": "0.23.0", - "type": "module", "source": "src/index.ts", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index d198539f2..869a3ad87 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -3,13 +3,11 @@ import { readFileSync } from 'fs'; import chalk from 'chalk'; import { Command, Option, CommanderError } from 'commander'; -import main from './main.js'; -import list from './list.js'; -import init from './init.js'; -import validate from './validate.js'; -import { InvalidUserInputError, InvalidConfigError } from './errors.js'; - -const __dirname = path.dirname(new URL(import.meta.url).pathname); +import main from './main'; +import list from './list'; +import init from './init'; +import validate from './validate'; +import { InvalidUserInputError, InvalidConfigError } from './errors'; const packageJson = readFileSync( path.join(__dirname, '..', 'package.json'), diff --git a/packages/cli/src/list.ts b/packages/cli/src/list.ts index aab66bafa..2b677dd8c 100644 --- a/packages/cli/src/list.ts +++ b/packages/cli/src/list.ts @@ -1,8 +1,8 @@ import chalk from 'chalk'; import { PluginManager } from 'live-plugin-manager'; -import { fetchPackages } from './utils/fetch-package.js'; -import { getHypermodPackageName } from './utils/package-names.js'; +import { fetchPackages } from './utils/fetch-package'; +import { getHypermodPackageName } from './utils/package-names'; export default async function list(packages: string[]) { const packageManager = new PluginManager(); diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.ts index 356253666..1f7efc04d 100644 --- a/packages/cli/src/main.ts +++ b/packages/cli/src/main.ts @@ -10,16 +10,11 @@ import { installPackage } from '@antfu/install-pkg'; import * as core from '@hypermod/core'; import { fetchConfigAtPath } from '@hypermod/fetcher'; -import { InvalidUserInputError } from './errors.js'; -import { fetchPackages } from './utils/fetch-package.js'; -import { mergeConfigs } from './utils/merge-configs.js'; -import { - fetchConfigsForWorkspaces, - getPackageJson, -} from './utils/file-system.js'; -import { getConfigPrompt, getMultiConfigPrompt } from './prompt.js'; - -const __dirname = path.dirname(new URL(import.meta.url).pathname); +import { InvalidUserInputError } from './errors'; +import { fetchPackages } from './utils/fetch-package'; +import { mergeConfigs } from './utils/merge-configs'; +import { fetchConfigsForWorkspaces, getPackageJson } from './utils/file-system'; +import { getConfigPrompt, getMultiConfigPrompt } from './prompt'; const ExperimentalModuleLoader = () => { const getInfo = (packageName: string) => { @@ -161,33 +156,21 @@ export default async function main( */ const configFilePath = await findUp([ 'hypermod.config.js', - 'hypermod.config.cjs', - 'hypermod.config.mjs', 'hypermod.config.ts', 'hypermod.config.tsx', 'src/hypermod.config.js', - 'src/hypermod.config.cjs', - 'src/hypermod.config.mjs', 'src/hypermod.config.ts', 'src/hypermod.config.tsx', 'codemods/hypermod.config.js', - 'codemods/hypermod.config.cjs', - 'codemods/hypermod.config.mjs', 'codemods/hypermod.config.ts', 'codemods/hypermod.config.tsx', 'codeshift.config.js', - 'codeshift.config.cjs', - 'codeshift.config.mjs', 'codeshift.config.ts', 'codeshift.config.tsx', 'src/codeshift.config.js', - 'src/codeshift.config.cjs', - 'src/codeshift.config.mjs', 'src/codeshift.config.ts', 'src/codeshift.config.tsx', 'codemods/codeshift.config.js', - 'codemods/codeshift.config.cjs', - 'codemods/codeshift.config.mjs', 'codemods/codeshift.config.ts', 'codemods/codeshift.config.tsx', ]); diff --git a/packages/cli/src/utils/fetch-package.ts b/packages/cli/src/utils/fetch-package.ts index abbd426f5..83ffd2ef4 100644 --- a/packages/cli/src/utils/fetch-package.ts +++ b/packages/cli/src/utils/fetch-package.ts @@ -9,7 +9,7 @@ import { } from '@hypermod/fetcher'; import { isValidConfig } from '@hypermod/validator'; -import { getHypermodPackageName } from './package-names.js'; +import { getHypermodPackageName } from './package-names'; export async function fetchPackages( packageName: string, diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index fa460117d..d8ebadead 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -3,9 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "dist", - "baseUrl": ".", - "module": "NodeNext", - "moduleResolution": "NodeNext" + "baseUrl": "." }, "include": ["src"], "references": [ diff --git a/yarn.lock b/yarn.lock index a9af191b0..8ae2faee7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3140,6 +3140,11 @@ astral-regex@^2.0.0: resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== +async@^3.2.3: + version "3.2.6" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" + integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" @@ -3331,6 +3336,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^2.3.1: version "2.3.2" resolved "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz" @@ -3371,9 +3383,9 @@ browserslist@^4.22.2, browserslist@^4.6.6: node-releases "^2.0.14" update-browserslist-db "^1.0.13" -bs-logger@0.x: +bs-logger@^0.2.6: version "0.2.6" - resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz" + resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog== dependencies: fast-json-stable-stringify "2.x" @@ -3478,7 +3490,7 @@ chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -4010,6 +4022,13 @@ duplexer3@^0.1.4: resolved "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz" integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== +ejs@^3.1.10: + version "3.1.10" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" + integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== + dependencies: + jake "^10.8.5" + electron-to-chromium@^1.4.601: version "1.4.614" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.614.tgz" @@ -4445,6 +4464,13 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +filelist@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== + dependencies: + minimatch "^5.0.1" + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz" @@ -5349,6 +5375,16 @@ istanbul-reports@^3.1.3: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" +jake@^10.8.5: + version "10.9.2" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f" + integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA== + dependencies: + async "^3.2.3" + chalk "^4.0.2" + filelist "^1.0.4" + minimatch "^3.1.2" + jest-changed-files@^29.7.0: version "29.7.0" resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz" @@ -6131,9 +6167,9 @@ lodash.debounce@^4.0.8: resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== -lodash.memoize@4.x: +lodash.memoize@^4.1.2: version "4.1.2" - resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== lodash.merge@^4.6.2: @@ -6218,9 +6254,9 @@ make-dir@^4.0.0: dependencies: semver "^7.5.3" -make-error@1.x, make-error@^1.1.1: +make-error@^1.1.1, make-error@^1.3.6: version "1.3.6" - resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== makeerror@1.0.12: @@ -6346,13 +6382,20 @@ min-indent@^1.0.0: resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1: +minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + minimist-options@^4.0.2: version "4.1.0" resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz" @@ -7367,6 +7410,11 @@ semver@^7.2.1, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2, semver@^7.5.3, semve dependencies: lru-cache "^6.0.0" +semver@^7.6.3: + version "7.6.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" + integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== + set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" @@ -7933,19 +7981,20 @@ trim-newlines@^3.0.0: resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -ts-jest@^29.0.0: - version "29.1.1" - resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz" - integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA== +ts-jest@^29.2.5: + version "29.2.5" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.5.tgz#591a3c108e1f5ebd013d3152142cb5472b399d63" + integrity sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA== dependencies: - bs-logger "0.x" - fast-json-stable-stringify "2.x" + bs-logger "^0.2.6" + ejs "^3.1.10" + fast-json-stable-stringify "^2.1.0" jest-util "^29.0.0" json5 "^2.2.3" - lodash.memoize "4.x" - make-error "1.x" - semver "^7.5.3" - yargs-parser "^21.0.1" + lodash.memoize "^4.1.2" + make-error "^1.3.6" + semver "^7.6.3" + yargs-parser "^21.1.1" ts-loader@^6.2.1: version "6.2.2" @@ -8389,7 +8438,7 @@ yargs-parser@^18.1.2, yargs-parser@^18.1.3: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^21.0.1, yargs-parser@^21.1.1: +yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==