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

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-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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",