Updated @codemod-utils/* (#109)

ijlee2 · web-flow · commit db493be622f0 · 2025-09-12T08:32:55.000+02:00
* chore: Updated @codemod-utils/*

* chore: Addressed breaking changes in @codemod-utils/package-json@3.0.0

* refactor: Consumed getPackageType()

* chore: Added changeset
diff --git a/.changeset/itchy-beds-push.md b/.changeset/itchy-beds-push.md
@@ -0,0 +1,5 @@
+---
+"ember-codemod-v1-to-v2": patch
+---
+
+Updated @codemod-utils/\*
diff --git a/package.json b/package.json
@@ -41,16 +41,16 @@
     "test": "./build.sh --test && mt dist-for-testing --quiet"
   },
   "dependencies": {
-    "@codemod-utils/blueprints": "^2.0.2",
-    "@codemod-utils/files": "^3.0.4",
-    "@codemod-utils/json": "^2.0.3",
+    "@codemod-utils/blueprints": "^2.0.3",
+    "@codemod-utils/files": "^3.0.5",
+    "@codemod-utils/package-json": "^3.1.0",
     "strip-json-comments": "^5.0.3",
     "yargs": "^18.0.0"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.7",
     "@changesets/get-github-info": "^0.6.0",
-    "@codemod-utils/tests": "^2.0.3",
+    "@codemod-utils/tests": "^2.0.4",
     "@ijlee2-frontend-configs/eslint-config-node": "^2.1.2",
     "@ijlee2-frontend-configs/prettier": "^2.1.1",
     "@sondr3/minitest": "^0.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/steps/create-options.ts b/src/steps/create-options.ts
@@ -1,5 +1,9 @@
 import { findFiles } from '@codemod-utils/files';
-import { readPackageJson, validatePackageJson } from '@codemod-utils/json';
+import {
+  getPackageType,
+  readPackageJson,
+  validatePackageJson,
+} from '@codemod-utils/package-json';
 
 import type { CodemodOptions, Options } from '../types/index.js';
 
@@ -13,13 +17,7 @@ function analyzePackageJson(codemodOptions: CodemodOptions): AddonPackage {
 
   validatePackageJson(packageJson);
 
-  const {
-    dependencies,
-    devDependencies,
-    'ember-addon': emberAddon,
-    name,
-    version,
-  } = packageJson;
+  const { dependencies, devDependencies, name, version } = packageJson;
 
   const projectDependencies = new Map<string, string>([
     ...(Object.entries(dependencies ?? {}) as [string, string][]),
@@ -30,7 +28,7 @@ function analyzePackageJson(codemodOptions: CodemodOptions): AddonPackage {
     dependencies: projectDependencies,
     hasGlint: projectDependencies.has('@glint/core'),
     hasTypeScript: projectDependencies.has('typescript'),
-    isV1Addon: Boolean(emberAddon),
+    isV1Addon: getPackageType(packageJson) === 'v1-addon',
     name,
     version,
   };
diff --git a/src/steps/update-addon-package-json.ts b/src/steps/update-addon-package-json.ts
@@ -1,7 +1,7 @@
 import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import { readPackageJson } from '@codemod-utils/json';
+import { readPackageJson } from '@codemod-utils/package-json';
 
 import type { Context, Options } from '../types/index.js';
 import {
diff --git a/src/steps/update-addon-package-json/update-dependencies.ts b/src/steps/update-addon-package-json/update-dependencies.ts
@@ -1,4 +1,4 @@
-import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { convertToMap, convertToObject } from '@codemod-utils/package-json';
 
 import type { Options, PackageJson } from '../../types/index.js';
 import { getLatestVersion } from '../../utils/blueprints.js';
diff --git a/src/steps/update-addon-package-json/update-dev-dependencies.ts b/src/steps/update-addon-package-json/update-dev-dependencies.ts
@@ -1,4 +1,4 @@
-import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { convertToMap, convertToObject } from '@codemod-utils/package-json';
 
 import type { Options, PackageJson } from '../../types/index.js';
 import { getLatestVersion } from '../../utils/blueprints.js';
diff --git a/src/steps/update-addon-package-json/update-scripts.ts b/src/steps/update-addon-package-json/update-scripts.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-useless-escape */
-import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { convertToMap, convertToObject } from '@codemod-utils/package-json';
 
 import type { Options, PackageJson } from '../../types/index.js';
 
diff --git a/src/steps/update-test-app-package-json.ts b/src/steps/update-test-app-package-json.ts
@@ -1,7 +1,7 @@
 import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import { readPackageJson } from '@codemod-utils/json';
