carbon-preprocess-svelte 0.11.1 → 0.11.3

package/dist/plugins/OptimizeCssPlugin.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
-const compare_diff_1 = require("./compare-diff");
 const create_optimized_css_1 = require("./create-optimized-css");
+const print_diff_1 = require("./print-diff");
 // Webpack plugin to optimize CSS for Carbon Svelte components.
 class OptimizeCssPlugin {
     constructor(options) {
@@ -35,10 +35,10 @@ class OptimizeCssPlugin {
                 for (const [id] of Object.entries(assets)) {
                     if ((0, utils_1.isCssFile)(id)) {
                         const original_css = assets[id].source();
-                        const optimized_css = (0, create_optimized_css_1.createOptimizedCss)(original_css, ids, this.options);
+                        const optimized_css = (0, create_optimized_css_1.createOptimizedCss)(Object.assign(Object.assign({}, this.options), { source: original_css, ids }));
                         compilation.updateAsset(id, new RawSource(optimized_css));
                         if (this.options.verbose) {
-                            (0, compare_diff_1.compareDiff)({ original_css, optimized_css, id });
+                            (0, print_diff_1.printDiff)({ original_css, optimized_css, id });
                         }
                     }
                 }

package/dist/plugins/create-optimized-css.d.ts

@@ -22,4 +22,9 @@ export type OptimizeCssOptions = {
      */
     preserveAllIBMFonts?: boolean;
 };
-export declare function createOptimizedCss(original_css: Uint8Array | string, ids: string[], options?: OptimizeCssOptions): string;
+type CreateOptimizedCssOptions = OptimizeCssOptions & {
+    source: Uint8Array | string;
+    ids: string[];
+};
+export declare function createOptimizedCss(options: CreateOptimizedCssOptions): string;
+export {};

package/dist/plugins/create-optimized-css.js

@@ -9,7 +9,8 @@ const postcss_1 = __importDefault(require("postcss"));
 const postcss_discard_empty_1 = __importDefault(require("postcss-discard-empty"));
 const component_index_1 = require("../component-index");
 const constants_1 = require("../constants");
-function createOptimizedCss(original_css, ids, options) {
+function createOptimizedCss(options) {
+    const { source, ids } = options;
     const preserveAllIBMFonts = (options === null || options === void 0 ? void 0 : options.preserveAllIBMFonts) === true;
     // List of Carbon classes that must be preserved in the CSS
     // but that are not referenced in Carbon Svelte components.
@@ -62,13 +63,9 @@ function createOptimizedCss(original_css, ids, options) {
                     node.walkDecls((decl) => {
                         switch (decl.prop) {
                             case "font-family":
-                                attributes["font-family"] = decl.value;
-                                break;
                             case "font-style":
-                                attributes["font-style"] = decl.value;
-                                break;
                             case "font-weight":
-                                attributes["font-weight"] = decl.value;
+                                attributes[decl.prop] = decl.value;
                                 break;
                         }
                     });
@@ -85,6 +82,6 @@ function createOptimizedCss(original_css, ids, options) {
             },
         },
         (0, postcss_discard_empty_1.default)(),
-    ]).process(original_css).css;
+    ]).process(source).css;
 }
 exports.createOptimizedCss = createOptimizedCss;

package/dist/plugins/optimize-css.js

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.optimizeCss = void 0;
 const utils_1 = require("../utils");
-const compare_diff_1 = require("./compare-diff");
 const create_optimized_css_1 = require("./create-optimized-css");
+const print_diff_1 = require("./print-diff");
 // Vite plugin (Rollup-compatible) to optimize CSS for Carbon Svelte components.
 const optimizeCss = (options) => {
     const verbose = (options === null || options === void 0 ? void 0 : options.verbose) !== false;
@@ -35,10 +35,10 @@ const optimizeCss = (options) => {
                     const file = bundle[id];
                     if (file.type === "asset" && (0, utils_1.isCssFile)(id)) {
                         const original_css = file.source;
-                        const optimized_css = (0, create_optimized_css_1.createOptimizedCss)(original_css, ids, options);
+                        const optimized_css = (0, create_optimized_css_1.createOptimizedCss)(Object.assign(Object.assign({}, options), { source: original_css, ids }));
                         file.source = optimized_css;
                         if (verbose) {
-                            (0, compare_diff_1.compareDiff)({ original_css, optimized_css, id });
+                            (0, print_diff_1.printDiff)({ original_css, optimized_css, id });
                         }
                     }
                 }

package/dist/plugins/{compare-diff.d.ts → print-diff.d.ts}

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-export declare function compareDiff(props: {
+export declare function printDiff(props: {
     original_css: Uint8Array | Buffer | string;
     optimized_css: string;
     id: string;

package/dist/plugins/{compare-diff.js → print-diff.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareDiff = void 0;
+exports.printDiff = void 0;
 const constants_1 = require("../constants");
 const formatter = new Intl.NumberFormat("en-US", { maximumFractionDigits: 2 });
 function toHumanReadableSize(size_in_kb) {
@@ -19,10 +19,13 @@ function stringSizeInKB(str) {
 function padIfNeeded(a, b) {
     return a.length > b.length ? a : a.padStart(b.length, " ");
 }
-function compareDiff(props) {
+function printDiff(props) {
     const { original_css, optimized_css, id } = props;
     const original_size = stringSizeInKB(original_css.toString());
     const optimized_size = stringSizeInKB(optimized_css);
+    if (original_size === optimized_size) {
+        return;
+    }
     const original = toHumanReadableSize(original_size);
     const optimized = toHumanReadableSize(optimized_size);
     const original_display = padIfNeeded(original, optimized);
@@ -33,4 +36,4 @@ function compareDiff(props) {
     console.log("Before:", original_display);
     console.log("After: ", optimized_display, `(-${diff})\n`);
 }
-exports.compareDiff = compareDiff;
+exports.printDiff = printDiff;

package/dist/preprocessors/optimize-imports.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.optimizeImports = void 0;
+const estree_walker_1 = require("estree-walker");
 const magic_string_1 = __importDefault(require("magic-string"));
 const compiler_1 = require("svelte/compiler");
 const component_index_1 = require("../component-index");
@@ -29,7 +30,7 @@ const optimizeImports = () => {
             // Wrap the content in a `<script>` tag to parse it with the Svelte parser.
             const content = `<script>${raw}</script>`;
             const s = new magic_string_1.default(content);
-            (0, compiler_1.walk)((0, compiler_1.parse)(content), {
+            (0, estree_walker_1.walk)((0, compiler_1.parse)(content), {
                 enter(node) {
                     if (node.type === "ImportDeclaration") {
                         const import_name = node.source.value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-preprocess-svelte",
-  "version": "0.11.1",
+  "version": "0.11.3",
   "license": "Apache-2.0",
   "description": "Svelte preprocessors for the Carbon Design System",
   "author": "Eric Liu (https://github.com/metonym)",
@@ -8,16 +8,18 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "index:components": "bun scripts/index-components.ts",
-    "prepack": "tsc -p tsconfig.build.json",
-    "format": "bunx --bun prettier --write ."
+    "build": "bun --bun tsc -p tsconfig.build.json",
+    "format": "bun --bun prettier --write . --cache"
   },
   "dependencies": {
+    "estree-walker": "^2.0.2",
     "magic-string": "^0.30.8",
     "postcss": "^8.4.36",
     "postcss-discard-empty": "^6.0.3"
   },
   "devDependencies": {
     "@types/bun": "latest",
+    "@types/jest": "latest",
     "carbon-components-svelte": "0.85.0",
     "prettier": "latest",
     "svelte": "latest",