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

package/README.md

@@ -27,6 +27,7 @@ npx ember-codemod-v1-to-v2 <arguments>
 Step 2. Review the addon package.
 
 - [x] Update the configuration files.<sup>2</sup>
+- [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`.
 
@@ -48,6 +49,7 @@ Step 4. Review the workspace root including CI/CD.
 In most cases, I recommend running the codemod without any arguments (i.e. allow the default values). This is to help different Ember projects converge to one layout.
 
 <details>
+
 <summary>Optional: Specify the addon location</summary>
 
 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.
@@ -58,7 +60,9 @@ npx ember-codemod-v1-to-v2 --addon-location packages/ui/buttons
 
 </details>
 
+
 <details>
+
 <summary>Optional: Specify the project root</summary>
 
 Pass `--root` to run the codemod on a project somewhere else (i.e. not in the current directory).
@@ -69,7 +73,9 @@ npx ember-codemod-v1-to-v2 --root <path/to/your/project>
 
 </details>
 
+
 <details>
+
 <summary>Optional: Specify the test-app location</summary>
 
 By default, the test-app package lives in the folder `test-app`. Pass `--test-app-location` to override the logic.
@@ -80,7 +86,9 @@ npx ember-codemod-v1-to-v2 --test-app-location docs-app
 
 </details>
 
+
 <details>
+
 <summary>Optional: Specify the test-app name</summary>
 
 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.

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

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

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

@@ -3,3 +3,10 @@
 # will also appear in published NPM packages.
 /LICENSE.md
 /README.md
+
+# compiled output
+/declarations
+/dist
+
+# npm/pnpm/yarn pack output
+*.tgz

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

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

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

@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -8,9 +7,6 @@ const addon = new Addon({
   destDir: 'dist',
 });
 
-// Add extensions here, such as ts, gjs, etc that you may import
-const extensions = ['.js'<% if (options.packages.addon.hasTypeScript) { %>, '.ts'<% } %>];
-
 export default {
   // This provides defaults that work well alongside `publicEntrypoints` below.
   // You can augment this if you need to.
@@ -39,12 +35,7 @@ export default {
     // babel.config.json.
     babel({
       babelHelpers: 'bundled',
-      extensions,
-    }),
-
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
+      extensions: ['.js'<% if (options.packages.addon.hasTypeScript) { %>, '.ts'<% } %>],
     }),
 
     // Ensure that standalone .hbs files are properly integrated as Javascript.

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

@@ -1,15 +1,10 @@
-# compiled output
-declarations/
-dist/
-
-# npm/pnpm/yarn pack output
-*.tgz
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # dependencies
 node_modules/
 
 # misc
-/.env*
-/.pnpm-debug.log
-/npm-debug.log*
-/yarn-error.log
+.env*
+.pnpm-debug.log
+npm-debug.log*
+yarn-error.log

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

@@ -1,5 +1,5 @@
 <% if (options.packageManager.isNpm) { %>{
-  "name": "<%= options.packages.addon.name %>",
+  "name": "workspace-root",
   "version": "<%= options.packages.addon.version %>",
   "private": true,
   "repository": "",
@@ -23,7 +23,7 @@
     "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
 }<% } else if (options.packageManager.isPnpm) { %>{
-  "name": "<%= options.packages.addon.name %>",
+  "name": "workspace-root",
   "version": "<%= options.packages.addon.version %>",
   "private": true,
   "repository": "",
@@ -43,7 +43,7 @@
     "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
 }<% } else if (options.packageManager.isYarn) { %>{
-  "name": "<%= options.packages.addon.name %>",
+  "name": "workspace-root",
   "version": "<%= options.packages.addon.version %>",
   "private": true,
   "repository": "",

package/dist/src/index.js

@@ -1,4 +1,22 @@
-import { migrateEmberAddon } from './migration/index.js';
+import { analyzeAddon, createFilesFromBlueprints, createOptions, moveAddonFiles, moveProjectRootFiles, moveTestAppFiles, updateAddonPackageJson, updateAddonTsConfigJson, updateTestAppPackageJson, updateTestAppTsConfigJson, } from './steps/index.js';
 export function runCodemod(codemodOptions) {
-    migrateEmberAddon(codemodOptions);
+    const options = createOptions(codemodOptions);
+    const { isV1Addon } = options.packages.addon;
+    // Guarantee idempotency
+    if (!isV1Addon) {
+        return;
+    }
+    // Prepare for migration
+    const context = analyzeAddon(options);
+    // Preserve code
+    moveAddonFiles(options);
+    moveTestAppFiles(options);
+    moveProjectRootFiles(options);
+    // Get the latest code from blueprints
+    createFilesFromBlueprints(context, options);
+    // Fine-tune individual files
+    updateAddonPackageJson(context, options);
+    updateAddonTsConfigJson(options);
+    updateTestAppPackageJson(options);
+    updateTestAppTsConfigJson(options);
 }

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

@@ -1,5 +1,5 @@
 import { findFiles, renamePathByDirectory } from '@codemod-utils/files';
-import { getVersion } from '../../../utils/blueprints.js';
+import { getVersion } from '../utils/blueprints.js';
 function getAppReexports(options) {
     const { projectRoot } = options;
     const filePaths = findFiles('app/**/*.js', {

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

@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { processTemplate } from '@codemod-utils/blueprints';
 import { createFiles, findFiles } from '@codemod-utils/files';
-import { blueprintsRoot } from '../../../utils/blueprints.js';
+import { blueprintsRoot } from '../utils/blueprints.js';
 function getFilesToSkip(options) {
     const { packageManager, packages } = options;
     const files = new Set();

package/dist/src/{migration/ember-addon/steps → 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 { getVersion } from '../../utils/blueprints.js';
 export function updateDependencies(packageJson, options) {
     const dependencies = convertToMap(packageJson['dependencies']);
     const packagesToDelete = [

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

@@ -1,5 +1,5 @@
 import { convertToMap, convertToObject } from '@codemod-utils/json';
-import { getVersion } from '../../../../utils/blueprints.js';
+import { getVersion } from '../../utils/blueprints.js';
 export function updateDevDependencies(packageJson, options) {
     const { packages } = options;
     const devDependencies = convertToMap(packageJson['devDependencies']);
@@ -21,7 +21,6 @@ export function updateDevDependencies(packageJson, options) {
         '@babel/runtime',
         '@embroider/addon-dev',
         '@rollup/plugin-babel',
-        '@rollup/plugin-node-resolve',
         'concurrently',
         'rollup',
         'rollup-plugin-copy',

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

@@ -1,16 +1,18 @@
 import { readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { convertToMap, convertToObject } from '@codemod-utils/json';
-import { sanitizeJson } from '../../../utils/json.js';
+import { sanitizeJson } from '../utils/json.js';
 function updateCompilerOptions(tsConfigJson, options) {
     const { packages } = options;
     const compilerOptions = convertToMap(tsConfigJson['compilerOptions']);
     compilerOptions.delete('baseUrl');
     compilerOptions.delete('paths');
     if (packages.addon.hasGlint) {
+        compilerOptions.set('allowImportingTsExtensions', true);
         compilerOptions.set('declarationDir', 'declarations');
     }
     else {
+        compilerOptions.set('allowImportingTsExtensions', true);
         compilerOptions.set('declaration', true);
         compilerOptions.set('declarationDir', 'declarations');
         compilerOptions.set('emitDeclarationOnly', true);

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

@@ -1,5 +1,5 @@
 import { convertToMap, convertToObject } from '@codemod-utils/json';
-import { getVersion } from '../../../../utils/blueprints.js';
+import { getVersion } from '../../utils/blueprints.js';
 export function moveDependenciesToDevDependencies(packageJson, options) {
     const { packages } = options;
     const dependencies = convertToMap(packageJson['dependencies']);

package/dist/src/{migration/ember-addon/steps → steps}/update-test-app-tsconfig-json.js

@@ -1,7 +1,7 @@
 import { readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { convertToMap, convertToObject } from '@codemod-utils/json';
-import { sanitizeJson } from '../../../utils/json.js';
+import { sanitizeJson } from '../utils/json.js';
 function updateCompilerOptions(tsConfigJson, options) {
     const { packages } = options;
     const compilerOptions = convertToMap(tsConfigJson['compilerOptions']);

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -29,32 +29,32 @@
   "dependencies": {
     "@codemod-utils/blueprints": "^0.2.1",
     "@codemod-utils/files": "^0.5.2",
-    "@codemod-utils/json": "^0.3.4",
+    "@codemod-utils/json": "^0.4.1",
     "strip-json-comments": "^5.0.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.8",
-    "@codemod-utils/tests": "^0.2.5",
+    "@babel/core": "^7.22.10",
+    "@codemod-utils/tests": "^0.3.0",
     "@sondr3/minitest": "^0.1.1",
     "@tsconfig/esm": "^1.0.4",
     "@tsconfig/node16": "^16.1.0",
     "@tsconfig/strictest": "^2.0.1",
-    "@types/node": "^16.11.7",
+    "@types/node": "^16.18.40",
     "@types/yargs": "^17.0.24",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.3.0",
+    "@typescript-eslint/parser": "^6.3.0",
     "concurrently": "^8.2.0",
-    "eslint": "^8.44.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint": "^8.47.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-typescript": "^3.6.0",
+    "eslint-plugin-import": "^2.28.0",
     "eslint-plugin-n": "^16.0.1",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-typescript-sort-keys": "^2.3.0",
     "lerna-changelog": "^2.2.0",
-    "prettier": "^3.0.0",
+    "prettier": "^3.0.1",
     "typescript": "^5.1.6"
   },
   "engines": {

package/dist/src/migration/ember-addon/index.js

@@ -1,22 +0,0 @@
-import { analyzeAddon, createFilesFromBlueprints, createOptions, moveAddonFiles, moveProjectRootFiles, moveTestAppFiles, updateAddonPackageJson, updateAddonTsConfigJson, updateTestAppPackageJson, updateTestAppTsConfigJson, } from './steps/index.js';
-export function migrateEmberAddon(codemodOptions) {
-    const options = createOptions(codemodOptions);
-    const { isV1Addon } = options.packages.addon;
-    // Guarantee idempotency
-    if (!isV1Addon) {
-        return;
-    }
-    // Prepare for migration
-    const context = analyzeAddon(options);
-    // Preserve code
-    moveAddonFiles(options);
-    moveTestAppFiles(options);
-    moveProjectRootFiles(options);
-    // Get the latest code from blueprints
-    createFilesFromBlueprints(context, options);
-    // Fine-tune individual files
-    updateAddonPackageJson(context, options);
-    updateAddonTsConfigJson(options);
-    updateTestAppPackageJson(options);
-    updateTestAppTsConfigJson(options);
-}

package/dist/src/migration/index.js

@@ -1 +0,0 @@
-export * from './ember-addon/index.js';