@griffel/webpack-plugin 1.1.0 → 2.0.0

package/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Change Log - @griffel/webpack-plugin
 
-This log was last generated on Fri, 06 Mar 2026 08:15:28 GMT and should not be manually modified.
+This log was last generated on Fri, 06 Mar 2026 15:54:55 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 2.0.0
+
+Fri, 06 Mar 2026 15:54:55 GMT
+
+### Major changes
+
+- BREAKING: consolidate resolvers into ESM-first createResolverFactory, remove enhanced-resolve dependency (olfedias@microsoft.com)
+- Bump @griffel/transform to v1.2.1
+- Bump @griffel/core to v1.20.1
+
 ## 1.1.0
 
-Fri, 06 Mar 2026 08:15:28 GMT
+Fri, 06 Mar 2026 08:17:05 GMT
 
 ### Minor changes
 

package/index.d.mts

@@ -1,4 +1,2 @@
 export { GriffelPlugin, type GriffelCSSExtractionPluginOptions } from './GriffelPlugin.mjs';
-export { createEnhancedResolverFactory } from './resolver/createEnhancedResolverFactory.mjs';
-export { createOxcResolverFactory } from './resolver/createOxcResolverFactory.mjs';
-export { createFluentOxcResolverFactory, type FluentOxcResolverOptions, } from './resolver/createFluentOxcResolverFactory.mjs';
+export { createResolverFactory } from './resolver/createResolverFactory.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@griffel/webpack-plugin",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "Webpack plugin that performs CSS extraction for Griffel",
   "license": "MIT",
   "repository": {
@@ -20,9 +20,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@griffel/transform": "^1.2.0",
-    "@griffel/core": "^1.20.0",
-    "enhanced-resolve": "^5.15.0",
+    "@griffel/transform": "^1.2.1",
+    "@griffel/core": "^1.20.1",
     "oxc-resolver": "^11.19.1",
     "stylis": "^4.2.0"
   },

package/resolver/createResolverFactory.d.mts

@@ -0,0 +1,2 @@
+import { TransformResolverFactory } from './types.mjs';
+export declare function createResolverFactory(): TransformResolverFactory;

package/webpack-plugin.js

@@ -1,33 +1,36 @@
 import { styleBucketOrdering, normalizeCSSBucketEntry, defaultCompareMediaQueries } from "@griffel/core";
 import { P as PLUGIN_NAME, G as GriffelCssLoaderContextKey } from "./constants-aY3k4vvW.js";
-import enhancedResolve from "enhanced-resolve";
+import { ResolverFactory } from "oxc-resolver";
 import * as path from "node:path";
 import { compile, COMMENT, serialize, stringify } from "stylis";
