ember-codemod-v1-to-v2 1.5.0 → 1.7.0

package/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2024 Isaac J. Lee
+Copyright (c) 2025 Isaac J. Lee
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

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

@@ -30,6 +30,7 @@ export default {
       'helpers/**/*.js',
       'modifiers/**/*.js',
       'services/**/*.js',
+      'utils/**/*.js',
     ]),
 
     // Follow the V2 Addon rules about dependencies. Your code can import from
@@ -52,7 +53,10 @@ export default {
     addon.hbs(),
 
     // Ensure that .gjs files are properly integrated as Javascript
-    addon.gjs(),
+    addon.gjs(),<% if (options.packages.addon.hasTypeScript) { %>
+
+    // Emit .d.ts declaration files
+    addon.declarations('declarations'),<% } %>
 
     // addons are allowed to contain imports of .css files, which we want rollup
     // to leave alone and keep in the published output.

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

@@ -7,7 +7,10 @@
     "emitDeclarationOnly": true,
     "noEmit": false,
     "noEmitOnError": false,
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "types": [
+      "ember-source/types"
+    ]
   },
   "include": [
     "src/**/*",
@@ -15,7 +18,8 @@
   ]<% if (options.packages.addon.hasGlint) { %>,
   "glint": {
     "environment": [
-      "ember-loose"
+      "ember-loose",
+      "ember-template-imports"
     ]
   }<% } %>
 }

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

@@ -2,13 +2,14 @@
 // 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! 👇
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  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
-  }
-}
+// 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/__testAppLocation__/types/global.d.ts

@@ -1,7 +1,3 @@
-// Types for compiled templates
-declare module '<%= options.packages.testApp.name %>/templates/*' {
-  import { TemplateFactory } from 'ember-cli-htmlbars';
-
-  const tmpl: TemplateFactory;
-  export default tmpl;
-}
+<% if (options.packages.addon.hasGlint) { %>import '@glint/environment-ember-loose';
+import '@glint/environment-ember-template-imports';
+<% } %>

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

@@ -14,7 +14,7 @@
     "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": "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"
@@ -31,13 +31,13 @@
   "author": "",
   "scripts": {
     "build": "pnpm --filter <%= options.packages.addon.name %> build",
-    "lint": "pnpm --filter '*' lint",
-    "lint:fix": "pnpm --filter '*' lint:fix",
+    "lint": "pnpm --filter \"*\" lint",
+    "lint:fix": "pnpm --filter \"*\" lint:fix",
     "prepare": "pnpm build",
-    "start": "concurrently 'pnpm: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"
+    "test": "pnpm --filter \"*\" test"
   },
   "devDependencies": {
     "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
@@ -58,7 +58,7 @@
     "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": "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/steps/create-options.js

@@ -30,8 +30,8 @@ function analyzePackageManager(codemodOptions) {
         projectRoot,
     });
     if (filePaths.length !== 1) {
-        console.warn('WARNING: Package manager is unknown. Yarn will be assumed.');
-        return 'yarn';
+        console.warn('WARNING: Package manager is unknown. pnpm will be assumed.');
+        return 'pnpm';
     }
     const lockfile = filePaths[0];
     return mapping[lockfile];

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

