@l-comedy/core 0.1.3 → 0.1.4

package/dist/index.d.ts

@@ -16,7 +16,11 @@ interface UserConfig {
     basename?: string
     routes?: RouteConfig[]
   }
-  plugins?: Array<'route' | LComedyPlugin>
+  reduxToolkit?: {
+    /** 相对于@ */
+    slicesDir?: string
+  }
+  plugins?: Array<'route' | 'redux-toolkit' | LComedyPlugin>
   rspackConfig?: Configuration
   sourceDir?: string
   output?: string
@@ -29,11 +33,11 @@ interface LComedyPlugin {
   name: string
   generateFiles?: (setupConfig: SetupConfigPlugin) => Promise<void> | viod
   modifyEntry?: (
-    setupConfig: SetupConfigPlugin
+    setupConfig: SetupConfigPlugin,
   ) => EntryModifier | Promise<EntryModifier>
   rspackConfig?: (
     rspackConfig: Configuration,
-    setupConfig: SetupConfig
+    setupConfig: SetupConfig,
   ) => Configuration | Promise<Configuration>
   runtimeExports?: string[]
 }
@@ -72,6 +76,7 @@ type SetupConfigPlugin = Omit<SetupConfig, 'plugins'>
 
 interface EntryModifier {
   imports?: string[]
+  runtimeExports?: string[]
   reactImports?: string[]
   beforeRender?: string
   afterRender?: string

package/dist/plugins/app-config/createLComedyPluginAppConfig.d.ts

@@ -1,4 +1,4 @@
-import { L as LComedyPlugin } from '../types.d-LN_39F7o.js';
+import { L as LComedyPlugin } from '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/app-config/createLComedyPluginAppConfig.js

@@ -82,7 +82,9 @@ function createLComedyPluginAppConfig() {
                     transpileOnly: true,
                     compilerOptions: {
                       paths: {
-                        "@/*": ["src/*"]
+                        // TODO: 使用变量
+                        "@/*": ["src/*"],
+                        "@@/*": [".comedy/*"]
                       }
                     }
                   }
@@ -133,7 +135,8 @@ function createLComedyPluginAppConfig() {
               patterns: [
                 {
                   from: publicDir,
-                  to: "."
+                  to: ".",
+                  noErrorOnMissing: true
                 }
               ]
             })

package/dist/plugins/app-config/index.d.ts

@@ -1,5 +1,5 @@
 export { createLComedyPluginAppConfig as default } from './createLComedyPluginAppConfig.js';
-import '../types.d-LN_39F7o.js';
+import '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/app-config/index.js

@@ -84,7 +84,9 @@ function createLComedyPluginAppConfig() {
                     transpileOnly: true,
                     compilerOptions: {
                       paths: {
-                        "@/*": ["src/*"]
+                        // TODO: 使用变量
+                        "@/*": ["src/*"],
+                        "@@/*": [".comedy/*"]
                       }
                     }
                   }
@@ -135,7 +137,8 @@ function createLComedyPluginAppConfig() {
               patterns: [
                 {
                   from: publicDir,
-                  to: "."
+                  to: ".",
+                  noErrorOnMissing: true
                 }
               ]
             })

package/dist/plugins/global-css/createLComedyPluginGlobalCSS.d.ts

@@ -1,4 +1,4 @@
-import { L as LComedyPlugin } from '../types.d-LN_39F7o.js';
+import { L as LComedyPlugin } from '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/global-css/index.d.ts

@@ -1,5 +1,5 @@
 export { createLComedyPluginGlobalCSS as default } from './createLComedyPluginGlobalCSS.js';
-import '../types.d-LN_39F7o.js';
+import '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/html/createHtmlFile.d.ts

@@ -1,4 +1,4 @@
-import { S as SetupConfigPlugin } from '../types.d-LN_39F7o.js';
+import { S as SetupConfigPlugin } from '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/html/createLComedyPluginHtml.d.ts

@@ -1,4 +1,4 @@
-import { L as LComedyPlugin } from '../types.d-LN_39F7o.js';
+import { L as LComedyPlugin } from '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/html/createTemplateParameters.d.ts

@@ -1,4 +1,4 @@
-import { S as SetupConfigPlugin } from '../types.d-LN_39F7o.js';
+import { S as SetupConfigPlugin } from '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/html/index.d.ts

@@ -1,5 +1,5 @@
 export { createLComedyPluginHtml as default } from './createLComedyPluginHtml.js';
