ember-codemod-remove-ember-css-modules 0.3.1 → 0.4.1

package/README.md

@@ -109,7 +109,7 @@ Case 1:
 ```hbs
 {{! app/components/ui/form/textarea.hbs }}
 <textarea
-  class={{local-class "input" from "app/components/ui/form/input.css"}}
+  class={{local-class "input" from="app/components/ui/form/input.css"}}
 />
 ```
 

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

@@ -0,0 +1,43 @@
+import { findFiles, renamePathByDirectory } from '@codemod-utils/files';
+import { analyzeFilePaths } from './analyze-file-paths.js';
+export function analyzeComponents(options) {
+    const { componentStructure, projectRoot } = options;
+    const classFilePaths = findFiles('app/components/**/*.{js,ts}', {
+        ignoreList: ['app/components/**/*.d.ts'],
+        projectRoot,
+    }).map((filePath) => {
+        return renamePathByDirectory(filePath, {
+            from: 'app/components',
+            to: '',
+        });
+    });
+    const stylesheetFilePaths = findFiles('app/components/**/*.css', {
+        projectRoot,
+    }).map((filePath) => {
+        return renamePathByDirectory(filePath, {
+            from: 'app/components',
+            to: '',
+        });
+    });
+    const templateFilePaths = findFiles('app/components/**/*.hbs', {
+        projectRoot,
+    }).map((filePath) => {
+        return renamePathByDirectory(filePath, {
+            from: 'app/components',
+            to: '',
+        });
+    });
+    const filePaths = [
+        ...classFilePaths,
+        ...stylesheetFilePaths,
+        ...templateFilePaths,
+    ].sort();
+    const entities = analyzeFilePaths(filePaths);
+    if (componentStructure === 'nested') {
+        return new Map(Array.from(entities.entries()).map(([entityName, extensions]) => {
+            const newEntityName = entityName.replace(/\/index$/, '');
+            return [newEntityName, extensions];
+        }));
+    }
+    return entities;
+}

package/dist/src/migration/ember-app/steps/analyze-app/analyze-file-paths.js

@@ -0,0 +1,16 @@
+import { join } from 'node:path';
+import { parseFilePath } from '@codemod-utils/files';
+export function analyzeFilePaths(filePaths) {
+    const entities = new Map();
+    filePaths.forEach((filePath) => {
+        const { dir, ext, name } = parseFilePath(filePath);
+        const entityName = join(dir, name);
+        if (entities.has(entityName)) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            entities.get(entityName).add(ext);
+            return;
+        }
+        entities.set(entityName, new Set([ext]));
+    });
+    return entities;
+}

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

@@ -0,0 +1,38 @@
+import { findFiles, renamePathByDirectory } from '@codemod-utils/files';
+import { analyzeFilePaths } from './analyze-file-paths.js';
+export function analyzeRoutes(options) {
+    const { projectRoot } = options;
+    const classFilePaths = findFiles('app/controllers/**/*.{js,ts}', {
+        ignoreList: ['app/controllers/**/*.d.ts'],
+        projectRoot,
+    }).map((filePath) => {
+        return renamePathByDirectory(filePath, {
+            from: 'app/controllers',
+            to: '',
+        });
+    });
+    const stylesheetFilePaths = findFiles('app/styles/**/*.css', {
+        ignoreList: ['app/styles/app.css'],
+        projectRoot,
+    }).map((filePath) => {
+        return renamePathByDirectory(filePath, {
+            from: 'app/styles',
+            to: '',
+        });
+    });
+    const templateFilePaths = findFiles('app/templates/**/*.hbs', {
+        ignoreList: ['app/templates/components/**/*'],
+        projectRoot,
+    }).map((filePath) => {
+        return renamePathByDirectory(filePath, {
+            from: 'app/templates',
+            to: '',
+        });
+    });
+    const filePaths = [
+        ...classFilePaths,
+        ...stylesheetFilePaths,
+        ...templateFilePaths,
+    ].sort();
+    return analyzeFilePaths(filePaths);
+}

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

@@ -0,0 +1,2 @@
+export * from './analyze-components.js';
+export * from './analyze-routes.js';

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

