ember-codemod-v1-to-v2 1.7.1 → 2.1.0

package/README.md

@@ -7,7 +7,7 @@ _Codemod to convert Ember addons to v2 addon format_
 
 ## Features
 
-- Scaffolds files according to [`@embroider/addon-blueprint`](https://github.com/embroider-build/addon-blueprint)
+- 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
@@ -17,7 +17,7 @@ _Codemod to convert Ember addons to v2 addon format_
 
 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/v4.3.1-%40embroider/addon-dev/docs/addon-author-guide.md).
+Step 1. Quickly migrate to [v2 format](https://github.com/embroider-build/embroider/blob/v7.1.3-%40embroider/addon-dev/docs/addon-author-guide.md).
 
 ```sh
 cd <path/to/your/project>
@@ -30,14 +30,14 @@ npx ember-codemod-v1-to-v2 <arguments>
 >
 > 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).
+> - [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).
 > - Update dependencies.
 > - Switch `npm` or `yarn` to `pnpm`.
 
 Step 2. Review the addon package.
 
-- [x] Update the configuration files.<sup>1</sup>
+- [x] Update 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.
@@ -45,13 +45,13 @@ Step 2. Review the addon package.
 
 Step 3. Review the test-app package.
 
-- [x] Update the configuration files.<sup>1</sup>
+- [x] Update 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. 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 `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>
 
 
 ### Arguments
@@ -131,7 +131,7 @@ You can also look at another codemod called [`ember-addon-migrator`](https://git
 
 ## Compatibility
 
-- Node.js v18 or above
+- Node.js v20 or above
 
 
 ## Contributing
@@ -143,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/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).
+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/v7.1.3-%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/src/blueprints/ember-addon/__addonLocation__/.prettierignore

@@ -1,9 +1,3 @@
-# unconventional js
-/blueprints/*/files/
-
 # compiled output
-/dist/
 /declarations/
-
-# misc
-/coverage/
+/dist/

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

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

package/dist/src/blueprints/ember-addon/__addonLocation__/.stylelintrc.mjs

@@ -0,0 +1 @@
+export { default } from '@ijlee2-frontend-configs/stylelint';

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

@@ -1,5 +1,3 @@
 'use strict';
 
-module.exports = {
-  extends: 'recommended',
-};
+module.exports = require('@ijlee2-frontend-configs/ember-template-lint');

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

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

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

@@ -0,0 +1 @@
+export { default } from '@ijlee2-frontend-configs/eslint-config-ember/v2-addon';

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

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

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

@@ -60,7 +60,13 @@ export default {
 
     // addons are allowed to contain imports of .css files, which we want rollup
     // to leave alone and keep in the published output.
-    addon.keepAssets(['**/*.css']),
+    addon.keepAssets(['**/*.css']),<% if (context.addon.hasPublicAssets) { %>
+
+    // Update public-assets field in package.json
+    addon.publicAssets('public/assets', {
+      exclude: ['**/.*'],
+      namespace: '<%= options.packages.addon.name %>',
+    }),<% } %>
 
     // Remove leftover build artifacts when starting a new build.
     addon.clean(),

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

@@ -4,9 +4,6 @@
     "allowImportingTsExtensions": true,
     "allowJs": true,
     "declarationDir": "declarations",
-    "emitDeclarationOnly": true,
-    "noEmit": false,
-    "noEmitOnError": false,
     "rootDir": "./src",
     "types": [
       "ember-source/types"

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

@@ -1,10 +1,12 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
+# compiled output
+dist/
+tmp/
 
 # dependencies
 node_modules/
 
 # misc
+.DS_Store
 .env*
-.pnpm-debug.log
-npm-debug.log*
-yarn-error.log
+.eslintcache
+<% if (options.packageManager === 'npm') { %>npm-debug.log*<% } else if (options.packageManager === 'pnpm') { %>pnpm-debug.log<% } else if (options.packageManager === 'yarn') { %>yarn-error.log<% } %>

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

@@ -0,0 +1,7 @@
+# compiled output
+/dist/
+
+# misc
+/coverage/
+!.*
+.*/

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

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

package/dist/src/blueprints/ember-addon/__testAppLocation__/.stylelintrc.mjs

@@ -0,0 +1 @@
+export { default } from '@ijlee2-frontend-configs/stylelint';

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

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('@ijlee2-frontend-configs/ember-template-lint');

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

@@ -0,0 +1,16 @@
+# compiled output
+/dist/
+
+# dependencies
+/node_modules/
+
+# misc
+/.env*
+/.pnp*
+/.eslintcache
+/.stylelintcache
+/coverage/
+/testem.log
+
+# broccoli-debug
+/DEBUG/

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

@@ -1,5 +1,7 @@
 'use strict';
 
+const sideWatch = require('@embroider/broccoli-side-watch');
+const { maybeEmbroider } = require('@embroider/test-setup');
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = function (defaults) {
@@ -11,9 +13,12 @@ module.exports = function (defaults) {
     'ember-cli-babel': {
       enableTypeScriptTransform: true,
     },<% } %>
+    trees: {
+      app: sideWatch('app', {
+        watching: ['<%= options.packages.addon.name %>'],
+      }),
+    },
   });
 
-  const { maybeEmbroider } = require('@embroider/test-setup');
-
   return maybeEmbroider(app);
 };

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

