ember-codemod-v1-to-v2 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -54,10 +54,10 @@
   },
   "devDependencies": {
     "@sondr3/minitest": "^0.1.1",
-    "eslint": "^8.32.0",
+    "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-simple-import-sort": "^9.0.0",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "fixturify": "^3.0.0",
     "lerna-changelog": "^2.2.0",
     "prettier": "^2.8.3"

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

@@ -1,4 +1,4 @@
-import typescript from 'rollup-plugin-ts';
+<% if (options.packages.addon.hasTypeScript) { %>import typescript from 'rollup-plugin-ts';<% } else { %>import { babel } from '@rollup/plugin-babel';<% } %>
 import copy from 'rollup-plugin-copy';
 import { Addon } from '@embroider/addon-dev/rollup';
 
@@ -27,13 +27,22 @@ export default {
     // package names.
     addon.dependencies(),
 
-    // compile TypeScript to latest JavaScript, including Babel transpilation
+<% if (options.packages.addon.hasTypeScript) { %>    // compile TypeScript to latest JavaScript, including Babel transpilation
     typescript({
       transpiler: 'babel',
       browserslist: false,
       transpileOnly: false,
     }),
-
+<% } else { %>    // This babel config should *not* apply presets or compile away ES modules.
+    // It exists only to provide development niceties for you, like automatic
+    // template colocation.
+    //
+    // By default, this will load the actual babel config from the file
+    // babel.config.json.
+    babel({
+      babelHelpers: 'bundled',
+    }),
+<% } %>
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 

package/src/migration/ember-addon/steps/analyze-addon.js

@@ -47,7 +47,8 @@ function getPublicEntrypoints(options) {
     })
     .map((filePath) => {
       return filePath.replace(/ts$/, 'js');
-    });
+    })
+    .sort();
 }
 
 export function analyzeAddon(options) {

package/src/migration/ember-addon/steps/create-files-from-blueprint.js

@@ -30,10 +30,7 @@ function getFilesToSkip(options) {
 
   const files = new Set();
 
-  if (packages.addon.hasTypeScript) {
-    files.add('__addonLocation__/rollup.config.js');
-  } else {
-    files.add('__addonLocation__/rollup.config.mjs');
+  if (!packages.addon.hasTypeScript) {
     files.add('__addonLocation__/unpublished-development-types/index.d.ts');
     files.add('__testAppLocation__/types/global.d.ts');
   }

package/src/migration/ember-addon/steps/move-project-root-files.js

@@ -35,30 +35,27 @@ function copyToAddon(options) {
 function moveToAddonAndTestApp(options) {
   const { locations, packages, projectRoot } = options;
 
-  const files = packages.addon.hasTypeScript
-    ? [
-        '.eslintignore',
-        '.eslintrc.js',
-        '.gitignore',
-        '.prettierignore',
-        '.prettierrc.js',
-        '.stylelintrc.js',
-        '.template-lintrc.js',
-        'package.json',
-        'tsconfig.json',
-      ]
-    : [
-        '.eslintignore',
-        '.eslintrc.js',
-        '.gitignore',
-        '.prettierignore',
-        '.prettierrc.js',
-        '.stylelintrc.js',
-        '.template-lintrc.js',
-        'package.json',
-      ];
+  const files = new Set([
+    '.eslintignore',
+    '.eslintrc.cjs',
+    '.eslintrc.js',
+    '.gitignore',
+    '.prettierignore',
+    '.prettierrc.cjs',
+    '.prettierrc.js',
+    '.stylelintignore',
+    '.stylelintrc.cjs',
+    '.stylelintrc.js',
+    '.template-lintrc.cjs',
+    '.template-lintrc.js',
+    'package.json',
+  ]);
+
+  if (packages.addon.hasTypeScript) {
+    files.add('tsconfig.json');
+  }
 
-  const filePaths = glob.sync(globPattern(files), {
+  const filePaths = glob.sync(globPattern([...files]), {
     cwd: projectRoot,
   });
 

package/src/migration/ember-addon/steps/update-addon-package-json.js

@@ -76,21 +76,40 @@ function updateDevDependencies(packageJson, options) {
   packageJson['devDependencies'] = convertToObject(devDependencies);
 }
 
-function updateOtherFields(packageJson) {
+function updateOtherFields(packageJson, options) {
+  const { packages } = options;
+
   packageJson['ember-addon'] = {
     'app-js': {},
-    main: 'addon-main.js',
+    main: 'addon-main.cjs',
     type: 'addon',
     version: 2,
   };
 
-  packageJson['exports'] = {
-    '.': './dist/index.js',
-    './*': './dist/*.js',
-    './addon-main.js': './addon-main.js',
-  };
-
-  packageJson['files'] = ['addon-main.js', 'dist'];
+  packageJson['exports'] = packages.addon.hasTypeScript
+    ? {
+        '.': './dist/index.js',
+        './*': {
+          default: './dist/*.js',
+          types: './dist/*.d.ts',
+        },
+        './addon-main.js': './addon-main.cjs',
+      }
+    : {
+        '.': './dist/index.js',
+        './*': './dist/*.js',
+        './addon-main.js': './addon-main.cjs',
+      };
+
+  packageJson['files'] = ['addon-main.cjs', 'dist'];
+
+  if (packages.addon.hasTypeScript) {
+    packageJson['typesVersions'] = {
+      '*': {
+        '*': ['dist/*'],
+      },
+    };
+  }
 }
 
 function updateScripts(packageJson) {
@@ -117,7 +136,7 @@ export function updateAddonPackageJson(options) {
   updateDependencies(packageJson, options);
   updateDevDependencies(packageJson, options);
   updateScripts(packageJson);
-  updateOtherFields(packageJson);
+  updateOtherFields(packageJson, options);
 
   const newFile = JSON.stringify(packageJson, null, 2) + '\n';
 

package/src/utils/blueprints/decide-version.js

@@ -1,26 +1,37 @@
 const latestVersions = new Map([
   ['@babel/core', '7.20.12'],
   ['@babel/plugin-proposal-class-properties', '7.18.6'],
-  ['@babel/plugin-proposal-decorators', '7.20.7'],
+  ['@babel/plugin-proposal-decorators', '7.20.13'],
   ['@babel/preset-typescript', '7.18.6'],
   ['@embroider/addon-dev', '3.0.0'],
   ['@embroider/addon-shim', '1.8.4'],
   ['@rollup/plugin-babel', '6.0.3'],
   ['concurrently', '7.6.0'],
-  ['ember-auto-import', '2.5.0'],
+  ['ember-auto-import', '2.6.0'],
   ['ember-cli-babel', '7.26.11'],
-  ['ember-cli-htmlbars', '6.1.11'],
+  ['ember-cli-htmlbars', '6.2.0'],
   ['prettier', '2.8.3'],
-  ['rollup', '3.10.0'],
+  ['rollup', '3.12.0'],
   ['rollup-plugin-copy', '3.4.0'],
-  ['rollup-plugin-ts', '3.1.1'],
+  ['rollup-plugin-ts', '3.2.0'],
 ]);
 
 export function decideVersion(packageName, options) {
   const { packages } = options;
 
   const installedVersion = packages.addon.dependencies.get(packageName);
-  const latestVersion = `^${latestVersions.get(packageName)}`;
 
-  return installedVersion ?? latestVersion;
+  if (installedVersion) {
+    return installedVersion;
+  }
+
+  const latestVersion = latestVersions.get(packageName);
+
+  if (!latestVersion) {
+    throw new RangeError(
+      `ERROR: The latest version of \`${packageName}\` is unknown.\n`
+    );
+  }
+
+  return `^${latestVersion}`;
 }

package/src/blueprints/ember-addon/__addonLocation__/rollup.config.js

@@ -1,58 +0,0 @@
-import babel from '@rollup/plugin-babel';
-import copy from 'rollup-plugin-copy';
-import { Addon } from '@embroider/addon-dev/rollup';
-
-const addon = new Addon({
-  srcDir: 'src',
-  destDir: 'dist',
-});
-
-export default {
-  // This provides defaults that work well alongside `publicEntrypoints` below.
-  // You can augment this if you need to.
-  output: addon.output(),
-
-  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(', ') %>]),
-
-    // 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(', ') %>]),
-
-    // Follow the V2 Addon rules about dependencies. Your code can import from
-    // `dependencies` and `peerDependencies` as well as standard Ember-provided
-    // package names.
-    addon.dependencies(),
-
-    // This babel config should *not* apply presets or compile away ES modules.
-    // It exists only to provide development niceties for you, like automatic
-    // template colocation.
-    //
-    // By default, this will load the actual babel config from the file
-    // babel.config.json.
-    babel({
-      babelHelpers: 'bundled',
-    }),
-
-    // Ensure that standalone .hbs files are properly integrated as Javascript.
-    addon.hbs(),
-
-    // 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']),
-
-    // Remove leftover build artifacts when starting a new build.
-    addon.clean(),
-
-    // Copy Readme and License into published package
-    copy({
-      targets: [
-        { src: '../README.md', dest: '.' },
-        { src: '../LICENSE.md', dest: '.' },
-      ],
-    }),
-  ],
-};