@plumeria/next-plugin 10.5.3 → 11.0.1

package/dist/index.d.ts

@@ -1,2 +1,2 @@
 import type { NextConfig } from 'next';
-export declare function withPlumeria(nextConfig: NextConfig): NextConfig;
+export declare function withPlumeria(nextConfig?: NextConfig): NextConfig;

package/dist/index.js

@@ -1,22 +1,71 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withPlumeria = withPlumeria;
-function withPlumeria(nextConfig) {
+const isRuleConfigItem = (rule) => !Array.isArray(rule) && typeof rule === 'object' && rule !== null;
+function withPlumeria(nextConfig = {}) {
     const originalWebpack = nextConfig.webpack;
+    const turbopackLoaders = [
+        { loader: '@plumeria/turbopack-loader', options: {} },
+    ];
+    const plumeriaRules = {
+        '*.ts': { loaders: turbopackLoaders },
+        '*.tsx': { loaders: turbopackLoaders },
+        '*.js': { loaders: turbopackLoaders },
+        '*.jsx': { loaders: turbopackLoaders },
+    };
+    const mergeTurbopackRules = (existingRules = {}, newRules) => {
+        const mergedRules = { ...existingRules };
+        for (const [key, newRule] of Object.entries(newRules)) {
+            const existing = mergedRules[key];
+            if (existing && isRuleConfigItem(existing) && isRuleConfigItem(newRule)) {
+                const newLoaders = newRule.loaders || [];
+                const existingLoaders = Array.isArray(existing.loaders)
+                    ? existing.loaders
+                    : existing.loaders
+                        ? [existing.loaders]
+                        : [];
+                mergedRules[key] = {
+                    ...existing,
+                    loaders: [...newLoaders, ...existingLoaders],
+                };
+            }
+            else {
+                mergedRules[key] = newRule;
+            }
+        }
+        return mergedRules;
+    };
     return {
         ...nextConfig,
+        turbopack: {
+            ...nextConfig?.turbopack,
+            rules: mergeTurbopackRules(nextConfig?.turbopack?.rules, plumeriaRules),
+        },
         webpack(config, context) {
             if (typeof originalWebpack === 'function') {
                 config = originalWebpack(config, context);
             }
+            const existingIgnored = config.watchOptions?.ignored;
+            const plumeriaIgnored = ['node_modules', '.next', '.git'];
+            const mergedIgnored = existingIgnored instanceof RegExp
+                ? existingIgnored
+                : Array.from(new Set([
+                    ...(Array.isArray(existingIgnored)
+                        ? existingIgnored
+                        : existingIgnored
+                            ? [existingIgnored]
+                            : []),
+                    ...plumeriaIgnored,
+                ]));
             config.watchOptions = {
-                ignored: ['node_modules', '.next', '.git'],
+                ...config.watchOptions,
+                ignored: mergedIgnored,
             };
             config.module?.rules?.unshift({
                 enforce: 'pre',
                 test: /\.(tsx|ts|jsx|js)$/,
                 exclude: [/node_modules/, /\.next/, /\.git/],
-                use: require.resolve('@plumeria/turbopack-loader'),
+                use: '@plumeria/turbopack-loader',
             });
             return config;
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/next-plugin",
-  "version": "10.5.3",
+  "version": "11.0.1",
   "description": "Plumeria Next.js plugin",
   "author": "Refirst 11",
   "license": "MIT",
@@ -20,20 +20,16 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "default": "./dist/index.js"
-    },
-    "./turbopack": {
-      "types": "./dist/turbopack.d.ts",
-      "import": "./dist/turbopack.js",
-      "default": "./dist/turbopack.js"
     }
   },
   "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "dist/"
   ],
   "dependencies": {
-    "@plumeria/turbopack-loader": "^10.5.3"
+    "@plumeria/turbopack-loader": "^11.0.1"
   },
   "devDependencies": {
     "next": "^16.2.3",

package/dist/turbopack.d.ts

@@ -1,2 +0,0 @@
-import type { NextConfig } from 'next/dist/server/config-shared';
-export declare const withPlumeria: (nextConfig?: NextConfig) => NextConfig;

package/dist/turbopack.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withPlumeria = void 0;
-const withPlumeria = (nextConfig = {}) => {
-    const reactLoaders = [
-        { loader: '@plumeria/turbopack-loader', options: {} },
-    ];
-    return {
-        ...nextConfig,
-        turbopack: {
-            ...nextConfig?.turbopack,
-            rules: {
-                '*.ts': {
-                    loaders: reactLoaders,
-                },
-                '*.tsx': {
-                    loaders: reactLoaders,
-                },
-                '*.js': {
-                    loaders: reactLoaders,
-                },
-                '*.jsx': {
-                    loaders: reactLoaders,
-                },
-            },
-        },
-    };
-};
-exports.withPlumeria = withPlumeria;