ember-codemod-v1-to-v2 1.2.4 → 1.3.1

package/README.md

@@ -15,33 +15,43 @@ _Codemod to convert Ember addons to v2 addon format_
 
 ## Usage
 
-You can check [`ember-container-query`](https://github.com/ijlee2/ember-container-query/pull/151) as a reference.
+For examples, see [`ember-container-query`](https://github.com/ijlee2/ember-container-query/pull/151/commits) and [`ember-render-helpers`](https://github.com/buschtoens/ember-render-helpers/pull/447/commits).
 
-Step 1. Quickly migrate to [v2 format](https://github.com/embroider-build/embroider/blob/main/ADDON-AUTHOR-GUIDE.md).<sup>1</sup>
+Step 1. Quickly migrate to [v2 format](https://github.com/embroider-build/embroider/blob/v4.3.1-%40embroider/addon-dev/docs/addon-author-guide.md).
 
 ```sh
 cd <path/to/your/project>
 npx ember-codemod-v1-to-v2 <arguments>
 ```
 
+> [!IMPORTANT]
+>
+> Before you run `ember-codemod-v1-to-v2`, I recommend that you address existing tech debts (one at a time). That is, treat the v2 migration as its own thing.
+>
+> Here are examples of what you may want to work on first:
+>
+> - [Meet prerequisites for v2 addon](https://github.com/embroider-build/embroider/blob/v4.3.1-%40embroider/addon-dev/docs/porting-addons-to-v2.md#part-3-prerequisites-for-v2-addon).
+> - [Un-pod v1 addon](https://github.com/ijlee2/ember-codemod-pod-to-octane).
+> - Update dependencies.
+> - Switch `npm` or `yarn` to `pnpm`.
+
 Step 2. Review the addon package.
 
-- [x] Update the configuration files.<sup>2</sup>
+- [x] Update the configuration files.<sup>1</sup>
+- [x] Install missing dependencies.
 - [x] Relative import paths must specify the file extension `.js` or `.ts`.
 - [x] Colocate stylesheets (if any). Let each component import the relevant stylesheet in the backing class.
 - [x] Confirm that you can run all scripts in `package.json`.
 
 Step 3. Review the test-app package.
 
-- [x] Update the configuration files.<sup>2</sup>
+- [x] Update the configuration files.<sup>1</sup>
 - [x] Rename the remaining instances of `dummy` to `test-app`.
 - [x] Confirm that you can run all scripts in `package.json`.
 
 Step 4. Review the workspace root including CI/CD.
 
-<sup>1. Before running `ember-codemod-v1-to-v2`, consider [meeting the prerequisites](https://github.com/embroider-build/embroider/blob/v1.8.3/PORTING-ADDONS-TO-V2.md#part-3-prerequisites-for-v2-addon). You can run [`ember-codemod-pod-to-octane`](https://github.com/ijlee2/ember-codemod-pod-to-octane) to un-pod a v1 addon.</sup>
-
-<sup>2. Files such as `.eslintrc.js`, `.gitignore`, `babel.config.json` (addon only), `config/environment.js` (test-app only), `ember-cli-build.js` (test-app only), `package.json`, `rollup.config.mjs` (addon only), `tsconfig.json`, etc.</sup>
+<sup>1. Files such as `.eslintrc.js`, `.gitignore`, `babel.config.json` (addon only), `config/environment.js` (test-app only), `ember-cli-build.js` (test-app only), `package.json`, `rollup.config.mjs` (addon only), `tsconfig.json`, etc.</sup>
 
 
 ### Arguments
@@ -55,7 +65,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/button
 ```
 
 </details>
@@ -94,7 +104,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-button
 ```
 
 </details>
@@ -133,7 +143,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.3-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/v4.3.1-%40embroider/addon-dev/docs/porting-addons-to-v2.md). The blueprints were derived from [`@embroider/addon-blueprint`](https://github.com/embroider-build/addon-blueprint).
 
 
 ## License

package/dist/bin/ember-codemod-v1-to-v2.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-// eslint-disable-next-line n/shebang
 'use strict';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';

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

@@ -2,8 +2,8 @@
 /blueprints/*/files/
 
 # compiled output
-/declarations/
 /dist/
+/declarations/
 
 # misc
 /coverage/

package/dist/src/blueprints/ember-addon/__addonLocation__/.eslintrc.cjs

@@ -0,0 +1,68 @@
+'use strict';
+
+module.exports = {
+  root: true,
+  parser: '<%= options.packages.addon.hasTypeScript ? '@typescript-eslint/parser' : '@babel/eslint-parser' %>',
+  parserOptions: {
+    ecmaVersion: 'latest',<% if (!options.packages.addon.hasTypeScript) { %>
+    sourceType: 'module',
+    babelOptions: {
+      root: __dirname,
+    },<% } %>
+  },
+  plugins: ['ember'],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
+  ],
+  env: {
+    browser: true,
+  },
+  rules: {},
+  overrides: [
+<% if (options.packages.addon.hasTypeScript) { %>    // ts files
+    {
+      files: ['**/*.ts', '**/*.gts'],
+      extends: [
+        'plugin:@typescript-eslint/eslint-recommended',
+        'plugin:@typescript-eslint/recommended',
+      ],
+      rules: {
+        // Add any custom rules here
+      },
+    },
+    // require relative imports use full extensions
+    {
+      files: ['src/**/*.{js,ts,gjs,gts}'],
+      rules: {
+        'import/extensions': ['error', 'always', { ignorePackages: true }],
+      },
+    },
+<% } else { %>    // require relative imports use full extensions
+    {
+      files: ['src/**/*.{js,gjs}'],
+      rules: {
+        'import/extensions': ['error', 'always', { ignorePackages: true }],
+      },
+    },
+<% } %>    // node files
+    {
+      files: [
+        './.eslintrc.cjs',
+        './.prettierrc.cjs',
+        './.template-lintrc.cjs',
+        './addon-main.cjs',
+      ],
+      parserOptions: {
+        sourceType: 'script',
+      },
+      env: {
+        browser: false,
+        node: true,
+      },
+      plugins: ['n'],
+      extends: ['plugin:n/recommended'],
+    },
+  ],
+};

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

@@ -2,8 +2,8 @@
 /blueprints/*/files/
 
 # compiled output
-/declarations/
 /dist/
+/declarations/
 
 # misc
 /coverage/

package/dist/src/blueprints/ember-addon/__addonLocation__/.prettierrc.cjs

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};

package/dist/src/blueprints/ember-addon/__addonLocation__/.template-lintrc.cjs

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: 'recommended',
+};

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

@@ -1,12 +1,17 @@
 # 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
+/LICENSE.md
 
 # compiled output
-/declarations
-/dist
+dist/
+declarations/
 
 # npm/pnpm/yarn pack output
 *.tgz
+
+# deps & caches
+node_modules/
+.eslintcache
+.prettiercache

package/dist/src/blueprints/ember-addon/__addonLocation__/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "extends": "@tsconfig/ember/tsconfig.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "allowJs": true,
+    "declarationDir": "declarations",
+    "emitDeclarationOnly": true,
+    "noEmit": false,
+    "noEmitOnError": false,
+    "rootDir": "./src"
+  },
+  "include": [
+    "src/**/*",
+    "unpublished-development-types/**/*"
+  ]<% if (options.packages.addon.hasGlint) { %>,
+  "glint": {
+    "environment": [
+      "ember-loose"
+    ]
+  }<% } %>
+}

package/dist/src/blueprints/ember-addon/__addonLocation__/unpublished-development-types/index.d.ts

@@ -2,7 +2,6 @@
 // These will *not* be published as part of your addon, so be careful that your published code does not rely on them!
 <% if (options.packages.addon.hasGlint) { %>
 import '@glint/environment-ember-loose';
-// import '@glint/environment-ember-template-imports';
 
 declare module '@glint/environment-ember-loose/registry' {
   // Remove this once entries have been added! 👇

package/dist/src/blueprints/ember-addon/package.json

@@ -1,4 +1,4 @@
-<% if (options.packageManager.isNpm) { %>{
+<% if (options.packageManager === 'npm') { %>{
   "name": "workspace-root",
   "version": "<%= options.packages.addon.version %>",
   "private": true,
@@ -22,7 +22,7 @@
   "devDependencies": {
     "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
-}<% } else if (options.packageManager.isPnpm) { %>{
+}<% } else if (options.packageManager === 'pnpm') { %>{
   "name": "workspace-root",
   "version": "<%= options.packages.addon.version %>",
   "private": true,
@@ -34,7 +34,7 @@
     "lint": "pnpm --filter '*' lint",
     "lint:fix": "pnpm --filter '*' lint:fix",
     "prepare": "pnpm build",
-    "start": "concurrently 'npm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
+    "start": "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
     "start:addon": "pnpm --filter <%= options.packages.addon.name %> start",
     "start:test-app": "pnpm --filter <%= options.packages.testApp.name %> start",
     "test": "pnpm --filter '*' test"
@@ -42,7 +42,7 @@
   "devDependencies": {
     "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
-}<% } else if (options.packageManager.isYarn) { %>{
+}<% } else if (options.packageManager === 'yarn') { %>{
   "name": "workspace-root",
   "version": "<%= options.packages.addon.version %>",
   "private": true,
@@ -58,7 +58,7 @@
     "lint": "yarn workspaces run lint",
     "lint:fix": "yarn workspaces run lint:fix",
     "prepare": "yarn build",
-    "start": "concurrently 'npm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
+    "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
     "start:addon": "yarn workspace <%= options.packages.addon.name %> run start",
     "start:test-app": "yarn workspace <%= options.packages.testApp.name %> run start",
     "test": "yarn workspaces run test"

package/dist/src/index.js

@@ -1,4 +1,4 @@
-import { analyzeAddon, createFilesFromBlueprints, createOptions, moveAddonFiles, moveProjectRootFiles, moveTestAppFiles, updateAddonPackageJson, updateAddonTsConfigJson, updateTestAppPackageJson, updateTestAppTsConfigJson, } from './steps/index.js';
+import { analyzeAddon, createFilesFromBlueprints, createOptions, moveAddonFiles, moveProjectRootFiles, moveTestAppFiles, updateAddonPackageJson, updateTestAppPackageJson, updateTestAppTsConfigJson, } from './steps/index.js';
 export function runCodemod(codemodOptions) {
     const options = createOptions(codemodOptions);
     const { isV1Addon } = options.packages.addon;
@@ -16,7 +16,6 @@ export function runCodemod(codemodOptions) {
     createFilesFromBlueprints(context, options);
     // Fine-tune individual files
     updateAddonPackageJson(context, options);
-    updateAddonTsConfigJson(options);
     updateTestAppPackageJson(options);
     updateTestAppTsConfigJson(options);
 }

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

@@ -7,10 +7,11 @@ function getFilesToSkip(options) {
     const { packageManager, packages } = options;
     const files = new Set();
     if (!packages.addon.hasTypeScript) {
+        files.add('__addonLocation__/tsconfig.json');
         files.add('__addonLocation__/unpublished-development-types/index.d.ts');
         files.add('__testAppLocation__/types/global.d.ts');
     }
-    if (!packageManager.isPnpm) {
+    if (packageManager !== 'pnpm') {
         files.add('pnpm-workspace.yaml');
     }
     return Array.from(files);

package/dist/src/steps/create-options.js

@@ -20,29 +20,21 @@ function analyzePackageJson(codemodOptions) {
 }
 function analyzePackageManager(codemodOptions) {
     const { projectRoot } = codemodOptions;
-    const mapping = new Map([
-        ['package-lock.json', 'npm'],
-        ['pnpm-lock.yaml', 'pnpm'],
-        ['yarn.lock', 'yarn'],
-    ]);
-    const lockFiles = Array.from(mapping.keys());
+    const mapping = {
+        'package-lock.json': 'npm',
+        'pnpm-lock.yaml': 'pnpm',
+        'yarn.lock': 'yarn',
+    };
+    const lockFiles = Object.keys(mapping);
     const filePaths = findFiles(lockFiles, {
         projectRoot,
     });
     if (filePaths.length !== 1) {
         console.warn('WARNING: Package manager is unknown. Yarn will be assumed.');
-        return {
-            isNpm: false,
-            isPnpm: false,
-            isYarn: true,
-        };
+        return 'yarn';
     }
-    const packageManager = mapping.get(filePaths[0]);
-    return {
-        isNpm: packageManager === 'npm',
-        isPnpm: packageManager === 'pnpm',
-        isYarn: packageManager === 'yarn',
-    };
+    const lockfile = filePaths[0];
+    return mapping[lockfile];
 }
 function deriveAddonLocation(addonPackage) {
     const hasScope = addonPackage.name.includes('/');

package/dist/src/steps/index.js

@@ -5,6 +5,5 @@ export * from './move-addon-files.js';
 export * from './move-project-root-files.js';
 export * from './move-test-app-files.js';
 export * from './update-addon-package-json.js';
-export * from './update-addon-tsconfig-json.js';
 export * from './update-test-app-package-json.js';
 export * from './update-test-app-tsconfig-json.js';

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

@@ -13,22 +13,7 @@ function copyToAddon(options) {
 }
 function moveToAddonAndTestApp(options) {
     const { locations, projectRoot } = options;
-    const files = [
-        '.eslintignore',
-        '.eslintrc.cjs',
-        '.eslintrc.js',
-        '.gitignore',
-        '.prettierignore',
-        '.prettierrc.cjs',
-        '.prettierrc.js',
-        '.stylelintignore',
-        '.stylelintrc.cjs',
-        '.stylelintrc.js',
-        '.template-lintrc.cjs',
-        '.template-lintrc.js',
-        'package.json',
-        'tsconfig.json',
-    ];
+    const files = ['.stylelintignore', '.stylelintrc.{cjs,js}', 'package.json'];
     const filePaths = findFiles(files, {
         projectRoot,
     });
@@ -48,9 +33,16 @@ function moveToTestApp(options) {
     const { locations, projectRoot } = options;
     const files = [
         '.ember-cli',
+        '.eslintignore',
+        '.eslintrc.{cjs,js}',
+        '.gitignore',
+        '.prettierignore',
+        '.prettierrc.{cjs,js}',
+        '.template-lintrc.{cjs,js}',
         '.watchmanconfig',
         'ember-cli-build.js',
         'testem.js',
+        'tsconfig.json',
     ];
     const filePaths = findFiles(files, {
         projectRoot,

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

@@ -1,5 +1,5 @@
 import { convertToMap, convertToObject } from '@codemod-utils/json';
-import { getVersion } from '../../utils/blueprints.js';
+import { getLatestVersion } from '../../utils/blueprints.js';
 export function updateDependencies(packageJson, options) {
     const dependencies = convertToMap(packageJson['dependencies']);
     const packagesToDelete = new Set([
@@ -16,7 +16,7 @@ export function updateDependencies(packageJson, options) {
     });
     const packagesToInstall = ['@embroider/addon-shim', 'decorator-transforms'];
     packagesToInstall.forEach((packageName) => {
-        const version = getVersion(packageName, options);
+        const version = getLatestVersion(packageName);
         dependencies.set(packageName, version);
     });
     packageJson['dependencies'] = convertToObject(dependencies);

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

@@ -1,36 +1,50 @@
 import { convertToMap, convertToObject } from '@codemod-utils/json';
-import { getVersion } from '../../utils/blueprints.js';
+import { getLatestVersion } 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
+      The codemod sets the development dependencies that v2 addons need.
+      End-developers must add dependencies that their v1 addon needed.
     */
     devDependencies.clear();
     const packagesToInstall = new Set([
         '@babel/core',
+        '@babel/eslint-parser',
         '@babel/runtime',
         '@embroider/addon-dev',
         '@rollup/plugin-babel',
         'babel-plugin-ember-template-compilation',
         'concurrently',
+        'ember-template-lint',
+        'eslint',
+        'eslint-config-prettier',
+        'eslint-plugin-ember',
+        'eslint-plugin-import',
+        'eslint-plugin-n',
+        'eslint-plugin-prettier',
+        'prettier',
         'rollup',
         'rollup-plugin-copy',
     ]);
     if (packages.addon.hasTypeScript) {
+        packagesToInstall.delete('@babel/eslint-parser');
         packagesToInstall.add('@babel/plugin-transform-typescript');
         packagesToInstall.add('@tsconfig/ember');
+        packagesToInstall.add('@types/ember__component');
+        packagesToInstall.add('@types/ember__object');
+        packagesToInstall.add('@types/ember__service');
+        packagesToInstall.add('@typescript-eslint/eslint-plugin');
+        packagesToInstall.add('@typescript-eslint/parser');
         packagesToInstall.add('typescript');
     }
+    if (packages.addon.hasGlint) {
+        packagesToInstall.add('@glint/core');
+        packagesToInstall.add('@glint/environment-ember-loose');
+        packagesToInstall.add('@glint/template');
+    }
     Array.from(packagesToInstall).forEach((packageName) => {
-        const version = getVersion(packageName, options);
+        const version = getLatestVersion(packageName);
         devDependencies.set(packageName, version);
     });
     packageJson['devDependencies'] = convertToObject(devDependencies);

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

@@ -1,28 +1,41 @@
 import { convertToMap, convertToObject } from '@codemod-utils/json';
 export function updateScripts(packageJson, options) {
-    const { packages } = options;
+    const { locations, packageManager, packages } = options;
     const scripts = convertToMap(packageJson['scripts']);
+    /*
+      The codemod sets the scripts that v2 addons need. End-developers
+      must add scripts that their v1 addon needed.
+    */
+    scripts.clear();
+    scripts.set('lint', `concurrently '${packageManager}:lint:*(!fix)' --names 'lint:'`);
+    scripts.set('lint:fix', `concurrently '${packageManager}:lint:*:fix' --names 'fix:'`);
+    scripts.set('lint:hbs', 'ember-template-lint . --no-error-on-unmatched-pattern');
+    scripts.set('lint:hbs:fix', 'ember-template-lint . --fix --no-error-on-unmatched-pattern');
+    scripts.set('lint:js', 'eslint . --cache');
+    scripts.set('lint:js:fix', 'eslint . --fix');
+    scripts.set('test', `echo 'A v2 addon does not have tests, run tests in ${locations.testApp}'`);
     if (packages.addon.hasTypeScript) {
-        scripts.set('build', 'concurrently "npm:build:*" --names "build:"');
+        scripts.set('build', `concurrently '${packageManager}: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');
-        if (scripts.get('postpack') === 'ember ts:clean') {
-            scripts.delete('postpack');
-        }
-        scripts.set('prepack', 'rollup --config');
-        scripts.set('start', 'concurrently "npm:start:*" --names "start:"');
+        scripts.delete('postpack');
+        scripts.set('prepack', `concurrently '${packageManager}:build:*'`);
+        scripts.set('start', `concurrently '${packageManager}: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'");
+        if (packages.addon.hasGlint) {
+            scripts.set('build:types', 'glint --declaration');
+            scripts.set('lint:types', 'glint');
+            scripts.set('start:types', 'glint --declaration --watch');
+        }
+        else {
+            scripts.set('build:types', 'tsc');
+            scripts.set('lint:types', 'tsc --emitDeclarationOnly false --noEmit');
+            scripts.set('start:types', 'tsc --watch');
+        }
     }
     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/utils/blueprints/get-version.js

@@ -1,23 +1,46 @@
 import { decideVersion } from '@codemod-utils/blueprints';
 const latestVersions = new Map([
-    ['@babel/core', '7.24.0'],
-    ['@babel/plugin-transform-typescript', '7.23.6'],
-    ['@babel/runtime', '7.24.0'],
-    ['@embroider/addon-dev', '4.2.1'],
-    ['@embroider/addon-shim', '1.8.7'],
-    ['@embroider/test-setup', '3.0.3'],
+    ['@babel/core', '7.24.7'],
+    ['@babel/eslint-parser', '7.24.7'],
+    ['@babel/plugin-transform-typescript', '7.24.7'],
+    ['@babel/runtime', '7.24.7'],
+    ['@embroider/addon-dev', '4.3.1'],
+    ['@embroider/addon-shim', '1.8.9'],
+    ['@embroider/test-setup', '4.0.0'],
+    ['@glint/core', '1.4.0'],
+    ['@glint/environment-ember-loose', '1.4.0'],
+    ['@glint/template', '1.4.0'],
     ['@rollup/plugin-babel', '6.0.4'],
-    ['@tsconfig/ember', '3.0.5'],
-    ['babel-plugin-ember-template-compilation', '2.2.1'],
+    ['@tsconfig/ember', '3.0.8'],
+    ['@types/ember__component', '4.0.22'],
+    ['@types/ember__object', '4.0.12'],
+    ['@types/ember__service', '4.0.9'],
+    ['@typescript-eslint/eslint-plugin', '7.12.0'],
+    ['@typescript-eslint/parser', '7.12.0'],
+    ['babel-plugin-ember-template-compilation', '2.2.5'],
     ['concurrently', '8.2.2'],
-    ['decorator-transforms', '1.1.0'],
-    ['ember-auto-import', '2.7.2'],
+    ['decorator-transforms', '2.0.0'],
+    ['ember-auto-import', '2.7.3'],
     ['ember-cli-babel', '8.1.0'],
     ['ember-cli-htmlbars', '6.3.0'],
-    ['rollup', '4.13.0'],
+    ['ember-template-lint', '6.0.0'],
+    ['eslint', '8.57.0'],
+    ['eslint-config-prettier', '9.1.0'],
+    ['eslint-plugin-ember', '12.1.1'],
+    ['eslint-plugin-import', '2.29.1'],
+    ['eslint-plugin-n', '17.8.1'],
+    ['eslint-plugin-prettier', '5.1.3'],
+    ['prettier', '3.3.1'],
+    ['rollup', '4.18.0'],
     ['rollup-plugin-copy', '3.5.0'],
-    ['typescript', '5.4.2'],
+    ['typescript', '5.4.5'],
 ]);
+export function getLatestVersion(packageName) {
+    if (!latestVersions.has(packageName)) {
+        throw new RangeError(`ERROR: The latest version of \`${packageName}\` is unknown.\n`);
+    }
+    return `^${latestVersions.get(packageName)}`;
+}
 export function getVersion(packageName, options) {
     const { packages } = options;
     return decideVersion(packageName, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "1.2.4",
+  "version": "1.3.1",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -27,34 +27,34 @@
     "dist"
   ],
   "dependencies": {
-    "@codemod-utils/blueprints": "^1.1.2",
-    "@codemod-utils/files": "^2.0.0",
-    "@codemod-utils/json": "^1.1.5",
+    "@codemod-utils/blueprints": "^1.1.3",
+    "@codemod-utils/files": "^2.0.2",
+    "@codemod-utils/json": "^1.1.7",
     "strip-json-comments": "^5.0.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.0",
-    "@codemod-utils/tests": "^1.1.3",
+    "@babel/core": "^7.24.7",
+    "@codemod-utils/tests": "^1.1.5",
     "@sondr3/minitest": "^0.1.2",
-    "@tsconfig/node18": "^18.2.2",
-    "@tsconfig/strictest": "^2.0.3",
-    "@types/node": "^18.19.24",
+    "@tsconfig/node18": "^18.2.4",
+    "@tsconfig/strictest": "^2.0.5",
+    "@types/node": "^18.19.34",
     "@types/yargs": "^17.0.32",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
     "concurrently": "^8.2.2",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-n": "^17.8.1",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-simple-import-sort": "^12.0.0",
+    "eslint-plugin-simple-import-sort": "^12.1.0",
     "eslint-plugin-typescript-sort-keys": "^3.2.0",
     "lerna-changelog": "^2.2.0",
-    "prettier": "^3.2.5",
-    "typescript": "^5.4.2"
+    "prettier": "^3.3.1",
+    "typescript": "^5.4.5"
   },
   "engines": {
     "node": "18.* || >= 20"

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

@@ -1,38 +0,0 @@
-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 setExtends(tsConfigJson) {
-    tsConfigJson['extends'] = '@tsconfig/ember/tsconfig.json';
-}
-function setCompilerOptions(tsConfigJson, options) {
-    const { packages } = options;
-    const compilerOptions = convertToMap();
-    compilerOptions.set('allowImportingTsExtensions', true);
-    compilerOptions.set('allowJs', true);
-    compilerOptions.set('declarationDir', 'declarations');
-    compilerOptions.set('rootDir', './src');
-    if (!packages.addon.hasGlint) {
-        compilerOptions.set('declaration', true);
-        compilerOptions.set('emitDeclarationOnly', true);
-        compilerOptions.set('noEmit', false);
-    }
-    tsConfigJson['compilerOptions'] = convertToObject(compilerOptions);
-}
-function setInclude(tsConfigJson) {
-    tsConfigJson['include'] = ['src/**/*', 'unpublished-development-types/**/*'];
-}
-export function updateAddonTsConfigJson(options) {
-    const { locations, packages, projectRoot } = options;
-    if (!packages.addon.hasTypeScript) {
-        return;
-    }
-    const oldPath = join(projectRoot, locations.addon, 'tsconfig.json');
-    const oldFile = readFileSync(oldPath, 'utf8');
-    const tsConfigJson = JSON.parse(sanitizeJson(oldFile));
-    setExtends(tsConfigJson);
-    setCompilerOptions(tsConfigJson, options);
-    setInclude(tsConfigJson);
-    const newFile = JSON.stringify(tsConfigJson, null, 2) + '\n';
-    writeFileSync(oldPath, newFile, 'utf8');
-}