ember-codemod-v1-to-v2 0.4.1 → 0.5.1

package/README.md

@@ -115,6 +115,8 @@ You can also look at another codemod called [`ember-addon-migrator`](https://git
 
 ## Contributing
 
+See the [Contributing](CONTRIBUTING.md) guide for details.
+
 If you have an open-sourced addon (v1 or v2) that I can use as a reference, reach out to me on [Discord](https://discord.gg/emberjs) at `ijlee2`. Please star this project so that I can gauge its importance to you and the Ember community. ⭐
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "0.4.1",
+  "version": "0.5.1",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",
@@ -31,7 +31,6 @@
     "changelog": "lerna-changelog",
     "lint": "eslint . --cache",
     "lint:fix": "eslint . --fix",
-    "start": "node ./src/index.js",
     "test": "mt tests --quiet"
   },
   "changelog": {
@@ -45,24 +44,24 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.21.0",
-    "@babel/eslint-parser": "^7.19.1",
-    "glob": "^9.2.1",
+    "glob": "^10.2.2",
     "lodash.template": "^4.5.0",
     "strip-json-comments": "^5.0.0",
-    "yargs": "^17.7.1"
+    "yargs": "^17.7.2"
   },
   "devDependencies": {
+    "@babel/core": "^7.21.8",
+    "@babel/eslint-parser": "^7.21.8",
     "@sondr3/minitest": "^0.1.1",
-    "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.39.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^15.6.1",
+    "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "fixturify": "^3.0.0",
     "lerna-changelog": "^2.2.0",
-    "prettier": "^2.8.4"
+    "prettier": "^2.8.8"
   },
   "engines": {
     "node": ">= 16"

package/src/blueprints/ember-addon/__gitignore__

@@ -1,25 +1,24 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
-dist/
+/dist/
 
 # dependencies
-node_modules/
+/node_modules/
 
 # misc
 /.env*
 /.pnp*
-/.pnpm-debug.log
-/.sass-cache
-.eslintcache
-/connect.lock
+/.eslintcache
 /coverage/
-/libpeerconnection.log
 /npm-debug.log*
 /testem.log
 /yarn-error.log
 
 # ember-try
 /.node_modules.ember-try/
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
 /yarn.lock.ember-try
+
+# broccoli-debug
+/DEBUG/

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

@@ -20,8 +20,7 @@
     "test": "npm run test --workspaces --if-present"
   },
   "devDependencies": {
-    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>",
-    "prettier": "<%= context.projectRoot.devDependencies['prettier'] %>"
+    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
 }<% } else if (options.packageManager.isPnpm) { %>{
   "name": "<%= options.packages.addon.name %>",
@@ -41,8 +40,7 @@
     "test": "pnpm --filter '*' test"
   },
   "devDependencies": {
-    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>",
-    "prettier": "<%= context.projectRoot.devDependencies['prettier'] %>"
+    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
 }<% } else if (options.packageManager.isYarn) { %>{
   "name": "<%= options.packages.addon.name %>",
@@ -66,7 +64,6 @@
     "test": "yarn workspaces run test"
   },
   "devDependencies": {
-    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>",
-    "prettier": "<%= context.projectRoot.devDependencies['prettier'] %>"
+    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
 }<% } %>

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