@@ -31,9 +31,6 @@ export function updateDevDependencies(packageJson, options) {
         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');
@@ -41,7 +38,9 @@ export function updateDevDependencies(packageJson, options) {
     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');
+        packagesToInstall.add('ember-source');
     }
     Array.from(packagesToInstall).forEach((packageName) => {
         const version = getLatestVersion(packageName);

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

@@ -7,35 +7,30 @@ export function updateScripts(packageJson, options) {
       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('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: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}'`);
+    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}\"`);
     if (packages.addon.hasTypeScript) {
-        scripts.set('build', `concurrently '${packageManager}:build:*'`);
-        scripts.set('build:js', 'rollup --config');
         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');
         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');
-    }
     packageJson['scripts'] = convertToObject(scripts);
 }

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

@@ -1,39 +1,38 @@
 import { decideVersion } from '@codemod-utils/blueprints';
 const latestVersions = new Map([
-    ['@babel/core', '7.25.2'],
-    ['@babel/eslint-parser', '7.25.1'],
-    ['@babel/plugin-transform-typescript', '7.25.2'],
-    ['@babel/runtime', '7.25.0'],
-    ['@embroider/addon-dev', '5.0.0'],
-    ['@embroider/addon-shim', '1.8.9'],
+    ['@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'],
     ['@embroider/test-setup', '4.0.0'],
-    ['@glint/core', '1.4.0'],
-    ['@glint/environment-ember-loose', '1.4.0'],
-    ['@glint/template', '1.4.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'],
     ['@rollup/plugin-babel', '6.0.4'],
     ['@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', '8.1.0'],
-    ['@typescript-eslint/parser', '8.1.0'],
-    ['babel-plugin-ember-template-compilation', '2.2.5'],
-    ['concurrently', '8.2.2'],
-    ['decorator-transforms', '2.0.0'],
-    ['ember-auto-import', '2.7.4'],
-    ['ember-cli-babel', '8.1.0'],
+    ['@typescript-eslint/eslint-plugin', '8.20.0'],
+    ['@typescript-eslint/parser', '8.20.0'],
+    ['babel-plugin-ember-template-compilation', '2.3.0'],
+    ['concurrently', '9.1.2'],
+    ['decorator-transforms', '2.3.0'],
+    ['ember-auto-import', '2.10.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.0'],
-    ['eslint-config-prettier', '9.1.0'],
-    ['eslint-plugin-ember', '12.1.1'],
-    ['eslint-plugin-import', '2.29.1'],
-    ['eslint-plugin-n', '17.10.2'],
-    ['eslint-plugin-prettier', '5.2.1'],
-    ['prettier', '3.3.3'],
-    ['rollup', '4.20.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'],
     ['rollup-plugin-copy', '3.5.0'],
-    ['typescript', '5.5.4'],
+    ['typescript', '5.7.3'],
 ]);
 export function getLatestVersion(packageName) {
     if (!latestVersions.has(packageName)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -27,34 +27,34 @@
     "dist"
   ],
   "dependencies": {
-    "@codemod-utils/blueprints": "^1.1.5",
-    "@codemod-utils/files": "^2.0.4",
-    "@codemod-utils/json": "^1.1.9",
+    "@codemod-utils/blueprints": "^1.1.6",
+    "@codemod-utils/files": "^2.0.5",
+    "@codemod-utils/json": "^1.1.10",
     "strip-json-comments": "^5.0.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@codemod-utils/tests": "^1.1.7",
+    "@babel/core": "^7.26.0",
+    "@codemod-utils/tests": "^1.1.8",
     "@sondr3/minitest": "^0.1.2",
     "@tsconfig/node18": "^18.2.4",
     "@tsconfig/strictest": "^2.0.5",
-    "@types/node": "^18.19.47",
+    "@types/node": "^18.19.70",
     "@types/yargs": "^17.0.33",
-    "@typescript-eslint/eslint-plugin": "^8.3.0",
-    "@typescript-eslint/parser": "^8.3.0",
-    "concurrently": "^8.2.2",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^3.6.3",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^17.10.2",
-    "eslint-plugin-prettier": "^5.2.1",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
+    "concurrently": "^9.1.2",
+    "eslint": "^8.57.1",
+    "eslint-config-prettier": "^10.0.1",
+    "eslint-import-resolver-typescript": "^3.7.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-n": "^17.15.1",
+    "eslint-plugin-prettier": "^5.2.2",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-typescript-sort-keys": "^3.2.0",
+    "eslint-plugin-typescript-sort-keys": "^3.3.0",
     "lerna-changelog": "^2.2.0",
-    "prettier": "^3.3.3",
-    "typescript": "^5.5.4"
+    "prettier": "^3.4.2",
+    "typescript": "^5.7.3"
   },
   "engines": {
     "node": "18.* || >= 20"