ember-codemod-remove-ember-css-modules 0.1.0 → 0.1.1

package/README.md

@@ -41,7 +41,7 @@ Step 3. Celebrate.
 <details>
 <summary>Optional: Specify the component structure</summary>
 
-By default, an Octane projects has the flat component structure. Pass `--component-structure` to indicate otherwise.
+By default, an Octane project has the flat component structure. Pass `--component-structure` to indicate otherwise.
 
 ```sh
 npx ember-codemod-remove-ember-css-modules --component-structure="nested"
@@ -217,6 +217,11 @@ The codemod is not responsible for fixing complex expressions. Refactor template
 * Node.js v16 or above
 
 
+## Contributing
+
+See the [Contributing](../../CONTRIBUTING.md) guide for details.
+
+
 ## License
 
 This project is licensed under the [MIT License](LICENSE.md).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-remove-ember-css-modules",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Codemod to replace ember-css-modules with embroider-css-modules",
   "keywords": [
     "codemod",
@@ -27,25 +27,25 @@
     "test": "tests"
   },
   "dependencies": {
-    "@babel/parser": "^7.21.4",
+    "@babel/parser": "^7.21.5",
     "ember-template-recast": "^6.1.4",
-    "glob": "^10.0.0",
+    "glob": "^10.2.2",
     "lodash.template": "^4.5.0",
     "recast": "^0.23.1",
-    "yargs": "^17.7.1"
+    "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.4",
+    "@babel/core": "^7.21.5",
     "@babel/eslint-parser": "^7.21.3",
     "@sondr3/minitest": "^0.1.1",
-    "eslint": "^8.38.0",
+    "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "fixturify": "^3.0.0",
-    "prettier": "^2.8.7"
+    "prettier": "^2.8.8"
   },
   "engines": {
     "node": "16.* || >= 18"

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

@@ -57,7 +57,7 @@ function analyzeComponents(options) {
     {
       from: 'app/components',
       to: '',
-    }
+    },
   );
 
   const stylesheetFilePaths = findAndRenameFiles(
@@ -68,7 +68,7 @@ function analyzeComponents(options) {
     {
       from: 'app/components',
       to: '',
-    }
+    },
   );
 
   const templateFilePaths = findAndRenameFiles(
@@ -79,7 +79,7 @@ function analyzeComponents(options) {
     {
       from: 'app/components',
       to: '',
-    }
+    },
   );
 
   const entities = analyzeEntities({
@@ -94,7 +94,7 @@ function analyzeComponents(options) {
         const newEntityName = entityName.replace(/\/index$/, '');
 
         return [newEntityName, extensions];
-      })
+      }),
     );
   }
 
@@ -113,7 +113,7 @@ function analyzeRoutes(options) {
     {
       from: 'app/controllers',
       to: '',
-    }
+    },
   );
 
   const stylesheetFilePaths = findAndRenameFiles(
@@ -125,7 +125,7 @@ function analyzeRoutes(options) {
     {
       from: 'app/styles',
       to: '',
-    }
+    },
   );
 
   const templateFilePaths = findAndRenameFiles(
@@ -137,7 +137,7 @@ function analyzeRoutes(options) {
     {
       from: 'app/templates',
       to: '',
-    }
+    },
   );
 
   return analyzeEntities({

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

@@ -7,7 +7,7 @@ function analyzePackageJson(codemodOptions) {
   try {
     const packageJsonFile = readFileSync(
       join(projectRoot, 'package.json'),
-      'utf8'
+      'utf8',
     );
 
     const { dependencies, devDependencies } = JSON.parse(packageJsonFile);
@@ -25,7 +25,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`,
     );
   }
 }

package/src/migration/ember-app/steps/shared/import-styles.js

@@ -29,10 +29,10 @@ function removeTemplateOnlyComponentMethod(file, data) {
         AST.builders.classBody([
           AST.builders.classProperty(
             AST.builders.identifier(data.__styles__),
-            AST.builders.identifier(data.__styles__)
+            AST.builders.identifier(data.__styles__),
           ),
         ]),
-        superClass
+        superClass,
       );
     },
 
@@ -42,7 +42,7 @@ function removeTemplateOnlyComponentMethod(file, data) {
       }
 
       const defaultImport = path.value.specifiers.find(
-        (specifier) => specifier.type === 'ImportDefaultSpecifier'
+        (specifier) => specifier.type === 'ImportDefaultSpecifier',
       );
 
       if (defaultImport?.local?.name !== 'templateOnlyComponent') {
@@ -52,10 +52,10 @@ function removeTemplateOnlyComponentMethod(file, data) {
       return AST.builders.importDeclaration(
         [
           AST.builders.importDefaultSpecifier(
-            AST.builders.identifier('Component')
+            AST.builders.identifier('Component'),
           ),
         ],
-        AST.builders.literal('@glimmer/component')
+        AST.builders.literal('@glimmer/component'),
       );
     },
   });