@@ -21,7 +21,6 @@ function getAppReexports(options) {
 function getProjectRootDevDependencies(options) {
   return {
     concurrently: decideVersion('concurrently', options),
-    prettier: decideVersion('prettier', options),
   };
 }
 

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

@@ -1,7 +1,7 @@
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import { blueprintRoot, processTemplate } from '../../../utils/blueprints.js';
+import { blueprintsRoot, processTemplate } from '../../../utils/blueprints.js';
 import { createFiles, findFiles } from '../../../utils/files.js';
 
 function getFilePath(blueprintFilePath, options) {
@@ -32,9 +32,10 @@ function getFilesToSkip(options) {
 
 export function createFilesFromBlueprint(context, options) {
   const filesToSkip = getFilesToSkip(options);
+  const emberAddonBlueprintsRoot = join(blueprintsRoot, 'ember-addon');
 
   const blueprintFilePaths = findFiles('**/*', {
-    cwd: blueprintRoot,
+    cwd: emberAddonBlueprintsRoot,
     ignoreList: filesToSkip,
   });
 
@@ -43,8 +44,8 @@ export function createFilesFromBlueprint(context, options) {
       const filePath = getFilePath(blueprintFilePath, options);
 
       const blueprintFile = readFileSync(
-        join(blueprintRoot, blueprintFilePath),
-        'utf8'
+        join(emberAddonBlueprintsRoot, blueprintFilePath),
+        'utf8',
       );
 
       const file = processTemplate(blueprintFile, {
@@ -53,7 +54,7 @@ export function createFilesFromBlueprint(context, options) {
       });
 
       return [filePath, file];
-    })
+    }),
   );
 
   createFiles(fileMapping, options);

package/src/migration/ember-addon/steps/create-options.js

@@ -28,7 +28,7 @@ function analyzePackageJson(codemodOptions) {
   try {
     const packageJsonFile = readFileSync(
       join(projectRoot, 'package.json'),
-      'utf8'
+      'utf8',
     );
 
     const {
@@ -56,7 +56,7 @@ function analyzePackageJson(codemodOptions) {
     };
   } catch (e) {
     throw new SyntaxError(
-      `ERROR: package.json is missing or is not valid. (${e.message})\n`
+      `ERROR: package.json is missing or is not valid. (${e.message})\n`,
     );
   }
 }
@@ -96,8 +96,9 @@ function analyzePackageManager(codemodOptions) {
 }
 
 function deriveAddonLocation(addonPackage) {
-  // Package is not scoped
-  if (!addonPackage.name.includes('/')) {
+  const hasScope = addonPackage.name.includes('/');
+
+  if (!hasScope) {
     return addonPackage.name;
   }
 

package/src/migration/ember-addon/steps/move-test-app-files.js

@@ -76,7 +76,7 @@ function renameDummy(options) {
 
     const newFile = oldFile.replace(
       new RegExp('dummy', 'g'),
-      packages.testApp.name
+      packages.testApp.name,
     );
 
     writeFileSync(oldPath, newFile, 'utf8');

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

@@ -50,6 +50,7 @@ function updateDevDependencies(packageJson, options) {
     '@babel/core',
     '@babel/plugin-proposal-class-properties',
     '@babel/plugin-proposal-decorators',
+    '@babel/runtime',
     '@embroider/addon-dev',
     '@rollup/plugin-babel',
     'rollup',
@@ -85,7 +86,7 @@ function updateOtherFields(packageJson, context, options) {
 
         return accumulator;
       },
-      {}
+      {},
     );
 
     packageJson['ember-addon'] = {
@@ -147,7 +148,7 @@ function updateScripts(packageJson) {
   scripts.set('start', 'rollup --config --watch');
   scripts.set(
     'test',
-    "echo 'A v2 addon does not have tests, run tests in test-app'"
+    "echo 'A v2 addon does not have tests, run tests in test-app'",
   );
 
   packageJson['scripts'] = convertToObject(scripts);

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

@@ -63,7 +63,7 @@ function updateOtherFields(packageJson, options) {
   delete packageJson['ember-addon'];
 
   packageJson['keywords'] = (packageJson['keywords'] ?? []).filter(
-    (keyword) => keyword !== 'ember-addon'
+    (keyword) => keyword !== 'ember-addon',
   );
 
   packageJson['name'] = packages.testApp.name;

package/src/utils/blueprints/{blueprint-root.js → blueprints-root.js}

@@ -4,10 +4,10 @@ import { fileURLToPath } from 'node:url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-function getBlueprintRoot() {
+function getBlueprintsRoot() {
   const srcDirectory = join(__dirname, '../..');
 
-  return join(srcDirectory, 'blueprints/ember-addon');
+  return join(srcDirectory, 'blueprints');
 }
 
-export const blueprintRoot = getBlueprintRoot();
+export const blueprintsRoot = getBlueprintsRoot();

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

@@ -1,17 +1,17 @@
 const latestVersions = new Map([
-  ['@babel/core', '7.21.0'],
+  ['@babel/core', '7.21.8'],
   ['@babel/plugin-proposal-class-properties', '7.18.6'],
   ['@babel/plugin-proposal-decorators', '7.21.0'],
-  ['@babel/preset-typescript', '7.21.0'],
+  ['@babel/preset-typescript', '7.21.5'],
+  ['@babel/runtime', '7.21.5'],
   ['@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.6.1'],
+  ['concurrently', '8.0.1'],
+  ['ember-auto-import', '2.6.3'],
   ['ember-cli-babel', '7.26.11'],
   ['ember-cli-htmlbars', '6.2.0'],
-  ['prettier', '2.8.4'],
-  ['rollup', '3.18.0'],
+  ['rollup', '3.21.3'],
   ['rollup-plugin-copy', '3.4.0'],
   ['rollup-plugin-ts', '3.2.0'],
 ]);
@@ -29,7 +29,7 @@ export function decideVersion(packageName, options) {
 
   if (!latestVersion) {
     throw new RangeError(
-      `ERROR: The latest version of \`${packageName}\` is unknown.\n`
+      `ERROR: The latest version of \`${packageName}\` is unknown.\n`,
     );
   }
 

package/src/utils/blueprints.js

@@ -1,3 +1,3 @@
-export * from './blueprints/blueprint-root.js';
+export * from './blueprints/blueprints-root.js';
 export * from './blueprints/decide-version.js';
 export * from './blueprints/process-template.js';

package/src/utils/files/map-file-paths.js

@@ -20,6 +20,6 @@ export function mapFilePaths(filePaths, directory) {
       const newPath = renameDirectory(filePath, { from, to });
 
       return [filePath, newPath];
-    })
+    }),
   );
 }

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

@@ -1,25 +0,0 @@
-# unconventional js
-/blueprints/*/files/
-/vendor/
-
-# compiled output
-/dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
-
-# misc
-/coverage/
-!.*
-.eslintcache
-.lint-todo/
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try

package/src/blueprints/ember-addon/.prettierrc.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = {
-  singleQuote: true,
-};