ember-scoped-css 0.2.12 → 0.3.0

package/dist/app-dependency-loader.cjs

@@ -0,0 +1,51 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/app-dependency-loader.js
+var app_dependency_loader_exports = {};
+__export(app_dependency_loader_exports, {
+  default: () => app_dependency_loader_default
+});
+module.exports = __toCommonJS(app_dependency_loader_exports);
+
+// src/fsExists.js
+var import_promises = require("fs/promises");
+async function fsExists_default(path) {
+  try {
+    await (0, import_promises.stat)(path);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+// src/app-dependency-loader.js
+async function app_dependency_loader_default(source) {
+  if (this.resourcePath.endsWith(".js")) {
+    const hbsExists = await fsExists_default(this.resourcePath.replace(/\.js/, ".hbs"));
+    if (hbsExists) {
+      return source;
+    }
+  }
+  const cssPath = this.resourcePath.replace(/(\.js)|(\.hbs)/, ".css");
+  const cssExists = await fsExists_default(cssPath);
+  if (cssExists) {
+    this.addDependency(cssPath);
+  }
+  return source;
+}

package/index.js

@@ -1,23 +1,17 @@
-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';
 
 export {
-  rollupEmberTemplateImportsPlugin,
   addonJsUnplugin,
   addonCssRollup,
   addonHbsRollup,
   appJsUnplugin,
   appCssUnplugin,
-  appCssLoader,
-  appDependencyLoader,
   appScopedcssWebpack,
   addonRewritecssRollup,
 };

package/package.json

@@ -1,23 +1,37 @@
 {
   "name": "ember-scoped-css",
-  "version": "0.2.12",
+  "version": "0.3.0",
   "description": "",
+  "keywords": [],
+  "license": "ISC",
+  "author": "",
   "type": "module",
-  "main": "index.js",
   "exports": {
     ".": "./index.js",
     "./babel-plugin-scoped-class": "./src/babel-plugin-scoped-class.js",
-    "./test-helper": "./src/scopedClass.js"
+    "./test-helper": "./src/scopedClass.js",
+    "./app-css-loader": {
+      "import": "./src/app-css-loader.js",
+      "require": "./dist/app-css-loader.cjs"
+    },
+    "./app-dependency-loader": {
+      "import": "./src/app-dependency-loader.js",
+      "require": "./dist/app-dependency-loader.cjs"
+    }
+  },
+  "main": "index.js",
+  "scripts": {
+    "esbuild": "esbuild src/app-css-loader.js src/app-dependency-loader.js --bundle --outdir=dist --platform=node --out-extension:.js=.cjs",
+    "lint": "eslint .",
+    "prepare": "npm run esbuild",
+    "release": "npx release-it",
+    "test": "mocha"
   },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
   "dependencies": {
     "@babel/parser": "^7.21.4",
     "blueimp-md5": "^2.19.0",
     "cheerio": "1.0.0-rc.12",
     "ember-source": "^4.10.0",
-    "ember-template-imports": "github:candunaj/ember-template-imports#embed-styles-in-gjs",
     "ember-template-recast": "^6.1.3",
     "glob": "^8.1.0",
     "postcss": "^8.4.21",
@@ -28,12 +42,33 @@
   },
   "devDependencies": {
     "chai": "^4.3.7",
+    "esbuild": "^0.17.17",
+    "eslint": "^8.38.0",
     "mocha": "^10.2.0",
+    "release-it": "^15.10.1",
+    "release-it-lerna-changelog": "^5.0.0",
     "sinon": "^15.0.1",
     "webpack": "^5.75.0"
   },
-  "scripts": {
-    "test": "mocha",
-    "lint": ""
+  "peerDependencies": {
+    "webpack": "^5.0.0"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "release-it": {
+    "plugins": {
+      "release-it-lerna-changelog": {
+        "infile": "../CHANGELOG.md",
+        "launchEditor": true
+      }
+    },
+    "git": {
+      "tagName": "v${version}"
+    },
+    "github": {
+      "release": true,
+      "tokenRef": "GITHUB_AUTH"
+    }
   }
-}
+}

package/src/addon-css-rollup.js

@@ -1,11 +1,5 @@
 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';
 
 export default function () {
   return {

package/src/addon-hbs-rollup.js

@@ -5,7 +5,7 @@ import getClassesTagsFromCss from './getClassesTagsFromCss.js';
 import rewriteHbs from './rewriteHbs.js';
 import fsExists from './fsExists.js';
 
-export default function rollupCssColocation(options = {}) {
+export default function rollupCssColocation() {
   return {
     name: 'addon-hbs-rollup',
 
@@ -34,7 +34,11 @@ export default function rollupCssColocation(options = {}) {
             return rewriteHbs(hbs, classes, tags, postfix);
           });
 
-          return rewrittenHbsJs;
+          return {
+            code: rewrittenHbsJs,
+            // this rollup plugin changes only the template string, so the code structure is the same
+            map: null,
+          };
         }
       }
     },

package/src/addon-js-unplugin.js

@@ -9,7 +9,7 @@ import fsExists from './fsExists.js';
 import findCssInJs from './findCssInJs.js';
 import recast from 'recast';
 
-export default createUnplugin((options) => {
+export default createUnplugin(() => {
   return {
     name: 'addon-js-unplugin',
 
@@ -31,11 +31,16 @@ export default createUnplugin((options) => {
           css = result.css;
           code = recast.print(result.ast).code;
           this.getModuleInfo(jsPath).meta.gjsCss = result.css;
+
+          // TODO: generate changed source map. Implementation depends on implemented rollup plugin for style tag
         }
       }
 
       if (!css) {
-        return code;
+        return {
+          code,
+          map: null,
+        };
       }
 
       // add css import for js and gjs files
@@ -44,12 +49,17 @@ export default createUnplugin((options) => {
       // rewrite hbs in js in case it is gjs file (for gjs files hbs is already in js file)
       // for js components "@embroider/addon-dev/template-colocation-plugin", will add hbs to js later. So there is hbs plugin to rewrite hbs
 
-      return replaceHbsInJs(code, (hbs) => {
+      const rewrittenCode = replaceHbsInJs(code, (hbs) => {
         const { classes, tags } = getClassesTagsFromCss(css);
         const postfix = getPostfix(cssPath);
         const rewritten = rewriteHbs(hbs, classes, tags, postfix);
         return rewritten;
       });
+
+      return {
+        code: rewrittenCode,
+        map: null,
+      };
     },
   };
 });

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

@@ -1,11 +1,10 @@
 import { createUnplugin } from 'unplugin';
 import path from 'path';
-import { readFile, writeFile } from 'fs/promises';
+import { readFile } from 'fs/promises';
 import { Compilation } from 'webpack';
 import getPostfix from './getPostfix.js';
-import cheerio from 'cheerio';
 
-export default createUnplugin(({ appDir, loaders, htmlEntrypointInfo }) => {
+export default createUnplugin(({ loaders, htmlEntrypointInfo }) => {
   return {
     name: 'app-css-livereload-loader',
 
@@ -77,7 +76,7 @@ export default createUnplugin(({ appDir, loaders, htmlEntrypointInfo }) => {
               if (!cssAssets.length) {
                 return;
               }
-              let linkAdded = false;
+              // let linkAdded = false;
               const document =
                 htmlEntrypointInfo.htmlEntryPoint.dom.window.document;
 
@@ -92,7 +91,7 @@ export default createUnplugin(({ appDir, loaders, htmlEntrypointInfo }) => {
                   link.rel = 'stylesheet';
                   link.href = '/' + asset;
                   head.appendChild(link);
-                  linkAdded = true;
+                  // linkAdded = true;
                 }
               }
 

package/src/app-css-loader.js

@@ -1,5 +1,5 @@
 // import { createUnplugin }  from 'unplugin';
-import { basename, join } from 'path';
+import { basename } from 'path';
 import fsExists from './fsExists.js';
 import getPostfix from './getPostfix.js';
 import rewriteCss from './rewriteCss.js';

package/src/app-css-unplugin.js

@@ -1,10 +1,4 @@
 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';
 
 export default createUnplugin(() => {
   return {

package/src/app-js-unplugin.js

@@ -3,8 +3,6 @@ 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) {
@@ -50,14 +48,11 @@ export default createUnplugin(({ appDir }) => {
 
     async transform(code, id) {
       const cssPath = id.replace(/(\.js)|(\.hbs)/, '.css');
-      const cssFileName = path.basename(cssPath);
       const postfix = getPostfix(cssPath);
 
       return await replaceGlimmerAst(code, id, (opcodes, css) => {
         const { classes, tags } = getClassesTagsFromCss(css);
-        const a = code;
         // this.addWatchFile(cssPath);
-        const tmp = this;
         const insertions = [];
 
         for (let instruction of iterateOpcodes(opcodes[0])) {

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

@@ -5,9 +5,7 @@ const scopedClass = () => {
     visitor: {
       CallExpression(path, state) {
         if (path.node?.callee?.name === 'precompileTemplate') {
-          let source = '';
           if (path.node.arguments[0].type === 'StringLiteral') {
-            source = path.node.arguments[0].value;
             path.node.arguments[0].value = replaceScopedClass(
               path.node.arguments[0].value,
               state.filename,

package/src/replaceScopedClass.js

@@ -2,7 +2,7 @@ import recast from 'ember-template-recast';
 import renameClass from './renameClass.js';
 import getPostfix from './getPostfix.js';
 
-export default function (hbs, templatePath, basePath) {
+export default function (hbs, templatePath) {
   let ast = recast.parse(hbs);
   let stack = [];
   const cssPath = templatePath.replace(/(\.hbs)?\.js$/, '.css');
@@ -13,7 +13,7 @@ export default function (hbs, templatePath, basePath) {
       enter(node) {
         stack.push(node);
       },
-      exit(node) {
+      exit() {
         stack.pop();
       },
     },

package/test/getPostfix.js

@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import { stub } from 'sinon';
 import getPostfix from '../src/getPostfix.js';
 
 describe('getPostfix', function () {

package/test/rewriteCss.js

@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import { stub } from 'sinon';
 import rewriteCss from '../src/rewriteCss.js';
 
 describe('rewriteCss', function () {

package/LICENSE.md

@@ -1,9 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2023
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -1,75 +0,0 @@
-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,
-} from 'ember-template-imports/lib/util.js';
-
-export default function firstClassComponentTemplates() {
-  return {
-    name: 'preprocess-fccts',
-    async resolveId(source, importer, options) {
-      if (source.endsWith('.hbs')) return;
-
-      for (let ext of ['', '.gjs', '.gts']) {
-        let result = await this.resolve(source + ext, importer, {
-          ...options,
-          skipSelf: true,
-        });
-
-        if (result?.external) {
-          return;
-        }
-
-        if (FCCT_EXTENSION.test(result?.id)) {
-          return resolutionFor(result.id);
-        }
-      }
-    },
-
-    async load(id) {
-      let originalId = this.getModuleInfo(id)?.meta?.fccts?.originalId ?? id;
-
-      if (originalId !== id) {
-        this.addWatchFile(originalId);
-      }
-
-      if (FCCT_EXTENSION.test(originalId)) {
-        return await preprocessTemplates(originalId);
-      }
-    },
-  };
-}
-
-const FCCT_EXTENSION = /\.g([jt]s)$/;
-
-function resolutionFor(originalId) {
-  return {
-    id: originalId.replace(FCCT_EXTENSION, '.$1'),
-    meta: {
-      fccts: { originalId },
-    },
-  };
-}
-
-async function preprocessTemplates(id) {
-  let ember = (await import('ember-source')).default;
-  let contents = await fs.readFile(id, 'utf-8');
-
-  // This is basically taken directly from `ember-template-imports`
-  let result = preprocessEmbeddedTemplates(contents, {
-    relativePath: path.relative('.', id),
-
-    getTemplateLocalsRequirePath: ember.absolutePaths.templateCompiler,
-    getTemplateLocalsExportPath: '_GlimmerSyntax.getTemplateLocals',
-
-    templateTag: TEMPLATE_TAG_NAME,
-    templateTagReplacement: TEMPLATE_TAG_PLACEHOLDER,
-
-    includeSourceMaps: true,
-    includeTemplateTokens: true,
-  });
-
-  return result.output;
-}