-import { ResolverFactory } from "oxc-resolver";
-const RESOLVE_OPTIONS_DEFAULTS$2 = {
-  conditionNames: ["require"],
+function isCJSOnlyPackage(id) {
+  return id === "tslib" || id.startsWith("@babel/runtime") || id.startsWith("@swc/helpers");
+}
+const RESOLVE_OPTIONS_DEFAULTS = {
+  conditionNames: ["import", "require"],
   extensions: [".js", ".jsx", ".cjs", ".mjs", ".ts", ".tsx", ".json"]
 };
-function createEnhancedResolverFactory(resolveOptions = {}) {
-  const { inheritResolveOptions = ["alias", "modules", "plugins"], webpackResolveOptions } = resolveOptions;
+function createResolverFactory() {
   return function(compilation) {
-    const resolveOptionsFromWebpackConfig = compilation?.options.resolve ?? {};
-    const resolveSync = enhancedResolve.create.sync({
-      ...RESOLVE_OPTIONS_DEFAULTS$2,
-      ...Object.fromEntries(
-        inheritResolveOptions.map((resolveOptionKey) => [
-          resolveOptionKey,
-          resolveOptionsFromWebpackConfig[resolveOptionKey]
-        ])
-      ),
-      ...webpackResolveOptions
+    const defaultResolver = new ResolverFactory({
+      ...RESOLVE_OPTIONS_DEFAULTS
+      // ...resolveOptionsFromWebpackConfig,
+    });
+    const cjsResolver = defaultResolver.cloneWithOptions({
+      conditionNames: ["require"],
+      extensions: RESOLVE_OPTIONS_DEFAULTS.extensions,
+      mainFields: ["module", "main"]
     });
     return function resolveModule(id, { filename }) {
-      const resolvedPath = resolveSync(path.dirname(filename), id);
-      if (!resolvedPath) {
-        throw new Error(`enhanced-resolve: Failed to resolve module "${id}"`);
+      const resolver = isCJSOnlyPackage(id) ? cjsResolver : defaultResolver;
+      const resolved = resolver.sync(path.dirname(filename), id);
+      if (resolved.error) {
+        throw resolved.error;
       }
-      return resolvedPath;
+      if (!resolved.path) {
+        throw new Error(`oxc-resolver: Failed to resolve module "${id}"`);
+      }
+      return resolved.path;
     };
   };
 }
@@ -156,7 +159,7 @@ class GriffelPlugin {
     this.#attachToEntryPoint = options.unstable_attachToEntryPoint;
     this.#collectStats = options.collectStats ?? false;
     this.#compareMediaQueries = options.compareMediaQueries ?? defaultCompareMediaQueries;
-    this.#resolverFactory = options.resolverFactory ?? createEnhancedResolverFactory();
+    this.#resolverFactory = options.resolverFactory ?? createResolverFactory();
   }
   apply(compiler) {
     const IS_RSPACK = Object.prototype.hasOwnProperty.call(compiler.webpack, "rspackVersion");
@@ -308,61 +311,7 @@ class GriffelPlugin {
     });
   }
 }
-const RESOLVE_OPTIONS_DEFAULTS$1 = {
-  conditionNames: ["require"],
-  extensions: [".js", ".jsx", ".cjs", ".mjs", ".ts", ".tsx", ".json"]
-};
-function createOxcResolverFactory() {
-  return function(compilation) {
-    const resolverFactory = new ResolverFactory({
-      ...RESOLVE_OPTIONS_DEFAULTS$1
-      // ...resolveOptionsFromWebpackConfig,
-    });
-    return function resolveModule(id, { filename }) {
-      const resolvedResolver = resolverFactory.sync(path.dirname(filename), id);
-      if (resolvedResolver.error) {
-        throw resolvedResolver.error;
-      }
-      if (!resolvedResolver.path) {
-        throw new Error(`oxc-resolver: Failed to resolve module "${id}"`);
-      }
-      return resolvedResolver.path;
-    };
-  };
-}
-function defaultIsFluentPackage(id) {
-  return id.startsWith("@fluentui/");
-}
-const RESOLVE_OPTIONS_DEFAULTS = {
-  conditionNames: ["require"],
-  extensions: [".raw.js", ".js", ".jsx", ".cjs", ".mjs", ".ts", ".tsx", ".json"]
-};
-function createFluentOxcResolverFactory(resolveOptions) {
-  const { isFluentPackage = defaultIsFluentPackage, ...restOptions } = resolveOptions ?? {};
-  return function(compilation) {
-    const defaultResolver = new ResolverFactory({
-      ...RESOLVE_OPTIONS_DEFAULTS,
-      ...restOptions
-    });
-    const esmResolver = defaultResolver.cloneWithOptions({
-      conditionNames: ["import", "require"]
-    });
-    return function resolveModule(id, { filename }) {
-      const resolver = isFluentPackage(id) ? esmResolver : defaultResolver;
-      const resolved = resolver.sync(path.dirname(filename), id);
-      if (resolved.error) {
-        throw resolved.error;
-      }
-      if (!resolved.path) {
-        throw new Error(`oxc-resolver: Failed to resolve module "${id}"`);
-      }
-      return resolved.path;
-    };
-  };
-}
 export {
   GriffelPlugin,
-  createEnhancedResolverFactory,
-  createFluentOxcResolverFactory,
-  createOxcResolverFactory
+  createResolverFactory
 };

package/resolver/createEnhancedResolverFactory.d.mts

@@ -1,6 +0,0 @@
-import { Configuration } from 'webpack';
-import { TransformResolverFactory } from './types.mjs';
-export declare function createEnhancedResolverFactory(resolveOptions?: {
-    inheritResolveOptions?: ('alias' | 'modules' | 'plugins' | 'conditionNames' | 'extensions')[];
-    webpackResolveOptions?: Pick<Required<Configuration>['resolve'], 'alias' | 'modules' | 'plugins' | 'conditionNames' | 'extensions'>;
-}): TransformResolverFactory;

package/resolver/createFluentOxcResolverFactory.d.mts

@@ -1,7 +0,0 @@
-import { NapiResolveOptions } from 'oxc-resolver';
-import { TransformResolverFactory } from './types.mjs';
-export type FluentOxcResolverOptions = Pick<NapiResolveOptions, 'conditionNames' | 'extensions' | 'alias' | 'mainFields' | 'modules'> & {
-    /** Predicate to determine if a module specifier should be resolved with ESM conditions. Defaults to matching `@fluentui/` prefixed packages. */
-    isFluentPackage?: (id: string) => boolean;
-};
-export declare function createFluentOxcResolverFactory(resolveOptions?: FluentOxcResolverOptions): TransformResolverFactory;

package/resolver/createOxcResolverFactory.d.mts

@@ -1,2 +0,0 @@
-import { TransformResolverFactory } from './types.mjs';
-export declare function createOxcResolverFactory(): TransformResolverFactory;