ember-scoped-css 0.2.9 → 0.2.11

package/index.js

@@ -1,17 +1,15 @@
-const rollupEmberTemplateImportsPlugin = require('./src/rollup-ember-template-imports-plugin');
-const addonJsUnplugin = require('./src/addon-js-unplugin');
-const addonCssRollup = require('./src/addon-css-rollup');
-const addonHbsRollup = require('./src/addon-hbs-rollup');
-const appJsUnplugin = require('./src/app-js-unplugin');
-const appCssUnplugin = require('./src/app-css-unplugin');
-const appCssLoader = require('./src/app-css-loader');
-const appDependencyLoader = require('./src/app-dependency-loader');
-const appScopedcssWebpack = require('./src/app-scopedcss-webpack');
-const addonRewritecssRollup = require('./src/addon-rewritecss-rollup');
-const babelPluginScopedClass = require('./src/babel-plugin-scoped-class');
-const scopedClassModule = require('./src/scopedClass');
+import rollupEmberTemplateImportsPlugin from './src/rollup-ember-template-imports-plugin.js';
+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 appCssLoader from './src/app-css-loader.js';
+import appDependencyLoader from './src/app-dependency-loader.js';
+import appScopedcssWebpack from './src/app-scopedcss-webpack.js';
+import addonRewritecssRollup from './src/addon-rewritecss-rollup.js';
 
