simpler ts setup

escoand · Jan 30, 2023 · 5135b5f · 5135b5f
1 parent 368939e
commit 5135b5f
Show file tree

Hide file tree

Showing 11 changed files with 337 additions and 492 deletions.
diff --git a/dist/caldav.js b/dist/caldav.js
diff --git a/dist/caldav.js.map b/dist/caldav.js.map
diff --git a/dist/multicol.js b/dist/multicol.js
diff --git a/dist/multicol.js.map b/dist/multicol.js.map
diff --git a/dist/yearview.js b/dist/yearview.js
diff --git a/dist/yearview.js.map b/dist/yearview.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,19 +1,19 @@
 {
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/preset-env": "^7.16.4",
-    "@fullcalendar/core": "^6.0.3",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-node-resolve": "^13.0.6",
-    "@rollup/plugin-typescript": "^11.0.0",
-    "core-js": "^3.19",
+    "@babel/core": "^7.20.12",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-typescript": "^7.18.6",
+    "@fullcalendar/core": "^6.1.0",
+    "@rollup/plugin-babel": "^6.0.3",
+    "@rollup/plugin-commonjs": "^24.0.1",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-terser": "^0.4.0",
+    "core-js": "^3.27.2",
     "ical.js": "^1.5.0",
-    "rollup": "^2.60.1",
+    "rollup": "^3.12.0",
     "rollup-plugin-import-css": "^3.1.0",
-    "rollup-plugin-serve": "^1.1.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "tslib": "^2.4.1",
+    "rollup-plugin-serve": "^2.0.2",
+    "tslib": "^2.5.0",
     "typescript": "^4.9.4"
   },
   "scripts": {

diff --git a/rollup.config.js → rollup.config.mjs b/rollup.config.js → rollup.config.mjs
@@ -1,24 +1,25 @@
 import { babel } from "@rollup/plugin-babel";
 import commonjs from "@rollup/plugin-commonjs";
 import resolve from "@rollup/plugin-node-resolve";
-import typescript from "@rollup/plugin-typescript";
+import terser from "@rollup/plugin-terser";
 import css from "rollup-plugin-import-css";
 import serve from "rollup-plugin-serve";
-import { terser } from "rollup-plugin-terser";
+
+const extensions = [".js", ".jsx", ".ts", ".tsx"];
 
 const plugins = [
-  resolve(),
+  resolve({ extensions }),
   commonjs(),
-  typescript(),
   babel({
     babelHelpers: "bundled",
     exclude: [/\/core-js\//],
+    extensions,
     presets: [
+      "@babel/preset-typescript",
       [
         "@babel/preset-env",
         {
-          corejs: "3.19",
-          modules: false,
+          corejs: "3.27",
           useBuiltIns: "usage",
         },
       ],

diff --git a/src/multicol.css b/src/multicol.css
@@ -1,6 +1,9 @@
 .fc-multicol {
   border-collapse: collapse !important;
 }
+.fc-multicol .fc-day-col {
+  width: 75px;
+}
 .fc-multicol .fc-day-today {
   background-color: var(--fc-today-bg-color);
 }

diff --git a/src/multicol.ts b/src/multicol.ts
@@ -31,6 +31,10 @@ class MultiColumnComponent extends BaseComponent {
       context.calendarApi.getCurrentData().eventSources
     ).filter((source) => source?.ui.display != "background");
 
+    // cols
+    const cols = showDayHeaders ? [h("col", { class: "fc-day-col" })] : [];
+    fgSources.forEach(() => cols.push(h("col", {})));
+
     // headers
     const headers = (showDayHeaders ? [null] : [])
       .concat(fgSources)
@@ -95,6 +99,7 @@ class MultiColumnComponent extends BaseComponent {
       h(
         "table",
         { class: "fc-scrollgrid fc-multicol" },
+        h("colgroup", {}, cols),
         h("thead", {}, h("tr", {}, headers)),
         h("tbody", {}, rows)
       ),