@@ -91,11 +91,11 @@ function importStylesInClass(file, data) {
     AST.builders.importDeclaration(
       [
         AST.builders.importDefaultSpecifier(
-          AST.builders.identifier(data.__styles__)
+          AST.builders.identifier(data.__styles__),
         ),
       ],
-      AST.builders.literal(`./${data.fileName}.css`)
-    )
+      AST.builders.literal(`./${data.fileName}.css`),
+    ),
   );
 
   return AST.print(ast);
@@ -111,7 +111,7 @@ function addStylesAsClassProperty(file, data) {
       const nodesToAdd = [
         AST.builders.classProperty(
           AST.builders.identifier(data.__styles__),
-          AST.builders.identifier(data.__styles__)
+          AST.builders.identifier(data.__styles__),
         ),
       ];
 
@@ -135,7 +135,7 @@ function createClass(customizations, options) {
     blueprintFilePaths.map((blueprintFilePath) => {
       const blueprintFile = readFileSync(
         join(blueprintRoot, blueprintFilePath),
-        'utf8'
+        'utf8',
       );
 
       const file = processTemplate(blueprintFile, {
@@ -144,7 +144,7 @@ function createClass(customizations, options) {
       });
 
       return [filePath, file];
-    })
+    }),
   );
 
   createFiles(fileMapping, options);
@@ -181,7 +181,7 @@ function updateClass(customizations, options) {
     createFiles(fileMapping, options);
   } catch (e) {
     console.warn(
-      `WARNING: updateClass could not update \`${filePath}\`. Please update the file manually. (${e.message})\n`
+      `WARNING: updateClass could not update \`${filePath}\`. Please update the file manually. (${e.message})\n`,
     );
   }
 }

package/src/migration/ember-app/steps/shared/update-templates.js