@@ -0,0 +1 @@
+export { default } from '@ijlee2-frontend-configs/eslint-config-ember/v1-app';

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

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

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

@@ -0,0 +1,25 @@
+{
+  "extends": "@tsconfig/ember/tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "<%= options.packages.testApp.name %>/tests/*": ["tests/*"],
+      "<%= options.packages.testApp.name %>/*": ["app/*"],
+      "*": ["types/*"]
+    },
+    "types": [
+      "ember-source/types"
+    ]
+  },
+  "include": [
+    "app/**/*",
+    "tests/**/*",
+    "types/**/*"
+  ]<% if (options.packages.addon.hasGlint) { %>,
+  "glint": {
+    "environment": [
+      "ember-loose",
+      "ember-template-imports"
+    ]
+  }<% } %>
+}

package/dist/src/index.js

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

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

@@ -25,10 +25,12 @@ function hasBlueprints(options) {
     return filePaths.length > 0;
 }
 export function analyzeAddon(options) {
+    const publicAssets = getPublicAssets(options);
     return {
         addon: {
             hasBlueprints: hasBlueprints(options),
-            publicAssets: getPublicAssets(options),
+            hasPublicAssets: Object.keys(publicAssets).length > 0,
+            publicAssets,
         },
         projectRoot: {
             devDependencies: getProjectRootDevDependencies(options),

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

@@ -9,6 +9,7 @@ function getFilesToSkip(options) {
     if (!packages.addon.hasTypeScript) {
         files.add('__addonLocation__/tsconfig.json');
         files.add('__addonLocation__/unpublished-development-types/index.d.ts');
+        files.add('__testAppLocation__/tsconfig.json');
         files.add('__testAppLocation__/types/global.d.ts');
     }
     if (packageManager !== 'pnpm') {

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

@@ -14,8 +14,8 @@ function analyzePackageJson(codemodOptions) {
         hasGlint: projectDependencies.has('@glint/core'),
         hasTypeScript: projectDependencies.has('typescript'),
         isV1Addon: Boolean(emberAddon),
-        name: name,
-        version: version,
+        name,
+        version,
     };
 }
 function analyzePackageManager(codemodOptions) {

package/dist/src/steps/index.js

@@ -6,4 +6,3 @@ export * from './move-project-root-files.js';
 export * from './move-test-app-files.js';
 export * from './update-addon-package-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,7 +13,7 @@ function copyToAddon(options) {
 }
 function moveToAddonAndTestApp(options) {
     const { locations, projectRoot } = options;
-    const files = ['.stylelintignore', '.stylelintrc.{cjs,js}', 'package.json'];
+    const files = ['package.json'];
     const filePaths = findFiles(files, {
         projectRoot,
     });
@@ -33,16 +33,10 @@ 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,
@@ -55,7 +49,20 @@ function moveToTestApp(options) {
 }
 function removeFromProjectRoot(options) {
     const { projectRoot } = options;
-    const files = ['.npmignore', 'index.js'];
+    const files = [
+        '.eslintignore',
+        '.eslintrc.{cjs,js}',
+        '.npmignore',
+        '.prettierignore',
+        '.prettierrc.{cjs,js}',
+        '.stylelintignore',
+        '.stylelintrc.{cjs,js,mjs}',
+        '.template-lintrc.{cjs,js}',
+        'eslint.config.mjs',
+        'index.js',
+        'prettier.config.mjs',
+        'tsconfig.json',
+    ];
     const filePaths = findFiles(files, {
         projectRoot,
     });

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

@@ -3,36 +3,31 @@ import { getLatestVersion } from '../../utils/blueprints.js';
 export function updateDevDependencies(packageJson, options) {
     const { packages } = options;
     const devDependencies = convertToMap(packageJson['devDependencies']);
-    /*
-      The codemod sets the development dependencies that v2 addons need.
-      End-developers must add dependencies that their v1 addon needed.
-    */
+    // Start over
     devDependencies.clear();
     const packagesToInstall = new Set([
         '@babel/core',
-        '@babel/eslint-parser',
         '@babel/runtime',
         '@embroider/addon-dev',
+        '@eslint/js',
+        '@ijlee2-frontend-configs/ember-template-lint',
+        '@ijlee2-frontend-configs/eslint-config-ember',
+        '@ijlee2-frontend-configs/prettier',
+        '@ijlee2-frontend-configs/stylelint',
         '@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',
+        'stylelint',
         '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('@typescript-eslint/eslint-plugin');
-        packagesToInstall.add('@typescript-eslint/parser');
+        packagesToInstall.add('ember-source');
         packagesToInstall.add('typescript');
     }
     if (packages.addon.hasGlint) {
@@ -40,7 +35,6 @@ export function updateDevDependencies(packageJson, options) {
         packagesToInstall.add('@glint/environment-ember-loose');
         packagesToInstall.add('@glint/environment-ember-template-imports');
         packagesToInstall.add('@glint/template');
-        packagesToInstall.add('ember-source');
     }
     Array.from(packagesToInstall).forEach((packageName) => {
         const version = getLatestVersion(packageName);

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

@@ -68,11 +68,11 @@ function updateTypesVersions(packageJson, data) {
     };
 }
 export function updateOtherFields(packageJson, context, options) {
-    const { hasBlueprints, publicAssets } = context.addon;
+    const { hasBlueprints, hasPublicAssets, publicAssets } = context.addon;
     const { hasTypeScript } = options.packages.addon;
     const data = {
         hasBlueprints,
-        hasPublicAssets: Object.keys(publicAssets).length > 0,
+        hasPublicAssets,
         hasTypeScript,
         publicAssets,
     };

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

@@ -1,30 +1,23 @@
+/* eslint-disable no-useless-escape */
 import { convertToMap, convertToObject } from '@codemod-utils/json';
 export function updateScripts(packageJson, options) {
-    const { locations, packageManager, packages } = options;
+    const { 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.
-    */
+    // Start over
     scripts.clear();
     scripts.set('build', 'rollup --config');
-    scripts.set('lint', 
-    // eslint-disable-next-line no-useless-escape
-    `concurrently \"${packageManager}:lint:*(!fix)\" --names \"lint:\"`);
-    scripts.set('lint:fix', 
-    // eslint-disable-next-line no-useless-escape
-    `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', `concurrently \"${packageManager}: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:hbs', 'ember-template-lint .');
+    scripts.set('lint:hbs:fix', 'ember-template-lint . --fix');
     scripts.set('lint:js', 'eslint . --cache');
     scripts.set('lint:js:fix', 'eslint . --fix');
     scripts.set('prepack', 'rollup --config');
     scripts.set('start', 'rollup --config --watch');
-    scripts.set('test', 
-    // eslint-disable-next-line no-useless-escape
-    `echo \"A v2 addon does not have tests, run tests in ${locations.testApp}\"`);
+    scripts.set('test', `echo \"A v2 addon does not have tests, run tests in ${packages.testApp.name}\"`);
     if (packages.addon.hasTypeScript) {
-        scripts.delete('postpack');
         if (packages.addon.hasGlint) {
             scripts.set('lint:types', 'glint');
         }

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

@@ -2,3 +2,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';
+export * from './update-scripts.js';

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

@@ -1,10 +1,7 @@
 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.
-    */
+    // Start over
     dependencies.clear();
     packageJson['dependencies'] = convertToObject(dependencies);
 }

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

@@ -1,7 +1,39 @@
 import { convertToMap, convertToObject } from '@codemod-utils/json';
+import { getLatestVersion } from '../../utils/blueprints.js';
 export function updateDevDependencies(packageJson, options) {
     const { packages } = options;
     const devDependencies = convertToMap(packageJson['devDependencies']);
+    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',
+        '@ijlee2-frontend-configs/stylelint',
+        'concurrently',
+        'ember-cli',
+        'ember-source',
+        'ember-template-lint',
+        'ember-try',
+        'eslint',
+        'prettier',
+        'stylelint',
+    ]);
+    if (packages.addon.hasTypeScript) {
+        packagesToInstall.add('@tsconfig/ember');
+        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/template');
+    }
+    Array.from(packagesToInstall).forEach((packageName) => {
+        const version = getLatestVersion(packageName);
+        devDependencies.set(packageName, version);
+    });
+    // Install addon
     devDependencies.set(packages.addon.name, packages.addon.version);
     packageJson['devDependencies'] = convertToObject(devDependencies);
 }

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

@@ -0,0 +1,29 @@
+/* eslint-disable no-useless-escape */
+import { convertToMap, convertToObject } from '@codemod-utils/json';
+export function updateScripts(packageJson, options) {
+    const { packageManager, 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('lint:css', 'stylelint \"**/*.css\" --allow-empty-input --cache"');
+    scripts.set('lint:css:fix', 'stylelint \"**/*.css\" --allow-empty-input --fix');
+    scripts.set('lint:hbs', 'ember-template-lint .');
+    scripts.set('lint:hbs:fix', 'ember-template-lint . --fix');
+    scripts.set('lint:js', 'eslint . --cache');
+    scripts.set('lint:js:fix', 'eslint . --fix');
+    scripts.set('start', 'ember serve');
+    scripts.set('test', 'ember test');
+    scripts.set('test:ember-compatibility', 'ember try:one');
+    if (packages.addon.hasTypeScript) {
+        if (packages.addon.hasGlint) {
+            scripts.set('lint:types', 'glint');
+        }
+        else {
+            scripts.set('lint:types', 'tsc --noEmit');
+        }
+    }
+    packageJson['scripts'] = convertToObject(scripts);
+}

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

@@ -1,7 +1,7 @@
 import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { readPackageJson } from '@codemod-utils/json';
-import { moveDependenciesToDevDependencies, updateDependencies, updateDevDependencies, updateOtherFields, } from './update-test-app-package-json/index.js';
+import { moveDependenciesToDevDependencies, updateDependencies, updateDevDependencies, updateOtherFields, updateScripts, } from './update-test-app-package-json/index.js';
 export function updateTestAppPackageJson(options) {
     const { locations, projectRoot } = options;
     const packageJson = readPackageJson({
@@ -10,6 +10,7 @@ export function updateTestAppPackageJson(options) {
     moveDependenciesToDevDependencies(packageJson, options);
     updateDependencies(packageJson);
     updateDevDependencies(packageJson, options);
+    updateScripts(packageJson, options);
     updateOtherFields(packageJson, options);
     const destination = join(projectRoot, locations.testApp, 'package.json');
     const file = JSON.stringify(packageJson, null, 2) + '\n';

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

@@ -1,38 +1,39 @@
 import { decideVersion } from '@codemod-utils/blueprints';
 const latestVersions = new Map([
-    ['@babel/core', '7.26.0'],
-    ['@babel/eslint-parser', '7.26.5'],
-    ['@babel/plugin-transform-typescript', '7.26.5'],
-    ['@babel/runtime', '7.26.0'],
-    ['@embroider/addon-dev', '7.1.1'],
-    ['@embroider/addon-shim', '1.9.0'],
+    ['@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'],
+    ['@embroider/broccoli-side-watch', '1.1.0'],
     ['@embroider/test-setup', '4.0.0'],
-    ['@glint/core', '1.5.1'],
-    ['@glint/environment-ember-loose', '1.5.1'],
-    ['@glint/environment-ember-template-imports', '1.5.1'],
-    ['@glint/template', '1.5.1'],
+    ['@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.0.0'],
+    ['@ijlee2-frontend-configs/eslint-config-ember', '1.0.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.8'],
-    ['@typescript-eslint/eslint-plugin', '8.20.0'],
-    ['@typescript-eslint/parser', '8.20.0'],
-    ['babel-plugin-ember-template-compilation', '2.3.0'],
+    ['@tsconfig/ember', '3.0.10'],
+    ['babel-plugin-ember-template-compilation', '3.0.0'],
     ['concurrently', '9.1.2'],
     ['decorator-transforms', '2.3.0'],
     ['ember-auto-import', '2.10.0'],
+    ['ember-cli', '6.4.0'],
     ['ember-cli-babel', '8.2.0'],
     ['ember-cli-htmlbars', '6.3.0'],
-    ['ember-source', '6.1.0'],
-    ['ember-template-lint', '6.0.0'],
-    ['eslint', '8.57.1'],
-    ['eslint-config-prettier', '10.0.1'],
-    ['eslint-plugin-ember', '12.3.3'],
-    ['eslint-plugin-import', '2.31.0'],
-    ['eslint-plugin-n', '17.15.1'],
-    ['eslint-plugin-prettier', '5.2.2'],
-    ['prettier', '3.4.2'],
-    ['rollup', '4.30.1'],
+    ['ember-source', '6.4.0'],
+    ['ember-template-lint', '7.6.0'],
+    ['ember-try', '4.0.0'],
+    ['eslint', '9.26.0'],
+    ['prettier', '3.5.3'],
+    ['rollup', '4.40.2'],
     ['rollup-plugin-copy', '3.5.0'],
-    ['typescript', '5.7.3'],
+    ['stylelint', '16.19.1'],
+    ['typescript', '5.8.3'],
 ]);
 export function getLatestVersion(packageName) {
     if (!latestVersions.has(packageName)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "1.7.1",
+  "version": "2.1.0",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -27,37 +27,30 @@
     "dist"
   ],
   "dependencies": {
-    "@codemod-utils/blueprints": "^1.1.9",
-    "@codemod-utils/files": "^2.0.8",
-    "@codemod-utils/json": "^1.1.13",
+    "@codemod-utils/blueprints": "^2.0.0",
+    "@codemod-utils/files": "^3.0.1",
+    "@codemod-utils/json": "^2.0.1",
     "strip-json-comments": "^5.0.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@codemod-utils/tests": "^1.1.11",
-    "@ijlee2-frontend-configs/eslint-config-node": "^0.2.1",
-    "@ijlee2-frontend-configs/prettier": "^0.2.0",
-    "@ijlee2-frontend-configs/typescript": "^0.3.0",
+    "@changesets/cli": "^2.29.3",
+    "@changesets/get-github-info": "^0.6.0",
+    "@codemod-utils/tests": "^2.0.0",
+    "@ijlee2-frontend-configs/eslint-config-node": "^1.0.0",
+    "@ijlee2-frontend-configs/prettier": "^1.0.0",
     "@sondr3/minitest": "^0.1.2",
-    "@types/node": "^18.19.75",
+    "@tsconfig/node20": "^20.1.5",
+    "@tsconfig/strictest": "^2.0.5",
+    "@types/node": "^20.17.46",
     "@types/yargs": "^17.0.33",
     "concurrently": "^9.1.2",
-    "eslint": "^9.20.0",
-    "lerna-changelog": "^2.2.0",
-    "prettier": "^3.5.0",
-    "typescript": "^5.7.3"
+    "eslint": "^9.26.0",
+    "prettier": "^3.5.3",
+    "typescript": "^5.8.3"
   },
   "engines": {
-    "node": "18.* || >= 20"
-  },
-  "changelog": {
-    "labels": {
-      "breaking": "Breaking Change",
-      "bug": "Bug Fix",
-      "enhance: code": "Enhancement",
-      "enhance: dependency": "Internal",
-      "enhance: documentation": "Documentation"
-    }
+    "node": "20.* || >= 22"
   },
   "scripts": {
     "build": "./build.sh --production",
@@ -66,8 +59,8 @@
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "lint:types": "tsc --noEmit",
-    "release:prepare": "lerna-changelog",
-    "release:publish": "pnpm publish",
+    "release:prepare": "changeset version",
+    "release:publish": "pnpm build && changeset publish",
     "test": "./build.sh --test && mt dist-for-testing --quiet"
   }
 }

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

@@ -1,9 +0,0 @@
-# unconventional js
-/blueprints/*/files/
-
-# compiled output
-/dist/
-/declarations/
-
-# misc
-/coverage/

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

@@ -1,104 +0,0 @@
-'use strict';
-
-module.exports = {
-  root: true,
-  // Only use overrides
-  // https://github.com/ember-cli/eslint-plugin-ember?tab=readme-ov-file#gtsgjs
-  overrides: [
-    {
-      files: ['**/*.js'<%= options.packages.addon.hasTypeScript ? ", '**/*.ts'" : '' %>],
-      env: { browser: 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', 'import'],
-      extends: [
-        'eslint:recommended',
-        'plugin:ember/recommended',
-        'plugin:prettier/recommended',
-      ],
-      rules: {
-        // require relative imports use full extensions
-        'import/extensions': ['error', 'always', { ignorePackages: true }],
-        // Add any custom rules here
-      },
-    },
-<% if (options.packages.addon.hasTypeScript) { %>    // ts files
-    {
-      files: ['**/*.ts'],
-      extends: [
-        'eslint:recommended',
-        'plugin:ember/recommended',
-        'plugin:@typescript-eslint/eslint-recommended',
-        'plugin:@typescript-eslint/recommended',
-        'plugin:prettier/recommended',
-      ],
-      rules: {
-        // require relative imports use full extensions
-        'import/extensions': ['error', 'always', { ignorePackages: true }],
-        // Add any custom rules here
-      },
-    },
-    {
-      files: ['**/*.gts'],
-      parser: 'ember-eslint-parser',
-      plugins: ['ember', 'import'],
-      extends: [
-        'eslint:recommended',
-        'plugin:@typescript-eslint/eslint-recommended',
-        'plugin:@typescript-eslint/recommended',
-        'plugin:ember/recommended',
-        'plugin:ember/recommended-gts',
-        'plugin:prettier/recommended',
-      ],
-      rules: {
-        // require relative imports use full extensions
-        'import/extensions': ['error', 'always', { ignorePackages: true }],
-        // Add any custom rules here
-      },
-    },
-<% } %>    {
-      files: ['**/*.gjs'],
-      parser: 'ember-eslint-parser',
-      plugins: ['ember', 'import'],
-      extends: [
-        'eslint:recommended',
-        'plugin:ember/recommended',
-        'plugin:ember/recommended-gjs',
-        'plugin:prettier/recommended',
-      ],
-      rules: {
-        // require relative imports use full extensions
-        'import/extensions': ['error', 'always', { ignorePackages: true }],
-        // Add any custom rules here
-      },
-    },
-    // node files
-    {
-      files: [
-        './.eslintrc.cjs',
-        './.prettierrc.cjs',
-        './.template-lintrc.cjs',
-        './addon-main.cjs',
-      ],
-      parserOptions: {
-        sourceType: 'script',
-      },
-      env: {
-        browser: false,
-        node: true,
-      },
-      plugins: ['n'],
-      extends: [
-        'eslint:recommended',
-        'plugin:n/recommended',
-        'plugin:prettier/recommended',
-      ],
-    },
-  ],
-};

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

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

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

@@ -1,30 +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 updateCompilerOptions(tsConfigJson, options) {
-    const { packages } = options;
-    const compilerOptions = convertToMap(tsConfigJson['compilerOptions']);
-    compilerOptions.set('paths', {
-        [`${packages.testApp.name}/tests/*`]: ['tests/*'],
-        [`${packages.testApp.name}/*`]: ['app/*'],
-        '*': ['types/*'],
-    });
-    tsConfigJson['compilerOptions'] = convertToObject(compilerOptions);
-}
-function removeInclude(tsConfigJson) {
-    delete tsConfigJson['include'];
-}
-export function updateTestAppTsConfigJson(options) {
-    const { locations, packages, projectRoot } = options;
-    if (!packages.addon.hasTypeScript) {
-        return;
-    }
-    const oldPath = join(projectRoot, locations.testApp, 'tsconfig.json');
-    const oldFile = readFileSync(oldPath, 'utf8');
-    const tsConfigJson = JSON.parse(sanitizeJson(oldFile));
-    updateCompilerOptions(tsConfigJson, options);
-    removeInclude(tsConfigJson);
-    const newFile = JSON.stringify(tsConfigJson, null, 2) + '\n';
-    writeFileSync(oldPath, newFile, 'utf8');
-}