2.6.3

Author: indooorsman

changelog.md

@@ -1,3 +1,7 @@
+## V2.6.3
+- upgrade dependencies
+- fix #45 #46, thanks to @markdalgleish
+
 ## V2.6.0
 - `@parcel/css` now named `lightningcss`
 - support pascal case by @FuriouZz [#43](https://github.com/indooorsman/esbuild-css-modules-plugin/pull/43)

lib/plugin.js

@@ -167,9 +167,9 @@ const prepareBuild = async (build, options) => {
  */
 const onResolveModulesCss = async (args, build) => {
   const { resolve, initialOptions, context } = build;
-  const { resolveDir, path: p, pluginData = {} } = args;
+  const { resolveDir, path: p, pluginData = {}, kind } = args;
   const { log, relative } = context;
-  const { path: absPath } = await resolve(p, { resolveDir });
+  const { path: absPath } = await resolve(p, { resolveDir, kind });
   const rpath = relative(absPath);
   log('resolve', p, 'to', rpath, 'from build root');
 
@@ -455,13 +455,13 @@ const setup = async (build, options) => {
   const builtModulesCssRegExp = getBuiltModulesCssRegExp(options);
 
   // resolve xxx.module.css to xxx.module.css?esbuild-css-modules-plugin-building
-  build.onResolve({ filter: modulesCssRegExp, namespace: 'file' }, async (args) => {
-    return await onResolveModulesCss(args, build);
+  build.onResolve({ filter: modulesCssRegExp, namespace: 'file' }, (args) => {
+    return onResolveModulesCss(args, build);
   });
 
   // load xxx.module.css?esbuild-css-modules-plugin-building
-  build.onLoad({ filter: modulesCssRegExp, namespace: pluginNamespace }, async (args) => {
-    return await onLoadModulesCss(build, options, args);
+  build.onLoad({ filter: modulesCssRegExp, namespace: pluginNamespace }, (args) => {
+    return onLoadModulesCss(build, options, args);
   });
 
   // resolve virtual path xxx.module.css?esbuild-css-modules-plugin-built
@@ -470,8 +470,8 @@ const setup = async (build, options) => {
       filter: builtModulesCssRegExp,
       namespace: pluginNamespace
     },
-    async (args) => {
-      return await onResolveBuiltModulesCss(args, build);
+    (args) => {
+      return onResolveBuiltModulesCss(args, build);
     }
   );
 
@@ -481,13 +481,13 @@ const setup = async (build, options) => {
       filter: builtModulesCssRegExp,
       namespace: pluginNamespace
     },
-    async (args) => {
-      return await onLoadBuiltModulesCss(args, build);
+    (args) => {
+      return onLoadBuiltModulesCss(args, build);
     }
   );
 
   build.onEnd(async (result) => {
-    await onEnd(build, options, result);
+    onEnd(build, options, result);
   });
 };
 

lib/utils.js

@@ -160,7 +160,7 @@ const getBuildId = async (build) => {
   if (Array.isArray(entryPoints)) {
     entries = [...entryPoints];
   } else {
-    Object.keys(entryPoints)
+    Object.keys(entryPoints ?? {})
       .sort()
       .forEach((k) => {
         entries.push(entryPoints[k]);
@@ -170,9 +170,12 @@ const getBuildId = async (build) => {
     `// ${packageName}@${packageVersion}\n` +
     (
       await Promise.all(
-        entries.map(async (p) => {
+        entries.map((p) => {
+          if (!p) {
+            return Promise.resolve('');
+          }
           const absPath = path.isAbsolute(p) ? p : path.resolve(buildRoot, p);
-          return (await readFile(absPath, { encoding: 'utf8' })).trim();
+          return readFile(absPath, { encoding: 'utf8' }).catch(() => '');
         })
       )
     ).join('\n');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "esbuild-css-modules-plugin",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "A esbuild plugin to bundle css modules into js(x)/ts(x).",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -22,17 +22,17 @@
   },
   "devDependencies": {
     "@types/node": "^17.0.23",
-    "esbuild": "^0.15.5"
+    "esbuild": "^0.16.2"
   },
   "peerDependencies": {
-    "esbuild": "^0.14.0 || ^0.15.0"
+    "esbuild": "*"
   },
   "dependencies": {
-    "lightningcss": "^1.16.0",
+    "lightningcss": "^1.17.1",
     "fs-extra": "^10.1.0",
     "lodash": "^4.17.21",
-    "postcss": "^8.4.12",
-    "postcss-modules": "^4.3.1",
+    "postcss": "^8.4.19",
+    "postcss-modules": "^6.0.0",
     "tmp": "^0.2.1"
   },
   "publishConfig": {