diff --git a/src/events.tsx b/src/events.tsx index f28a57b3..efafeb44 100644 --- a/src/events.tsx +++ b/src/events.tsx @@ -1,6 +1,5 @@ -import { RRule } from "rrule"; +import { datetime, RRule } from "rrule"; import { ProcessedEvent } from "./lib/types"; -import { convertDateToRRuleDate } from "./lib/helpers/generals"; export const EVENTS: ProcessedEvent[] = [ { @@ -204,3 +203,13 @@ export const generateRandomEvents = (total = 300) => { return events; }; + +function convertDateToRRuleDate(date: Date) { + return datetime( + date.getFullYear(), + date.getMonth() + 1, + date.getDate(), + date.getHours(), + date.getMinutes() + ); +} diff --git a/src/lib/helpers/generals.tsx b/src/lib/helpers/generals.tsx index 5abd37f4..2c246cd7 100644 --- a/src/lib/helpers/generals.tsx +++ b/src/lib/helpers/generals.tsx @@ -21,7 +21,6 @@ import { SchedulerProps, } from "../types"; import { StateEvent } from "../views/Editor"; -import { datetime } from "rrule"; export const getOneView = (state: Partial): View => { if (state.month) { @@ -126,16 +125,6 @@ export const differenceInDaysOmitTime = (start: Date, end: Date) => { return differenceInDays(endOfDay(addSeconds(end, -1)), startOfDay(start)); }; -export const convertDateToRRuleDate = (date: Date) => { - return datetime( - date.getFullYear(), - date.getMonth() + 1, - date.getDate(), - date.getHours(), - date.getMinutes() - ); -}; - export const convertRRuleDateToDate = (rruleDate: Date) => { return new Date( rruleDate.getUTCFullYear(), diff --git a/vite.config.js b/vite.config.js index 3701c813..300be830 100644 --- a/vite.config.js +++ b/vite.config.js @@ -4,7 +4,7 @@ import { defineConfig } from "vite"; import react from "@vitejs/plugin-react"; import dts from "vite-plugin-dts"; import tsconfigPaths from "vite-tsconfig-paths"; -import { peerDependencies } from "./package.json"; +import peerDepsExternal from "rollup-plugin-peer-deps-external"; const __dirname = dirname(fileURLToPath(import.meta.url)); @@ -15,6 +15,7 @@ export default defineConfig(() => ({ configNames: ["tsconfig.json"], }), dts({ tsconfigPath: "./tsconfig.build.json" }), + peerDepsExternal(), ], server: { port: 3000, @@ -31,17 +32,6 @@ export default defineConfig(() => ({ name: "Scheduler", formats: ["es"], }, - rollupOptions: { - external: (path) => { - const nodeModules = path.includes("node_modules"); - const isPeer = Object.keys(peerDependencies).some((dep) => path.startsWith(dep)); - const isExternal = nodeModules || isPeer; - return isExternal; - }, - output: { - globals: (path) => path, - }, - }, copyPublicDir: false, }, resolve: {