@@ -7,7 +7,7 @@ import { createFiles } from '../../../../utils/files.js';
 function sanitizeClassAndLocalClassAttributes(file) {
   function removeAttributeWithoutValue(attributeName, attributes) {
     const attributeIndex = attributes.findIndex(
-      (attribute) => attribute.name === attributeName
+      (attribute) => attribute.name === attributeName,
     );
 
     if (attributeIndex === -1) {
@@ -52,10 +52,10 @@ function mergeClassAndLocalClassAttributes(file, data) {
       const { attributes } = node;
 
       const localClassAttributeIndex = attributes.findIndex(
-        (attribute) => attribute.name === 'local-class'
+        (attribute) => attribute.name === 'local-class',
       );
       const classAttributeIndex = attributes.findIndex(
-        (attribute) => attribute.name === 'class'
+        (attribute) => attribute.name === 'class',
       );
 
       if (localClassAttributeIndex === -1 || classAttributeIndex === -1) {
@@ -97,7 +97,7 @@ function mergeClassAndLocalClassAttributes(file, data) {
 
       attributes[classAttributeIndex].value = AST.builders.mustache(
         AST.builders.path('concat'),
-        params
+        params,
       );
 
       // Remove the local-class attribute
@@ -119,7 +119,7 @@ function removeLocalClassHelpers(file, data) {
 
     if (hasFromArgument) {
       throw new RangeError(
-        `Unable to handle the {{local-class}} helper's \`from\` key. See lines ${path.loc.start.line}-${path.loc.end.line}.`
+        `Unable to handle the {{local-class}} helper's \`from\` key. See lines ${path.loc.start.line}-${path.loc.end.line}.`,
       );
     }
 
@@ -166,7 +166,7 @@ function removeLocalClassHelpers(file, data) {
 
       if (localClassNames.length === 1) {
         node.value = AST.builders.mustache(
-          AST.builders.path(`this.${data.__styles__}.${localClassNames[0]}`)
+          AST.builders.path(`this.${data.__styles__}.${localClassNames[0]}`),
         );
 
         return;
@@ -199,7 +199,7 @@ function removeLocalClassHelpers(file, data) {
 
       if (localClassNames.length === 1) {
         return AST.builders.path(
-          `this.${data.__styles__}.${localClassNames[0]}`
+          `this.${data.__styles__}.${localClassNames[0]}`,
         );
       }
 
@@ -224,7 +224,7 @@ function removeLocalClassAttributes(file, data) {
         } else {
           param = AST.builders.sexpr(
             'array',
-            localClassNames.map(AST.builders.string)
+            localClassNames.map(AST.builders.string),
           );
         }
 
@@ -305,7 +305,7 @@ function removeLocalClassAttributes(file, data) {
 
         if (localClassNames.length === 1) {
           return AST.builders.mustache(
-            AST.builders.path(`this.${data.__styles__}.${localClassNames[0]}`)
+            AST.builders.path(`this.${data.__styles__}.${localClassNames[0]}`),
           );
         }
 
@@ -337,7 +337,7 @@ function removeLocalClassAttributes(file, data) {
       const { attributes } = node;
 
       const localClassAttributeIndex = attributes.findIndex(
-        (attribute) => attribute.name === 'local-class'
+        (attribute) => attribute.name === 'local-class',
       );
 
       if (localClassAttributeIndex === -1) {
@@ -351,7 +351,7 @@ function removeLocalClassAttributes(file, data) {
         case 'ConcatStatement': {
           localClassAttribute.name = 'class';
           localClassAttribute.value.parts = transformParts(
-            localClassAttribute.value.parts
+            localClassAttribute.value.parts,
           );
 
           break;
@@ -415,7 +415,7 @@ function updateTemplate(customizations, options) {
     createFiles(fileMapping, options);
   } catch (e) {
     console.warn(
-      `WARNING: updateTemplate could not update \`${filePath}\`. Please update the file manually. (${e.message})\n`
+      `WARNING: updateTemplate could not update \`${filePath}\`. Please update the file manually. (${e.message})\n`,
     );
   }
 }

package/src/migration/ember-app/steps/update-app-app-js.js

@@ -12,7 +12,7 @@ function addCssEntryPoint(file, data) {
       const nodesToAdd = [
         AST.builders.importDeclaration(
           [],
-          AST.builders.literal('./assets/app.css')
+          AST.builders.literal('./assets/app.css'),
         ),
         AST.builders.noop(),
       ];
@@ -35,7 +35,7 @@ export function updateAppAppJs(options) {
 
   if (filePaths.length !== 1) {
     console.warn(
-      'WARNING: updateAppAppJs could not find app.{js,ts} in the app folder. Will skip this step.\n'
+      'WARNING: updateAppAppJs could not find app.{js,ts} in the app folder. Will skip this step.\n',
     );
 
     return;
@@ -58,7 +58,7 @@ export function updateAppAppJs(options) {
     createFiles(fileMapping, options);
   } catch (e) {
     console.warn(
-      `WARNING: updateAppAppJs could not update \`${filePath}\`. Please update the file manually. (${e.message})\n`
+      `WARNING: updateAppAppJs could not update \`${filePath}\`. Please update the file manually. (${e.message})\n`,
     );
   }
 }

package/src/utils/abstract-syntax-tree/javascript.js

@@ -71,29 +71,25 @@ const tsOptions = {
 };
 
 function getParseOptions(hasTypeScript) {
+  const options = hasTypeScript ? tsOptions : jsOptions;
+
   return {
     parser: {
       parse(file) {
-        return babelParser(file, hasTypeScript ? tsOptions : jsOptions);
+        return babelParser(file, options);
       },
     },
   };
 }
 
-function traverseJavaScript(file, visitMethods) {
-  const ast = parse(file, getParseOptions(false));
-
-  visit(ast, visitMethods);
-
-  return ast;
-}
+function traverse(hasTypeScript) {
+  return function (file, visitMethods) {
+    const ast = parse(file, getParseOptions(hasTypeScript));
 
-function traverseTypeScript(file, visitMethods) {
-  const ast = parse(file, getParseOptions(true));
+    visit(ast, visitMethods);
 
-  visit(ast, visitMethods);
-
-  return ast;
+    return ast;
+  };
 }
 
 const tools = {
@@ -101,9 +97,7 @@ const tools = {
   print(ast) {
     return print(ast, formattingOptions).code;
   },
-  traverse(hasTypeScript) {
-    return hasTypeScript ? traverseTypeScript : traverseJavaScript;
-  },
+  traverse,
 };
 
 export default tools;

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

@@ -1,7 +1,7 @@
 const latestVersions = new Map([
-  ['embroider-css-modules', '0.1.0'],
-  ['type-css-modules', '0.1.0'],
-  ['webpack', '5.78.0'],
+  ['embroider-css-modules', '0.1.1'],
+  ['type-css-modules', '0.1.1'],
+  ['webpack', '5.81.0'],
 ]);
 
 export function decideVersion(packageName, options) {
@@ -17,7 +17,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/files/map-file-paths.js

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