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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -28,18 +28,18 @@
     "src/"
   ],
   "dependencies": {
-    "@codemod-utils/blueprints": "^0.1.1",
-    "@codemod-utils/files": "^0.1.0",
-    "@codemod-utils/json": "^0.1.1",
+    "@codemod-utils/blueprints": "^0.1.2",
+    "@codemod-utils/files": "^0.3.1",
+    "@codemod-utils/json": "^0.2.0",
     "strip-json-comments": "^5.0.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.1",
-    "@babel/eslint-parser": "^7.21.8",
-    "@codemod-utils/tests": "^0.1.0",
+    "@babel/core": "^7.22.5",
+    "@babel/eslint-parser": "^7.22.5",
+    "@codemod-utils/tests": "^0.1.2",
     "@sondr3/minitest": "^0.1.1",
-    "eslint": "^8.41.0",
+    "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-n": "^16.0.0",

package/src/migration/ember-addon/steps/analyze-addon.js

@@ -1,4 +1,4 @@
-import { findFiles, renameDirectory } from '@codemod-utils/files';
+import { findFiles, renamePathByDirectory } from '@codemod-utils/files';
 
 import { getVersion } from '../../../utils/blueprints.js';
 
@@ -6,12 +6,12 @@ function getAppReexports(options) {
   const { projectRoot } = options;
 
   const filePaths = findFiles('app/**/*.js', {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   return filePaths
     .map((filePath) => {
-      return renameDirectory(filePath, {
+      return renamePathByDirectory(filePath, {
         from: 'app',
         to: '',
       });
@@ -29,12 +29,12 @@ function getPublicAssets(options) {
   const { projectRoot } = options;
 
   const filePaths = findFiles('public/**/*', {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   return filePaths
     .map((filePath) => {
-      return renameDirectory(filePath, {
+      return renamePathByDirectory(filePath, {
         from: 'public',
         to: '',
       });
@@ -46,18 +46,18 @@ function getPublicEntrypoints(options) {
   const { projectRoot } = options;
 
   const filePaths = findFiles('{addon,addon-test-support}/**/*.{js,ts}', {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   return filePaths
     .map((filePath) => {
-      return renameDirectory(filePath, {
+      return renamePathByDirectory(filePath, {
         from: 'addon',
         to: '',
       });
     })
     .map((filePath) => {
-      return renameDirectory(filePath, {
+      return renamePathByDirectory(filePath, {
         from: 'addon-test-support',
         to: 'test-support',
       });

package/src/migration/ember-addon/steps/create-files-from-blueprint.js

@@ -37,8 +37,8 @@ export function createFilesFromBlueprint(context, options) {
   const cwd = join(blueprintsRoot, 'ember-addon');
 
   const blueprintFilePaths = findFiles('**/*', {
-    cwd,
     ignoreList: filesToSkip,
+    projectRoot: cwd,
   });
 
   const fileMap = new Map(

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 ?? {}),
@@ -37,7 +43,7 @@ function analyzePackageManager(codemodOptions) {
   const lockFiles = [...mapping.keys()];
 
   const filePaths = findFiles(unionize(lockFiles), {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   if (filePaths.length !== 1) {

package/src/migration/ember-addon/steps/move-addon-files.js

@@ -9,7 +9,7 @@ function moveAddonFolder(options) {
   const { locations, projectRoot } = options;
 
   const filePaths = findFiles('addon/**/*', {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   const filePathMap = mapFilePaths(filePaths, {
@@ -24,7 +24,7 @@ function moveAddonTestSupportFolder(options) {
   const { locations, projectRoot } = options;
 
   const filePaths = findFiles('addon-test-support/**/*', {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   const filePathMap = mapFilePaths(filePaths, {
@@ -39,7 +39,7 @@ function moveBlueprintsFolder(options) {
   const { locations, projectRoot } = options;
 
   const filePaths = findFiles('blueprints/**/*', {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   const filePathMap = mapFilePaths(filePaths, {
@@ -54,7 +54,7 @@ function movePublicFolder(options) {
   const { locations, projectRoot } = options;
 
   const filePaths = findFiles('public/**/*', {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   const filePathMap = mapFilePaths(filePaths, {
@@ -69,7 +69,7 @@ function removeAppFolder(options) {
   const { projectRoot } = options;
 
   const filePaths = findFiles('app/**/*', {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   removeFiles(filePaths, options);

package/src/migration/ember-addon/steps/move-project-root-files.js

@@ -13,7 +13,7 @@ function copyToAddon(options) {
   const files = ['LICENSE.md', 'README.md'];
 
   const filePaths = findFiles(unionize(files), {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   const filePathMap = mapFilePaths(filePaths, {
@@ -48,7 +48,7 @@ function moveToAddonAndTestApp(options) {
   }
 
   const filePaths = findFiles(unionize([...files]), {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   let filePathMap = mapFilePaths(filePaths, {
@@ -79,7 +79,7 @@ function moveToTestApp(options) {
   ];
 
   const filePaths = findFiles(unionize(files), {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   const filePathMap = mapFilePaths(filePaths, {
@@ -96,7 +96,7 @@ function removeFromProjectRoot(options) {
   const files = ['.npmignore', 'index.js'];
 
   const filePaths = findFiles(unionize(files), {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   removeFiles(filePaths, options);

package/src/migration/ember-addon/steps/move-test-app-files.js

@@ -7,7 +7,7 @@ function moveTestsFolder(options) {
   const { locations, projectRoot } = options;
 
   let filePaths = findFiles('tests/dummy/**/*', {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   let filePathMap = mapFilePaths(filePaths, {
@@ -18,8 +18,8 @@ function moveTestsFolder(options) {
   moveFiles(filePathMap, options);
 
   filePaths = findFiles('tests/**/*', {
-    cwd: projectRoot,
     ignoreList: ['tests/dummy/**/*'],
+    projectRoot,
   });
 
   filePathMap = mapFilePaths(filePaths, {
@@ -38,7 +38,7 @@ function moveTypesFolder(options) {
   }
 
   let filePaths = findFiles('types/dummy/**/*', {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   let filePathMap = mapFilePaths(filePaths, {
@@ -49,8 +49,8 @@ function moveTypesFolder(options) {
   moveFiles(filePathMap, options);
 
   filePaths = findFiles('types/**/*', {
-    cwd: projectRoot,
     ignoreList: ['types/dummy/**/*'],
+    projectRoot,
   });
 
   filePathMap = mapFilePaths(filePaths, {
@@ -67,7 +67,7 @@ function renameDummy(options) {
   // File extensions had been specified, partly to encode assumptions
   // about Ember, and partly to avoid corrupting non-text files
   const filePaths = findFiles(`${locations.testApp}/**/*.{d.ts,html,js,ts}`, {
-    cwd: projectRoot,
+    projectRoot,
   });
 
   filePaths.forEach((filePath) => {

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');
 }

package/src/utils/blueprints/get-version.js

@@ -1,19 +1,19 @@
 import { decideVersion } from '@codemod-utils/blueprints';
 
 const latestVersions = new Map([
-  ['@babel/core', '7.22.1'],
+  ['@babel/core', '7.22.5'],
   ['@babel/plugin-proposal-class-properties', '7.18.6'],
-  ['@babel/plugin-proposal-decorators', '7.22.3'],
-  ['@babel/preset-typescript', '7.21.5'],
-  ['@babel/runtime', '7.22.3'],
-  ['@embroider/addon-dev', '3.1.0'],
+  ['@babel/plugin-proposal-decorators', '7.22.5'],
+  ['@babel/preset-typescript', '7.22.5'],
+  ['@babel/runtime', '7.22.5'],
+  ['@embroider/addon-dev', '3.1.1'],
   ['@embroider/addon-shim', '1.8.5'],
   ['@rollup/plugin-babel', '6.0.3'],
-  ['concurrently', '8.0.1'],
+  ['concurrently', '8.2.0'],
   ['ember-auto-import', '2.6.3'],
   ['ember-cli-babel', '7.26.11'],
   ['ember-cli-htmlbars', '6.2.0'],
-  ['rollup', '3.23.0'],
+  ['rollup', '3.24.1'],
   ['rollup-plugin-copy', '3.4.0'],
   ['rollup-plugin-ts', '3.2.0'],
 ]);