Updated latestVersions and standardized project structure (#104)

* chore: Updated latestVersions * chore: Updated fixtures * refactor: Realigned the project structure to the recommended * chore: Updated test files * chore: Added changeset --------- Co-authored-by: ijlee2 <ijlee2@users.noreply.github.com>
ijlee2 · Nov 24, 2023 · 282f0d1 · 282f0d1
1 parent 9c3ab3b
commit 282f0d1
Show file tree

Hide file tree

Showing 32 changed files with 133 additions and 134 deletions.
diff --git a/.changeset/tidy-spies-shout.md 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
@@ -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 → packages/cli/src/index.ts b/packages/cli/src/migration/index.ts → 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/...ion/steps/create-files-from-blueprints.ts → ...src/steps/create-files-from-blueprints.ts b/...ion/steps/create-files-from-blueprints.ts → ...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/...cli/src/migration/steps/create-options.ts → packages/cli/src/steps/create-options.ts b/...cli/src/migration/steps/create-options.ts → 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 → packages/cli/src/steps/index.ts b/packages/cli/src/migration/steps/index.ts → packages/cli/src/steps/index.ts
diff --git a/...rc/migration/steps/update-package-json.ts → ...ages/cli/src/steps/update-package-json.ts b/...rc/migration/steps/update-package-json.ts → ...ages/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
@@ -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/...tests/fixtures/javascript-with-addons/output/ember-codemod-args-to-signature/package.json b/...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
@@ -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/...e-package-json/javascript-with-addons/output/ember-codemod-args-to-signature/package.json b/...e-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/...ures/steps/update-package-json/javascript/output/ember-codemod-pod-to-octane/package.json b/...ures/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/...e-package-json/typescript-with-addons/output/ember-codemod-args-to-signature/package.json b/...e-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/...ures/steps/update-package-json/typescript/output/ember-codemod-pod-to-octane/package.json b/...ures/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/...tests/fixtures/typescript-with-addons/output/ember-codemod-args-to-signature/package.json b/...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"