-import '../types.d-LN_39F7o.js';
+import '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/layout/createLComedyPluginLayout.d.ts

@@ -1,4 +1,4 @@
-import { L as LComedyPlugin } from '../types.d-LN_39F7o.js';
+import { L as LComedyPlugin } from '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/layout/index.d.ts

@@ -1,5 +1,5 @@
 export { createLComedyPluginLayout as default } from './createLComedyPluginLayout.js';
-import '../types.d-LN_39F7o.js';
+import '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/page-loading/createLComedyPluginPageLoading.d.ts

@@ -1,4 +1,4 @@
-import { L as LComedyPlugin } from '../types.d-LN_39F7o.js';
+import { L as LComedyPlugin } from '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/page-loading/index.d.ts

@@ -1,5 +1,5 @@
 export { createLComedyPluginPageLoading as default } from './createLComedyPluginPageLoading.js';
-import '../types.d-LN_39F7o.js';
+import '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/redux-toolkit/createLComedyPluginReduxToolkit.d.ts

@@ -0,0 +1,9 @@
+import { L as LComedyPlugin } from '../types.d-CDy64Uxi.js';
+import '@rspack/core';
+import 'tsup';
+import 'html-webpack-plugin';
+import '@jest/types';
+
+declare function createLComedyPluginReduxToolkit(): LComedyPlugin;
+
+export { createLComedyPluginReduxToolkit };

package/dist/plugins/redux-toolkit/createLComedyPluginReduxToolkit.js

@@ -0,0 +1,152 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+
+// src/plugins/redux-toolkit/createLComedyPluginReduxToolkit.ts
+var createLComedyPluginReduxToolkit_exports = {};
+__export(createLComedyPluginReduxToolkit_exports, {
+  createLComedyPluginReduxToolkit: () => createLComedyPluginReduxToolkit
+});
+module.exports = __toCommonJS(createLComedyPluginReduxToolkit_exports);
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_path = __toESM(require("path"));
+var import_fast_glob = __toESM(require("fast-glob"));
+function createLComedyPluginReduxToolkit() {
+  return {
+    name: "l-comedy-plugin-redux-toolkit",
+    generateFiles(setupConfig) {
+      return __async(this, null, function* () {
+        var _a2;
+        const sliceDir = ((_a2 = setupConfig.userConfig.reduxToolkit) == null ? void 0 : _a2.slicesDir) || `store/slice`;
+        const entires = yield (0, import_fast_glob.default)([`${sliceDir}/*.ts`, "!**/*.tsx"], {
+          cwd: setupConfig.sourcePath,
+          onlyFiles: true
+        });
+        const fileMap = entires.map((filePath) => ({
+          name: import_path.default.parse(filePath).name,
+          filePath
+        }));
+        import_fs_extra.default.outputFileSync(
+          import_path.default.posix.join(setupConfig.workDir, "runtimes", "redux/store.ts"),
+          `import { configureStore } from '@reduxjs/toolkit';
+import {
+  useDispatch,
+  useSelector,
+  useStore,
+} from 'react-redux';
+import type { TypedUseSelectorHook } from 'react-redux';
+
+// \u5BFC\u5165\u6240\u6709 slice reducer
+${fileMap.map((item) => `import ${item.name}Reducer from '@/${sliceDir}/${item.name}';`).join("\n")}
+
+// \u521B\u5EFA store
+export const store = configureStore({
+  reducer: {
+    ${fileMap.map((item) => `${item.name}: ${item.name}Reducer,`).join("\n")}
+  },
+});
+
+export type RootState = ReturnType<typeof store.getState>;
+export type AppDispatch = typeof store.dispatch;
+
+export const useAppDispatch = () => useDispatch<AppDispatch>();
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
+export const useAppStore = () => useStore<RootState>();
+`
+        );
+      });
+    },
+    modifyEntry() {
+      return __async(this, null, function* () {
+        return {
+          imports: [
+            `import { Provider as ReduxProvider } from 'react-redux'`,
+            `import { store as reduxStore } from './runtimes/redux/store'`
+          ],
+          runtimeExports: [
+            `export { useAppSelector, useAppDispatch, useAppStore } from './runtimes/redux/store'`
+          ],
+          appWrap(app) {
+            return `<ReduxProvider store={reduxStore}>
+  ${app}
+</ReduxProvider>`;
+          }
+        };
+      });
+    }
+    /*modifyEntry(setupConfig) {
+          let hasLoading = false
+          const imports: string[] = []
+          const pageLoadingPath = path.posix.join(
+            setupConfig.sourceDir,
+            'layout/PageLoading.tsx',
+          )
+    
+          if (fs.existsSync(pageLoadingPath)) {
+            hasLoading = true
+            imports.push("import PageLoading from '@/layout/PageLoading'")
+          }
+    
+          return {
+            imports,
+            reactImports: ['Suspense'],
+            appWrap(app) {
+              return `<Suspense fallback={${
+                hasLoading ? '<PageLoading />' : '<div />'
+              }}>
+      ${app}
+    </Suspense>`
+            },
+          }
+        },*/
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createLComedyPluginReduxToolkit
+});

