ember-codemod-v1-to-v2 0.7.4 → 0.9.0

package/README.md

@@ -53,7 +53,7 @@ In most cases, I recommend running the codemod without any arguments (i.e. allow
 By default, the package name decides where the addon package lives. Pass `--addon-location` to override the logic. This may be useful if you have a workspace with many addons.
 
 ```sh
-npx ember-codemod-v1-to-v2 --addon-location="packages/ui/buttons"
+npx ember-codemod-v1-to-v2 --addon-location packages/ui/buttons
 ```
 
 </details>
@@ -64,7 +64,7 @@ npx ember-codemod-v1-to-v2 --addon-location="packages/ui/buttons"
 Pass `--root` to run the codemod on a project somewhere else (i.e. not in the current directory).
 
 ```sh
-npx ember-codemod-v1-to-v2 --root=<path/to/your/project>
+npx ember-codemod-v1-to-v2 --root <path/to/your/project>
 ```
 
 </details>
@@ -75,7 +75,7 @@ npx ember-codemod-v1-to-v2 --root=<path/to/your/project>
 By default, the test-app package lives in the folder `test-app`. Pass `--test-app-location` to override the logic.
 
 ```sh
-npx ember-codemod-v1-to-v2 --test-app-location="docs-app"
+npx ember-codemod-v1-to-v2 --test-app-location docs-app
 ```
 
 </details>
@@ -86,7 +86,7 @@ npx ember-codemod-v1-to-v2 --test-app-location="docs-app"
 By default, the test-app package is named `test-app`. Pass `--test-app-name` to override the logic. This may be useful if you have a workspace with many addons.
 
 ```sh
-npx ember-codemod-v1-to-v2 --test-app-name="test-app-for-ui-buttons"
+npx ember-codemod-v1-to-v2 --test-app-name test-app-for-ui-buttons
 ```
 
 </details>
@@ -105,7 +105,7 @@ cd <path/to/cloned/repo>
 pnpm build
 
 # Run codemod
-./dist/bin/ember-codemod-v1-to-v2.js --root=<path/to/your/project>
+./dist/bin/ember-codemod-v1-to-v2.js --root <path/to/your/project>
 ```
 
 You can also look at another codemod called [`ember-addon-migrator`](https://github.com/NullVoxPopuli/ember-addon-migrator).
@@ -125,7 +125,7 @@ If you have an open-sourced addon (v1 or v2) that I can use as a reference, reac
 
 ## Credits
 
-The codemod steps were based on [Migrating an Ember addon to the next-gen v2 format](https://www.kaliber5.de/de/blog/v2-addon_en) and [Guide: Porting an Addon to v2](https://github.com/embroider-build/embroider/blob/v3.1.1-core/docs/porting-addons-to-v2.md). The blueprints were derived from [`@embroider/addon-blueprint`](https://github.com/embroider-build/addon-blueprint).
+The codemod steps were based on [Migrating an Ember addon to the next-gen v2 format](https://www.kaliber5.de/de/blog/v2-addon_en) and [Guide: Porting an Addon to v2](https://github.com/embroider-build/embroider/blob/v3.1.3-core/docs/porting-addons-to-v2.md). The blueprints were derived from [`@embroider/addon-blueprint`](https://github.com/embroider-build/addon-blueprint).
 
 
 ## License

package/dist/src/blueprints/ember-addon/__addonLocation__/.eslintignore

@@ -2,6 +2,7 @@
 /blueprints/*/files/
 
 # compiled output
+/declarations/
 /dist/
 
 # misc

package/dist/src/blueprints/ember-addon/__addonLocation__/__gitignore__

@@ -0,0 +1,5 @@
+# The authoritative copies of these live in the monorepo root (because they're
+# more useful on github that way), but the build copies them into here so they
+# will also appear in published NPM packages.
+/LICENSE.md
+/README.md

package/dist/src/blueprints/ember-addon/__addonLocation__/babel.config.json

@@ -4,6 +4,6 @@
     "@embroider/addon-dev/template-colocation-plugin",<% if (options.packages.addon.hasTypeScript) { %>
     ["@babel/plugin-transform-typescript", { "allowDeclareFields": true }],<% } %>
     ["@babel/plugin-proposal-decorators", { "version": "legacy" }],
-    "@babel/plugin-proposal-class-properties"
+    "@babel/plugin-transform-class-properties"
   ]
 }

package/dist/src/blueprints/ember-addon/__addonLocation__/rollup.config.mjs

@@ -1,12 +1,16 @@
-<% if (options.packages.addon.hasTypeScript) { %>import typescript from 'rollup-plugin-ts';<% } else { %>import { babel } from '@rollup/plugin-babel';<% } %>
-import copy from 'rollup-plugin-copy';
 import { Addon } from '@embroider/addon-dev/rollup';
+import { babel } from '@rollup/plugin-babel';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
   srcDir: 'src',
   destDir: 'dist',
 });
 
+// Add extensions here, such as ts, gjs, etc that you may import
+const extensions = ['.js'<% if (options.packages.addon.hasTypeScript) { %>, '.ts'<% } %>];
+
 export default {
   // This provides defaults that work well alongside `publicEntrypoints` below.
   // You can augment this if you need to.
@@ -27,13 +31,7 @@ export default {
     // package names.
     addon.dependencies(),
 
-<% if (options.packages.addon.hasTypeScript) { %>    // compile TypeScript to latest JavaScript, including Babel transpilation
-    typescript({
-      transpiler: 'babel',
-      browserslist: false,
-      transpileOnly: false,
-    }),
-<% } else { %>    // This babel config should *not* apply presets or compile away ES modules.
+    // This babel config should *not* apply presets or compile away ES modules.
     // It exists only to provide development niceties for you, like automatic
     // template colocation.
     //
@@ -41,8 +39,14 @@ export default {
     // babel.config.json.
     babel({
       babelHelpers: 'bundled',
+      extensions,
     }),
-<% } %>
+
+    // Allows rollup to resolve imports of files with the specified extensions
+    nodeResolve({
+      extensions,
+    }),
+
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 

package/dist/src/blueprints/ember-addon/__gitignore__

@@ -1,24 +1,15 @@
 # compiled output
-/dist/
+declarations/
+dist/
+
+# npm/pnpm/yarn pack output
+*.tgz
 
 # dependencies
-/node_modules/
+node_modules/
 
 # misc
 /.env*
-/.pnp*
-/.eslintcache
-/coverage/
+/.pnpm-debug.log
 /npm-debug.log*
-/testem.log
 /yarn-error.log
-
-# ember-try
-/.node_modules.ember-try/
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
-
-# broccoli-debug
-/DEBUG/

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

@@ -52,7 +52,7 @@ function getPublicEntrypoints(options) {
         });
     })
         .map((filePath) => {
-        return filePath.replace(/ts$/, 'js');
+        return filePath.replace(/(?<!\.d)\.ts$/, '.js');
     })
         .sort();
 }

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

@@ -13,7 +13,7 @@ function getFilesToSkip(options) {
     if (!packageManager.isPnpm) {
         files.add('pnpm-workspace.yaml');
     }
-    return [...files];
+    return Array.from(files);
 }
 function resolveBlueprintFilePath(blueprintFilePath, options) {
     const { locations } = options;

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

@@ -14,8 +14,8 @@ function analyzePackageJson(codemodOptions) {
         hasGlint: projectDependencies.has('@glint/core'),
         hasTypeScript: projectDependencies.has('typescript'),
         isV1Addon: Boolean(emberAddon),
-        name,
-        version,
+        name: name,
+        version: version,
     };
 }
 function analyzePackageManager(codemodOptions) {
@@ -25,7 +25,7 @@ function analyzePackageManager(codemodOptions) {
         ['pnpm-lock.yaml', 'pnpm'],
         ['yarn.lock', 'yarn'],
     ]);
-    const lockFiles = [...mapping.keys()];
+    const lockFiles = Array.from(mapping.keys());
     const filePaths = findFiles(unionize(lockFiles), {
         projectRoot,
     });
@@ -49,8 +49,7 @@ function deriveAddonLocation(addonPackage) {
     if (!hasScope) {
         return addonPackage.name;
     }
-    // eslint-disable-next-line no-unused-vars
-    const [_scope, packageName] = addonPackage.name.split('/');
+    const packageName = addonPackage.name.split('/')[1];
     return packageName;
 }
 export function createOptions(codemodOptions) {

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

@@ -12,8 +12,8 @@ function copyToAddon(options) {
     copyFiles(filePathMap, options);
 }
 function moveToAddonAndTestApp(options) {
-    const { locations, packages, projectRoot } = options;
-    const files = new Set([
+    const { locations, projectRoot } = options;
+    const files = [
         '.eslintignore',
         '.eslintrc.cjs',
         '.eslintrc.js',
@@ -27,11 +27,9 @@ function moveToAddonAndTestApp(options) {
         '.template-lintrc.cjs',
         '.template-lintrc.js',
         'package.json',
-    ]);
-    if (packages.addon.hasTypeScript) {
-        files.add('tsconfig.json');
-    }
-    const filePaths = findFiles(unionize([...files]), {
+        'tsconfig.json',
+    ];
+    const filePaths = findFiles(unionize(files), {
         projectRoot,
     });
     let filePathMap = mapFilePaths(filePaths, {

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

@@ -54,7 +54,7 @@ function renameDummy(options) {
     filePaths.forEach((filePath) => {
         const oldPath = join(projectRoot, filePath);
         const oldFile = readFileSync(oldPath, 'utf8');
-        const newFile = oldFile.replace(new RegExp('dummy', 'g'), packages.testApp.name);
+        const newFile = oldFile.replace(/dummy/g, packages.testApp.name);
         writeFileSync(oldPath, newFile, 'utf8');
     });
 }

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

@@ -0,0 +1,4 @@
+export * from './update-dependencies.js';
+export * from './update-dev-dependencies.js';
+export * from './update-other-fields.js';
+export * from './update-scripts.js';

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

@@ -0,0 +1,20 @@
+import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { getVersion } from '../../../../utils/blueprints.js';
+export function updateDependencies(packageJson, options) {
+    const dependencies = convertToMap(packageJson['dependencies']);
+    const packagesToDelete = [
+        '@embroider/macros',
+        'ember-auto-import',
+        'ember-cli-babel',
+        'ember-cli-htmlbars',
+    ];
+    packagesToDelete.forEach((packageName) => {
+        dependencies.delete(packageName);
+    });
+    const packagesToInstall = ['@embroider/addon-shim'];
+    packagesToInstall.forEach((packageName) => {
+        const version = getVersion(packageName, options);
+        dependencies.set(packageName, version);
+    });
+    packageJson['dependencies'] = convertToObject(dependencies);
+}

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

@@ -0,0 +1,37 @@
+import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { getVersion } from '../../../../utils/blueprints.js';
+export function updateDevDependencies(packageJson, options) {
+    const { packages } = options;
+    const devDependencies = convertToMap(packageJson['devDependencies']);
+    /*
+      For the time being, we'll take the approach of starting over and
+      adding back the development dependencies that are required. For
+      a more conservative approach, we could delete only the following:
+  
+        - @embroider/macros
+        - ember-auto-import
+        - ember-cli-babel
+        - ember-cli-htmlbars
+    */
+    devDependencies.clear();
+    const packagesToInstall = new Set([
+        '@babel/core',
+        '@babel/plugin-proposal-decorators',
+        '@babel/plugin-transform-class-properties',
+        '@babel/runtime',
+        '@embroider/addon-dev',
+        '@rollup/plugin-babel',
+        '@rollup/plugin-node-resolve',
+        'concurrently',
+        'rollup',
+        'rollup-plugin-copy',
+    ]);
+    if (packages.addon.hasTypeScript) {
+        packagesToInstall.add('@babel/preset-typescript');
+    }
+    Array.from(packagesToInstall).forEach((packageName) => {
+        const version = getVersion(packageName, options);
+        devDependencies.set(packageName, version);
+    });
+    packageJson['devDependencies'] = convertToObject(devDependencies);
+}

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

@@ -0,0 +1,85 @@
+function updateEmberAddon(packageJson, data) {
+    const { hasPublicAssets, publicAssetMapping } = data;
+    if (!hasPublicAssets) {
+        packageJson['ember-addon'] = {
+            'app-js': {},
+            main: 'addon-main.cjs',
+            type: 'addon',
+            version: 2,
+        };
+        return;
+    }
+    packageJson['ember-addon'] = {
+        'app-js': {},
+        main: 'addon-main.cjs',
+        'public-assets': publicAssetMapping,
+        type: 'addon',
+        version: 2,
+    };
+}
+function updateExports(packageJson, data) {
+    const { hasTypeScript } = data;
+    if (!hasTypeScript) {
+        packageJson['exports'] = {
+            '.': './dist/index.js',
+            './*': './dist/*.js',
+            './addon-main.js': './addon-main.cjs',
+        };
+        return;
+    }
+    packageJson['exports'] = {
+        '.': {
+            types: './declarations/index.d.ts',
+            default: './dist/index.js',
+        },
+        './*': {
+            /*
+              This object has an order dependency. The `default` key must appear last.
+            */
+            types: './declarations/*.d.ts',
+            default: './dist/*.js',
+        },
+        './addon-main.js': './addon-main.cjs',
+    };
+}
+function updateFiles(packageJson, data) {
+    const { hasPublicAssets, hasTypeScript } = data;
+    const files = new Set(['addon-main.cjs', 'dist']);
+    if (hasPublicAssets) {
+        files.add('public');
+    }
+    if (hasTypeScript) {
+        files.add('declarations');
+    }
+    packageJson['files'] = Array.from(files).sort();
+}
+function updateTypesVersions(packageJson, data) {
+    const { hasTypeScript } = data;
+    if (!hasTypeScript) {
+        return;
+    }
+    packageJson['typesVersions'] = {
+        '*': {
+            '*': ['declarations/*'],
+        },
+    };
+}
+export function updateOtherFields(packageJson, context, options) {
+    const { packages } = options;
+    const publicAssetMapping = context.addon.publicAssets.reduce((accumulator, filePath) => {
+        const from = `./public/${filePath}`;
+        const to = `/${packages.addon.name}/${filePath}`;
+        accumulator[from] = to;
+        return accumulator;
+    }, {});
+    const hasPublicAssets = Object.keys(publicAssetMapping).length > 0;
+    const data = {
+        hasPublicAssets,
+        hasTypeScript: packages.addon.hasTypeScript,
+        publicAssetMapping,
+    };
+    updateEmberAddon(packageJson, data);
+    updateExports(packageJson, data);
+    updateFiles(packageJson, data);
+    updateTypesVersions(packageJson, data);
+}

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

@@ -0,0 +1,25 @@
+import { convertToMap, convertToObject } from '@codemod-utils/json';
+export function updateScripts(packageJson, options) {
+    const { packages } = options;
+    const scripts = convertToMap(packageJson['scripts']);
+    if (packages.addon.hasTypeScript) {
+        scripts.set('build', 'concurrently "npm:build:*" --names "build:"');
+        scripts.set('build:js', 'rollup --config');
+        scripts.set('build:types', packages.addon.hasGlint ? 'glint --declaration' : 'tsc');
+        scripts.set('lint:types', packages.addon.hasGlint
+            ? 'glint'
+            : 'tsc --emitDeclarationOnly false --noEmit');
+        scripts.set('prepack', 'rollup --config');
+        scripts.set('start', 'concurrently "npm:start:*" --names "start:"');
+        scripts.set('start:js', 'rollup --config --watch --no-watch.clearScreen');
+        scripts.set('start:types', packages.addon.hasGlint ? 'glint --declaration --watch' : 'tsc --watch');
+        scripts.set('test', "echo 'A v2 addon does not have tests, run tests in test-app'");
+    }
+    else {
+        scripts.set('build', 'rollup --config');
+        scripts.set('prepack', 'rollup --config');
+        scripts.set('start', 'rollup --config --watch');
+        scripts.set('test', "echo 'A v2 addon does not have tests, run tests in test-app'");
+    }
+    packageJson['scripts'] = convertToObject(scripts);
+}

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

@@ -1,128 +1,7 @@
 import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { convertToMap, convertToObject, readPackageJson, } from '@codemod-utils/json';
-import { getVersion } from '../../../utils/blueprints.js';
-function updateDependencies(packageJson, options) {
-    const dependencies = convertToMap(packageJson['dependencies']);
-    const packagesToDelete = [
-        '@embroider/macros',
-        'ember-auto-import',
-        'ember-cli-babel',
-        'ember-cli-htmlbars',
-    ];
-    packagesToDelete.forEach((packageName) => {
-        dependencies.delete(packageName);
-    });
-    const packagesToInstall = ['@embroider/addon-shim'];
-    packagesToInstall.sort().forEach((packageName) => {
-        const version = getVersion(packageName, options);
-        dependencies.set(packageName, version);
-    });
-    packageJson['dependencies'] = convertToObject(dependencies);
-}
-function updateDevDependencies(packageJson, options) {
-    const { packages } = options;
-    const devDependencies = convertToMap(packageJson['devDependencies']);
-    /*
-      For the time being, we'll take the approach of starting over and
-      adding back the development dependencies that are required. For
-      a more conservative approach, we could delete only the following:
-  
-        - @embroider/macros
-        - ember-auto-import
-        - ember-cli-babel
-        - ember-cli-htmlbars
-    */
-    devDependencies.clear();
-    const packagesToInstall = new Set([
-        '@babel/core',
-        '@babel/plugin-proposal-class-properties',
-        '@babel/plugin-proposal-decorators',
-        '@babel/runtime',
-        '@embroider/addon-dev',
-        '@rollup/plugin-babel',
-        'rollup',
-        'rollup-plugin-copy',
-    ]);
-    if (packages.addon.hasTypeScript) {
-        packagesToInstall.add('@babel/preset-typescript');
-        packagesToInstall.add('rollup-plugin-ts');
-        packagesToInstall.delete('@rollup/plugin-babel');
-    }
-    [...packagesToInstall].sort().forEach((packageName) => {
-        const version = getVersion(packageName, options);
-        devDependencies.set(packageName, version);
-    });
-    packageJson['devDependencies'] = convertToObject(devDependencies);
-}
-function updateOtherFields(packageJson, context, options) {
-    const { packages } = options;
-    const hasPublicAssets = context.addon.publicAssets.length > 0;
-    if (hasPublicAssets) {
-        const publicAssetMapping = context.addon.publicAssets.reduce((accumulator, filePath) => {
-            const from = `./public/${filePath}`;
-            const to = `/${packages.addon.name}/${filePath}`;
-            accumulator[from] = to;
-            return accumulator;
-        }, {});
-        packageJson['ember-addon'] = {
-            'app-js': {},
-            main: 'addon-main.cjs',
-            'public-assets': publicAssetMapping,
-            type: 'addon',
-            version: 2,
-        };
-    }
-    else {
-        packageJson['ember-addon'] = {
-            'app-js': {},
-            main: 'addon-main.cjs',
-            type: 'addon',
-            version: 2,
-        };
-    }
-    if (packages.addon.hasTypeScript) {
-        packageJson['exports'] = {
-            '.': './dist/index.js',
-            './*': {
-                /*
-                  This object has an order dependency. The `default` key must appear last.
-                */
-                types: './dist/*.d.ts',
-                default: './dist/*.js',
-            },
-            './addon-main.js': './addon-main.cjs',
-        };
-    }
-    else {
-        packageJson['exports'] = {
-            '.': './dist/index.js',
-            './*': './dist/*.js',
-            './addon-main.js': './addon-main.cjs',
-        };
-    }
-    if (hasPublicAssets) {
-        packageJson['files'] = ['addon-main.cjs', 'dist', 'public'];
-    }
-    else {
-        packageJson['files'] = ['addon-main.cjs', 'dist'];
-    }
-    if (packages.addon.hasTypeScript) {
-        packageJson['typesVersions'] = {
-            '*': {
-                '*': ['dist/*'],
-            },
-        };
-    }
-}
-function updateScripts(packageJson) {
-    const scripts = convertToMap(packageJson['scripts']);
-    scripts.set('build', 'rollup --config');
-    scripts.set('prepack', 'rollup --config');
-    scripts.set('start', 'rollup --config --watch');
-    scripts.set('test', "echo 'A v2 addon does not have tests, run tests in test-app'");
-    packageJson['scripts'] = convertToObject(scripts);
-}
+import { readPackageJson } from '@codemod-utils/json';
+import { updateDependencies, updateDevDependencies, updateOtherFields, updateScripts, } from './update-addon-package-json/index.js';
 export function updateAddonPackageJson(context, options) {
     const { locations, projectRoot } = options;
     const packageJson = readPackageJson({
@@ -130,7 +9,7 @@ export function updateAddonPackageJson(context, options) {
     });
     updateDependencies(packageJson, options);
     updateDevDependencies(packageJson, options);
-    updateScripts(packageJson);
+    updateScripts(packageJson, options);
     updateOtherFields(packageJson, context, options);
     const destination = join(projectRoot, locations.addon, 'package.json');
     const file = JSON.stringify(packageJson, null, 2) + '\n';

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

@@ -2,10 +2,20 @@ import { readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { convertToMap, convertToObject } from '@codemod-utils/json';
 import { sanitizeJson } from '../../../utils/json.js';
-function updateCompilerOptions(tsConfigJson) {
+function updateCompilerOptions(tsConfigJson, options) {
+    const { packages } = options;
     const compilerOptions = convertToMap(tsConfigJson['compilerOptions']);
     compilerOptions.delete('baseUrl');
     compilerOptions.delete('paths');
+    if (packages.addon.hasGlint) {
+        compilerOptions.set('declarationDir', 'declarations');
+    }
+    else {
+        compilerOptions.set('declaration', true);
+        compilerOptions.set('declarationDir', 'declarations');
+        compilerOptions.set('emitDeclarationOnly', true);
+        compilerOptions.set('noEmit', false);
+    }
     tsConfigJson['compilerOptions'] = convertToObject(compilerOptions);
 }
 function updateInclude(tsConfigJson) {
@@ -19,7 +29,7 @@ export function updateAddonTsConfigJson(options) {
     const oldPath = join(projectRoot, locations.addon, 'tsconfig.json');
     const oldFile = readFileSync(oldPath, 'utf8');
     const tsConfigJson = JSON.parse(sanitizeJson(oldFile));
-    updateCompilerOptions(tsConfigJson);
+    updateCompilerOptions(tsConfigJson, options);
     updateInclude(tsConfigJson);
     const newFile = JSON.stringify(tsConfigJson, null, 2) + '\n';
     writeFileSync(oldPath, newFile, 'utf8');

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

@@ -0,0 +1,4 @@
+export * from './move-dev-dependencies-to-dependencies.js';
+export * from './update-dependencies.js';
+export * from './update-dev-dependencies.js';
+export * from './update-other-fields.js';

package/dist/src/migration/ember-addon/steps/update-test-app-package-json/move-dev-dependencies-to-dependencies.js

@@ -0,0 +1,25 @@
+import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { getVersion } from '../../../../utils/blueprints.js';
+export function moveDependenciesToDevDependencies(packageJson, options) {
+    const { packages } = options;
+    const dependencies = convertToMap(packageJson['dependencies']);
+    const devDependencies = convertToMap(packageJson['devDependencies']);
+    const packagesToMove = new Set([
+        'ember-auto-import',
+        'ember-cli-babel',
+        'ember-cli-htmlbars',
+    ]);
+    if (packages.addon.hasTypeScript) {
+        packagesToMove.add('ember-cli-typescript');
+    }
+    Array.from(packagesToMove).forEach((packageName) => {
+        if (!dependencies.has(packageName)) {
+            return;
+        }
+        const version = getVersion(packageName, options);
+        dependencies.delete(packageName);
+        devDependencies.set(packageName, version);
+    });
+    packageJson['dependencies'] = convertToObject(dependencies);
+    packageJson['devDependencies'] = convertToObject(devDependencies);
+}

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

@@ -0,0 +1,10 @@
+import { convertToMap, convertToObject } from '@codemod-utils/json';
+export function updateDependencies(packageJson) {
+    const dependencies = convertToMap(packageJson['dependencies']);
+    /*
+      For the time being, we'll take the approach of starting over and
+      adding back the dependencies that are required.
+    */
+    dependencies.clear();
+    packageJson['dependencies'] = convertToObject(dependencies);
+}

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

@@ -0,0 +1,7 @@
+import { convertToMap, convertToObject } from '@codemod-utils/json';
+export function updateDevDependencies(packageJson, options) {
+    const { packages } = options;
+    const devDependencies = convertToMap(packageJson['devDependencies']);
+    devDependencies.set(packages.addon.name, packages.addon.version);
+    packageJson['devDependencies'] = convertToObject(devDependencies);
+}

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

@@ -0,0 +1,7 @@
+export function updateOtherFields(packageJson, options) {
+    const { packages } = options;
+    delete packageJson['ember-addon'];
+    packageJson['keywords'] = (packageJson['keywords'] ?? []).filter((keyword) => keyword !== 'ember-addon');
+    packageJson['name'] = packages.testApp.name;
+    packageJson['private'] = true;
+}

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

@@ -1,52 +1,7 @@
 import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { convertToMap, convertToObject, readPackageJson, } from '@codemod-utils/json';
-import { getVersion } from '../../../utils/blueprints.js';
-function moveDependenciesToDevDependencies(packageJson, options) {
-    const { packages } = options;
-    const dependencies = convertToMap(packageJson['dependencies']);
-    const devDependencies = convertToMap(packageJson['devDependencies']);
-    const packagesToMove = new Set([
-        'ember-auto-import',
-        'ember-cli-babel',
-        'ember-cli-htmlbars',
-    ]);
-    if (packages.addon.hasTypeScript) {
-        packagesToMove.add('ember-cli-typescript');
-    }
-    [...packagesToMove]
-        .filter((packageName) => dependencies.has(packageName))
-        .sort()
-        .forEach((packageName) => {
-        const version = getVersion(packageName, options);
-        devDependencies.set(packageName, version);
-        dependencies.delete(packageName);
-    });
-    packageJson['dependencies'] = convertToObject(dependencies);
-    packageJson['devDependencies'] = convertToObject(devDependencies);
-}
-function updateDependencies(packageJson) {
-    const dependencies = convertToMap(packageJson['dependencies']);
-    /*
-      For the time being, we'll take the approach of starting over and
-      adding back the dependencies that are required.
-    */
-    dependencies.clear();
-    packageJson['dependencies'] = convertToObject(dependencies);
-}
-function updateDevDependencies(packageJson, options) {
-    const { packages } = options;
-    const devDependencies = convertToMap(packageJson['devDependencies']);
-    devDependencies.set(packages.addon.name, packages.addon.version);
-    packageJson['devDependencies'] = convertToObject(devDependencies);
-}
-function updateOtherFields(packageJson, options) {
-    const { packages } = options;
-    delete packageJson['ember-addon'];
-    packageJson['keywords'] = (packageJson['keywords'] ?? []).filter((keyword) => keyword !== 'ember-addon');
-    packageJson['name'] = packages.testApp.name;
-    packageJson['private'] = true;
-}
+import { readPackageJson } from '@codemod-utils/json';
+import { moveDependenciesToDevDependencies, updateDependencies, updateDevDependencies, updateOtherFields, } from './update-test-app-package-json/index.js';
 export function updateTestAppPackageJson(options) {
     const { locations, projectRoot } = options;
     const packageJson = readPackageJson({

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

@@ -1,20 +1,20 @@
 import { decideVersion } from '@codemod-utils/blueprints';
 const latestVersions = new Map([
     ['@babel/core', '7.22.6'],
-    ['@babel/plugin-proposal-class-properties', '7.18.6'],
     ['@babel/plugin-proposal-decorators', '7.22.6'],
+    ['@babel/plugin-transform-class-properties', '7.22.5'],
     ['@babel/preset-typescript', '7.22.5'],
     ['@babel/runtime', '7.22.6'],
     ['@embroider/addon-dev', '3.1.1'],
     ['@embroider/addon-shim', '1.8.5'],
     ['@rollup/plugin-babel', '6.0.3'],
+    ['@rollup/plugin-node-resolve', '15.1.0'],
     ['concurrently', '8.2.0'],
     ['ember-auto-import', '2.6.3'],
     ['ember-cli-babel', '7.26.11'],
     ['ember-cli-htmlbars', '6.2.0'],
     ['rollup', '3.26.0'],
     ['rollup-plugin-copy', '3.4.0'],
-    ['rollup-plugin-ts', '3.2.0'],
 ]);
 export function getVersion(packageName, options) {
     const { packages } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "0.7.4",
+  "version": "0.9.0",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -28,37 +28,37 @@
   ],
   "dependencies": {
     "@codemod-utils/blueprints": "^0.2.1",
-    "@codemod-utils/files": "^0.5.1",
-    "@codemod-utils/json": "^0.3.2",
-    "strip-json-comments": "^5.0.0",
+    "@codemod-utils/files": "^0.5.2",
+    "@codemod-utils/json": "^0.3.4",
+    "strip-json-comments": "^5.0.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.6",
-    "@codemod-utils/tests": "^0.2.4",
+    "@babel/core": "^7.22.8",
+    "@codemod-utils/tests": "^0.2.5",
     "@sondr3/minitest": "^0.1.1",
     "@tsconfig/esm": "^1.0.4",
     "@tsconfig/node16": "^16.1.0",
     "@tsconfig/strictest": "^2.0.1",
     "@types/node": "^16.11.7",
     "@types/yargs": "^17.0.24",
-    "@typescript-eslint/eslint-plugin": "^5.61.0",
-    "@typescript-eslint/parser": "^5.61.0",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
     "concurrently": "^8.2.0",
     "eslint": "^8.44.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-n": "^16.0.1",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-typescript-sort-keys": "^2.3.0",
     "lerna-changelog": "^2.2.0",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.0",
     "typescript": "^5.1.6"
   },
   "engines": {
-    "node": ">= 16"
+    "node": "16.* || >= 18"
   },
   "changelog": {
     "labels": {
@@ -66,8 +66,7 @@
       "bug": "Bug Fix",
       "enhance: code": "Enhancement",
       "enhance: dependency": "Internal",
-      "enhance: documentation": "Documentation",
-      "user feedback": "User Feedback"
+      "enhance: documentation": "Documentation"
     }
   },
   "scripts": {