@pwrs/lit-css 3.0.0 → 4.0.0

package/lit-css.cjs

@@ -35,6 +35,7 @@ var require_src = __commonJS({
     var path = require("path");
     var fs = require("fs");
     var os = require("os");
+    var url = require("url");
     var fsReadFileAsync = fs.promises.readFile;
     function getDefaultSearchPlaces(name, sync) {
       return [
@@ -57,20 +58,25 @@ var require_src = __commonJS({
       return path.dirname(p) || path.sep;
     }
     var jsonLoader = (_, content) => JSON.parse(content);
+    var requireFunc = typeof __webpack_require__ === "function" ? __non_webpack_require__ : require;
     var defaultLoadersSync = Object.freeze({
-      ".js": require,
-      ".json": require,
-      ".cjs": require,
+      ".js": requireFunc,
+      ".json": requireFunc,
+      ".cjs": requireFunc,
       noExt: jsonLoader
     });
     module2.exports.defaultLoadersSync = defaultLoadersSync;
     var dynamicImport = async (id) => {
       try {
-        const mod = await import(id);
+        const fileUrl = url.pathToFileURL(id).href;
+        const mod = await import(
+          /* webpackIgnore: true */
+          fileUrl
+        );
         return mod.default;
       } catch (e) {
         try {
-          return require(id);
+          return requireFunc(id);
         } catch (requireE) {
           if (requireE.code === "ERR_REQUIRE_ESM" || requireE instanceof SyntaxError && requireE.toString().includes("Cannot use import statement outside a module")) {
             throw e;
@@ -116,26 +122,21 @@ var require_src = __commonJS({
       return conf;
     }
     function getPackageProp(props, obj) {
-      if (typeof props === "string" && props in obj)
-        return obj[props];
+      if (typeof props === "string" && props in obj) return obj[props];
       return (Array.isArray(props) ? props : props.split(".")).reduce(
         (acc, prop) => acc === void 0 ? acc : acc[prop],
         obj
       ) || null;
     }
     function validateFilePath(filepath) {
-      if (!filepath)
-        throw new Error("load must pass a non-empty string");
+      if (!filepath) throw new Error("load must pass a non-empty string");
     }
     function validateLoader(loader, ext) {
-      if (!loader)
-        throw new Error(`No loader specified for extension "${ext}"`);
-      if (typeof loader !== "function")
-        throw new Error("loader is not a function");
+      if (!loader) throw new Error(`No loader specified for extension "${ext}"`);
+      if (typeof loader !== "function") throw new Error("loader is not a function");
     }
     var makeEmplace = (enableCache) => (c, filepath, res) => {
-      if (enableCache)
-        c.set(filepath, res);
+      if (enableCache) c.set(filepath, res);
       return res;
     };
     module2.exports.lilconfig = function lilconfig(name, options) {
@@ -159,61 +160,56 @@ var require_src = __commonJS({
           };
           const visited = /* @__PURE__ */ new Set();
           let dir = searchFrom;
-          dirLoop:
-            while (true) {
-              if (cache) {
-                const r = searchCache.get(dir);
-                if (r !== void 0) {
-                  for (const p of visited)
-                    searchCache.set(p, r);
-                  return r;
-                }
-                visited.add(dir);
+          dirLoop: while (true) {
+            if (cache) {
+              const r = searchCache.get(dir);
+              if (r !== void 0) {
+                for (const p of visited) searchCache.set(p, r);
+                return r;
               }
-              for (const searchPlace of searchPlaces) {
-                const filepath = path.join(dir, searchPlace);
-                try {
-                  await fs.promises.access(filepath);
-                } catch (e) {
-                  continue;
-                }
-                const content = String(await fsReadFileAsync(filepath));
-                const loaderKey = path.extname(searchPlace) || "noExt";
-                const loader = loaders[loaderKey];
-                if (searchPlace === "package.json") {
-                  const pkg = await loader(filepath, content);
-                  const maybeConfig = getPackageProp(packageProp, pkg);
-                  if (maybeConfig != null) {
-                    result.config = maybeConfig;
-                    result.filepath = filepath;
-                    break dirLoop;
-                  }
-                  continue;
-                }
-                const isEmpty = content.trim() === "";
-                if (isEmpty && ignoreEmptySearchPlaces)
-                  continue;
-                if (isEmpty) {
-                  result.isEmpty = true;
-                  result.config = void 0;
-                } else {
-                  validateLoader(loader, loaderKey);
-                  result.config = await loader(filepath, content);
+              visited.add(dir);
+            }
+            for (const searchPlace of searchPlaces) {
+              const filepath = path.join(dir, searchPlace);
+              try {
+                await fs.promises.access(filepath);
+              } catch (e) {
+                continue;
+              }
+              const content = String(await fsReadFileAsync(filepath));
+              const loaderKey = path.extname(searchPlace) || "noExt";
+              const loader = loaders[loaderKey];
+              if (searchPlace === "package.json") {
+                const pkg = await loader(filepath, content);
+                const maybeConfig = getPackageProp(packageProp, pkg);
+                if (maybeConfig != null) {
+                  result.config = maybeConfig;
+                  result.filepath = filepath;
+                  break dirLoop;
                 }
-                result.filepath = filepath;
-                break dirLoop;
+                continue;
+              }
+              const isEmpty = content.trim() === "";
+              if (isEmpty && ignoreEmptySearchPlaces) continue;
+              if (isEmpty) {
+                result.isEmpty = true;
+                result.config = void 0;
+              } else {
+                validateLoader(loader, loaderKey);
+                result.config = await loader(filepath, content);
               }
-              if (dir === stopDir || dir === parentDir(dir))
-                break dirLoop;
-              dir = parentDir(dir);
+              result.filepath = filepath;
+              break dirLoop;
             }
+            if (dir === stopDir || dir === parentDir(dir)) break dirLoop;
+            dir = parentDir(dir);
+          }
           const transformed = (
             // not found
             result.filepath === "" && result.config === null ? transform2(null) : transform2(result)
           );
           if (cache) {
-            for (const p of visited)
-              searchCache.set(p, transformed);
+            for (const p of visited) searchCache.set(p, transformed);
           }
           return transformed;
         },
@@ -262,12 +258,10 @@ var require_src = __commonJS({
           );
         },
         clearLoadCache() {
-          if (cache)
-            loadCache.clear();
+          if (cache) loadCache.clear();
         },
         clearSearchCache() {
-          if (cache)
-            searchCache.clear();
+          if (cache) searchCache.clear();
         },
         clearCaches() {
           if (cache) {
@@ -298,61 +292,56 @@ var require_src = __commonJS({
           };
           const visited = /* @__PURE__ */ new Set();
           let dir = searchFrom;
-          dirLoop:
-            while (true) {
-              if (cache) {
-                const r = searchCache.get(dir);
-                if (r !== void 0) {
-                  for (const p of visited)
-                    searchCache.set(p, r);
-                  return r;
-                }
-                visited.add(dir);
+          dirLoop: while (true) {
+            if (cache) {
+              const r = searchCache.get(dir);
+              if (r !== void 0) {
+                for (const p of visited) searchCache.set(p, r);
+                return r;
               }
-              for (const searchPlace of searchPlaces) {
-                const filepath = path.join(dir, searchPlace);
-                try {
-                  fs.accessSync(filepath);
-                } catch (e) {
-                  continue;
-                }
-                const loaderKey = path.extname(searchPlace) || "noExt";
-                const loader = loaders[loaderKey];
-                const content = String(fs.readFileSync(filepath));
-                if (searchPlace === "package.json") {
-                  const pkg = loader(filepath, content);
-                  const maybeConfig = getPackageProp(packageProp, pkg);
-                  if (maybeConfig != null) {
-                    result.config = maybeConfig;
-                    result.filepath = filepath;
-                    break dirLoop;
-                  }
-                  continue;
-                }
-                const isEmpty = content.trim() === "";
-                if (isEmpty && ignoreEmptySearchPlaces)
-                  continue;
-                if (isEmpty) {
-                  result.isEmpty = true;
-                  result.config = void 0;
-                } else {
-                  validateLoader(loader, loaderKey);
-                  result.config = loader(filepath, content);
+              visited.add(dir);
+            }
+            for (const searchPlace of searchPlaces) {
+              const filepath = path.join(dir, searchPlace);
+              try {
+                fs.accessSync(filepath);
+              } catch (e) {
+                continue;
+              }
+              const loaderKey = path.extname(searchPlace) || "noExt";
+              const loader = loaders[loaderKey];
+              const content = String(fs.readFileSync(filepath));
+              if (searchPlace === "package.json") {
+                const pkg = loader(filepath, content);
+                const maybeConfig = getPackageProp(packageProp, pkg);
+                if (maybeConfig != null) {
+                  result.config = maybeConfig;
+                  result.filepath = filepath;
+                  break dirLoop;
                 }
-                result.filepath = filepath;
-                break dirLoop;
+                continue;
+              }
+              const isEmpty = content.trim() === "";
+              if (isEmpty && ignoreEmptySearchPlaces) continue;
+              if (isEmpty) {
+                result.isEmpty = true;
+                result.config = void 0;
+              } else {
+                validateLoader(loader, loaderKey);
+                result.config = loader(filepath, content);
               }
-              if (dir === stopDir || dir === parentDir(dir))
-                break dirLoop;
-              dir = parentDir(dir);
+              result.filepath = filepath;
+              break dirLoop;
             }
+            if (dir === stopDir || dir === parentDir(dir)) break dirLoop;
+            dir = parentDir(dir);
+          }
           const transformed = (
             // not found
             result.filepath === "" && result.config === null ? transform2(null) : transform2(result)
           );
           if (cache) {
-            for (const p of visited)
-              searchCache.set(p, transformed);
+            for (const p of visited) searchCache.set(p, transformed);
           }
           return transformed;
         },
@@ -397,12 +386,10 @@ var require_src = __commonJS({
           );
         },
         clearLoadCache() {
-          if (cache)
-            loadCache.clear();
+          if (cache) loadCache.clear();
         },
         clearSearchCache() {
-          if (cache)
-            searchCache.clear();
+          if (cache) searchCache.clear();
         },
         clearCaches() {
           if (cache) {
@@ -1005,10 +992,8 @@ var require_main = __commonJS({
         return function(a, b) {
           a = removeVendorPrefix(a);
           b = removeVendorPrefix(b);
-          if (shorthandData2[a] && shorthandData2[a].includes(b))
-            return 0;
-          if (shorthandData2[b] && shorthandData2[b].includes(a))
-            return 0;
+          if (shorthandData2[a] && shorthandData2[a].includes(b)) return 0;
+          if (shorthandData2[b] && shorthandData2[b].includes(a)) return 0;
           return comparator(a, b);
         };
       };
@@ -2424,6 +2409,22 @@ var require_src3 = __commonJS({
         },
         cssDeclarationSorter: {
           keepOverrides: true
+        },
+        minifySelectors: {
+          sort: true
+        },
+        svgo: {
+          plugins: [
+            {
+              name: "preset-default",
+              params: {
+                overrides: {
+                  removeViewBox: false,
+                  removeTitle: false
+                }
+              }
+            }
+          ]
         }
       };
       return plugins.map(([plugin, opt]) => {
@@ -2485,6 +2486,7 @@ var require_src4 = __commonJS({
     var path = require("path");
     var postcss = require("postcss");
     var { lilconfigSync } = require_src();
+    var defaultPreset = require_src3();
     var cssnano2 = "cssnano";
     function isResolvable(moduleId) {
       try {
@@ -2507,7 +2509,7 @@ var require_src4 = __commonJS({
         return fn.plugins;
       }
       if (fn === "default") {
-        return require_src3()(options).plugins;
+        return defaultPreset(options).plugins;
       }
       if (typeof fn === "function") {
         return fn(options).plugins;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pwrs/lit-css",
   "description": "Import CSS files as css tagged-template literals",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "type": "module",
   "main": "lit-css.js",
   "types": "lit-css.d.ts",
@@ -30,6 +30,6 @@
     "lit-css.d.ts"
   ],
   "dependencies": {
-    "cssnano": "^6.1.2"
+    "cssnano": "^7.0.7"
   }
 }