ember-codemod-v1-to-v2 1.1.1 → 1.2.1

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

@@ -9,7 +9,6 @@
       }
     ],
 <% } %>    "@embroider/addon-dev/template-colocation-plugin",
-    "@babel/plugin-transform-class-static-block",
     [
       "babel-plugin-ember-template-compilation",
       {
@@ -17,7 +16,13 @@
         "transforms": []
       }
     ],
-    ["@babel/plugin-proposal-decorators", { "version": "legacy" }],
-    "@babel/plugin-transform-class-properties"
+    [
+      "module:decorator-transforms",
+      {
+        "runtime": {
+          "import": "decorator-transforms/runtime"
+        }
+      }
+    ]
   ]
 }

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

@@ -2,6 +2,7 @@
 // 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! 👇

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

@@ -1,4 +1,4 @@
-import { findFiles, renamePathByDirectory } from '@codemod-utils/files';
+import { findFiles } from '@codemod-utils/files';
 import { getVersion } from '../utils/blueprints.js';
 function getProjectRootDevDependencies(options) {
     return {
@@ -6,22 +6,28 @@ function getProjectRootDevDependencies(options) {
     };
 }
 function getPublicAssets(options) {
-    const { projectRoot } = options;
+    const { packages, projectRoot } = options;
     const filePaths = findFiles('public/**/*', {
         projectRoot,
     });
-    return filePaths
-        .map((filePath) => {
-        return renamePathByDirectory(filePath, {
-            from: 'public',
-            to: '',
-        });
-    })
-        .sort();
+    return filePaths.reduce((accumulator, filePath) => {
+        const from = `./${filePath}`;
+        const to = `/${packages.addon.name}/${filePath.replace(/^public\//, '')}`;
+        accumulator[from] = to;
+        return accumulator;
+    }, {});
+}
+function hasBlueprints(options) {
+    const { projectRoot } = options;
+    const filePaths = findFiles('blueprints/**/*', {
+        projectRoot,
+    });
+    return filePaths.length > 0;
 }
 export function analyzeAddon(options) {
     return {
         addon: {
+            hasBlueprints: hasBlueprints(options),
             publicAssets: getPublicAssets(options),
         },
         projectRoot: {

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

@@ -14,7 +14,7 @@ export function updateDependencies(packageJson, options) {
     Array.from(packagesToDelete).forEach((packageName) => {
         dependencies.delete(packageName);
     });
-    const packagesToInstall = ['@embroider/addon-shim'];
+    const packagesToInstall = ['@embroider/addon-shim', 'decorator-transforms'];
     packagesToInstall.forEach((packageName) => {
         const version = getVersion(packageName, options);
         dependencies.set(packageName, version);

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

@@ -16,9 +16,6 @@ export function updateDevDependencies(packageJson, options) {
     devDependencies.clear();
     const packagesToInstall = new Set([
         '@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',

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

@@ -1,9 +1,10 @@
 function updateEmberAddon(packageJson, data) {
-    const { hasPublicAssets, publicAssetMapping } = data;
-    if (!hasPublicAssets) {
+    const { hasPublicAssets, publicAssets } = data;
+    if (hasPublicAssets) {
         packageJson['ember-addon'] = {
             'app-js': {},
             main: 'addon-main.cjs',
+            'public-assets': publicAssets,
             type: 'addon',
             version: 2,
         };
@@ -12,7 +13,6 @@ function updateEmberAddon(packageJson, data) {
     packageJson['ember-addon'] = {
         'app-js': {},
         main: 'addon-main.cjs',
-        'public-assets': publicAssetMapping,
         type: 'addon',
         version: 2,
     };
@@ -43,8 +43,11 @@ function updateExports(packageJson, data) {
     };
 }
 function updateFiles(packageJson, data) {
-    const { hasPublicAssets, hasTypeScript } = data;
+    const { hasBlueprints, hasPublicAssets, hasTypeScript } = data;
     const files = new Set(['addon-main.cjs', 'dist']);
+    if (hasBlueprints) {
+        files.add('blueprints');
+    }
     if (hasPublicAssets) {
         files.add('public');
     }
@@ -65,18 +68,13 @@ function updateTypesVersions(packageJson, data) {
     };
 }
 export function updateOtherFields(packageJson, context, options) {
-    const { packages } = options;
-    const publicAssetMapping = context.addon.publicAssets.reduce((accumulator, filePath) => {
-        const from = `./public/${filePath}`;
-        const to = `/${packages.addon.name}/${filePath}`;
-        accumulator[from] = to;
-        return accumulator;
-    }, {});
-    const hasPublicAssets = Object.keys(publicAssetMapping).length > 0;
+    const { hasBlueprints, publicAssets } = context.addon;
+    const { hasTypeScript } = options.packages.addon;
     const data = {
-        hasPublicAssets,
-        hasTypeScript: packages.addon.hasTypeScript,
-        publicAssetMapping,
+        hasBlueprints,
+        hasPublicAssets: Object.keys(publicAssets).length > 0,
+        hasTypeScript,
+        publicAssets,
     };
     updateEmberAddon(packageJson, data);
     updateExports(packageJson, data);

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

@@ -11,6 +11,7 @@ function setCompilerOptions(tsConfigJson, options) {
     compilerOptions.set('allowImportingTsExtensions', true);
     compilerOptions.set('allowJs', true);
     compilerOptions.set('declarationDir', 'declarations');
+    compilerOptions.set('rootDir', './src');
     if (!packages.addon.hasGlint) {
         compilerOptions.set('declaration', true);
         compilerOptions.set('emitDeclarationOnly', true);

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

@@ -1,24 +1,22 @@
 import { decideVersion } from '@codemod-utils/blueprints';
 const latestVersions = new Map([
-    ['@babel/core', '7.23.2'],
-    ['@babel/plugin-proposal-decorators', '7.22.15'],
-    ['@babel/plugin-transform-class-properties', '7.22.5'],
-    ['@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.2'],
+    ['@babel/core', '7.23.6'],
+    ['@babel/plugin-transform-typescript', '7.23.6'],
+    ['@babel/runtime', '7.23.6'],
+    ['@embroider/addon-dev', '4.1.3'],
+    ['@embroider/addon-shim', '1.8.7'],
+    ['@embroider/test-setup', '3.0.3'],
     ['@rollup/plugin-babel', '6.0.4'],
-    ['@tsconfig/ember', '3.0.2'],
+    ['@tsconfig/ember', '3.0.3'],
     ['babel-plugin-ember-template-compilation', '2.2.1'],
     ['concurrently', '8.2.2'],
-    ['ember-auto-import', '2.6.3'],
+    ['decorator-transforms', '1.0.1'],
+    ['ember-auto-import', '2.7.1'],
     ['ember-cli-babel', '8.1.0'],
     ['ember-cli-htmlbars', '6.3.0'],
-    ['rollup', '4.3.0'],
+    ['rollup', '4.9.1'],
     ['rollup-plugin-copy', '3.5.0'],
-    ['typescript', '5.2.2'],
+    ['typescript', '5.3.3'],
 ]);
 export function getVersion(packageName, options) {
     const { packages } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -48,8 +48,8 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^16.4.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-n": "^16.5.0",
+    "eslint-plugin-prettier": "^5.1.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-typescript-sort-keys": "^3.1.0",
     "lerna-changelog": "^2.2.0",