+import { readPackageJson } from '@codemod-utils/package-json';
 
 import type { Options } from '../types/index.js';
 import {
diff --git a/src/steps/update-test-app-package-json/move-dev-dependencies-to-dependencies.ts b/src/steps/update-test-app-package-json/move-dev-dependencies-to-dependencies.ts
@@ -1,4 +1,4 @@
-import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { convertToMap, convertToObject } from '@codemod-utils/package-json';
 
 import type { Options, PackageJson } from '../../types/index.js';
 import { getVersion } from '../../utils/blueprints.js';
diff --git a/src/steps/update-test-app-package-json/update-dependencies.ts b/src/steps/update-test-app-package-json/update-dependencies.ts
@@ -1,4 +1,4 @@
-import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { convertToMap, convertToObject } from '@codemod-utils/package-json';
 
 import type { PackageJson } from '../../types/index.js';
 
diff --git a/src/steps/update-test-app-package-json/update-dev-dependencies.ts b/src/steps/update-test-app-package-json/update-dev-dependencies.ts
@@ -1,4 +1,4 @@
-import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { convertToMap, convertToObject } from '@codemod-utils/package-json';
 
 import type { Options, PackageJson } from '../../types/index.js';
 import { getLatestVersion } from '../../utils/blueprints.js';
diff --git a/src/steps/update-test-app-package-json/update-scripts.ts b/src/steps/update-test-app-package-json/update-scripts.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-useless-escape */
-import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { convertToMap, convertToObject } from '@codemod-utils/package-json';
 
 import type { Options, PackageJson } from '../../types/index.js';
 
diff --git a/src/types/index.ts b/src/types/index.ts
@@ -1,4 +1,4 @@
-import type { PackageJson, TsConfigJson } from '@codemod-utils/json';
+import type { PackageJson } from '@codemod-utils/package-json';
 
 type CodemodOptions = {
   addonLocation: string | undefined;
@@ -40,4 +40,4 @@ type Options = {
   projectRoot: string;
 };
 
-export type { CodemodOptions, Context, Options, PackageJson, TsConfigJson };
+export type { CodemodOptions, Context, Options, PackageJson };
diff --git a/tests/steps/create-options/customizations.test.ts b/tests/steps/create-options/customizations.test.ts
@@ -9,6 +9,7 @@ test('steps | create-options > customizations', function () {
       {
         name: 'ember-container-query',
         version: '3.2.0',
+        keywords: ['ember-addon'],
         dependencies: {
           'ember-cli-babel': '^7.26.11',
           'ember-cli-htmlbars': '^6.1.1',
diff --git a/tests/steps/create-options/glint.test.ts b/tests/steps/create-options/glint.test.ts
@@ -9,6 +9,7 @@ test('steps | create-options > glint', function () {
       {
         name: 'ember-container-query',
         version: '3.2.0',
+        keywords: ['ember-addon'],
         dependencies: {
           'ember-cli-babel': '^7.26.11',
           'ember-cli-htmlbars': '^6.1.1',
diff --git a/tests/steps/create-options/javascript.test.ts b/tests/steps/create-options/javascript.test.ts
@@ -9,6 +9,7 @@ test('steps | create-options > javascript', function () {
       {
         name: 'ember-container-query',
         version: '3.2.0',
+        keywords: ['ember-addon'],
         dependencies: {
           'ember-cli-babel': '^7.26.11',
           'ember-cli-htmlbars': '^6.1.1',
diff --git a/tests/steps/create-options/npm.test.ts b/tests/steps/create-options/npm.test.ts
@@ -15,6 +15,7 @@ test('steps | create-options > npm', function () {
       {
         name: 'new-v1-addon',
         version: '0.0.0',
+        keywords: ['ember-addon'],
         dependencies: {
           'ember-cli-babel': '^7.26.11',
           'ember-cli-htmlbars': '^6.1.1',
diff --git a/tests/steps/create-options/pnpm.test.ts b/tests/steps/create-options/pnpm.test.ts
@@ -15,6 +15,7 @@ test('steps | create-options > pnpm', function () {
       {
         name: 'new-v1-addon',
         version: '0.0.0',
+        keywords: ['ember-addon'],
         dependencies: {
           'ember-cli-babel': '^7.26.11',
           'ember-cli-htmlbars': '^6.1.1',
diff --git a/tests/steps/create-options/scoped.test.ts b/tests/steps/create-options/scoped.test.ts
@@ -9,6 +9,7 @@ test('steps | create-options > scoped', function () {
       {
         name: '@ijlee2/ember-container-query',
         version: '3.2.0',
+        keywords: ['ember-addon'],
         dependencies: {
           'ember-cli-babel': '^7.26.11',
           'ember-cli-htmlbars': '^6.1.1',
diff --git a/tests/steps/create-options/typescript.test.ts b/tests/steps/create-options/typescript.test.ts
@@ -9,6 +9,7 @@ test('steps | create-options > typescript', function () {
       {
         name: 'ember-container-query',
         version: '3.2.0',
+        keywords: ['ember-addon'],
         dependencies: {
           'ember-cli-babel': '^7.26.11',
           'ember-cli-htmlbars': '^6.1.1',
diff --git a/tests/steps/create-options/v2-addon.test.ts b/tests/steps/create-options/v2-addon.test.ts
@@ -9,6 +9,7 @@ test('steps | create-options > v2 addon', function () {
       {
         name: 'ember-container-query',
         version: '3.2.0',
+        keywords: ['ember-addon'],
         private: true,
         workspaces: ['ember-container-query', 'test-app'],
       },

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"ember-codemod-v1-to-v2": patch
 +---
++
 +Updated @codemod-utils/\*
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { convertToMap, convertToObject } from '@codemod-utils/json';`
	`1`	`+import { convertToMap, convertToObject } from '@codemod-utils/package-json';`
`2`	`2`
`3`	`3`	`import type { Options, PackageJson } from '../../types/index.js';`
`4`	`4`	`import { getLatestVersion } from '../../utils/blueprints.js';`