ember-codemod-v1-to-v2 2.2.0 → 3.0.0

package/README.md

@@ -5,14 +5,6 @@
 _Codemod to convert Ember addons to v2 addon format_
 
 
-## Features
-
-- Follows closely [`@embroider/addon-blueprint`](https://github.com/embroider-build/addon-blueprint)
-- Preserves your code whenever possible
-- Supports [`ember-cli-typescript`](https://docs.ember-cli-typescript.com/) and [`glint`](https://typed-ember.gitbook.io/glint/)
-- Focuses on maintainability and extensibility
-
-
 ## Usage
 
 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).
@@ -32,6 +24,7 @@ npx ember-codemod-v1-to-v2 <arguments>
 >
 > - [Meet prerequisites for v2 addon](https://github.com/embroider-build/embroider/blob/v7.1.3-%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).
+> - [Convert templates to strict mode](https://github.com/ijlee2/ember-codemod-add-template-tags).
 > - Update dependencies.
 > - Switch `npm` or `yarn` to `pnpm`.
 
@@ -51,7 +44,7 @@ Step 3. Review the test-app package.
 
 Step 4. Review the workspace root including CI/CD.
 
-<sup>1. Files such as `eslint.config.mjs`, `.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 `eslint.config.mjs`, `.gitignore`, `babel.config.cjs` (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
@@ -126,7 +119,7 @@ pnpm build
 ./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).
+If you'd rather start over, you can use [`create-v2-addon-repo`](https://github.com/ijlee2/create-v2-addon-repo).
 
 
 ## Compatibility
@@ -138,8 +131,6 @@ You can also look at another codemod called [`ember-addon-migrator`](https://git
 
 See the [Contributing](CONTRIBUTING.md) guide for details.
 
-If you have an open-sourced addon (v1 or v2) that I can use as a reference, reach out to me on [Discord](https://discord.gg/emberjs) at `ijlee2`. Please star this project so that I can gauge its importance to you and the Ember community. ⭐
-
 
 ## Credits
 

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

@@ -1,3 +1,10 @@
 # compiled output
 /declarations/
 /dist/
+
+# misc
+!.*
+.*/
+README.md
+
+# specific to this package

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

@@ -9,5 +9,5 @@
 /.eslintcache
 /.stylelintcache
 
-# npm/pnpm/yarn pack output
+# pnpm pack output
 *.tgz

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

@@ -0,0 +1,31 @@
+module.exports = {
+  generatorOpts: {
+    compact: false,
+  },
+  plugins: [
+<% if (options.packages.addon.hasTypeScript) { %>    [
+      '@babel/plugin-transform-typescript',
+      {
+        allExtensions: true,
+        allowDeclareFields: true,
+        onlyRemoveTypeImports: true,
+      },
+    ],
+<% } %>    '@embroider/addon-dev/template-colocation-plugin',
+    [
+      'babel-plugin-ember-template-compilation',
+      {
+        targetFormat: 'hbs',
+        transforms: [],
+      },
+    ],
+    [
+      'module:decorator-transforms',
+      {
+        runtime: {
+          import: 'decorator-transforms/runtime-esm',
+        },
+      },
+    ],
+  ],
+};

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

@@ -1 +1 @@
-export { default } from '@ijlee2-frontend-configs/prettier';
+export { default } from '@ijlee2-frontend-configs/prettier/ember';

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

@@ -1,12 +1,18 @@
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
   srcDir: 'src',
   destDir: 'dist',
 });
 
+const rootDirectory = dirname(fileURLToPath(import.meta.url));
+const babelConfig = resolve(rootDirectory, './babel.config.cjs');<% if (options.packages.addon.hasTypeScript) { %>
+const tsConfig = resolve(rootDirectory, './tsconfig.json');<% } %>
+
 export default {
   // This provides defaults that work well alongside `publicEntrypoints` below.
   // You can augment this if you need to.
@@ -30,7 +36,6 @@ export default {
       'helpers/**/*.js',
       'modifiers/**/*.js',
       'services/**/*.js',
-      'utils/**/*.js',
     ]),
 
     // Follow the V2 Addon rules about dependencies. Your code can import from
@@ -46,7 +51,8 @@ export default {
     // babel.config.json.
     babel({
       babelHelpers: 'bundled',
-      extensions: ['.js', '.gjs'<% if (options.packages.addon.hasTypeScript) { %>, '.ts', '.gts'<% } %>],
+      configFile: babelConfig,
+      extensions: <% if (options.packages.addon.hasTypeScript) { %>['.gjs', '.gts', '.js', '.ts']<% } else { %>['.gjs', '.js']<% } %>,
     }),
 
     // Ensure that standalone .hbs files are properly integrated as Javascript.
@@ -56,7 +62,10 @@ export default {
     addon.gjs(),<% if (options.packages.addon.hasTypeScript) { %>
 
     // Emit .d.ts declaration files
-    addon.declarations('declarations'),<% } %>
+    addon.declarations(
+      'declarations',
+      `pnpm ember-tsc --declaration --project ${tsConfig}`,
+    ),<% } %>
 
     // addons are allowed to contain imports of .css files, which we want rollup
     // to leave alone and keep in the published output.
@@ -70,13 +79,5 @@ export default {
 
     // Remove leftover build artifacts when starting a new build.
     addon.clean(),
-
-    // Copy Readme and License into published package
-    copy({
-      targets: [
-        { src: '../README.md', dest: '.' },
-        { src: '../LICENSE.md', dest: '.' },
-      ],
-    }),
   ],
 };

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

@@ -2,21 +2,19 @@
   "extends": "@tsconfig/ember/tsconfig.json",
   "compilerOptions": {
     "allowImportingTsExtensions": true,
-    "allowJs": true,
+    "declaration": true,
     "declarationDir": "declarations",
-    "rootDir": "./src",
-    "types": [
-      "ember-source/types"
-    ]
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "noEmit": false,<% if (options.packages.addon.hasGlint) { %>
+    "plugins": [
+      {
+        "name": "@glint/tsserver-plugin"
+      }
+    ],<% } %>
+    "rootDir": "./src",<% if (options.packages.addon.hasGlint) { %>
+    "types": ["ember-source/types", "@glint/ember-tsc/types"]<% } else { %>
+    "types": ["ember-source/types"]<% } %>
   },
-  "include": [
-    "src/**/*",
-    "unpublished-development-types/**/*"
-  ]<% if (options.packages.addon.hasGlint) { %>,
-  "glint": {
-    "environment": [
-      "ember-loose",
-      "ember-template-imports"
-    ]
-  }<% } %>
+  "include": ["src/**/*", "unpublished-development-types/**/*"]
 }

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

@@ -1,15 +1,2 @@
 // Add any types here that you need for local development only.
 // 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';
-
-// Uncomment if you need to support consuming projects in loose mode
-//
-// declare module '@glint/environment-ember-loose/registry' {
-//   export default interface Registry {
-//     // Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
-//     // See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons
-//   }
-// }
-<% } %>

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

@@ -9,4 +9,4 @@ node_modules/
 .DS_Store
 .env*
 .eslintcache
-<% if (options.packageManager === 'npm') { %>npm-debug.log*<% } else if (options.packageManager === 'pnpm') { %>pnpm-debug.log<% } else if (options.packageManager === 'yarn') { %>yarn-error.log<% } %>
+pnpm-debug.log

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

@@ -0,0 +1,4 @@
+auto-install-peers=false
+public-hoist-pattern[]=*eslint*
+public-hoist-pattern[]=*prettier*
+resolve-peers-from-workspace-root=false

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

@@ -5,3 +5,7 @@
 /coverage/
 !.*
 .*/
+*.html
+README.md
+
+# specific to this package

package/dist/src/blueprints/ember-addon/__testAppLocation__/.stylelintignore

@@ -1,3 +1,2 @@
 # compiled output
-/declarations/
 /dist/

package/dist/src/blueprints/ember-addon/__testAppLocation__/ember-cli-build.js

@@ -8,11 +8,13 @@ module.exports = function (defaults) {
   const app = new EmberApp(defaults, {
     // Add options here
     autoImport: {
-      watchDependencies: ['<%= options.packages.addon.name %>'],
-    },<% if (options.packages.addon.hasTypeScript) { %>
+      watchDependencies: [],
+    },
+<% if (options.packages.addon.hasTypeScript) { %>
     'ember-cli-babel': {
       enableTypeScriptTransform: true,
-    },<% } %>
+    },
+<% } %>
     trees: {
       app: sideWatch('app', {
         watching: ['<%= options.packages.addon.name %>'],

package/dist/src/blueprints/ember-addon/__testAppLocation__/prettier.config.mjs

@@ -1 +1 @@
-export { default } from '@ijlee2-frontend-configs/prettier';
+export { default } from '@ijlee2-frontend-configs/prettier/ember';

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

@@ -6,20 +6,14 @@
       "<%= options.packages.testApp.name %>/tests/*": ["tests/*"],
       "<%= options.packages.testApp.name %>/*": ["app/*"],
       "*": ["types/*"]
-    },
-    "types": [
-      "ember-source/types"
-    ]
+    },<% if (options.packages.addon.hasGlint) { %>
+    "plugins": [
+      {
+        "name": "@glint/tsserver-plugin"
+      }
+    ],<% } %><% if (options.packages.addon.hasGlint) { %>
+    "types": ["ember-source/types", "@glint/ember-tsc/types"]<% } else { %>
+    "types": ["ember-source/types"]<% } %>
   },
-  "include": [
-    "app/**/*",
-    "tests/**/*",
-    "types/**/*"
-  ]<% if (options.packages.addon.hasGlint) { %>,
-  "glint": {
-    "environment": [
-      "ember-loose",
-      "ember-template-imports"
-    ]
-  }<% } %>
+  "include": ["app/**/*", "tests/**/*", "types/**/*"]
 }

package/dist/src/blueprints/ember-addon/__testAppLocation__/types/global.d.ts

@@ -1,3 +0,0 @@
-<% if (options.packages.addon.hasGlint) { %>import '@glint/environment-ember-loose';
-import '@glint/environment-ember-template-imports';
-<% } %>

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

@@ -1,28 +1,4 @@
-<% if (options.packageManager === 'npm') { %>{
-  "name": "workspace-root",
-  "version": "<%= options.packages.addon.version %>",
-  "private": true,
-  "repository": "",
-  "license": "MIT",
-  "author": "",
-  "workspaces": [
-    "<%= options.locations.addon %>",
-    "<%= options.locations.testApp %>"
-  ],
-  "scripts": {
-    "build": "npm run build --workspace <%= options.packages.addon.name %>",
-    "lint": "npm run lint --workspaces --if-present",
-    "lint:fix": "npm run lint:fix --workspaces --if-present",
-    "prepare": "npm run build",
-    "start": "concurrently \"npm:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow",
-    "start:addon": "npm start --workspace <%= options.packages.addon.name %>",
-    "start:test-app": "npm start --workspace <%= options.packages.testApp.name %>",
-    "test": "npm run test --workspaces --if-present"
-  },
-  "devDependencies": {
-    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
-  }
-}<% } else if (options.packageManager === 'pnpm') { %>{
+{
   "name": "workspace-root",
   "version": "<%= options.packages.addon.version %>",
   "private": true,
@@ -31,6 +7,7 @@
   "author": "",
   "scripts": {
     "build": "pnpm --filter <%= options.packages.addon.name %> build",
+    "format": "pnpm --filter \"*\" format",
     "lint": "pnpm --filter \"*\" lint",
     "lint:fix": "pnpm --filter \"*\" lint:fix",
     "prepare": "pnpm build",
@@ -41,29 +18,10 @@
   },
   "devDependencies": {
     "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
-  }
-}<% } else if (options.packageManager === 'yarn') { %>{
-  "name": "workspace-root",
-  "version": "<%= options.packages.addon.version %>",
-  "private": true,
-  "repository": "",
-  "license": "MIT",
-  "author": "",
-  "workspaces": [
-    "<%= options.locations.addon %>",
-    "<%= options.locations.testApp %>"
-  ],
-  "scripts": {
-    "build": "yarn workspace <%= options.packages.addon.name %> run build",
-    "lint": "yarn workspaces run lint",
-    "lint:fix": "yarn workspaces run lint:fix",
-    "prepare": "yarn build",
-    "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"
   },
-  "devDependencies": {
-    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
+  "packageManager": "pnpm@<%= context.projectRoot.devDependencies['pnpm'] %>",
+  "engines": {
+    "node": "20.* || >= 22",
+    "pnpm": ">= 10"
   }
-}<% } %>
+}

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

@@ -1,11 +1,6 @@
 import { relative, sep } from 'node:path';
 import { findFiles } from '@codemod-utils/files';
-import { getVersion } from '../utils/blueprints.js';
-function getProjectRootDevDependencies(options) {
-    return {
-        concurrently: getVersion('concurrently', options),
-    };
-}
+import { getLatestVersion } from '../utils/blueprints.js';
 function getPublicAssets(options) {
     const { packages, projectRoot } = options;
     const filePaths = findFiles('public/**/*', {
@@ -34,7 +29,10 @@ export function analyzeAddon(options) {
             publicAssets,
         },
         projectRoot: {
-            devDependencies: getProjectRootDevDependencies(options),
+            devDependencies: {
+                concurrently: getLatestVersion('concurrently'),
+                pnpm: getLatestVersion('pnpm').replace('^', ''),
+            },
         },
     };
 }

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

@@ -4,7 +4,7 @@ import { processTemplate } from '@codemod-utils/blueprints';
 import { createFiles, findFiles } from '@codemod-utils/files';
 import { blueprintsRoot } from '../utils/blueprints.js';
 function getFilesToSkip(options) {
-    const { packageManager, packages } = options;
+    const { packages } = options;
     const files = new Set();
     if (!packages.addon.hasTypeScript) {
         files.add('__addonLocation__/tsconfig.json');
@@ -12,9 +12,6 @@ function getFilesToSkip(options) {
         files.add('__testAppLocation__/tsconfig.json');
         files.add('__testAppLocation__/types/global.d.ts');
     }
-    if (packageManager !== 'pnpm') {
-        files.add('pnpm-workspace.yaml');
-    }
     return Array.from(files);
 }
 function resolveBlueprintFilePath(blueprintFilePath, options) {
@@ -22,6 +19,7 @@ function resolveBlueprintFilePath(blueprintFilePath, options) {
     return blueprintFilePath
         .replace('__addonLocation__', locations.addon)
         .replace('__gitignore__', '.gitignore')
+        .replace('__npmrc__', '.npmrc')
         .replace('__testAppLocation__', locations.testApp);
 }
 export function createFilesFromBlueprints(context, options) {

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

@@ -1,4 +1,3 @@
-import { findFiles } from '@codemod-utils/files';
 import { getPackageType, readPackageJson, validatePackageJson, } from '@codemod-utils/package-json';
 function analyzePackageJson(codemodOptions) {
     const { projectRoot } = codemodOptions;
@@ -11,31 +10,14 @@ function analyzePackageJson(codemodOptions) {
     ]);
     return {
         dependencies: projectDependencies,
-        hasGlint: projectDependencies.has('@glint/core'),
+        hasGlint: projectDependencies.has('@glint/core') ||
+            projectDependencies.has('@glint/ember-tsc'),
         hasTypeScript: projectDependencies.has('typescript'),
         isV1Addon: getPackageType(packageJson) === 'v1-addon',
         name,
         version,
     };
 }
-function analyzePackageManager(codemodOptions) {
-    const { projectRoot } = codemodOptions;
-    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. pnpm will be assumed.');
-        return 'pnpm';
-    }
-    const lockfile = filePaths[0];
-    return mapping[lockfile];
-}
 function deriveAddonLocation(addonPackage) {
     const hasScope = addonPackage.name.includes('/');
     if (!hasScope) {
@@ -46,13 +28,11 @@ function deriveAddonLocation(addonPackage) {
 }
 export function createOptions(codemodOptions) {
     const addonPackage = analyzePackageJson(codemodOptions);
-    const packageManager = analyzePackageManager(codemodOptions);
     return {
         locations: {
             addon: codemodOptions.addonLocation ?? deriveAddonLocation(addonPackage),
             testApp: codemodOptions.testAppLocation ?? 'test-app',
         },
-        packageManager,
         packages: {
             addon: addonPackage,
             testApp: {

package/dist/src/steps/move-addon-files.js

@@ -17,7 +17,7 @@ function moveAddonTestSupportFolder(options) {
     });
     if (filePaths.length === 1) {
         const oldPath = filePaths[0];
-        const newPath = `${locations.addon}/src/test-support${oldPath.endsWith('.ts') ? '.ts' : 'js'}`;
+        const newPath = `${locations.addon}/src/test-support${oldPath.endsWith('.ts') ? '.ts' : '.js'}`;
         moveFiles(new Map([[oldPath, newPath]]), options);
     }
     filePaths = findFiles('addon-test-support/**/*', {

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

@@ -9,7 +9,8 @@ export function updateDevDependencies(packageJson, options) {
         '@babel/core',
         '@babel/runtime',
         '@embroider/addon-dev',
-        '@eslint/js',
+        '@glimmer/component',
+        '@glimmer/tracking',
         '@ijlee2-frontend-configs/ember-template-lint',
         '@ijlee2-frontend-configs/eslint-config-ember',
         '@ijlee2-frontend-configs/prettier',
@@ -17,24 +18,23 @@ export function updateDevDependencies(packageJson, options) {
         '@rollup/plugin-babel',
         'babel-plugin-ember-template-compilation',
         'concurrently',
+        'ember-modifier',
+        'ember-source',
         'ember-template-lint',
         'eslint',
         'prettier',
         'stylelint',
         'rollup',
-        'rollup-plugin-copy',
     ]);
     if (packages.addon.hasTypeScript) {
         packagesToInstall.add('@babel/plugin-transform-typescript');
         packagesToInstall.add('@tsconfig/ember');
-        packagesToInstall.add('ember-source');
         packagesToInstall.add('typescript');
     }
     if (packages.addon.hasGlint) {
-        packagesToInstall.add('@glint/core');
-        packagesToInstall.add('@glint/environment-ember-loose');
-        packagesToInstall.add('@glint/environment-ember-template-imports');
+        packagesToInstall.add('@glint/ember-tsc');
         packagesToInstall.add('@glint/template');
+        packagesToInstall.add('@glint/tsserver-plugin');
     }
     packagesToInstall.forEach((packageName) => {
         const version = getLatestVersion(packageName);

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

@@ -1,15 +1,17 @@
 /* eslint-disable no-useless-escape */
 import { convertToMap, convertToObject } from '@codemod-utils/package-json';
 export function updateScripts(packageJson, options) {
-    const { packageManager, packages } = options;
+    const { packages } = options;
     const scripts = convertToMap(packageJson['scripts']);
     // Start over
     scripts.clear();
     scripts.set('build', 'rollup --config');
-    scripts.set('lint', `concurrently \"${packageManager}:lint:*(!fix)\" --names \"lint:\"`);
+    scripts.set('format', 'prettier . --cache --write');
+    scripts.set('lint', `concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"`);
     scripts.set('lint:css', 'stylelint \"**/*.css\" --allow-empty-input --cache"');
     scripts.set('lint:css:fix', 'stylelint \"**/*.css\" --allow-empty-input --fix');
-    scripts.set('lint:fix', `concurrently \"${packageManager}:lint:*:fix\" --names \"fix:\"`);
+    scripts.set('lint:fix', `concurrently \"pnpm:lint:*:fix\" --names \"fix:\" && pnpm format`);
+    scripts.set('lint:format', 'prettier . --cache --check');
     scripts.set('lint:hbs', 'ember-template-lint .');
     scripts.set('lint:hbs:fix', 'ember-template-lint . --fix');
     scripts.set('lint:js', 'eslint . --cache');
@@ -19,7 +21,7 @@ export function updateScripts(packageJson, options) {
     scripts.set('test', `echo \"A v2 addon does not have tests, run tests in ${packages.testApp.name}\"`);
     if (packages.addon.hasTypeScript) {
         if (packages.addon.hasGlint) {
-            scripts.set('lint:types', 'glint');
+            scripts.set('lint:types', 'ember-tsc --noEmit');
         }
         else {
             scripts.set('lint:types', 'tsc --emitDeclarationOnly false --noEmit');

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

@@ -1,7 +1,6 @@
 import { convertToMap, convertToObject } from '@codemod-utils/package-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([
@@ -9,9 +8,6 @@ export function moveDependenciesToDevDependencies(packageJson, options) {
         'ember-cli-babel',
         'ember-cli-htmlbars',
     ]);
-    if (packages.addon.hasTypeScript) {
-        packagesToMove.add('ember-cli-typescript');
-    }
     packagesToMove.forEach((packageName) => {
         if (!dependencies.has(packageName)) {
             return;

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

@@ -3,9 +3,17 @@ import { getLatestVersion } from '../../utils/blueprints.js';
 export function updateDevDependencies(packageJson, options) {
     const { packages } = options;
     const devDependencies = convertToMap(packageJson['devDependencies']);
+    const packagesToDelete = new Set([
+        '@glint/core',
+        '@glint/environment-ember-loose',
+        '@glint/environment-ember-template-imports',
+        'ember-cli-typescript',
+    ]);
+    packagesToDelete.forEach((packageName) => {
+        devDependencies.delete(packageName);
+    });
     const packagesToInstall = new Set([
         '@embroider/broccoli-side-watch',
-        '@eslint/js',
         '@ijlee2-frontend-configs/ember-template-lint',
         '@ijlee2-frontend-configs/eslint-config-ember',
         '@ijlee2-frontend-configs/prettier',
@@ -24,10 +32,9 @@ export function updateDevDependencies(packageJson, options) {
         packagesToInstall.add('typescript');
     }
     if (packages.addon.hasGlint) {
-        packagesToInstall.add('@glint/core');
-        packagesToInstall.add('@glint/environment-ember-loose');
-        packagesToInstall.add('@glint/environment-ember-template-imports');
+        packagesToInstall.add('@glint/ember-tsc');
         packagesToInstall.add('@glint/template');
+        packagesToInstall.add('@glint/tsserver-plugin');
     }
     packagesToInstall.forEach((packageName) => {
         const version = getLatestVersion(packageName);

package/dist/src/steps/update-test-app-package-json/update-scripts.js

@@ -1,15 +1,17 @@
 /* eslint-disable no-useless-escape */
 import { convertToMap, convertToObject } from '@codemod-utils/package-json';
 export function updateScripts(packageJson, options) {
-    const { packageManager, packages } = options;
+    const { packages } = options;
     const scripts = convertToMap(packageJson['scripts']);
     // Start over
     scripts.clear();
     scripts.set('build', 'ember build --environment=production');
-    scripts.set('lint', `concurrently \"${packageManager}:lint:*(!fix)\" --names \"lint:\"`);
-    scripts.set('lint:fix', `concurrently \"${packageManager}:lint:*:fix\" --names \"fix:\"`);
+    scripts.set('format', 'prettier . --cache --write');
+    scripts.set('lint', `concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"`);
     scripts.set('lint:css', 'stylelint \"**/*.css\" --allow-empty-input --cache"');
     scripts.set('lint:css:fix', 'stylelint \"**/*.css\" --allow-empty-input --fix');
+    scripts.set('lint:fix', `concurrently \"pnpm:lint:*:fix\" --names \"fix:\" && pnpm format`);
+    scripts.set('lint:format', 'prettier . --cache --check');
     scripts.set('lint:hbs', 'ember-template-lint .');
     scripts.set('lint:hbs:fix', 'ember-template-lint . --fix');
     scripts.set('lint:js', 'eslint . --cache');
@@ -19,7 +21,7 @@ export function updateScripts(packageJson, options) {
     scripts.set('test:ember-compatibility', 'ember try:one');
     if (packages.addon.hasTypeScript) {
         if (packages.addon.hasGlint) {
-            scripts.set('lint:types', 'glint');
+            scripts.set('lint:types', 'ember-tsc --noEmit');
         }
         else {
             scripts.set('lint:types', 'tsc --noEmit');

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

@@ -1,39 +1,41 @@
 import { decideVersion } from '@codemod-utils/blueprints';
 const latestVersions = new Map([
-    ['@babel/core', '7.27.1'],
-    ['@babel/plugin-transform-typescript', '7.27.1'],
-    ['@babel/runtime', '7.27.1'],
-    ['@embroider/addon-dev', '8.0.1'],
-    ['@embroider/addon-shim', '1.10.0'],
+    ['@babel/core', '7.28.5'],
+    ['@babel/plugin-transform-typescript', '7.28.5'],
+    ['@babel/runtime', '7.28.4'],
+    ['@embroider/addon-dev', '8.1.2'],
+    ['@embroider/addon-shim', '1.10.2'],
     ['@embroider/broccoli-side-watch', '1.1.0'],
     ['@embroider/test-setup', '4.0.0'],
-    ['@eslint/js', '9.26.0'],
-    ['@glint/core', '1.5.2'],
-    ['@glint/environment-ember-loose', '1.5.2'],
-    ['@glint/environment-ember-template-imports', '1.5.2'],
-    ['@glint/template', '1.5.2'],
-    ['@ijlee2-frontend-configs/ember-template-lint', '1.1.0'],
-    ['@ijlee2-frontend-configs/eslint-config-ember', '1.1.0'],
-    ['@ijlee2-frontend-configs/prettier', '1.0.0'],
-    ['@ijlee2-frontend-configs/stylelint', '1.0.0'],
-    ['@rollup/plugin-babel', '6.0.4'],
-    ['@tsconfig/ember', '3.0.10'],
-    ['babel-plugin-ember-template-compilation', '2.4.1'],
-    ['concurrently', '9.1.2'],
+    ['@glimmer/component', '2.0.0'],
+    ['@glimmer/tracking', '1.1.2'],
+    ['@glint/ember-tsc', '1.0.8'],
+    ['@glint/template', '1.7.3'],
+    ['@glint/tsserver-plugin', '2.0.8'],
+    ['@ijlee2-frontend-configs/ember-template-lint', '2.3.0'],
+    ['@ijlee2-frontend-configs/eslint-config-ember', '2.4.2'],
+    ['@ijlee2-frontend-configs/prettier', '2.3.1'],
+    ['@ijlee2-frontend-configs/stylelint', '2.2.0'],
+    ['@rollup/plugin-babel', '6.1.0'],
+    ['@tsconfig/ember', '3.0.12'],
+    ['babel-plugin-ember-template-compilation', '3.0.1'],
+    ['concurrently', '9.2.1'],
     ['decorator-transforms', '2.3.0'],
-    ['ember-auto-import', '2.10.0'],
-    ['ember-cli', '6.4.0'],
+    ['ember-auto-import', '2.12.0'],
+    ['ember-cli', '6.8.1'],
     ['ember-cli-babel', '8.2.0'],
-    ['ember-cli-htmlbars', '6.3.0'],
-    ['ember-source', '6.4.0'],
-    ['ember-template-lint', '7.7.0'],
+    ['ember-cli-htmlbars', '7.0.0'],
+    ['ember-modifier', '4.2.2'],
+    ['ember-source', '6.8.2'],
+    ['ember-template-imports', '4.3.0'],
+    ['ember-template-lint', '7.9.3'],
     ['ember-try', '4.0.0'],
-    ['eslint', '9.26.0'],
-    ['prettier', '3.5.3'],
-    ['rollup', '4.40.2'],
-    ['rollup-plugin-copy', '3.5.0'],
-    ['stylelint', '16.19.1'],
-    ['typescript', '5.8.3'],
+    ['eslint', '9.39.1'],
+    ['pnpm', '10.25.0'],
+    ['prettier', '3.7.4'],
+    ['rollup', '4.53.3'],
+    ['stylelint', '16.26.1'],
+    ['typescript', '5.9.3'],
 ]);
 export function getLatestVersion(packageName) {
     if (!latestVersions.has(packageName)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -29,19 +29,19 @@
   "dependencies": {
     "@codemod-utils/blueprints": "^2.1.0",
     "@codemod-utils/files": "^3.2.1",
-    "@codemod-utils/package-json": "^3.3.0",
+    "@codemod-utils/package-json": "^3.3.1",
     "yargs": "^18.0.0"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.8",
-    "@changesets/get-github-info": "^0.7.0",
     "@codemod-utils/tests": "^2.2.0",
-    "@ijlee2-frontend-configs/eslint-config-node": "^2.3.0",
-    "@ijlee2-frontend-configs/prettier": "^2.3.0",
+    "@ijlee2-frontend-configs/changesets": "^1.0.0",
+    "@ijlee2-frontend-configs/eslint-config-node": "^2.3.1",
+    "@ijlee2-frontend-configs/prettier": "^2.3.1",
     "@sondr3/minitest": "^0.1.2",
     "@tsconfig/node20": "^20.1.8",
     "@tsconfig/strictest": "^2.0.8",
-    "@types/node": "^20.19.25",
+    "@types/node": "^20.19.26",
     "@types/yargs": "^17.0.35",
     "concurrently": "^9.2.1",
     "eslint": "^9.39.1",

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

@@ -1,28 +0,0 @@
-{
-  "plugins": [
-<% if (options.packages.addon.hasTypeScript) { %>    [
-      "@babel/plugin-transform-typescript",
-      {
-        "allExtensions": true,
-        "allowDeclareFields": true,
-        "onlyRemoveTypeImports": true
-      }
-    ],
-<% } %>    "@embroider/addon-dev/template-colocation-plugin",
-    [
-      "babel-plugin-ember-template-compilation",
-      {
-        "targetFormat": "hbs",
-        "transforms": []
-      }
-    ],
-    [
-      "module:decorator-transforms",
-      {
-        "runtime": {
-          "import": "decorator-transforms/runtime"
-        }
-      }
-    ]
-  ]
-}