chore: bump Rspack, webpack & enhanced-resolve (#485)

change/@griffel-next-extraction-plugin-3a886562-e18d-4644-a1a0-c4de934b5d27.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: improve checks on .rules",
+  "packageName": "@griffel/next-extraction-plugin",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@griffel-webpack-loader-3fb1bc3a-66a9-4e4d-ad5d-0dba893b109d.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: bump `enhanced-resolve` & improve internal types",
+  "packageName": "@griffel/webpack-loader",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

package.json

@@ -47,8 +47,8 @@
     "@nrwl/web": "15.3.3",
     "@nrwl/workspace": "15.3.3",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@rspack/cli": "0.4.5",
-    "@rspack/core": "0.4.5",
+    "@rspack/cli": "0.5.0",
+    "@rspack/core": "0.5.0",
     "@storybook/addon-essentials": "6.5.15",
     "@storybook/builder-webpack5": "6.5.15",
     "@storybook/manager-webpack5": "6.5.15",
@@ -140,7 +140,7 @@
     "tsconfig-paths": "4.1.1",
     "typescript": "4.8.4",
     "url-loader": "^4.1.1",
-    "webpack": "^5.76.0",
+    "webpack": "^5.89.0",
     "webpack-merge": "^5.8.0",
     "yargs": "^17.5.1"
   },
@@ -158,7 +158,7 @@
     "ajv": "^8.4.0",
     "browserslist": "^4.19.1",
     "csstype": "^3.1.3",
-    "enhanced-resolve": "^5.8.2",
+    "enhanced-resolve": "^5.15.0",
     "rtl-css-js": "^1.16.1",
     "source-map-js": "1.0.2",
     "stylis": "^4.2.0",

packages/next-extraction-plugin/src/lib/next-extraction-plugin.ts

@@ -60,9 +60,14 @@ export const withGriffelCSSExtraction =
           config.module?.rules?.find(
             rule =>
               typeof rule === 'object' &&
+              rule !== null &&
               Array.isArray(rule.oneOf) &&
               rule.oneOf.some(
-                ({ test }) => test instanceof RegExp && typeof test.test === 'function' && test.test('filename.css'),
+                setRule =>
+                  setRule &&
+                  setRule.test instanceof RegExp &&
+                  typeof setRule.test.test === 'function' &&
+                  setRule.test.test('filename.css'),
               ),
           ) as RuleSetRule
         )?.oneOf;

packages/webpack-loader/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@babel/core": "^7.23.2",
     "@griffel/babel-preset": "^1.5.5",
-    "enhanced-resolve": "^5.8.2",
+    "enhanced-resolve": "^5.15.0",
     "tslib": "^2.1.0"
   },
   "peerDependencies": {

packages/webpack-loader/src/webpackLoader.ts

@@ -16,6 +16,10 @@ export type WebpackLoaderOptions = BabelPluginOptions & {
   >;
 };
 
+type ResolveOptions = Pick<
+  enhancedResolve.ResolveOptionsOptionalFS,
+  'alias' | 'conditionNames' | 'extensions' | 'modules' | 'plugins'
+>;
 type WebpackLoaderParams = Parameters<webpack.LoaderDefinitionFunction<WebpackLoaderOptions>>;
 
 export function shouldTransformSourceCode(
@@ -73,7 +77,7 @@ export function webpackLoader(
 
   EvalCache.clearForFile(this.resourcePath);
 
-  const resolveOptionsDefaults: webpack.ResolveOptions = {
+  const resolveOptionsDefaults: ResolveOptions = {
     conditionNames: ['require'],
     extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
   };
@@ -91,7 +95,7 @@ export function webpackLoader(
         resolveOptionsFromWebpackConfig[resolveOptionKey],
       ]),
     ),
-    ...webpackResolveOptions,
+    ...(webpackResolveOptions as ResolveOptions),
   });
 
   const originalResolveFilename = Module._resolveFilename;