package/dist/plugins/redux-toolkit/index.d.ts

@@ -0,0 +1,6 @@
+export { createLComedyPluginReduxToolkit as default } from './createLComedyPluginReduxToolkit.js';
+import '../types.d-CDy64Uxi.js';
+import '@rspack/core';
+import 'tsup';
+import 'html-webpack-plugin';
+import '@jest/types';

package/dist/plugins/redux-toolkit/index.js

@@ -0,0 +1,150 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+
+// src/plugins/redux-toolkit/index.ts
+var redux_toolkit_exports = {};
+__export(redux_toolkit_exports, {
+  default: () => createLComedyPluginReduxToolkit
+});
+module.exports = __toCommonJS(redux_toolkit_exports);
+
+// src/plugins/redux-toolkit/createLComedyPluginReduxToolkit.ts
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_path = __toESM(require("path"));
+var import_fast_glob = __toESM(require("fast-glob"));
+function createLComedyPluginReduxToolkit() {
+  return {
+    name: "l-comedy-plugin-redux-toolkit",
+    generateFiles(setupConfig) {
+      return __async(this, null, function* () {
+        var _a2;
+        const sliceDir = ((_a2 = setupConfig.userConfig.reduxToolkit) == null ? void 0 : _a2.slicesDir) || `store/slice`;
+        const entires = yield (0, import_fast_glob.default)([`${sliceDir}/*.ts`, "!**/*.tsx"], {
+          cwd: setupConfig.sourcePath,
+          onlyFiles: true
+        });
+        const fileMap = entires.map((filePath) => ({
+          name: import_path.default.parse(filePath).name,
+          filePath
+        }));
+        import_fs_extra.default.outputFileSync(
+          import_path.default.posix.join(setupConfig.workDir, "runtimes", "redux/store.ts"),
+          `import { configureStore } from '@reduxjs/toolkit';
+import {
+  useDispatch,
+  useSelector,
+  useStore,
+} from 'react-redux';
+import type { TypedUseSelectorHook } from 'react-redux';
+
+// \u5BFC\u5165\u6240\u6709 slice reducer
+${fileMap.map((item) => `import ${item.name}Reducer from '@/${sliceDir}/${item.name}';`).join("\n")}
+
+// \u521B\u5EFA store
+export const store = configureStore({
+  reducer: {
+    ${fileMap.map((item) => `${item.name}: ${item.name}Reducer,`).join("\n")}
+  },
+});
+
+export type RootState = ReturnType<typeof store.getState>;
+export type AppDispatch = typeof store.dispatch;
+
+export const useAppDispatch = () => useDispatch<AppDispatch>();
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
+export const useAppStore = () => useStore<RootState>();
+`
+        );
+      });
+    },
+    modifyEntry() {
+      return __async(this, null, function* () {
+        return {
+          imports: [
+            `import { Provider as ReduxProvider } from 'react-redux'`,
+            `import { store as reduxStore } from './runtimes/redux/store'`
+          ],
+          runtimeExports: [
+            `export { useAppSelector, useAppDispatch, useAppStore } from './runtimes/redux/store'`
+          ],
+          appWrap(app) {
+            return `<ReduxProvider store={reduxStore}>
+  ${app}
+</ReduxProvider>`;
+          }
+        };
+      });
+    }
+    /*modifyEntry(setupConfig) {
+          let hasLoading = false
+          const imports: string[] = []
+          const pageLoadingPath = path.posix.join(
+            setupConfig.sourceDir,
+            'layout/PageLoading.tsx',
+          )
+    
+          if (fs.existsSync(pageLoadingPath)) {
+            hasLoading = true
+            imports.push("import PageLoading from '@/layout/PageLoading'")
+          }
+    
+          return {
+            imports,
+            reactImports: ['Suspense'],
+            appWrap(app) {
+              return `<Suspense fallback={${
+                hasLoading ? '<PageLoading />' : '<div />'
+              }}>
+      ${app}
+    </Suspense>`
+            },
+          }
+        },*/
+  };
+}

