diff --git a/.changeset/tidy-spies-shout.md b/.changeset/tidy-spies-shout.md new file mode 100644 index 00000000..ce6d7981 --- /dev/null +++ b/.changeset/tidy-spies-shout.md @@ -0,0 +1,5 @@ +--- +"@codemod-utils/cli": patch +--- + +Updated latestVersions and standardized project structure diff --git a/packages/cli/bin/cli.ts b/packages/cli/bin/cli.ts index 531afee6..d1980dfb 100755 --- a/packages/cli/bin/cli.ts +++ b/packages/cli/bin/cli.ts @@ -5,7 +5,7 @@ import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; -import { createCodemod } from '../src/migration/index.js'; +import { createCodemod } from '../src/index.js'; import type { CodemodOptions } from '../src/types/index.js'; // Provide a title to the process in `ps` diff --git a/packages/cli/src/migration/index.ts b/packages/cli/src/index.ts similarity index 83% rename from packages/cli/src/migration/index.ts rename to packages/cli/src/index.ts index 44d16eab..31ebbc96 100644 --- a/packages/cli/src/migration/index.ts +++ b/packages/cli/src/index.ts @@ -1,9 +1,9 @@ -import type { CodemodOptions } from '../types/index.js'; import { createFilesFromBlueprints, createOptions, updatePackageJson, } from './steps/index.js'; +import type { CodemodOptions } from './types/index.js'; export function createCodemod(codemodOptions: CodemodOptions): void { const options = createOptions(codemodOptions); diff --git a/packages/cli/src/migration/steps/create-files-from-blueprints.ts b/packages/cli/src/steps/create-files-from-blueprints.ts similarity index 95% rename from packages/cli/src/migration/steps/create-files-from-blueprints.ts rename to packages/cli/src/steps/create-files-from-blueprints.ts index 9eb39bf6..511397ae 100644 --- a/packages/cli/src/migration/steps/create-files-from-blueprints.ts +++ b/packages/cli/src/steps/create-files-from-blueprints.ts @@ -4,8 +4,8 @@ import { join } from 'node:path'; import { processTemplate } from '@codemod-utils/blueprints'; import { createFiles, findFiles } from '@codemod-utils/files'; -import type { Options } from '../../types/index.js'; -import { blueprintsRoot } from '../../utils/blueprints.js'; +import type { Options } from '../types/index.js'; +import { blueprintsRoot } from '../utils/blueprints.js'; function getFilesToSkip(options: Options): string[] { const { codemod } = options; diff --git a/packages/cli/src/migration/steps/create-options.ts b/packages/cli/src/steps/create-options.ts similarity index 78% rename from packages/cli/src/migration/steps/create-options.ts rename to packages/cli/src/steps/create-options.ts index 7b2db002..e8b39030 100644 --- a/packages/cli/src/migration/steps/create-options.ts +++ b/packages/cli/src/steps/create-options.ts @@ -1,4 +1,4 @@ -import type { CodemodOptions, Options } from '../../types/index.js'; +import type { CodemodOptions, Options } from '../types/index.js'; export function createOptions(codemodOptions: CodemodOptions): Options { const { addons, hasTypeScript, name, projectRoot } = codemodOptions; diff --git a/packages/cli/src/migration/steps/index.ts b/packages/cli/src/steps/index.ts similarity index 100% rename from packages/cli/src/migration/steps/index.ts rename to packages/cli/src/steps/index.ts diff --git a/packages/cli/src/migration/steps/update-package-json.ts b/packages/cli/src/steps/update-package-json.ts similarity index 96% rename from packages/cli/src/migration/steps/update-package-json.ts rename to packages/cli/src/steps/update-package-json.ts index 80c2fdbc..fde0f2ef 100644 --- a/packages/cli/src/migration/steps/update-package-json.ts +++ b/packages/cli/src/steps/update-package-json.ts @@ -8,8 +8,8 @@ import { readPackageJson, } from '@codemod-utils/json'; -import type { Options } from '../../types/index.js'; -import { getVersion } from '../../utils/blueprints.js'; +import type { Options } from '../types/index.js'; +import { getVersion } from '../utils/blueprints.js'; function updateDependencies(packageJson: PackageJson, options: Options): void { const { codemod } = options; diff --git a/packages/cli/src/utils/blueprints/get-version.ts b/packages/cli/src/utils/blueprints/get-version.ts index 455c51d7..adadd700 100644 --- a/packages/cli/src/utils/blueprints/get-version.ts +++ b/packages/cli/src/utils/blueprints/get-version.ts @@ -1,35 +1,35 @@ import { decideVersion } from '@codemod-utils/blueprints'; const latestVersions = new Map([ - ['@babel/core', '7.23.2'], - ['@babel/eslint-parser', '7.22.15'], + ['@babel/core', '7.23.3'], + ['@babel/eslint-parser', '7.23.3'], ['@changesets/cli', '2.26.2'], ['@changesets/get-github-info', '0.5.2'], - ['@codemod-utils/ast-javascript', '1.2.0'], + ['@codemod-utils/ast-javascript', '1.2.1'], ['@codemod-utils/ast-template', '1.1.0'], ['@codemod-utils/blueprints', '1.1.0'], ['@codemod-utils/ember-cli-string', '1.1.0'], ['@codemod-utils/files', '1.1.0'], - ['@codemod-utils/json', '1.1.1'], + ['@codemod-utils/json', '1.1.2'], ['@codemod-utils/tests', '1.1.1'], ['@sondr3/minitest', '0.1.2'], ['@tsconfig/node18', '18.2.2'], ['@tsconfig/strictest', '2.0.2'], - ['@types/node', '18.18.7'], - ['@types/yargs', '17.0.29'], - ['@typescript-eslint/eslint-plugin', '6.9.0'], - ['@typescript-eslint/parser', '6.9.0'], - ['concurrently', '8.2.1'], - ['eslint', '8.52.0'], + ['@types/node', '18.18.13'], + ['@types/yargs', '17.0.32'], + ['@typescript-eslint/eslint-plugin', '6.12.0'], + ['@typescript-eslint/parser', '6.12.0'], + ['concurrently', '8.2.2'], + ['eslint', '8.54.0'], ['eslint-config-prettier', '9.0.0'], ['eslint-import-resolver-typescript', '3.6.1'], ['eslint-plugin-import', '2.29.0'], - ['eslint-plugin-n', '16.2.0'], + ['eslint-plugin-n', '16.3.1'], ['eslint-plugin-prettier', '5.0.1'], ['eslint-plugin-simple-import-sort', '10.0.0'], ['eslint-plugin-typescript-sort-keys', '3.1.0'], - ['prettier', '3.0.3'], - ['typescript', '5.2.2'], + ['prettier', '3.1.0'], + ['typescript', '5.3.2'], ['yargs', '17.7.2'], ]); diff --git a/packages/cli/tests/fixtures/javascript-with-addons/output/ember-codemod-args-to-signature/package.json b/packages/cli/tests/fixtures/javascript-with-addons/output/ember-codemod-args-to-signature/package.json index adeb3bc9..6c4ed936 100644 --- a/packages/cli/tests/fixtures/javascript-with-addons/output/ember-codemod-args-to-signature/package.json +++ b/packages/cli/tests/fixtures/javascript-with-addons/output/ember-codemod-args-to-signature/package.json @@ -31,29 +31,29 @@ "test": "mt tests --quiet" }, "dependencies": { - "@codemod-utils/ast-javascript": "^1.2.0", + "@codemod-utils/ast-javascript": "^1.2.1", "@codemod-utils/ast-template": "^1.1.0", "@codemod-utils/blueprints": "^1.1.0", "@codemod-utils/ember-cli-string": "^1.1.0", "@codemod-utils/files": "^1.1.0", - "@codemod-utils/json": "^1.1.1", + "@codemod-utils/json": "^1.1.2", "yargs": "^17.7.2" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/eslint-parser": "^7.22.15", + "@babel/core": "^7.23.3", + "@babel/eslint-parser": "^7.23.3", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@codemod-utils/tests": "^1.1.1", "@sondr3/minitest": "^0.1.2", - "concurrently": "^8.2.1", - "eslint": "^8.52.0", + "concurrently": "^8.2.2", + "eslint": "^8.54.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-import": "^2.29.0", - "eslint-plugin-n": "^16.2.0", + "eslint-plugin-n": "^16.3.1", "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-simple-import-sort": "^10.0.0", - "prettier": "^3.0.3" + "prettier": "^3.1.0" }, "engines": { "node": "18.* || >= 20" diff --git a/packages/cli/tests/fixtures/javascript/output/ember-codemod-pod-to-octane/package.json b/packages/cli/tests/fixtures/javascript/output/ember-codemod-pod-to-octane/package.json index b301e442..ae1bc06a 100644 --- a/packages/cli/tests/fixtures/javascript/output/ember-codemod-pod-to-octane/package.json +++ b/packages/cli/tests/fixtures/javascript/output/ember-codemod-pod-to-octane/package.json @@ -35,20 +35,20 @@ "yargs": "^17.7.2" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/eslint-parser": "^7.22.15", + "@babel/core": "^7.23.3", + "@babel/eslint-parser": "^7.23.3", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@codemod-utils/tests": "^1.1.1", "@sondr3/minitest": "^0.1.2", - "concurrently": "^8.2.1", - "eslint": "^8.52.0", + "concurrently": "^8.2.2", + "eslint": "^8.54.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-import": "^2.29.0", - "eslint-plugin-n": "^16.2.0", + "eslint-plugin-n": "^16.3.1", "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-simple-import-sort": "^10.0.0", - "prettier": "^3.0.3" + "prettier": "^3.1.0" }, "engines": { "node": "18.* || >= 20" diff --git a/packages/cli/tests/fixtures/steps/update-package-json/javascript-with-addons/output/ember-codemod-args-to-signature/package.json b/packages/cli/tests/fixtures/steps/update-package-json/javascript-with-addons/output/ember-codemod-args-to-signature/package.json index adeb3bc9..6c4ed936 100644 --- a/packages/cli/tests/fixtures/steps/update-package-json/javascript-with-addons/output/ember-codemod-args-to-signature/package.json +++ b/packages/cli/tests/fixtures/steps/update-package-json/javascript-with-addons/output/ember-codemod-args-to-signature/package.json @@ -31,29 +31,29 @@ "test": "mt tests --quiet" }, "dependencies": { - "@codemod-utils/ast-javascript": "^1.2.0", + "@codemod-utils/ast-javascript": "^1.2.1", "@codemod-utils/ast-template": "^1.1.0", "@codemod-utils/blueprints": "^1.1.0", "@codemod-utils/ember-cli-string": "^1.1.0", "@codemod-utils/files": "^1.1.0", - "@codemod-utils/json": "^1.1.1", + "@codemod-utils/json": "^1.1.2", "yargs": "^17.7.2" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/eslint-parser": "^7.22.15", + "@babel/core": "^7.23.3", + "@babel/eslint-parser": "^7.23.3", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@codemod-utils/tests": "^1.1.1", "@sondr3/minitest": "^0.1.2", - "concurrently": "^8.2.1", - "eslint": "^8.52.0", + "concurrently": "^8.2.2", + "eslint": "^8.54.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-import": "^2.29.0", - "eslint-plugin-n": "^16.2.0", + "eslint-plugin-n": "^16.3.1", "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-simple-import-sort": "^10.0.0", - "prettier": "^3.0.3" + "prettier": "^3.1.0" }, "engines": { "node": "18.* || >= 20" diff --git a/packages/cli/tests/fixtures/steps/update-package-json/javascript/output/ember-codemod-pod-to-octane/package.json b/packages/cli/tests/fixtures/steps/update-package-json/javascript/output/ember-codemod-pod-to-octane/package.json index b301e442..ae1bc06a 100644 --- a/packages/cli/tests/fixtures/steps/update-package-json/javascript/output/ember-codemod-pod-to-octane/package.json +++ b/packages/cli/tests/fixtures/steps/update-package-json/javascript/output/ember-codemod-pod-to-octane/package.json @@ -35,20 +35,20 @@ "yargs": "^17.7.2" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/eslint-parser": "^7.22.15", + "@babel/core": "^7.23.3", + "@babel/eslint-parser": "^7.23.3", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@codemod-utils/tests": "^1.1.1", "@sondr3/minitest": "^0.1.2", - "concurrently": "^8.2.1", - "eslint": "^8.52.0", + "concurrently": "^8.2.2", + "eslint": "^8.54.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-import": "^2.29.0", - "eslint-plugin-n": "^16.2.0", + "eslint-plugin-n": "^16.3.1", "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-simple-import-sort": "^10.0.0", - "prettier": "^3.0.3" + "prettier": "^3.1.0" }, "engines": { "node": "18.* || >= 20" diff --git a/packages/cli/tests/fixtures/steps/update-package-json/typescript-with-addons/output/ember-codemod-args-to-signature/package.json b/packages/cli/tests/fixtures/steps/update-package-json/typescript-with-addons/output/ember-codemod-args-to-signature/package.json index fa6989d5..31d5b796 100644 --- a/packages/cli/tests/fixtures/steps/update-package-json/typescript-with-addons/output/ember-codemod-args-to-signature/package.json +++ b/packages/cli/tests/fixtures/steps/update-package-json/typescript-with-addons/output/ember-codemod-args-to-signature/package.json @@ -33,37 +33,37 @@ "test": "./build.sh --test && mt dist-for-testing --quiet" }, "dependencies": { - "@codemod-utils/ast-javascript": "^1.2.0", + "@codemod-utils/ast-javascript": "^1.2.1", "@codemod-utils/ast-template": "^1.1.0", "@codemod-utils/blueprints": "^1.1.0", "@codemod-utils/ember-cli-string": "^1.1.0", "@codemod-utils/files": "^1.1.0", - "@codemod-utils/json": "^1.1.1", + "@codemod-utils/json": "^1.1.2", "yargs": "^17.7.2" }, "devDependencies": { - "@babel/core": "^7.23.2", + "@babel/core": "^7.23.3", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@codemod-utils/tests": "^1.1.1", "@sondr3/minitest": "^0.1.2", "@tsconfig/node18": "^18.2.2", "@tsconfig/strictest": "^2.0.2", - "@types/node": "^18.18.7", - "@types/yargs": "^17.0.29", - "@typescript-eslint/eslint-plugin": "^6.9.0", - "@typescript-eslint/parser": "^6.9.0", - "concurrently": "^8.2.1", - "eslint": "^8.52.0", + "@types/node": "^18.18.13", + "@types/yargs": "^17.0.32", + "@typescript-eslint/eslint-plugin": "^6.12.0", + "@typescript-eslint/parser": "^6.12.0", + "concurrently": "^8.2.2", + "eslint": "^8.54.0", "eslint-config-prettier": "^9.0.0", "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-import": "^2.29.0", - "eslint-plugin-n": "^16.2.0", + "eslint-plugin-n": "^16.3.1", "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-typescript-sort-keys": "^3.1.0", - "prettier": "^3.0.3", - "typescript": "^5.2.2" + "prettier": "^3.1.0", + "typescript": "^5.3.2" }, "engines": { "node": "18.* || >= 20" diff --git a/packages/cli/tests/fixtures/steps/update-package-json/typescript/output/ember-codemod-pod-to-octane/package.json b/packages/cli/tests/fixtures/steps/update-package-json/typescript/output/ember-codemod-pod-to-octane/package.json index c1ed84c7..e5a520dd 100644 --- a/packages/cli/tests/fixtures/steps/update-package-json/typescript/output/ember-codemod-pod-to-octane/package.json +++ b/packages/cli/tests/fixtures/steps/update-package-json/typescript/output/ember-codemod-pod-to-octane/package.json @@ -37,28 +37,28 @@ "yargs": "^17.7.2" }, "devDependencies": { - "@babel/core": "^7.23.2", + "@babel/core": "^7.23.3", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@codemod-utils/tests": "^1.1.1", "@sondr3/minitest": "^0.1.2", "@tsconfig/node18": "^18.2.2", "@tsconfig/strictest": "^2.0.2", - "@types/node": "^18.18.7", - "@types/yargs": "^17.0.29", - "@typescript-eslint/eslint-plugin": "^6.9.0", - "@typescript-eslint/parser": "^6.9.0", - "concurrently": "^8.2.1", - "eslint": "^8.52.0", + "@types/node": "^18.18.13", + "@types/yargs": "^17.0.32", + "@typescript-eslint/eslint-plugin": "^6.12.0", + "@typescript-eslint/parser": "^6.12.0", + "concurrently": "^8.2.2", + "eslint": "^8.54.0", "eslint-config-prettier": "^9.0.0", "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-import": "^2.29.0", - "eslint-plugin-n": "^16.2.0", + "eslint-plugin-n": "^16.3.1", "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-typescript-sort-keys": "^3.1.0", - "prettier": "^3.0.3", - "typescript": "^5.2.2" + "prettier": "^3.1.0", + "typescript": "^5.3.2" }, "engines": { "node": "18.* || >= 20" diff --git a/packages/cli/tests/fixtures/typescript-with-addons/output/ember-codemod-args-to-signature/package.json b/packages/cli/tests/fixtures/typescript-with-addons/output/ember-codemod-args-to-signature/package.json index fa6989d5..31d5b796 100644 --- a/packages/cli/tests/fixtures/typescript-with-addons/output/ember-codemod-args-to-signature/package.json +++ b/packages/cli/tests/fixtures/typescript-with-addons/output/ember-codemod-args-to-signature/package.json @@ -33,37 +33,37 @@ "test": "./build.sh --test && mt dist-for-testing --quiet" }, "dependencies": { - "@codemod-utils/ast-javascript": "^1.2.0", + "@codemod-utils/ast-javascript": "^1.2.1", "@codemod-utils/ast-template": "^1.1.0", "@codemod-utils/blueprints": "^1.1.0", "@codemod-utils/ember-cli-string": "^1.1.0", "@codemod-utils/files": "^1.1.0", - "@codemod-utils/json": "^1.1.1", + "@codemod-utils/json": "^1.1.2", "yargs": "^17.7.2" }, "devDependencies": { - "@babel/core": "^7.23.2", + "@babel/core": "^7.23.3", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@codemod-utils/tests": "^1.1.1", "@sondr3/minitest": "^0.1.2", "@tsconfig/node18": "^18.2.2", "@tsconfig/strictest": "^2.0.2", - "@types/node": "^18.18.7", - "@types/yargs": "^17.0.29", - "@typescript-eslint/eslint-plugin": "^6.9.0", - "@typescript-eslint/parser": "^6.9.0", - "concurrently": "^8.2.1", - "eslint": "^8.52.0", + "@types/node": "^18.18.13", + "@types/yargs": "^17.0.32", + "@typescript-eslint/eslint-plugin": "^6.12.0", + "@typescript-eslint/parser": "^6.12.0", + "concurrently": "^8.2.2", + "eslint": "^8.54.0", "eslint-config-prettier": "^9.0.0", "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-import": "^2.29.0", - "eslint-plugin-n": "^16.2.0", + "eslint-plugin-n": "^16.3.1", "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-typescript-sort-keys": "^3.1.0", - "prettier": "^3.0.3", - "typescript": "^5.2.2" + "prettier": "^3.1.0", + "typescript": "^5.3.2" }, "engines": { "node": "18.* || >= 20" diff --git a/packages/cli/tests/fixtures/typescript/output/ember-codemod-pod-to-octane/package.json b/packages/cli/tests/fixtures/typescript/output/ember-codemod-pod-to-octane/package.json index c1ed84c7..e5a520dd 100644 --- a/packages/cli/tests/fixtures/typescript/output/ember-codemod-pod-to-octane/package.json +++ b/packages/cli/tests/fixtures/typescript/output/ember-codemod-pod-to-octane/package.json @@ -37,28 +37,28 @@ "yargs": "^17.7.2" }, "devDependencies": { - "@babel/core": "^7.23.2", + "@babel/core": "^7.23.3", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@codemod-utils/tests": "^1.1.1", "@sondr3/minitest": "^0.1.2", "@tsconfig/node18": "^18.2.2", "@tsconfig/strictest": "^2.0.2", - "@types/node": "^18.18.7", - "@types/yargs": "^17.0.29", - "@typescript-eslint/eslint-plugin": "^6.9.0", - "@typescript-eslint/parser": "^6.9.0", - "concurrently": "^8.2.1", - "eslint": "^8.52.0", + "@types/node": "^18.18.13", + "@types/yargs": "^17.0.32", + "@typescript-eslint/eslint-plugin": "^6.12.0", + "@typescript-eslint/parser": "^6.12.0", + "concurrently": "^8.2.2", + "eslint": "^8.54.0", "eslint-config-prettier": "^9.0.0", "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-import": "^2.29.0", - "eslint-plugin-n": "^16.2.0", + "eslint-plugin-n": "^16.3.1", "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-typescript-sort-keys": "^3.1.0", - "prettier": "^3.0.3", - "typescript": "^5.2.2" + "prettier": "^3.1.0", + "typescript": "^5.3.2" }, "engines": { "node": "18.* || >= 20" diff --git a/packages/cli/tests/migration/index/javascript-with-addons.test.ts b/packages/cli/tests/index/javascript-with-addons.test.ts similarity index 66% rename from packages/cli/tests/migration/index/javascript-with-addons.test.ts rename to packages/cli/tests/index/javascript-with-addons.test.ts index cda26a33..4b9fe857 100644 --- a/packages/cli/tests/migration/index/javascript-with-addons.test.ts +++ b/packages/cli/tests/index/javascript-with-addons.test.ts @@ -1,11 +1,11 @@ import { assertFixture, loadFixture, test } from '@codemod-utils/tests'; -import { createCodemod } from '../../../src/migration/index.js'; +import { createCodemod } from '../../src/index.js'; import { inputProject, outputProject, -} from '../../fixtures/javascript-with-addons/index.js'; -import { codemodOptions } from '../../helpers/shared-test-setups/javascript-with-addons.js'; +} from '../fixtures/javascript-with-addons/index.js'; +import { codemodOptions } from '../helpers/shared-test-setups/javascript-with-addons.js'; test('migration | index > javascript with addons', function () { loadFixture(inputProject, codemodOptions); diff --git a/packages/cli/tests/migration/index/javascript.test.ts b/packages/cli/tests/index/javascript.test.ts similarity index 61% rename from packages/cli/tests/migration/index/javascript.test.ts rename to packages/cli/tests/index/javascript.test.ts index c0af59b5..c56d16cc 100644 --- a/packages/cli/tests/migration/index/javascript.test.ts +++ b/packages/cli/tests/index/javascript.test.ts @@ -1,11 +1,8 @@ import { assertFixture, loadFixture, test } from '@codemod-utils/tests'; -import { createCodemod } from '../../../src/migration/index.js'; -import { - inputProject, - outputProject, -} from '../../fixtures/javascript/index.js'; -import { codemodOptions } from '../../helpers/shared-test-setups/javascript.js'; +import { createCodemod } from '../../src/index.js'; +import { inputProject, outputProject } from '../fixtures/javascript/index.js'; +import { codemodOptions } from '../helpers/shared-test-setups/javascript.js'; test('migration | index > javascript', function () { loadFixture(inputProject, codemodOptions); diff --git a/packages/cli/tests/migration/index/typescript-with-addons.test.ts b/packages/cli/tests/index/typescript-with-addons.test.ts similarity index 66% rename from packages/cli/tests/migration/index/typescript-with-addons.test.ts rename to packages/cli/tests/index/typescript-with-addons.test.ts index f5d6bc78..a27325c5 100644 --- a/packages/cli/tests/migration/index/typescript-with-addons.test.ts +++ b/packages/cli/tests/index/typescript-with-addons.test.ts @@ -1,11 +1,11 @@ import { assertFixture, loadFixture, test } from '@codemod-utils/tests'; -import { createCodemod } from '../../../src/migration/index.js'; +import { createCodemod } from '../../src/index.js'; import { inputProject, outputProject, -} from '../../fixtures/typescript-with-addons/index.js'; -import { codemodOptions } from '../../helpers/shared-test-setups/typescript-with-addons.js'; +} from '../fixtures/typescript-with-addons/index.js'; +import { codemodOptions } from '../helpers/shared-test-setups/typescript-with-addons.js'; test('migration | index > typescript with addons', function () { loadFixture(inputProject, codemodOptions); diff --git a/packages/cli/tests/migration/index/typescript.test.ts b/packages/cli/tests/index/typescript.test.ts similarity index 61% rename from packages/cli/tests/migration/index/typescript.test.ts rename to packages/cli/tests/index/typescript.test.ts index 813eee3c..cd9dfc4b 100644 --- a/packages/cli/tests/migration/index/typescript.test.ts +++ b/packages/cli/tests/index/typescript.test.ts @@ -1,11 +1,8 @@ import { assertFixture, loadFixture, test } from '@codemod-utils/tests'; -import { createCodemod } from '../../../src/migration/index.js'; -import { - inputProject, - outputProject, -} from '../../fixtures/typescript/index.js'; -import { codemodOptions } from '../../helpers/shared-test-setups/typescript.js'; +import { createCodemod } from '../../src/index.js'; +import { inputProject, outputProject } from '../fixtures/typescript/index.js'; +import { codemodOptions } from '../helpers/shared-test-setups/typescript.js'; test('migration | index > typescript', function () { loadFixture(inputProject, codemodOptions); diff --git a/packages/cli/tests/migration/steps/create-files-from-blueprints/javascript-with-addons.test.ts b/packages/cli/tests/steps/create-files-from-blueprints/javascript-with-addons.test.ts similarity index 77% rename from packages/cli/tests/migration/steps/create-files-from-blueprints/javascript-with-addons.test.ts rename to packages/cli/tests/steps/create-files-from-blueprints/javascript-with-addons.test.ts index c53a0cf3..f0bcf7b2 100644 --- a/packages/cli/tests/migration/steps/create-files-from-blueprints/javascript-with-addons.test.ts +++ b/packages/cli/tests/steps/create-files-from-blueprints/javascript-with-addons.test.ts @@ -5,11 +5,11 @@ import { test, } from '@codemod-utils/tests'; -import { createFilesFromBlueprints } from '../../../../src/migration/steps/index.js'; +import { createFilesFromBlueprints } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/javascript-with-addons.js'; +} from '../../helpers/shared-test-setups/javascript-with-addons.js'; test('migration | steps | create-files-from-blueprints > javascript-with-addons', function () { const inputProject = {}; diff --git a/packages/cli/tests/migration/steps/create-files-from-blueprints/javascript.test.ts b/packages/cli/tests/steps/create-files-from-blueprints/javascript.test.ts similarity index 77% rename from packages/cli/tests/migration/steps/create-files-from-blueprints/javascript.test.ts rename to packages/cli/tests/steps/create-files-from-blueprints/javascript.test.ts index 91ebcf64..99322fc7 100644 --- a/packages/cli/tests/migration/steps/create-files-from-blueprints/javascript.test.ts +++ b/packages/cli/tests/steps/create-files-from-blueprints/javascript.test.ts @@ -5,11 +5,11 @@ import { test, } from '@codemod-utils/tests'; -import { createFilesFromBlueprints } from '../../../../src/migration/steps/index.js'; +import { createFilesFromBlueprints } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/javascript.js'; +} from '../../helpers/shared-test-setups/javascript.js'; test('migration | steps | create-files-from-blueprints > javascript', function () { const inputProject = {}; diff --git a/packages/cli/tests/migration/steps/create-files-from-blueprints/typescript-with-addons.test.ts b/packages/cli/tests/steps/create-files-from-blueprints/typescript-with-addons.test.ts similarity index 77% rename from packages/cli/tests/migration/steps/create-files-from-blueprints/typescript-with-addons.test.ts rename to packages/cli/tests/steps/create-files-from-blueprints/typescript-with-addons.test.ts index 630ec995..75ba5dce 100644 --- a/packages/cli/tests/migration/steps/create-files-from-blueprints/typescript-with-addons.test.ts +++ b/packages/cli/tests/steps/create-files-from-blueprints/typescript-with-addons.test.ts @@ -5,11 +5,11 @@ import { test, } from '@codemod-utils/tests'; -import { createFilesFromBlueprints } from '../../../../src/migration/steps/index.js'; +import { createFilesFromBlueprints } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/typescript-with-addons.js'; +} from '../../helpers/shared-test-setups/typescript-with-addons.js'; test('migration | steps | create-files-from-blueprints > typescript-with-addons', function () { const inputProject = {}; diff --git a/packages/cli/tests/migration/steps/create-files-from-blueprints/typescript.test.ts b/packages/cli/tests/steps/create-files-from-blueprints/typescript.test.ts similarity index 77% rename from packages/cli/tests/migration/steps/create-files-from-blueprints/typescript.test.ts rename to packages/cli/tests/steps/create-files-from-blueprints/typescript.test.ts index e7b7297d..57474c2e 100644 --- a/packages/cli/tests/migration/steps/create-files-from-blueprints/typescript.test.ts +++ b/packages/cli/tests/steps/create-files-from-blueprints/typescript.test.ts @@ -5,11 +5,11 @@ import { test, } from '@codemod-utils/tests'; -import { createFilesFromBlueprints } from '../../../../src/migration/steps/index.js'; +import { createFilesFromBlueprints } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/typescript.js'; +} from '../../helpers/shared-test-setups/typescript.js'; test('migration | steps | create-files-from-blueprints > typescript', function () { const inputProject = {}; diff --git a/packages/cli/tests/migration/steps/create-options/javascript-with-addons.test.ts b/packages/cli/tests/steps/create-options/javascript-with-addons.test.ts similarity index 62% rename from packages/cli/tests/migration/steps/create-options/javascript-with-addons.test.ts rename to packages/cli/tests/steps/create-options/javascript-with-addons.test.ts index c90ec9e7..251a048b 100644 --- a/packages/cli/tests/migration/steps/create-options/javascript-with-addons.test.ts +++ b/packages/cli/tests/steps/create-options/javascript-with-addons.test.ts @@ -1,10 +1,10 @@ import { assert, test } from '@codemod-utils/tests'; -import { createOptions } from '../../../../src/migration/steps/index.js'; +import { createOptions } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/javascript-with-addons.js'; +} from '../../helpers/shared-test-setups/javascript-with-addons.js'; test('migration | steps | create-options > javascript-with-addons', function () { assert.deepStrictEqual(createOptions(codemodOptions), options); diff --git a/packages/cli/tests/migration/steps/create-options/javascript.test.ts b/packages/cli/tests/steps/create-options/javascript.test.ts similarity index 63% rename from packages/cli/tests/migration/steps/create-options/javascript.test.ts rename to packages/cli/tests/steps/create-options/javascript.test.ts index c735f453..c1189fdb 100644 --- a/packages/cli/tests/migration/steps/create-options/javascript.test.ts +++ b/packages/cli/tests/steps/create-options/javascript.test.ts @@ -1,10 +1,10 @@ import { assert, test } from '@codemod-utils/tests'; -import { createOptions } from '../../../../src/migration/steps/index.js'; +import { createOptions } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/javascript.js'; +} from '../../helpers/shared-test-setups/javascript.js'; test('migration | steps | create-options > javascript', function () { assert.deepStrictEqual(createOptions(codemodOptions), options); diff --git a/packages/cli/tests/migration/steps/create-options/typescript-with-addons.test.ts b/packages/cli/tests/steps/create-options/typescript-with-addons.test.ts similarity index 62% rename from packages/cli/tests/migration/steps/create-options/typescript-with-addons.test.ts rename to packages/cli/tests/steps/create-options/typescript-with-addons.test.ts index 0bc0c185..b147574d 100644 --- a/packages/cli/tests/migration/steps/create-options/typescript-with-addons.test.ts +++ b/packages/cli/tests/steps/create-options/typescript-with-addons.test.ts @@ -1,10 +1,10 @@ import { assert, test } from '@codemod-utils/tests'; -import { createOptions } from '../../../../src/migration/steps/index.js'; +import { createOptions } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/typescript-with-addons.js'; +} from '../../helpers/shared-test-setups/typescript-with-addons.js'; test('migration | steps | create-options > typescript-with-addons', function () { assert.deepStrictEqual(createOptions(codemodOptions), options); diff --git a/packages/cli/tests/migration/steps/create-options/typescript.test.ts b/packages/cli/tests/steps/create-options/typescript.test.ts similarity index 63% rename from packages/cli/tests/migration/steps/create-options/typescript.test.ts rename to packages/cli/tests/steps/create-options/typescript.test.ts index 60469c29..1dcb4e58 100644 --- a/packages/cli/tests/migration/steps/create-options/typescript.test.ts +++ b/packages/cli/tests/steps/create-options/typescript.test.ts @@ -1,10 +1,10 @@ import { assert, test } from '@codemod-utils/tests'; -import { createOptions } from '../../../../src/migration/steps/index.js'; +import { createOptions } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/typescript.js'; +} from '../../helpers/shared-test-setups/typescript.js'; test('migration | steps | create-options > typescript', function () { assert.deepStrictEqual(createOptions(codemodOptions), options); diff --git a/packages/cli/tests/migration/steps/update-package-json/javascript-with-addons.test.ts b/packages/cli/tests/steps/update-package-json/javascript-with-addons.test.ts similarity index 79% rename from packages/cli/tests/migration/steps/update-package-json/javascript-with-addons.test.ts rename to packages/cli/tests/steps/update-package-json/javascript-with-addons.test.ts index 2e5d61f2..e78dca50 100644 --- a/packages/cli/tests/migration/steps/update-package-json/javascript-with-addons.test.ts +++ b/packages/cli/tests/steps/update-package-json/javascript-with-addons.test.ts @@ -5,11 +5,11 @@ import { test, } from '@codemod-utils/tests'; -import { updatePackageJson } from '../../../../src/migration/steps/index.js'; +import { updatePackageJson } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/javascript-with-addons.js'; +} from '../../helpers/shared-test-setups/javascript-with-addons.js'; test('migration | steps | update-package-json > javascript-with-addons', function () { const inputProject = convertFixtureToJson( diff --git a/packages/cli/tests/migration/steps/update-package-json/javascript.test.ts b/packages/cli/tests/steps/update-package-json/javascript.test.ts similarity index 80% rename from packages/cli/tests/migration/steps/update-package-json/javascript.test.ts rename to packages/cli/tests/steps/update-package-json/javascript.test.ts index 33feac11..0a09eb4e 100644 --- a/packages/cli/tests/migration/steps/update-package-json/javascript.test.ts +++ b/packages/cli/tests/steps/update-package-json/javascript.test.ts @@ -5,11 +5,11 @@ import { test, } from '@codemod-utils/tests'; -import { updatePackageJson } from '../../../../src/migration/steps/index.js'; +import { updatePackageJson } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/javascript.js'; +} from '../../helpers/shared-test-setups/javascript.js'; test('migration | steps | update-package-json > javascript', function () { const inputProject = convertFixtureToJson( diff --git a/packages/cli/tests/migration/steps/update-package-json/typescript-with-addons.test.ts b/packages/cli/tests/steps/update-package-json/typescript-with-addons.test.ts similarity index 79% rename from packages/cli/tests/migration/steps/update-package-json/typescript-with-addons.test.ts rename to packages/cli/tests/steps/update-package-json/typescript-with-addons.test.ts index e32b78b7..bb63f692 100644 --- a/packages/cli/tests/migration/steps/update-package-json/typescript-with-addons.test.ts +++ b/packages/cli/tests/steps/update-package-json/typescript-with-addons.test.ts @@ -5,11 +5,11 @@ import { test, } from '@codemod-utils/tests'; -import { updatePackageJson } from '../../../../src/migration/steps/index.js'; +import { updatePackageJson } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/typescript-with-addons.js'; +} from '../../helpers/shared-test-setups/typescript-with-addons.js'; test('migration | steps | update-package-json > typescript-with-addons', function () { const inputProject = convertFixtureToJson( diff --git a/packages/cli/tests/migration/steps/update-package-json/typescript.test.ts b/packages/cli/tests/steps/update-package-json/typescript.test.ts similarity index 80% rename from packages/cli/tests/migration/steps/update-package-json/typescript.test.ts rename to packages/cli/tests/steps/update-package-json/typescript.test.ts index 261027f0..95c92902 100644 --- a/packages/cli/tests/migration/steps/update-package-json/typescript.test.ts +++ b/packages/cli/tests/steps/update-package-json/typescript.test.ts @@ -5,11 +5,11 @@ import { test, } from '@codemod-utils/tests'; -import { updatePackageJson } from '../../../../src/migration/steps/index.js'; +import { updatePackageJson } from '../../../src/steps/index.js'; import { codemodOptions, options, -} from '../../../helpers/shared-test-setups/typescript.js'; +} from '../../helpers/shared-test-setups/typescript.js'; test('migration | steps | update-package-json > typescript', function () { const inputProject = convertFixtureToJson(