ember-codemod-v1-to-v2 0.6.2 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -27,16 +27,10 @@
     "bin/",
     "src/"
   ],
-  "scripts": {
-    "changelog": "lerna-changelog",
-    "lint": "eslint . --cache",
-    "lint:fix": "eslint . --fix",
-    "test": "mt tests --quiet"
-  },
   "dependencies": {
     "@codemod-utils/blueprints": "^0.1.2",
     "@codemod-utils/files": "^0.3.1",
-    "@codemod-utils/json": "^0.1.2",
+    "@codemod-utils/json": "^0.2.0",
     "strip-json-comments": "^5.0.0",
     "yargs": "^17.7.2"
   },
@@ -66,5 +60,11 @@
       "enhance: documentation": "Documentation",
       "user feedback": "User Feedback"
     }
+  },
+  "scripts": {
+    "changelog": "lerna-changelog",
+    "lint": "eslint . --cache",
+    "lint:fix": "eslint . --fix",
+    "test": "mt tests --quiet"
   }
-}
+}

package/src/migration/ember-addon/steps/create-options.js

@@ -1,14 +1,20 @@
 import { findFiles, unionize } from '@codemod-utils/files';
-import { readPackageJson } from '@codemod-utils/json';
+import { readPackageJson, validatePackageJson } from '@codemod-utils/json';
 
 function analyzePackageJson(codemodOptions) {
+  const { projectRoot } = codemodOptions;
+
+  const packageJson = readPackageJson({ projectRoot });
+
+  validatePackageJson(packageJson);
+
   const {
     dependencies,
     devDependencies,
     'ember-addon': emberAddon,
     name,
     version,
-  } = readPackageJson(codemodOptions);
+  } = packageJson;
 
   const projectDependencies = new Map([
     ...Object.entries(dependencies ?? {}),

package/src/migration/ember-addon/steps/update-addon-package-json.js

@@ -1,7 +1,11 @@
-import { readFileSync, writeFileSync } from 'node:fs';
+import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import { convertToMap, convertToObject } from '@codemod-utils/json';
+import {
+  convertToMap,
+  convertToObject,
+  readPackageJson,
+} from '@codemod-utils/json';
 
 import { getVersion } from '../../../utils/blueprints.js';
 
@@ -158,16 +162,17 @@ function updateScripts(packageJson) {
 export function updateAddonPackageJson(context, options) {
   const { locations, projectRoot } = options;
 
-  const oldPath = join(projectRoot, locations.addon, 'package.json');
-  const oldFile = readFileSync(oldPath, 'utf8');
-  const packageJson = JSON.parse(oldFile);
+  const packageJson = readPackageJson({
+    projectRoot: join(projectRoot, locations.addon),
+  });
 
   updateDependencies(packageJson, options);
   updateDevDependencies(packageJson, options);
   updateScripts(packageJson);
   updateOtherFields(packageJson, context, options);
 
-  const newFile = JSON.stringify(packageJson, null, 2) + '\n';
+  const destination = join(projectRoot, locations.addon, 'package.json');
+  const file = JSON.stringify(packageJson, null, 2) + '\n';
 
-  writeFileSync(oldPath, newFile, 'utf8');
+  writeFileSync(destination, file, 'utf8');
 }

package/src/migration/ember-addon/steps/update-test-app-package-json.js

@@ -1,7 +1,11 @@
-import { readFileSync, writeFileSync } from 'node:fs';
+import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import { convertToMap, convertToObject } from '@codemod-utils/json';
+import {
+  convertToMap,
+  convertToObject,
+  readPackageJson,
+} from '@codemod-utils/json';
 
 import { getVersion } from '../../../utils/blueprints.js';
 
@@ -75,16 +79,17 @@ function updateOtherFields(packageJson, options) {
 export function updateTestAppPackageJson(options) {
   const { locations, projectRoot } = options;
 
-  const oldPath = join(projectRoot, locations.testApp, 'package.json');
-  const oldFile = readFileSync(oldPath, 'utf8');
-  const packageJson = JSON.parse(oldFile);
+  const packageJson = readPackageJson({
+    projectRoot: join(projectRoot, locations.testApp),
+  });
 
   moveDependenciesToDevDependencies(packageJson, options);
   updateDependencies(packageJson);
   updateDevDependencies(packageJson, options);
   updateOtherFields(packageJson, options);
 
-  const newFile = JSON.stringify(packageJson, null, 2) + '\n';
+  const destination = join(projectRoot, locations.testApp, 'package.json');
+  const file = JSON.stringify(packageJson, null, 2) + '\n';
 
-  writeFileSync(oldPath, newFile, 'utf8');
+  writeFileSync(destination, file, 'utf8');
 }