ember-codemod-v1-to-v2 1.0.1 → 1.1.0

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

@@ -1,15 +1,23 @@
-<% if (options.packages.addon.hasTypeScript) { %>{
-  "presets": [["@babel/preset-typescript"]],
+{
   "plugins": [
-    "@embroider/addon-dev/template-colocation-plugin",
-    ["@babel/plugin-transform-typescript", { "allowDeclareFields": true }],
+<% if (options.packages.addon.hasTypeScript) { %>    [
+      "@babel/plugin-transform-typescript",
+      {
+        "allExtensions": true,
+        "allowDeclareFields": true,
+        "onlyRemoveTypeImports": true
+      }
+    ],
+<% } %>    "@embroider/addon-dev/template-colocation-plugin",
+    "@babel/plugin-transform-class-static-block",
+    [
+      "babel-plugin-ember-template-compilation",
+      {
+        "targetFormat": "hbs",
+        "transforms": []
+      }
+    ],
     ["@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

@@ -15,12 +15,22 @@ export default {
   plugins: [
     // These are the modules that users should be able to import from your
     // addon. Anything not listed here may get optimized away.
-    addon.publicEntrypoints([<%= context.addon.publicEntrypoints.map((filePath) => `'${filePath}'`).join(', ') %>]),
+    // By default all your JavaScript modules (**/*.js) will be importable.
+    // But you are encouraged to tweak this to only cover the modules that make
+    // up your addon's public API. Also make sure your package.json#exports
+    // is aligned to the config here.
+    // See https://github.com/embroider-build/embroider/blob/main/docs/v2-faq.md#how-can-i-define-the-public-exports-of-my-addon
+    addon.publicEntrypoints(['**/*.js', 'index.js'<% if (options.packages.addon.hasGlint) {%>, 'template-registry.js'<% } %>]),
 
     // These are the modules that should get reexported into the traditional
     // "app" tree. Things in here should also be in publicEntrypoints above, but
     // not everything in publicEntrypoints necessarily needs to go here.
-    addon.appReexports([<%= context.addon.appReexports.map((filePath) => `'${filePath}'`).join(', ') %>]),
+    addon.appReexports([
+      'components/**/*.js',
+      'helpers/**/*.js',
+      'modifiers/**/*.js',
+      'services/**/*.js',
+    ]),
 
     // Follow the V2 Addon rules about dependencies. Your code can import from
     // `dependencies` and `peerDependencies` as well as standard Ember-provided
@@ -35,12 +45,15 @@ export default {
     // babel.config.json.
     babel({
       babelHelpers: 'bundled',
-      extensions: ['.js'<% if (options.packages.addon.hasTypeScript) { %>, '.ts'<% } %>],
+      extensions: ['.js', '.gjs'<% if (options.packages.addon.hasTypeScript) { %>, '.ts', '.gts'<% } %>],
     }),
 
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
+    // Ensure that .gjs files are properly integrated as Javascript
+    addon.gjs(),
+
     // 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']),

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

@@ -1,19 +1,5 @@
 import { findFiles, renamePathByDirectory } from '@codemod-utils/files';
 import { getVersion } from '../utils/blueprints.js';
-function getAppReexports(options) {
-    const { projectRoot } = options;
-    const filePaths = findFiles('app/**/*.js', {
-        projectRoot,
-    });
-    return filePaths
-        .map((filePath) => {
-        return renamePathByDirectory(filePath, {
-            from: 'app',
-            to: '',
-        });
-    })
-        .sort();
-}
 function getProjectRootDevDependencies(options) {
     return {
         concurrently: getVersion('concurrently', options),
@@ -33,35 +19,10 @@ function getPublicAssets(options) {
     })
         .sort();
 }
-function getPublicEntrypoints(options) {
-    const { projectRoot } = options;
-    const filePaths = findFiles('{addon,addon-test-support}/**/*.{js,ts}', {
-        projectRoot,
-    });
-    return filePaths
-        .map((filePath) => {
-        return renamePathByDirectory(filePath, {
-            from: 'addon',
-            to: '',
-        });
-    })
-        .map((filePath) => {
-        return renamePathByDirectory(filePath, {
-            from: 'addon-test-support',
-            to: 'test-support',
-        });
-    })
-        .map((filePath) => {
-        return filePath.replace(/(?<!\.d)\.ts$/, '.js');
-    })
-        .sort();
-}
 export function analyzeAddon(options) {
     return {
         addon: {
-            appReexports: getAppReexports(options),
             publicAssets: getPublicAssets(options),
-            publicEntrypoints: getPublicEntrypoints(options),
         },
         projectRoot: {
             devDependencies: getProjectRootDevDependencies(options),

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

@@ -2,13 +2,16 @@ import { convertToMap, convertToObject } from '@codemod-utils/json';
 import { getVersion } from '../../utils/blueprints.js';
 export function updateDependencies(packageJson, options) {
     const dependencies = convertToMap(packageJson['dependencies']);
-    const packagesToDelete = [
+    const packagesToDelete = new Set([
         '@embroider/macros',
         'ember-auto-import',
         'ember-cli-babel',
         'ember-cli-htmlbars',
-    ];
-    packagesToDelete.forEach((packageName) => {
+    ]);
+    if (options.packages.addon.hasTypeScript) {
+        packagesToDelete.add('ember-cli-typescript');
+    }
+    Array.from(packagesToDelete).forEach((packageName) => {
         dependencies.delete(packageName);
     });
     const packagesToInstall = ['@embroider/addon-shim'];

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

@@ -18,15 +18,19 @@ export function updateDevDependencies(packageJson, options) {
         '@babel/core',
         '@babel/plugin-proposal-decorators',
         '@babel/plugin-transform-class-properties',
+        '@babel/plugin-transform-class-static-block',
         '@babel/runtime',
         '@embroider/addon-dev',
         '@rollup/plugin-babel',
+        'babel-plugin-ember-template-compilation',
         'concurrently',
         'rollup',
         'rollup-plugin-copy',
     ]);
     if (packages.addon.hasTypeScript) {
-        packagesToInstall.add('@babel/preset-typescript');
+        packagesToInstall.add('@babel/plugin-transform-typescript');
+        packagesToInstall.add('@tsconfig/ember');
+        packagesToInstall.add('typescript');
     }
     Array.from(packagesToInstall).forEach((packageName) => {
         const version = getVersion(packageName, options);

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

@@ -9,6 +9,9 @@ export function updateScripts(packageJson, options) {
         scripts.set('lint:types', packages.addon.hasGlint
             ? 'glint'
             : 'tsc --emitDeclarationOnly false --noEmit');
+        if (scripts.get('postpack') === 'ember ts:clean') {
+            scripts.delete('postpack');
+        }
         scripts.set('prepack', 'rollup --config');
         scripts.set('start', 'concurrently "npm:start:*" --names "start:"');
         scripts.set('start:js', 'rollup --config --watch --no-watch.clearScreen');

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

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

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

@@ -1,20 +1,24 @@
 import { decideVersion } from '@codemod-utils/blueprints';
 const latestVersions = new Map([
-    ['@babel/core', '7.22.17'],
+    ['@babel/core', '7.23.2'],
     ['@babel/plugin-proposal-decorators', '7.22.15'],
     ['@babel/plugin-transform-class-properties', '7.22.5'],
-    ['@babel/preset-typescript', '7.22.15'],
-    ['@babel/runtime', '7.22.15'],
-    ['@embroider/addon-dev', '4.1.0'],
+    ['@babel/plugin-transform-class-static-block', '7.22.11'],
+    ['@babel/plugin-transform-typescript', '7.22.15'],
+    ['@babel/runtime', '7.23.2'],
+    ['@embroider/addon-dev', '4.1.1'],
     ['@embroider/addon-shim', '1.8.6'],
-    ['@embroider/test-setup', '3.0.1'],
-    ['@rollup/plugin-babel', '6.0.3'],
-    ['concurrently', '8.2.1'],
+    ['@embroider/test-setup', '3.0.2'],
+    ['@rollup/plugin-babel', '6.0.4'],
+    ['@tsconfig/ember', '3.0.2'],
+    ['babel-plugin-ember-template-compilation', '2.2.1'],
+    ['concurrently', '8.2.2'],
     ['ember-auto-import', '2.6.3'],
-    ['ember-cli-babel', '8.0.0'],
+    ['ember-cli-babel', '8.1.0'],
     ['ember-cli-htmlbars', '6.3.0'],
-    ['rollup', '3.29.1'],
+    ['rollup', '4.3.0'],
     ['rollup-plugin-copy', '3.5.0'],
+    ['typescript', '5.2.2'],
 ]);
 export function getVersion(packageName, options) {
     const { packages } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -40,15 +40,15 @@
     "@tsconfig/node18": "^18.2.2",
     "@tsconfig/strictest": "^2.0.2",
     "@types/node": "^18.18.7",
-    "@types/yargs": "^17.0.29",
-    "@typescript-eslint/eslint-plugin": "^6.9.1",
-    "@typescript-eslint/parser": "^6.9.1",
+    "@types/yargs": "^17.0.30",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
     "concurrently": "^8.2.2",
-    "eslint": "^8.52.0",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-n": "^16.2.0",
+    "eslint-plugin-n": "^16.3.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-typescript-sort-keys": "^3.1.0",