-module.exports = {
+export {
   rollupEmberTemplateImportsPlugin,
   addonJsUnplugin,
   addonCssRollup,
@@ -22,6 +20,4 @@ module.exports = {
   appDependencyLoader,
   appScopedcssWebpack,
   addonRewritecssRollup,
-  babelPluginScopedClass,
-  'test-helper': scopedClassModule,
 };

package/package.json

@@ -1,9 +1,14 @@
 {
   "name": "ember-scoped-css",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "",
-  "type": "commonjs",
+  "type": "module",
   "main": "index.js",
+  "exports": {
+    ".": "./index.js",
+    "./babel-plugin-scoped-class": "./src/babel-plugin-scoped-class.js",
+    "./test-helper": "./src/scopedClass.js"
+  },
   "keywords": [],
   "author": "",
   "license": "ISC",

package/src/addon-css-rollup.js

@@ -1,13 +1,13 @@
-const path = require('path');
-const getPostfix = require('./getPostfix');
-const rewriteCss = require('./rewriteCss');
-const { readFile } = require('fs').promises;
-const fsExists = require('./fsExists');
-const findCssInJs = require('./findCssInJs');
-const getImportedCssFiles = require('./getImportedCssFiles');
-const recast = require('recast');
+import path from 'path';
+import getPostfix from './getPostfix.js';
+import rewriteCss from './rewriteCss.js';
+import { readFile } from 'fs/promises';
+import fsExists from './fsExists.js';
+import findCssInJs from './findCssInJs.js';
+import getImportedCssFiles from './getImportedCssFiles.js';
+import recast from 'recast';
 
-module.exports = function () {
+export default function () {
   return {
     name: 'addon-css-rollup',
 
@@ -89,4 +89,4 @@ module.exports = function () {
       }
     },
   };
-};
+}

package/src/addon-hbs-rollup.js

@@ -1,11 +1,11 @@
-const { readFile } = require('fs').promises;
-const getPostfix = require('./getPostfix');
-const replaceHbsInJs = require('./replaceHbsInJs');
-const getClassesTagsFromCss = require('./getClassesTagsFromCss');
-const rewriteHbs = require('./rewriteHbs');
-const fsExists = require('./fsExists');
+import { readFile } from 'fs/promises';
+import getPostfix from './getPostfix.js';
+import replaceHbsInJs from './replaceHbsInJs.js';
+import getClassesTagsFromCss from './getClassesTagsFromCss.js';
+import rewriteHbs from './rewriteHbs.js';
+import fsExists from './fsExists.js';
 
-module.exports = function rollupCssColocation(options = {}) {
+export default function rollupCssColocation(options = {}) {
   return {
     name: 'addon-hbs-rollup',
 
@@ -39,4 +39,4 @@ module.exports = function rollupCssColocation(options = {}) {
       }
     },
   };
-};
+}

package/src/addon-js-unplugin.js

@@ -1,15 +1,15 @@
-const { createUnplugin } = require('unplugin');
-const { readFile } = require('fs').promises;
-const path = require('path');
-const getClassesTagsFromCss = require('./getClassesTagsFromCss');
-const getPostfix = require('./getPostfix');
-const replaceHbsInJs = require('./replaceHbsInJs');
-const rewriteHbs = require('./rewriteHbs');
-const fsExists = require('./fsExists');
-const findCssInJs = require('./findCssInJs');
-const recast = require('recast');
-
-module.exports = createUnplugin((options) => {
+import { createUnplugin } from 'unplugin';
+import { readFile } from 'fs/promises';
+import path from 'path';
+import getClassesTagsFromCss from './getClassesTagsFromCss.js';
+import getPostfix from './getPostfix.js';
+import replaceHbsInJs from './replaceHbsInJs.js';
+import rewriteHbs from './rewriteHbs.js';
+import fsExists from './fsExists.js';
+import findCssInJs from './findCssInJs.js';
+import recast from 'recast';
+
+export default createUnplugin((options) => {
   return {
     name: 'addon-js-unplugin',
 

package/src/addon-rewritecss-rollup.js

@@ -1,9 +1,9 @@
-const path = require('path');
-const getPostfix = require('./getPostfix');
-const rewriteCss = require('./rewriteCss');
-const fsExists = require('./fsExists');
+import path from 'path';
+import getPostfix from './getPostfix.js';
+import rewriteCss from './rewriteCss.js';
+import fsExists from './fsExists.js';
 
-module.exports = function () {
+export default function () {
   return {
     name: 'addon-rewritecss-rollup',
 
@@ -26,4 +26,4 @@ module.exports = function () {
       }
     },
   };
-};
+}

package/src/app-css-livereload-loader.js

@@ -1,11 +1,11 @@
-const { createUnplugin } = require('unplugin');
-const path = require('path');
-const { readFile, writeFile } = require('fs').promises;
-const { Compilation } = require('webpack');
-const getPostfix = require('./getPostfix');
-const cheerio = require('cheerio');
-
-module.exports = createUnplugin(({ appDir, loaders, htmlEntrypointInfo }) => {
+import { createUnplugin } from 'unplugin';
+import path from 'path';
+import { readFile, writeFile } from 'fs/promises';
+import { Compilation } from 'webpack';
+import getPostfix from './getPostfix.js';
+import cheerio from 'cheerio';
+
+export default createUnplugin(({ appDir, loaders, htmlEntrypointInfo }) => {
   return {
     name: 'app-css-livereload-loader',
 

package/src/app-css-loader.js

@@ -1,11 +1,11 @@
-// const { createUnplugin } = require('unplugin');
-const { basename, join } = require('path');
-const fsExists = require('./fsExists');
-const getPostfix = require('./getPostfix');
-const rewriteCss = require('./rewriteCss');
-// const path = require('path');
+// import { createUnplugin }  from 'unplugin';
+import { basename, join } from 'path';
+import fsExists from './fsExists.js';
+import getPostfix from './getPostfix.js';
+import rewriteCss from './rewriteCss.js';
+// import path  from 'path';
 
-module.exports = async function (code) {
+export default async function (code) {
   const cssPath = this.resourcePath;
   const cssFileName = basename(cssPath);
   const postfix = getPostfix(cssPath);
@@ -18,11 +18,11 @@ module.exports = async function (code) {
   ]);
 
   let rewrittenCss;
-  if (hbsExists || gjsExists && cssPath.startsWith(this.rootContext)) {
+  if (hbsExists || (gjsExists && cssPath.startsWith(this.rootContext))) {
     rewrittenCss = rewriteCss(code, postfix, cssFileName);
   } else {
     rewrittenCss = code;
   }
 
   return rewrittenCss;
-};
+}

package/src/app-css-unplugin.js

@@ -1,13 +1,12 @@
-const { createUnplugin } = require('unplugin');
-const replaceGlimmerAst = require('./replaceGlimmerAst');
-const path = require('path');
-const getPostfix = require('./getPostfix');
-const getClassesTagsFromCss = require('./getClassesTagsFromCss');
-const { readFile } = require('fs').promises;
-const fsExists = require('./fsExists');
+import { createUnplugin } from 'unplugin';
+import replaceGlimmerAst from './replaceGlimmerAst.js';
+import path from 'path';
+import getPostfix from './getPostfix.js';
+import getClassesTagsFromCss from './getClassesTagsFromCss.js';
+import { readFile } from 'fs/promises';
+import fsExists from './fsExists.js';
 
-
-module.exports = createUnplugin(() => {
+export default createUnplugin(() => {
   return {
     name: 'app-css-unplugin',
 

package/src/app-dependency-loader.js

@@ -1,6 +1,6 @@
-const fsExists = require('./fsExists');
+import fsExists from './fsExists.js';
 
-module.exports = async function (source) {
+export default async function (source) {
   if (this.resourcePath.endsWith('.js')) {
     const hbsExists = await fsExists(this.resourcePath.replace(/\.js/, '.hbs'));
     if (hbsExists) {
@@ -16,4 +16,4 @@ module.exports = async function (source) {
   }
 
   return source;
-};
+}

package/src/app-js-unplugin.js

@@ -1,10 +1,10 @@
-const { createUnplugin } = require('unplugin');
-const replaceGlimmerAst = require('./replaceGlimmerAst');
-const path = require('path');
-const getPostfix = require('./getPostfix');
-const getClassesTagsFromCss = require('./getClassesTagsFromCss');
-const { readFile } = require('fs').promises;
-const fsExists = require('./fsExists');
+import { createUnplugin } from 'unplugin';
+import replaceGlimmerAst from './replaceGlimmerAst.js';
+import path from 'path';
+import getPostfix from './getPostfix.js';
+import getClassesTagsFromCss from './getClassesTagsFromCss.js';
+import { readFile } from 'fs/promises';
+import fsExists from './fsExists.js';
 
 function* iterateOpcodes(opcodes) {
   for (let instruction of opcodes) {
@@ -37,7 +37,7 @@ function inflateTagName(tag) {
   throw new Error('Unknown tag');
 }
 
-module.exports = createUnplugin(({ appDir }) => {
+export default createUnplugin(({ appDir }) => {
   return {
     name: 'app-js-unplugin',
 

package/src/app-scopedcss-webpack.js

@@ -1,12 +1,12 @@
-// const { RawSource } = require('webpack-sources');
-const rewriteCss = require('./rewriteCss');
-const { readFile, writeFile } = require('fs').promises;
-const path = require('path');
-const getPostfix = require('./getPostfix');
-const fsExists = require('./fsExists');
-const getFiles = require('./getFiles');
+// import { RawSource }  from 'webpack-sources';
+import rewriteCss from './rewriteCss.js';
+import { readFile, writeFile } from 'fs/promises';
+import path from 'path';
+import getPostfix from './getPostfix.js';
+import fsExists from './fsExists.js';
+import getFiles from './getFiles.js';
 
-module.exports = class {
+export default class {
   apply(compiler) {
     if (process.env.EMBER_ENV === 'production') {
       return;
@@ -65,4 +65,4 @@ module.exports = class {
       }
     );
   }
-};
+}

package/src/babel-plugin-scoped-class.js

@@ -1,5 +1,4 @@
-const template = require('@babel/template').default;
-const replaceScopedClass = require('./replaceScopedClass');
+import replaceScopedClass from './replaceScopedClass.js';
 
 const scopedClass = () => {
   return {
@@ -27,4 +26,4 @@ const scopedClass = () => {
   };
 };
 
-module.exports = scopedClass;
+export default scopedClass;

package/src/findCssInJs.js

@@ -1,6 +1,6 @@
-const recast = require('recast');
+import recast from 'recast';
 
-module.exports = function (script, removeCallExpression = false) {
+export default function (script, removeCallExpression = false) {
   const ast = typeof script === 'string' ? recast.parse(script) : script;
   let css = '';
 
@@ -24,4 +24,4 @@ module.exports = function (script, removeCallExpression = false) {
   });
 
   return { css, ast };
-};
+}

package/src/fsExists.js

@@ -1,10 +1,10 @@
-const { stat } = require('fs').promises;
+import { stat } from 'fs/promises';
 
-module.exports = async function (path) {
+export default async function (path) {
   try {
     await stat(path);
     return true;
   } catch (e) {
     return false;
   }
-};
+}

package/src/generateHash.js

@@ -0,0 +1,5 @@
+import md5 from 'blueimp-md5';
+
+export default function (relativePath) {
+  return 'e' + md5(relativePath).substring(0, 8);
+}

package/src/getClassesTagsFromCss.js

@@ -1,6 +1,6 @@
-const postcss = require('postcss');
-const parser = require('postcss-selector-parser');
-const isInsideGlobal = require('./isInsideGlobal');
+import postcss from 'postcss';
+import parser from 'postcss-selector-parser';
+import isInsideGlobal from './isInsideGlobal.js';
 
 function getClassesAndTags(sel, classes, tags) {
   const transform = (sls) => {
@@ -16,7 +16,7 @@ function getClassesAndTags(sel, classes, tags) {
   parser(transform).processSync(sel);
 }
 
-module.exports = function getClassesTagsFromCss(css) {
+export default function getClassesTagsFromCss(css) {
   const classes = new Set();
   const tags = new Set();
 
@@ -28,4 +28,4 @@ module.exports = function getClassesTagsFromCss(css) {
   });
 
   return { classes, tags };
-};
+}

package/src/getFiles.js

@@ -1,6 +1,6 @@
-const glob = require('glob');
+import glob from 'glob';
 
-module.exports = function (globPath) {
+export default function (globPath) {
   return new Promise((resolve, reject) => {
     glob(globPath, (err, files) => {
       if (err) {
@@ -9,4 +9,4 @@ module.exports = function (globPath) {
       resolve(files);
     });
   });
-};
+}

package/src/getImportedCssFiles.js

@@ -1,4 +1,4 @@
-module.exports = function (css) {
+export default function (css) {
   const regex = /@import\s+["']?([^"')]+)["']?;/g;
   const importedCssPaths = [];
   let match;
@@ -15,4 +15,4 @@ module.exports = function (css) {
     css,
     importedCssPaths,
   };
-};
+}

package/src/getPostfix.js

@@ -1,7 +1,7 @@
-const md5 = require('blueimp-md5');
-const path = require('path');
+import generateHash from './generateHash.js';
+import path from 'path';
 
-module.exports = function (cssFileName) {
+export default function (cssFileName) {
   const relativePath = path.relative(process.cwd(), cssFileName);
-  return 'e' + md5(relativePath).substring(0, 8);
-};
+  return generateHash(relativePath);
+}

package/src/isInsideGlobal.js

@@ -1,6 +1,6 @@
-module.exports = function isInsideGlobal(node, func) {
+export default function isInsideGlobal(node, func) {
   const parent = node.parent;
   if (!parent) return false;
   if (parent.type === 'pseudo' && parent.value === ':global') return true;
   return isInsideGlobal(parent, func);
-};
+}

package/src/renameClass.js

@@ -1,4 +1,4 @@
-module.exports = function (className, postfix, classesInCss) {
+export default function (className, postfix, classesInCss) {
   const classes = className.split(/\s+/);
   const renamedClasses = classes
     .filter((c) => c)
@@ -11,4 +11,4 @@ module.exports = function (className, postfix, classesInCss) {
     renamedClasses
   );
   return renamedWithPreservedSpaces;
-};
+}

package/src/replaceGlimmerAst.js

@@ -1,15 +1,10 @@
-const recast = require('recast');
-const babelParser = require('recast/parsers/babel');
-const path = require('path');
-const { readFile } = require('fs').promises;
-const fsExists = require('./fsExists');
+import recast from 'recast';
+import path from 'path';
+import { readFile } from 'fs/promises';
+import fsExists from './fsExists.js';
 
-const parseOptions = {
-  parser: babelParser,
-};
-
-module.exports = async function (script, id, replaceFunction) {
-  const ast = recast.parse(script, parseOptions);
+export default async function (script, id, replaceFunction) {
+  const ast = recast.parse(script);
   const cssPath = id.replace(/(\.js)|(\.hbs)/, '.css');
   let css;
 
@@ -53,4 +48,4 @@ module.exports = async function (script, id, replaceFunction) {
   });
   const resultScript = recast.print(ast).code;
   return resultScript;
-};
+}

package/src/replaceHbsInJs.js

@@ -1,12 +1,7 @@
-const recast = require('recast');
-const babelParser = require('recast/parsers/babel');
+import recast from 'recast';
 
-const parseOptions = {
-  parser: babelParser,
-};
-
-module.exports = function (script, replaceFunction) {
-  const ast = recast.parse(script, parseOptions);
+export default function (script, replaceFunction) {
+  const ast = recast.parse(script);
   recast.visit(ast, {
     visitCallExpression(path) {
       const node = path.node;
@@ -29,4 +24,4 @@ module.exports = function (script, replaceFunction) {
     },
   });
   return recast.print(ast).code;
-};
+}

package/src/replaceScopedClass.js

@@ -1,8 +1,8 @@
-const recast = require('ember-template-recast');
-const renameClass = require('./renameClass');
-const getPostfix = require('./getPostfix');
+import recast from 'ember-template-recast';
+import renameClass from './renameClass.js';
+import getPostfix from './getPostfix.js';
 
-module.exports = function (hbs, templatePath, basePath) {
+export default function (hbs, templatePath, basePath) {
   let ast = recast.parse(hbs);
   let stack = [];
   const cssPath = templatePath.replace(/(\.hbs)?\.js$/, '.css');
@@ -63,4 +63,4 @@ module.exports = function (hbs, templatePath, basePath) {
 
   let result = recast.print(ast);
   return result;
-};
+}

package/src/rewriteCss.js

@@ -1,6 +1,6 @@
-const parser = require('postcss-selector-parser');
-const postcss = require('postcss');
-const isInsideGlobal = require('./isInsideGlobal');
+import parser from 'postcss-selector-parser';
+import postcss from 'postcss';
+import isInsideGlobal from './isInsideGlobal.js';
 
 function rewriteSelector(sel, postfix) {
   const transform = (selectors) => {
@@ -33,7 +33,7 @@ function isInsideKeyframes(node) {
   return isInsideKeyframes(parent);
 }
 
-module.exports = function rewriteCss(css, postfix, fileName) {
+export default function rewriteCss(css, postfix, fileName) {
   const ast = postcss.parse(css);
   ast.walk((node) => {
     if (node.type === 'rule' && !isInsideKeyframes(node)) {
@@ -44,4 +44,4 @@ module.exports = function rewriteCss(css, postfix, fileName) {
   const rewrittenCss = ast.toString();
   return `/* ${fileName} */\n@layer components {\n\n` + rewrittenCss + '\n}\n';
   // return `/* ${fileName} */\n ${rewrittenCss}`;
-};
+}

package/src/rewriteHbs.js

@@ -1,7 +1,7 @@
-const recast = require('ember-template-recast');
-const renameClass = require('./renameClass');
+import recast from 'ember-template-recast';
+import renameClass from './renameClass.js';
 
-module.exports = function rewriteHbs(hbs, classes, tags, postfix) {
+export default function rewriteHbs(hbs, classes, tags, postfix) {
   let ast = recast.parse(hbs);
 
   recast.traverse(ast, {
@@ -39,4 +39,4 @@ module.exports = function rewriteHbs(hbs, classes, tags, postfix) {
 
   let result = recast.print(ast);
   return result;
-};
+}

package/src/rollup-ember-template-imports-plugin.js

@@ -1,14 +1,12 @@
-const fs = require('fs/promises');
-const path = require('path');
-const {
-  preprocessEmbeddedTemplates,
-} = require('ember-template-imports/lib/preprocess-embedded-templates.js');
-const {
+import fs from 'fs/promises';
+import path from 'path';
+import { preprocessEmbeddedTemplates } from 'ember-template-imports/lib/preprocess-embedded-templates.js';
+import {
   TEMPLATE_TAG_NAME,
   TEMPLATE_TAG_PLACEHOLDER,
-} = require('ember-template-imports/lib/util.js');
+} from 'ember-template-imports/lib/util.js';
 
-module.exports = function firstClassComponentTemplates() {
+export default function firstClassComponentTemplates() {
   return {
     name: 'preprocess-fccts',
     async resolveId(source, importer, options) {
@@ -42,7 +40,7 @@ module.exports = function firstClassComponentTemplates() {
       }
     },
   };
-};
+}
 
 const FCCT_EXTENSION = /\.g([jt]s)$/;
 

package/src/scopedClass.js

@@ -1,6 +1,6 @@
-const getPostfix = require('./getPostfix');
-const renameClass = require('./renameClass');
+import generateHash from './generateHash.js';
+import renameClass from './renameClass.js';
 
-module.exports.scopedClass = function (className, relativeCssPath) {
-  return renameClass(className, getPostfix(relativeCssPath));
-};
+export function scopedClass(className, relativeCssPath) {
+  return renameClass(className, generateHash(relativeCssPath));
+}

package/test/getClassesTagsFromCss.js

@@ -1,5 +1,5 @@
-const expect = require('chai').expect;
-const getClassesTagsFromCss = require('../src/getClassesTagsFromCss');
+import { expect } from 'chai';
+import getClassesTagsFromCss from '../src/getClassesTagsFromCss.js';
 
 describe('rewriteCss', function () {
   it('should return classes and tags that are not in :global', function () {

package/test/getPostfix.js

@@ -1,6 +1,6 @@
-const expect = require('chai').expect;
-const { stub } = require('sinon');
-const getPostfix = require('../src/getPostfix');
+import { expect } from 'chai';
+import { stub } from 'sinon';
+import getPostfix from '../src/getPostfix.js';
 
 describe('getPostfix', function () {
   it('should return a string', function () {

package/test/rewriteCss.js

@@ -1,6 +1,6 @@
-const expect = require('chai').expect;
-const { stub } = require('sinon');
-const rewriteCss = require('../src/rewriteCss');
+import { expect } from 'chai';
+import { stub } from 'sinon';
+import rewriteCss from '../src/rewriteCss.js';
 
 describe('rewriteCss', function () {
   it('should rewrite css', function () {