happy-css-modules 2.1.2 → 3.0.1

package/src/transformer/less-transformer.test.ts

@@ -23,8 +23,6 @@ test('handles less features', async () => {
         &_2 { dummy: ''; }
         .b_1();
         .b_2();
-        composes: a_1; // css module feature test (composes)
-        composes: c from './3.less'; // css module feature test (composes from other file)
       }
       `,
     '/test/2.less': dedent`
@@ -40,7 +38,7 @@ test('handles less features', async () => {
   // FIXME: The end position of 'a_2_2' is incorrect.
   expect(result).toMatchInlineSnapshot(`
     {
-      dependencies: ["<fixtures>/test/2.less", "<fixtures>/test/3.less"],
+      dependencies: ["<fixtures>/test/2.less"],
       tokens: [
         {
           name: "b_1",
@@ -72,12 +70,6 @@ test('handles less features', async () => {
             { filePath: "<fixtures>/test/1.less", start: { line: 7, column: 3 }, end: { line: 7, column: 8 } },
           ],
         },
-        {
-          name: "c",
-          originalLocations: [
-            { filePath: "<fixtures>/test/3.less", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
-          ],
-        },
       ],
     }
   `);

package/src/transformer/less-transformer.ts

@@ -44,6 +44,7 @@ function createLessPluginResolver(Less: typeof import('less'), options: Transfor
 export const createLessTransformer: () => Transformer = () => {
   let less: typeof import('less');
   return async (source, options) => {
+    // eslint-disable-next-line require-atomic-updates
     less ??= (await import('less').catch(handleImportError('less'))).default;
     const result = await less.render(source, {
       filename: options.from,

package/src/transformer/postcss-transformer.ts

@@ -8,7 +8,7 @@ const require = createRequire(import.meta.url);
 
 const postcssrc: typeof import('postcss-load-config') = require('postcss-load-config');
 
-//ref: https://github.com/postcss/postcss-import#dependency-message-support
+// ref: https://github.com/postcss/postcss-import#dependency-message-support
 interface DependencyMessage extends Message {
   type: 'dependency';
   file: string;

package/src/transformer/scss-transformer.test.ts

@@ -22,8 +22,6 @@ test('handles sass features', async () => {
         // sass feature test (nesting)
         .a_2_1 { dummy: ''; }
         &_2 { dummy: ''; }
-        composes: a_1; // css module feature test (composes)
-        composes: d from './4.scss'; // css module feature test (composes from other file)
       }
       `,
     '/test/2.scss': dedent`
@@ -46,7 +44,7 @@ test('handles sass features', async () => {
   // FIXME: The end position of 'a_2_2' is incorrect.
   expect(result).toMatchInlineSnapshot(`
     {
-      dependencies: ["<fixtures>/test/2.scss", "<fixtures>/test/3.scss", "<fixtures>/test/4.scss"],
+      dependencies: ["<fixtures>/test/2.scss", "<fixtures>/test/3.scss"],
       tokens: [
         {
           name: "b_1",
@@ -85,12 +83,6 @@ test('handles sass features', async () => {
             { filePath: "<fixtures>/test/1.scss", start: { line: 8, column: 3 }, end: { line: 8, column: 8 } },
           ],
         },
-        {
-          name: "d",
-          originalLocations: [
-            { filePath: "<fixtures>/test/4.scss", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
-          ],
-        },
       ],
     }
   `);

package/src/transformer/scss-transformer.ts

@@ -22,8 +22,8 @@ function promisifySassRender(sass: typeof import('sass')) {
 export const createScssTransformer: () => Transformer = () => {
   let sass: typeof import('sass');
   return async (source, options) => {
-    const sassModule = await import('sass').catch(handleImportError('sass'));
-    sass ??= sassModule.default ?? sassModule;
+    // eslint-disable-next-line require-atomic-updates
+    sass ??= await import('sass').catch(handleImportError('sass'));
     const render = promisifySassRender(sass);
     const result = await render({
       data: source,

package/src/util.ts

@@ -3,7 +3,7 @@ import { access } from 'fs/promises';
 import { join, dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { resolve as importMetaResolve } from 'import-meta-resolve';
-import minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 
 /**
  * The SystemError type of Node.js.
@@ -66,21 +66,24 @@ export async function exists(path: string): Promise<boolean> {
 }
 
 export function isMatchByGlob(filePath: string, pattern: string, options: { cwd: string }): boolean {
-  return minimatch(filePath, join(options.cwd, pattern));
+  return minimatch(filePath, join(options.cwd, pattern), { windowsPathsNoEscape: true });
 }
 
 export function getPackageJson() {
   return JSON.parse(readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf-8'));
 }
 
-export async function getInstalledPeerDependencies(): Promise<string[]> {
+export function getInstalledPeerDependencies(): string[] {
   const pkgJson = getPackageJson();
   const result = [];
   for (const deps of Object.keys(pkgJson.peerDependencies)) {
-    const isInstalled = await importMetaResolve(deps, import.meta.url)
-      .then(() => true)
-      .catch(() => false);
-    if (isInstalled) result.push(deps);
+    try {
+      importMetaResolve(deps, import.meta.url);
+      // If the package is installed, push it to the result array.
+      result.push(deps);
+    } catch {
+      // If the package is not installed, do nothing.
+    }
   }
   return result;
 }