Merge pull request #31 from soxhub/rename-functions

Fix naming of rollup plugins and helper functions in ember-scoped-css
soxhub · May 16, 2023 · b33d3eb · b33d3eb
2 parents 5277984 + a177553
commit b33d3eb
Show file tree

Hide file tree

Showing 17 changed files with 138 additions and 264 deletions.
diff --git a/ember-scoped-css/index.js b/ember-scoped-css/index.js
@@ -1,17 +1,11 @@
-import addonJsUnplugin from './src/addon-js-unplugin.js';
-import addonCssRollup from './src/addon-css-rollup.js';
-import addonHbsRollup from './src/addon-hbs-rollup.js';
 import appJsUnplugin from './src/app-js-unplugin.js';
 import appCssUnplugin from './src/app-css-unplugin.js';
 import appScopedcssWebpack from './src/app-scopedcss-webpack.js';
-import addonRewritecssRollup from './src/addon-rewritecss-rollup.js';
+import scopedCssUnplugin from './src/scoped-css-unplugin.js';
 
 export {
-  addonJsUnplugin,
-  addonCssRollup,
-  addonHbsRollup,
+  scopedCssUnplugin,
   appJsUnplugin,
   appCssUnplugin,
   appScopedcssWebpack,
-  addonRewritecssRollup,
 };
diff --git a/ember-scoped-css/src/addon-css-rollup.js b/ember-scoped-css/src/addon-css-rollup.js
diff --git a/ember-scoped-css/src/addon-hbs-rollup.js b/ember-scoped-css/src/addon-hbs-rollup.js
diff --git a/ember-scoped-css/src/addon-js-unplugin.js b/ember-scoped-css/src/addon-js-unplugin.js
diff --git a/ember-scoped-css/src/addon-rewritecss-rollup.js b/ember-scoped-css/src/addon-rewritecss-rollup.js
diff --git a/ember-scoped-css/src/app-css-livereload-loader.js b/ember-scoped-css/src/app-css-livereload-loader.js
@@ -2,7 +2,7 @@ import { createUnplugin } from 'unplugin';
 import path from 'path';
 import { readFile } from 'fs/promises';
 import { Compilation } from 'webpack';
-import getPostfix from './lib/getPostfix.js';
+import generateHash from './lib/generateAbsolutePathHash.js';
 
 export default createUnplugin(({ loaders, htmlEntrypointInfo }) => {
   return {
@@ -41,7 +41,7 @@ export default createUnplugin(({ loaders, htmlEntrypointInfo }) => {
           css = await loader.bind({ resourcePath: cssPath })(css);
         }
         // random string; lenght is 8
-        const postfix = getPostfix(path.basename(cssPath));
+        const postfix = generateHash(path.basename(cssPath));
 
         this.emitFile({
           type: 'asset',

diff --git a/ember-scoped-css/src/app-css-loader.js b/ember-scoped-css/src/app-css-loader.js
@@ -1,14 +1,14 @@
 // import { createUnplugin }  from 'unplugin';
 import { basename } from 'path';
 import fsExists from './lib/fsExists.js';
-import getPostfix from './lib/getPostfix.js';
+import generateHash from './lib/generateAbsolutePathHash.js';
 import rewriteCss from './lib/rewriteCss.js';
 // import path  from 'path';
 
 export default async function (code) {
   const cssPath = this.resourcePath;
   const cssFileName = basename(cssPath);
-  const postfix = getPostfix(cssPath);
+  const postfix = generateHash(cssPath);
 
   const hbsPath = cssPath.replace('.css', '.hbs');
   const gjsPath = cssPath.replace('.css', '.js');

diff --git a/ember-scoped-css/src/app-js-unplugin.js b/ember-scoped-css/src/app-js-unplugin.js
@@ -1,7 +1,7 @@
 import { createUnplugin } from 'unplugin';
 import replaceGlimmerAst from './lib/replaceGlimmerAst.js';
 import path from 'path';
-import getPostfix from './lib/getPostfix.js';
+import generateHash from './lib/generateAbsolutePathHash.js';
 import getClassesTagsFromCss from './lib/getClassesTagsFromCss.js';
 
 function* iterateOpcodes(opcodes) {
@@ -48,7 +48,7 @@ export default createUnplugin(({ appDir }) => {
 
     async transform(code, id) {
       const cssPath = id.replace(/(\.js)|(\.hbs)/, '.css');
-      const postfix = getPostfix(cssPath);
+      const postfix = generateHash(cssPath);
 
       return await replaceGlimmerAst(code, id, (opcodes, css) => {
         const { classes, tags } = getClassesTagsFromCss(css);

diff --git a/ember-scoped-css/src/app-scopedcss-webpack.js b/ember-scoped-css/src/app-scopedcss-webpack.js
@@ -2,7 +2,7 @@
 import rewriteCss from './lib/rewriteCss.js';
 import { readFile, writeFile } from 'fs/promises';
 import path from 'path';
-import getPostfix from './lib/getPostfix.js';
+import generateHash from './lib/generateAbsolutePathHash.js';
 import fsExists from './lib/fsExists.js';
 import getFiles from './lib/getFiles.js';
 
@@ -44,7 +44,7 @@ export default class {
               continue;
             }
             const fileName = path.basename(file);
-            const postfix = getPostfix(fileName);
+            const postfix = generateHash(fileName);
             const css = await readFile(file, 'utf-8');
             const rewrittenCss = rewriteCss(css, postfix, fileName);
 

diff --git a/ember-scoped-css/src/lib/getPostfix.js → ...d-css/src/lib/generateAbsolutePathHash.js b/ember-scoped-css/src/lib/getPostfix.js → ...d-css/src/lib/generateAbsolutePathHash.js
@@ -1,4 +1,4 @@
-import generateHash from './generateHash.js';
+import generateHash from './generateRelativePathHash.js';
 import path from 'path';
 
 export default function (cssFileName) {

diff --git a/ember-scoped-css/src/lib/generateHash.js → ...d-css/src/lib/generateRelativePathHash.js b/ember-scoped-css/src/lib/generateHash.js → ...d-css/src/lib/generateRelativePathHash.js
diff --git a/ember-scoped-css/src/lib/replaceScopedClass.js b/ember-scoped-css/src/lib/replaceScopedClass.js
@@ -1,12 +1,12 @@
 import recast from 'ember-template-recast';
 import renameClass from './renameClass.js';
-import getPostfix from './getPostfix.js';
+import generateHash from './generateAbsolutePathHash.js';
 
 export default function (hbs, templatePath) {
   let ast = recast.parse(hbs);
   let stack = [];
   const cssPath = templatePath.replace(/(\.hbs)?\.js$/, '.css');
-  const postfix = getPostfix(cssPath);
+  const postfix = generateHash(cssPath);
 
   recast.traverse(ast, {
     All: {