@nx/next 18.0.4 → 18.1.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "18.0.4",
+  "version": "18.1.0-beta.0",
   "private": false,
   "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -34,7 +34,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "18.0.4",
+    "@nx/devkit": "18.1.0-beta.0",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -45,13 +45,13 @@
     "url-loader": "^4.1.1",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "18.0.4",
-    "@nx/eslint": "18.0.4",
-    "@nx/react": "18.0.4",
-    "@nx/web": "18.0.4",
-    "@nx/webpack": "18.0.4",
-    "@nx/workspace": "18.0.4",
-    "@nrwl/next": "18.0.4"
+    "@nx/js": "18.1.0-beta.0",
+    "@nx/eslint": "18.1.0-beta.0",
+    "@nx/react": "18.1.0-beta.0",
+    "@nx/web": "18.1.0-beta.0",
+    "@nx/webpack": "18.1.0-beta.0",
+    "@nx/workspace": "18.1.0-beta.0",
+    "@nrwl/next": "18.1.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

package/plugins/with-nx.js

@@ -219,39 +219,19 @@ function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
              */
             // Default SVGR support to be on for projects.
             if (nx?.svgr !== false) {
-                config.module.rules.push({
-                    test: /\.svg$/,
-                    oneOf: [
-                        // If coming from JS/TS file, then transform into React component using SVGR.
-                        {
-                            issuer: /\.[jt]sx?$/,
-                            use: [
-                                {
-                                    loader: require.resolve('@svgr/webpack'),
-                                    options: {
-                                        svgo: false,
-                                        titleProp: true,
-                                        ref: true,
-                                    },
-                                },
-                                {
-                                    loader: require.resolve('url-loader'),
-                                    options: {
-                                        limit: 10000, // 10kB
-                                        name: '[name].[hash:7].[ext]',
-                                    },
-                                },
-                            ],
-                        },
-                        // Fallback to plain URL loader if someone just imports the SVG and references it on the <img src> tag
-                        {
-                            loader: require.resolve('url-loader'),
-                            options: {
-                                limit: 10000, // 10kB
-                                name: '[name].[hash:7].[ext]',
-                            },
-                        },
-                    ],
+                config.module.rules.push(
+                // Apply rule for svg imports ending in ?url
+                {
+                    test: /\.svg$/i,
+                    type: 'asset',
+                    resourceQuery: /url/, // apply to *.svg?url
+                }, 
+                // Convert all other svg imports to React components
+                {
+                    test: /\.svg$/i,
+                    issuer: /\.[jt]sx?$/,
+                    resourceQuery: { not: [/url/] },
+                    use: ['@svgr/webpack'],
                 });
             }
             return userWebpack(config, options);