package/dist/plugins/route/createLComedyPluginRoute.d.ts

@@ -1,4 +1,4 @@
-import { L as LComedyPlugin } from '../types.d-LN_39F7o.js';
+import { L as LComedyPlugin } from '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/route/index.d.ts

@@ -1,5 +1,5 @@
 export { createLComedyPluginRoute as default } from './createLComedyPluginRoute.js';
-import '../types.d-LN_39F7o.js';
+import '../types.d-CDy64Uxi.js';
 import '@rspack/core';
 import 'tsup';
 import 'html-webpack-plugin';

package/dist/plugins/{types.d-LN_39F7o.d.ts → types.d-CDy64Uxi.d.ts}

@@ -16,7 +16,11 @@ interface UserConfig {
     basename?: string
     routes?: RouteConfig[]
   }
-  plugins?: Array<'route' | LComedyPlugin>
+  reduxToolkit?: {
+    /** 相对于@ */
+    slicesDir?: string
+  }
+  plugins?: Array<'route' | 'redux-toolkit' | LComedyPlugin>
   rspackConfig?: Configuration
   sourceDir?: string
   output?: string
@@ -29,11 +33,11 @@ interface LComedyPlugin {
   name: string
   generateFiles?: (setupConfig: SetupConfigPlugin) => Promise<void> | viod
   modifyEntry?: (
-    setupConfig: SetupConfigPlugin
+    setupConfig: SetupConfigPlugin,
   ) => EntryModifier | Promise<EntryModifier>
   rspackConfig?: (
     rspackConfig: Configuration,
-    setupConfig: SetupConfig
+    setupConfig: SetupConfig,
   ) => Configuration | Promise<Configuration>
   runtimeExports?: string[]
 }
@@ -72,6 +76,7 @@ type SetupConfigPlugin = Omit<SetupConfig, 'plugins'>
 
 interface EntryModifier {
   imports?: string[]
+  runtimeExports?: string[]
   reactImports?: string[]
   beforeRender?: string
   afterRender?: string

package/dist/run.js

@@ -130,6 +130,15 @@ import { createRoot } from 'react-dom/client';
         entryCode += m.afterRender + "\n";
       }
     });
+    yield import_fs_extra.default.outputFile(
+      import_path.default.posix.join(targetDir, "exports.ts"),
+      `${modifiers.filter((item) => item.runtimeExports).map(
+        (item) => {
+          var _a2;
+          return `${(_a2 = item.runtimeExports) == null ? void 0 : _a2.map((exportStr) => exportStr).join("\n")}`;
+        }
+      ).join("\n")}`
+    );
     yield import_fs_extra.default.outputFile(import_path.default.posix.join(targetDir, "entry.tsx"), entryCode);
   });
 }
@@ -167,7 +176,9 @@ function createLComedyPluginAppConfig() {
                     transpileOnly: true,
                     compilerOptions: {
                       paths: {
-                        "@/*": ["src/*"]
+                        // TODO: 使用变量
+                        "@/*": ["src/*"],
+                        "@@/*": [".comedy/*"]
                       }
                     }
                   }
@@ -218,7 +229,8 @@ function createLComedyPluginAppConfig() {
               patterns: [
                 {
                   from: publicDir,
-                  to: "."
+                  to: ".",
+                  noErrorOnMissing: true
                 }
               ]
             })
@@ -454,7 +466,8 @@ function setup(userConfig, options) {
       resolve: {
         extensions: [".ts", ".tsx", ".js", ".jsx"],
         alias: {
-          "@": setupConfig.sourcePath
+          "@": setupConfig.sourcePath,
+          "@@": setupConfig.workPath
         }
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@l-comedy/core",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -40,6 +40,7 @@
     "commander": "^14.0.2",
     "css-loader": "7.1.2",
     "esbuild": "^0.27.1",
+    "fast-glob": "^3.3.3",
     "fs-extra": "^11.3.2",
     "html-webpack-plugin": "^5.6.5",
     "less": "4.4.2",
@@ -50,8 +51,10 @@
   },
   "optionalDependencies": {
     "@l-comedy/jest-preset": "^0.1.0",
+    "@reduxjs/toolkit": "^2.11.2",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
+    "react-redux": "^9.2.0",
     "react-router": "^7.0.0",
     "tsup": "^8.5.1"
   },