@@ -1,96 +1,4 @@
-import { join, parse } from 'node:path';
-import { findFiles, renamePathByDirectory } from '@codemod-utils/files';
-function analyzeFilePaths(filePaths) {
-    const entities = new Map();
-    filePaths.forEach((filePath) => {
-        const { dir, ext, name } = parse(filePath);
-        const entityName = join(dir, name);
-        if (entities.has(entityName)) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            entities.get(entityName).add(ext);
-            return;
-        }
-        entities.set(entityName, new Set([ext]));
-    });
-    return entities;
-}
-function analyzeComponents(options) {
-    const { componentStructure, projectRoot } = options;
-    const classFilePaths = findFiles('app/components/**/*.{js,ts}', {
-        ignoreList: ['app/components/**/*.d.ts'],
-        projectRoot,
-    }).map((filePath) => {
-        return renamePathByDirectory(filePath, {
-            from: 'app/components',
-            to: '',
-        });
-    });
-    const stylesheetFilePaths = findFiles('app/components/**/*.css', {
-        projectRoot,
-    }).map((filePath) => {
-        return renamePathByDirectory(filePath, {
-            from: 'app/components',
-            to: '',
-        });
-    });
-    const templateFilePaths = findFiles('app/components/**/*.hbs', {
-        projectRoot,
-    }).map((filePath) => {
-        return renamePathByDirectory(filePath, {
-            from: 'app/components',
-            to: '',
-        });
-    });
-    const filePaths = [
-        ...classFilePaths,
-        ...stylesheetFilePaths,
-        ...templateFilePaths,
-    ].sort();
-    const entities = analyzeFilePaths(filePaths);
-    if (componentStructure === 'nested') {
-        return new Map(Array.from(entities.entries()).map(([entityName, extensions]) => {
-            const newEntityName = entityName.replace(/\/index$/, '');
-            return [newEntityName, extensions];
-        }));
-    }
-    return entities;
-}
-function analyzeRoutes(options) {
-    const { projectRoot } = options;
-    const classFilePaths = findFiles('app/controllers/**/*.{js,ts}', {
-        ignoreList: ['app/controllers/**/*.d.ts'],
-        projectRoot,
-    }).map((filePath) => {
-        return renamePathByDirectory(filePath, {
-            from: 'app/controllers',
-            to: '',
-        });
-    });
-    const stylesheetFilePaths = findFiles('app/styles/**/*.css', {
-        ignoreList: ['app/styles/app.css'],
-        projectRoot,
-    }).map((filePath) => {
-        return renamePathByDirectory(filePath, {
-            from: 'app/styles',
-            to: '',
-        });
-    });
-    const templateFilePaths = findFiles('app/templates/**/*.hbs', {
-        ignoreList: ['app/templates/components/**/*'],
-        projectRoot,
-    }).map((filePath) => {
-        return renamePathByDirectory(filePath, {
-            from: 'app/templates',
-            to: '',
-        });
-    });
-    const filePaths = [
-        ...classFilePaths,
-        ...stylesheetFilePaths,
-        ...templateFilePaths,
-    ].sort();
-    return analyzeFilePaths(filePaths);
-}
+import { analyzeComponents, analyzeRoutes } from './analyze-app/index.js';
 export function analyzeApp(options) {
     return {
         components: analyzeComponents(options),

package/dist/src/migration/ember-app/steps/import-styles/create-class.js

@@ -0,0 +1,25 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { processTemplate } from '@codemod-utils/blueprints';
+import { classify, doubleColonize } from '@codemod-utils/ember-cli-string';
+import { createFiles, parseFilePath } from '@codemod-utils/files';
+import { blueprintsRoot } from '../../../../utils/blueprints.js';
+export function createClass(entityName, { customizations, options }) {
+    const { blueprintFilePaths, getFilePath } = customizations;
+    const entity = {
+        classifiedName: classify(entityName),
+        doubleColonizedName: doubleColonize(entityName),
+        fileName: parseFilePath(entityName).name,
+        name: entityName,
+    };
+    const filePath = getFilePath(entityName);
+    const fileMap = new Map(blueprintFilePaths.map((blueprintFilePath) => {
+        const blueprintFile = readFileSync(join(blueprintsRoot, blueprintFilePath), 'utf8');
+        const file = processTemplate(blueprintFile, {
+            entity,
+            options,
+        });
+        return [filePath, file];
+    }));
+    createFiles(fileMap, options);
+}

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

@@ -0,0 +1,16 @@
+import { createClass } from './create-class.js';
+import { updateClass } from './update-class.js';
+export function importStyles(entities, options) {
+    for (const [entityName, extensions] of entities) {
+        const hasClass = extensions.has('.js') || extensions.has('.ts');
+        const hasStylesheet = extensions.has('.css');
+        if (!hasStylesheet) {
+            continue;
+        }
+        if (!hasClass) {
+            createClass(entityName, options);
+            continue;
+        }
+        updateClass(entityName, options);
+    }
+}

package/dist/src/migration/ember-app/steps/{shared/import-styles.js → import-styles/update-class.js}

@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { readFileSync } from 'node:fs';
-import { join, parse } from 'node:path';
-import { ASTJavaScript as AST } from '@codemod-utils/ast';
-import { processTemplate } from '@codemod-utils/blueprints';
-import { createFiles } from '@codemod-utils/files';
-import { blueprintsRoot } from '../../../../utils/blueprints.js';
-import { parseEntityName } from '../../../../utils/string.js';
+import { join } from 'node:path';
+import { AST } from '@codemod-utils/ast-javascript';
+import { createFiles, parseFilePath } from '@codemod-utils/files';
 function removeTemplateOnlyComponentMethod(file, data) {
     const traverse = AST.traverse(data.isTypeScript);
     const ast = traverse(file, {
@@ -80,29 +77,15 @@ function addStylesAsClassProperty(file, data) {
     });
     return AST.print(ast);
 }
-function createClass(entityName, { customizations, options }) {
-    const { blueprintFilePaths, getFilePath } = customizations;
-    const entity = parseEntityName(entityName);
-    const filePath = getFilePath(entityName);
-    const fileMap = new Map(blueprintFilePaths.map((blueprintFilePath) => {
-        const blueprintFile = readFileSync(join(blueprintsRoot, blueprintFilePath), 'utf8');
-        const file = processTemplate(blueprintFile, {
-            entity,
-            options,
-        });
-        return [filePath, file];
-    }));
-    createFiles(fileMap, options);
-}
-function updateClass(entityName, { customizations, options }) {
+export function updateClass(entityName, { customizations, options }) {
     const { getFilePath } = customizations;
     const { __styles__, projectRoot } = options;
     const filePath = getFilePath(entityName);
-    const { ext: fileExtension, name: fileName } = parse(filePath);
+    const { ext, name } = parseFilePath(filePath);
     const data = {
         __styles__,
-        fileName,
-        isTypeScript: fileExtension === '.ts',
+        fileName: name,
+        isTypeScript: ext === '.ts',
     };
     try {
         let file = readFileSync(join(projectRoot, filePath), 'utf8');
@@ -120,17 +103,3 @@ function updateClass(entityName, { customizations, options }) {
         console.warn(`${message}\n`);
     }
 }
-export function importStyles(entities, options) {
-    for (const [entityName, extensions] of entities) {
-        const hasClass = extensions.has('.js') || extensions.has('.ts');
-        const hasStylesheet = extensions.has('.css');
-        if (!hasStylesheet) {
-            continue;
-        }
-        if (!hasClass) {
-            createClass(entityName, options);
-            continue;
-        }
-        updateClass(entityName, options);
-    }
-}

package/dist/src/migration/ember-app/steps/import-styles-in-components.js

@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { importStyles } from './shared/import-styles.js';
+import { importStyles } from './import-styles/index.js';
 function getBlueprintFilePaths(options) {
     const { project } = options;
     if (project.hasTypeScript) {

package/dist/src/migration/ember-app/steps/import-styles-in-routes.js

@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { importStyles } from './shared/import-styles.js';
+import { importStyles } from './import-styles/index.js';
 function getBlueprintFilePaths(options) {
     const { project } = options;
     if (project.hasTypeScript) {

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

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs';
 import { extname, join } from 'node:path';
-import { ASTJavaScript as AST } from '@codemod-utils/ast';
+import { AST } from '@codemod-utils/ast-javascript';
 import { createFiles, findFiles } from '@codemod-utils/files';
 function addCssEntryPoint(file, data) {
     const traverse = AST.traverse(data.isTypeScript);

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

@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { updateTemplates } from './shared/update-templates.js';
+import { updateTemplates } from './update-templates/index.js';
 function getFilePath(options) {
     const { componentStructure } = options;
     return function (entityName) {

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

@@ -9,7 +9,16 @@ function updateDevDependencies(packageJson, options) {
     packagesToDelete.forEach((packageName) => {
         devDependencies.delete(packageName);
     });
-    const packagesToInstall = new Set(['embroider-css-modules']);
+    const packagesToInstall = new Set([
+        '@embroider/compat',
+        '@embroider/core',
+        '@embroider/webpack',
+        'autoprefixer',
+        'embroider-css-modules',
+        'postcss',
+        'postcss-loader',
+        'webpack',
+    ]);
     if (project.hasTypeScript) {
         packagesToInstall.add('type-css-modules');
     }

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

@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { updateTemplates } from './shared/update-templates.js';
+import { updateTemplates } from './update-templates/index.js';
 function getFilePath() {
     return function (entityName) {
         let filePath = join('app/templates', entityName);

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

@@ -0,0 +1,10 @@
+import { updateTemplate } from './update-template.js';
+export function updateTemplates(entities, options) {
+    for (const [entityName, extensions] of entities) {
+        const hasTemplate = extensions.has('.hbs');
+        if (!hasTemplate) {
+            continue;
+        }
+        updateTemplate(entityName, options);
+    }
+}

package/dist/src/migration/ember-app/steps/{shared/update-templates.js → update-templates/update-template.js}

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment, @typescript-eslint/no-non-null-assertion */
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { ASTHandlebars as AST } from '@codemod-utils/ast';
+import { AST } from '@codemod-utils/ast-template';
 import { createFiles } from '@codemod-utils/files';
 function sanitizeClassAndLocalClassAttributes(file) {
     function removeAttributeWithoutValue(attributeName, attributes) {
@@ -327,7 +327,7 @@ function removeLocalClassAttributes(file, data) {
     });
     return AST.print(ast);
 }
-function updateTemplate(entityName, { customizations, options }) {
+export function updateTemplate(entityName, { customizations, options }) {
     const { getFilePath } = customizations;
     const { __styles__, projectRoot } = options;
     const filePath = getFilePath(entityName);
@@ -351,12 +351,3 @@ function updateTemplate(entityName, { customizations, options }) {
         console.warn(`${message}\n`);
     }
 }
-export function updateTemplates(entities, options) {
-    for (const [entityName, extensions] of entities) {
-        const hasTemplate = extensions.has('.hbs');
-        if (!hasTemplate) {
-            continue;
-        }
-        updateTemplate(entityName, options);
-    }
-}

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

@@ -1,8 +1,14 @@
 import { decideVersion } from '@codemod-utils/blueprints';
 const latestVersions = new Map([
-    ['embroider-css-modules', '0.1.7'],
-    ['type-css-modules', '0.1.5'],
-    ['webpack', '5.86.0'],
+    ['@embroider/compat', '3.0.2'],
+    ['@embroider/core', '3.0.2'],
+    ['@embroider/webpack', '3.0.0'],
+    ['autoprefixer', '10.4.14'],
+    ['embroider-css-modules', '0.1.9'],
+    ['postcss', '8.4.24'],
+    ['postcss-loader', '7.3.3'],
+    ['type-css-modules', '0.2.2'],
+    ['webpack', '5.87.0'],
 ]);
 export function getVersion(packageName, options) {
     const { project } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-remove-ember-css-modules",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "Codemod to replace ember-css-modules with embroider-css-modules",
   "keywords": [
     "codemod",
@@ -26,14 +26,16 @@
     "dist"
   ],
   "dependencies": {
-    "@codemod-utils/ast": "^0.2.0",
-    "@codemod-utils/blueprints": "^0.2.0",
-    "@codemod-utils/files": "^0.4.1",
-    "@codemod-utils/json": "^0.3.1",
+    "@codemod-utils/ast-javascript": "^0.3.0",
+    "@codemod-utils/ast-template": "^0.3.0",
+    "@codemod-utils/blueprints": "^0.2.1",
+    "@codemod-utils/ember-cli-string": "^0.1.0",
+    "@codemod-utils/files": "^0.5.0",
+    "@codemod-utils/json": "^0.3.2",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@codemod-utils/tests": "^0.2.2",
+    "@codemod-utils/tests": "^0.2.3",
     "@sondr3/minitest": "^0.1.1",
     "@types/node": "^16.11.7",
     "@types/yargs": "^17.0.24",
@@ -41,8 +43,8 @@
     "eslint": "^8.43.0",
     "prettier": "^2.8.8",
     "typescript": "^5.1.3",
-    "@shared-configs/prettier": "0.0.0",
     "@shared-configs/eslint-config-node": "0.0.0",
+    "@shared-configs/prettier": "0.0.0",
     "@shared-configs/typescript": "0.0.0"
   },
   "engines": {

package/dist/src/utils/string/ember-cli-string-utils/camelize.js

@@ -1,11 +0,0 @@
-/* https://github.com/ember-cli/ember-cli-string-utils/blob/v1.1.0/index.js */
-const STRING_CAMELIZE_REGEXP = /(-|_|\.|\s)+(.)?/g;
-export function camelize(value) {
-    return value
-        .replace(STRING_CAMELIZE_REGEXP, function (_match, _separator, character) {
-        return character ? character.toUpperCase() : '';
-    })
-        .replace(/^([A-Z])/, function (match) {
-        return match.toLowerCase();
-    });
-}

package/dist/src/utils/string/ember-cli-string-utils/classify.js

@@ -1,10 +0,0 @@
-/* https://github.com/ember-cli/ember-cli-string-utils/blob/v1.1.0/index.js */
-import { camelize } from './camelize.js';
-export function classify(value) {
-    const tokens = value.split('.');
-    const tokensTransformed = tokens.map((token) => {
-        const camelized = camelize(token);
-        return camelized.charAt(0).toUpperCase() + camelized.substring(1);
-    });
-    return tokensTransformed.join('.');
-}

package/dist/src/utils/string/entity-name/classify.js

@@ -1,5 +0,0 @@
-/* https://github.com/emberjs/ember.js/blob/v4.12.0/blueprints/component/index.js#L255-L256 */
-import { classify } from '../ember-cli-string-utils/classify.js';
-export function classifyEntityName(entityName) {
-    return classify(entityName.replace(/\//g, '-'));
-}

package/dist/src/utils/string/entity-name/double-colonize.js

@@ -1,7 +0,0 @@
-/* https://github.com/emberjs/ember.js/blob/v4.12.0/blueprints/component-test/index.js#L13-L16 */
-import { classify } from '../ember-cli-string-utils/classify.js';
-export function doubleColonizeEntityName(entityName) {
-    const tokens = entityName.split('/');
-    const tokensTransformed = tokens.map(classify);
-    return tokensTransformed.join('::');
-}

package/dist/src/utils/string/entity-name/parse.js

@@ -1,15 +0,0 @@
-import { parse } from 'node:path';
-import { classifyEntityName } from './classify.js';
-import { doubleColonizeEntityName } from './double-colonize.js';
-export function parseEntityName(entityName) {
-    const classifiedName = classifyEntityName(entityName);
-    const doubleColonizedName = doubleColonizeEntityName(entityName);
-    const { name: fileName } = parse(entityName);
-    const entity = {
-        classifiedName,
-        doubleColonizedName,
-        fileName,
-        name: entityName,
-    };
-    return entity;
-}

package/dist/src/utils/string.js

@@ -1,5 +0,0 @@
-export * from './string/ember-cli-string-utils/camelize.js';
-export * from './string/ember-cli-string-utils/classify.js';
-export * from './string/entity-name/classify.js';
-export * from './string/entity-name/double-colonize.js';
-export * from './string/entity-name/parse.js';