Split date adapters into sub packages to help with peerDependencies r…

…esolution ```diff - import { AdapterDateFns } from "@salt-ds/date-adapters"; - import { AdapterDayjs } from "@salt-ds/date-adapters"; - import { AdapterLuxon } from "@salt-ds/date-adapters"; - import { AdapterMoment } from "@salt-ds/date-adapters"; + import { AdapterDateFns } from "@salt-ds/date-adapters/date-fns"; + import { AdapterDayjs } from "@salt-ds/date-adapters/dayjs"; + import { AdapterLuxon } from "@salt-ds/date-adapters/luxon"; + import { AdapterMoment } from "@salt-ds/date-adapters/moment"; ```
jpmorganchase · Dec 25, 2024 · bfc7fc3 · bfc7fc3
1 parent 47e2f12
commit bfc7fc3
Show file tree

Hide file tree

Showing 29 changed files with 281 additions and 95 deletions.
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -56,10 +56,6 @@ async function getViteConfig(config: UserConfig) {
             __dirname,
             "./dist/salt-ds-countries",
           ),
-          "@salt-ds/date-adapters": path.resolve(
-            __dirname,
-            "./dist/salt-ds-date-adapters",
-          ),
           "@salt-ds/data-grid": path.resolve(
             __dirname,
             "./dist/salt-ds-data-grid",
@@ -73,7 +69,6 @@ async function getViteConfig(config: UserConfig) {
       optimizeDeps: {
         include: [
           "@salt-ds/core",
-          "@salt-ds/data-adapters",
           "@salt-ds/data-grid",
           "@salt-ds/lab",
           "@salt-ds/icons",

diff --git a/package.json b/package.json
@@ -140,6 +140,7 @@
     "get-tsconfig": "^4.7.5",
     "rollup": "^4.24.2",
     "rollup-plugin-esbuild": "^6.1.1",
-    "rollup-plugin-postcss": "^4.0.2"
+    "rollup-plugin-postcss": "^4.0.2",
+    "vite-tsconfig-paths": "^4.2.0"
   }
 }
diff --git a/packages/date-adapters/package.json b/packages/date-adapters/package.json
@@ -38,6 +38,6 @@
     "provenance": true
   },
   "scripts": {
-    "build": "yarn node ../../scripts/build.mjs"
+    "build": "yarn node ./scripts/build.mjs"
   }
 }
diff --git a/packages/date-adapters/scripts/build.mjs b/packages/date-adapters/scripts/build.mjs
@@ -0,0 +1,164 @@
+import path from "node:path";
+import commonjs from "@rollup/plugin-commonjs";
+import json from "@rollup/plugin-json";
+import { nodeResolve } from "@rollup/plugin-node-resolve";
+import browserslistToEsbuild from "browserslist-to-esbuild";
+import fs from "fs-extra";
+import { rollup } from "rollup";
+import esbuild from "rollup-plugin-esbuild";
+import { makeTypings } from "./../../../scripts/makeTypings.mjs";
+import { transformWorkspaceDeps } from "./../../../scripts/transformWorkspaceDeps.mjs";
+import { distinct } from "./../../../scripts/utils.mjs";
+
+const cwd = process.cwd();
+
+const packageJson = (
+  await import(path.join("file://", cwd, "package.json"), {
+    with: { type: "json" },
+  })
+).default;
+
+const FILES_TO_COPY = ["README.md", "LICENSE", "CHANGELOG.md"].concat(
+  packageJson.files ?? [],
+);
+
+const packageName = packageJson.name;
+const outputDir = path.join(packageJson.publishConfig.directory);
+
+console.log(`Building ${packageName}`);
+
+await fs.mkdirp(outputDir);
+await fs.emptyDir(outputDir);
+
+// Define entry points for each adapter
+const entryPoints = {
+  types: path.join(cwd, "src/types/index.ts"),
+  moment: path.join(cwd, "src/moment-adapter/index.ts"),
+  luxon: path.join(cwd, "src/luxon-adapter/index.ts"),
+  dayjs: path.join(cwd, "src/dayjs-adapter/index.ts"),
+  "date-fns": path.join(cwd, "src/date-fns-adapter/index.ts"),
+};
+
+for (const [adapterName, inputPath] of Object.entries(entryPoints)) {
+  const entryFolder = path.basename(path.dirname(inputPath));
+
+  await makeTypings(outputDir, path.dirname(inputPath));
+
+  const bundle = await rollup({
+    input: inputPath,
+    external: (id) => {
+      if (id === "babel-plugin-transform-async-to-promises/helpers") {
+        return false;
+      }
+      return !id.startsWith(".") && !path.isAbsolute(id);
+    },
+    treeshake: {
+      propertyReadSideEffects: false,
+    },
+    plugins: [
+      nodeResolve({
+        extensions: [".ts", ".tsx", ".js", ".jsx"],
+        browser: true,
+        mainFields: ["module", "main", "browser"],
+      }),
+      commonjs({ include: /\/node_modules\// }),
+      esbuild({
+        target: browserslistToEsbuild(),
+        minify: false,
+        sourceMap: true,
+      }),
+      json(),
+    ],
+  });
+
+  const transformSourceMap = (relativeSourcePath, sourceMapPath) => {
+    const absoluteSourcepath = path.resolve(
+      path.dirname(sourceMapPath),
+      relativeSourcePath,
+    );
+    const packageRelativeSourcePath = path.relative(cwd, absoluteSourcepath);
+
+    return `../${packageRelativeSourcePath}`;
+  };
+
+  await bundle.write({
+    freeze: false,
+    sourcemap: true,
+    preserveModules: false,
+    dir: path.join(outputDir, `dist-cjs/${adapterName}`),
+    format: "cjs",
+    exports: "named",
+    sourcemapPathTransform: transformSourceMap,
+  });
+
+  await bundle.write({
+    freeze: false,
+    sourcemap: true,
+    preserveModules: false,
+    dir: path.join(outputDir, `dist-es/${adapterName}`),
+    format: "es",
+    exports: "named",
+    sourcemapPathTransform: transformSourceMap,
+  });
+
+  await bundle.close();
+}
+
+await fs.writeJSON(
+  path.join(outputDir, "package.json"),
+  {
+    ...packageJson,
+    dependencies: await transformWorkspaceDeps(packageJson.dependencies),
+    main: "dist-cjs/index.js",
+    module: "dist-es/index.js",
+    typings: "dist-types/types/index.d.ts",
+    exports: {
+      ".": {
+        import: "./dist-es/index.js",
+        require: "./dist-cjs/index.js",
+        types: "./dist-types/types/index.d.ts",
+      },
+      "./date-fns": {
+        import: "./dist-es/date-fns/index.js",
+        require: "./dist-cjs/date-fns/index.js",
+        types: "./dist-types/date-fns-adapter/index.d.ts",
+      },
+      "./dayjs": {
+        import: "./dist-es/dayjs/index.js",
+        require: "./dist-cjs/dayjs/index.js",
+        types: "./dist-types/dayjs-adapter/index.d.ts",
+      },
+      "./luxon": {
+        import: "./dist-es/luxon/index.js",
+        require: "./dist-cjs/luxon/index.js",
+        types: "./dist-types/luxon-adapter/index.d.ts",
+      },
+      "./moment": {
+        import: "./dist-es/moment/index.js",
+        require: "./dist-cjs/moment/index.js",
+        types: "./dist-types/moment-adapter/index.d.ts",
+      },
+    },
+    files: distinct([
+      ...(packageJson.files ?? []),
+      "dist-cjs",
+      "dist-es",
+      "dist-types",
+      "CHANGELOG.md",
+    ]),
+  },
+  { spaces: 2 },
+);
+
+for (const file of FILES_TO_COPY) {
+  const filePath = path.join(cwd, file);
+  try {
+    await fs.copy(filePath, path.join(outputDir, file));
+  } catch (error) {
+    if (error.code !== "ENOENT") {
+      throw error;
+    }
+  }
+}
+
+console.log(`Built ${packageName} into ${outputDir}`);
diff --git a/packages/date-adapters/src/date-fns/index.ts → ...te-adapters/src/date-fns-adapter/index.ts b/packages/date-adapters/src/date-fns/index.ts → ...te-adapters/src/date-fns-adapter/index.ts
@@ -41,7 +41,7 @@ import {
   type Timezone,
 } from "../types";
 
-declare module "../types" {
+declare module "@salt-ds/date-adapters" {
   interface DateFrameworkTypeMap {
     "date-fns": Date;
   }

diff --git a/packages/date-adapters/src/dayjs/index.ts → .../date-adapters/src/dayjs-adapter/index.ts b/packages/date-adapters/src/dayjs/index.ts → .../date-adapters/src/dayjs-adapter/index.ts
@@ -20,7 +20,7 @@ type Constructor = {
   utc?: (value?: Parameters<typeof defaultDayjs>[0]) => Dayjs;
 };
 
-declare module "../types" {
+declare module "@salt-ds/date-adapters" {
   interface DateFrameworkTypeMap {
     dayjs: Dayjs;
   }

diff --git a/packages/date-adapters/src/index.ts b/packages/date-adapters/src/index.ts
@@ -1,18 +1,5 @@
-/**
- * To add a new adapter, then, add the adapter's date object to `DateFrameworkTypeMap` interface
- *
- * declare module "./types" {
- *   interface DateFrameworkTypeMap {
- *     luxon: DateTime;
- *   }
- * }
- */
-// biome-ignore lint/complexity/noBannedTypes: type augmented by configured adapters
-export type DateFrameworkTypeMap = {};
-
-export * from "./date-fns";
-export * from "./dayjs";
-export * from "./luxon";
-export * from "./moment";
-
+export * from "./date-fns-adapter";
+export * from "./dayjs-adapter";
+export * from "./luxon-adapter";
+export * from "./moment-adapter";
 export * from "./types";
diff --git a/packages/date-adapters/src/luxon/index.ts → .../date-adapters/src/luxon-adapter/index.ts b/packages/date-adapters/src/luxon/index.ts → .../date-adapters/src/luxon-adapter/index.ts
@@ -9,7 +9,7 @@ import {
   type Timezone,
 } from "../types";
 
-declare module "../types" {
+declare module "@salt-ds/date-adapters" {
   interface DateFrameworkTypeMap {
     luxon: DateTime;
   }

diff --git a/packages/date-adapters/src/moment/index.ts → ...date-adapters/src/moment-adapter/index.ts b/packages/date-adapters/src/moment/index.ts → ...date-adapters/src/moment-adapter/index.ts
@@ -9,7 +9,7 @@ import {
   type Timezone,
 } from "../types";
 
-declare module "../types" {
+declare module "@salt-ds/date-adapters" {
   export interface DateFrameworkTypeMap {
     moment: Moment;
   }

diff --git a/packages/date-adapters/src/types/DateFrameworkTypeMap.ts b/packages/date-adapters/src/types/DateFrameworkTypeMap.ts
@@ -0,0 +1,12 @@
+/**
+ * To add a new adapter, then, add the adapter's date object to `DateFrameworkTypeMap` interface
+ *
+ * declare module "./types" {
+ *   interface DateFrameworkTypeMap {
+ *     luxon: DateTime;
+ *   }
+ * }
+ */
+
+// biome-ignore lint/complexity/noBannedTypes: type augmented by configured adapters
+export type DateFrameworkTypeMap = {};
diff --git a/packages/date-adapters/src/types.ts → packages/date-adapters/src/types/index.ts b/packages/date-adapters/src/types.ts → packages/date-adapters/src/types/index.ts
@@ -1,3 +1,4 @@
+import type { DateFrameworkTypeMap } from "./DateFrameworkTypeMap";
 /**
  * Represents the date object of a date framework.
  *

diff --git a/packages/date-adapters/tsconfig.json b/packages/date-adapters/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./src",
+    "declaration": false,
+    "outDir": "./dist",
+    "module": "commonjs",
+    "target": "es2016",
+    "moduleResolution": "node",
+    "strict": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true
+  },
+  "include": ["src/**/*"]
+}
diff --git a/packages/lab/src/__tests__/__e2e__/calendar/Calendar.a11y.cy.tsx b/packages/lab/src/__tests__/__e2e__/calendar/Calendar.a11y.cy.tsx
@@ -1,7 +1,9 @@
-import { AdapterDateFns } from "@salt-ds/date-adapters";
-import { AdapterDayjs } from "@salt-ds/date-adapters";
-import { AdapterLuxon } from "@salt-ds/date-adapters";
-import { AdapterMoment } from "@salt-ds/date-adapters";
+import {
+  AdapterDateFns,
+  AdapterDayjs,
+  AdapterLuxon,
+  AdapterMoment,
+} from "@salt-ds/date-adapters";
 
 import * as calendarStories from "@stories/calendar/calendar.stories";
 import { composeStories } from "@storybook/react";

diff --git a/packages/lab/src/__tests__/__e2e__/calendar/Calendar.cy.tsx b/packages/lab/src/__tests__/__e2e__/calendar/Calendar.cy.tsx
@@ -1,11 +1,11 @@
-import type {
-  DateFrameworkType,
-  SaltDateAdapter,
+import {
+  AdapterDateFns,
+  AdapterDayjs,
+  AdapterLuxon,
+  AdapterMoment,
+  type DateFrameworkType,
+  type SaltDateAdapter,
 } from "@salt-ds/date-adapters";
-import { AdapterDateFns } from "@salt-ds/date-adapters";
-import { AdapterDayjs } from "@salt-ds/date-adapters";
-import { AdapterLuxon } from "@salt-ds/date-adapters";
-import { AdapterMoment } from "@salt-ds/date-adapters";
 import {
   Calendar,
   CalendarGrid,

diff --git a/packages/lab/src/__tests__/__e2e__/calendar/Calendar.multiselect.cy.tsx b/packages/lab/src/__tests__/__e2e__/calendar/Calendar.multiselect.cy.tsx
@@ -1,11 +1,11 @@
-import type {
-  DateFrameworkType,
-  SaltDateAdapter,
+import {
+  AdapterDateFns,
+  AdapterDayjs,
+  AdapterLuxon,
+  AdapterMoment,
+  type DateFrameworkType,
+  type SaltDateAdapter,
 } from "@salt-ds/date-adapters";
-import { AdapterDateFns } from "@salt-ds/date-adapters";
-import { AdapterDayjs } from "@salt-ds/date-adapters";
-import { AdapterLuxon } from "@salt-ds/date-adapters";
-import { AdapterMoment } from "@salt-ds/date-adapters";
 import {
   Calendar,
   CalendarGrid,

diff --git a/packages/lab/src/__tests__/__e2e__/calendar/Calendar.offset.cy.tsx b/packages/lab/src/__tests__/__e2e__/calendar/Calendar.offset.cy.tsx
@@ -1,11 +1,11 @@
-import type {
-  DateFrameworkType,
-  SaltDateAdapter,
+import {
+  AdapterDateFns,
+  AdapterDayjs,
+  AdapterLuxon,
+  AdapterMoment,
+  type DateFrameworkType,
+  type SaltDateAdapter,
 } from "@salt-ds/date-adapters";
-import { AdapterDateFns } from "@salt-ds/date-adapters";
-import { AdapterDayjs } from "@salt-ds/date-adapters";
-import { AdapterLuxon } from "@salt-ds/date-adapters";
-import { AdapterMoment } from "@salt-ds/date-adapters";
 import {
   Calendar,
   CalendarGrid,

diff --git a/packages/lab/src/__tests__/__e2e__/calendar/Calendar.single.cy.tsx b/packages/lab/src/__tests__/__e2e__/calendar/Calendar.single.cy.tsx
@@ -1,11 +1,11 @@
-import type {
-  DateFrameworkType,
-  SaltDateAdapter,
+import {
+  AdapterDateFns,
+  AdapterDayjs,
+  AdapterLuxon,
+  AdapterMoment,
+  type DateFrameworkType,
+  type SaltDateAdapter,
 } from "@salt-ds/date-adapters";
-import { AdapterDateFns } from "@salt-ds/date-adapters";
-import { AdapterDayjs } from "@salt-ds/date-adapters";
-import { AdapterLuxon } from "@salt-ds/date-adapters";
-import { AdapterMoment } from "@salt-ds/date-adapters";
 import {
   Calendar,
   CalendarGrid,

diff --git a/packages/lab/src/__tests__/__e2e__/date-input/DateInput.cy.tsx b/packages/lab/src/__tests__/__e2e__/date-input/DateInput.cy.tsx
@@ -1,7 +1,9 @@
-import { AdapterDateFns } from "@salt-ds/date-adapters";
-import { AdapterDayjs } from "@salt-ds/date-adapters";
-import { AdapterLuxon } from "@salt-ds/date-adapters";
-import { AdapterMoment } from "@salt-ds/date-adapters";
+import {
+  AdapterDateFns,
+  AdapterDayjs,
+  AdapterLuxon,
+  AdapterMoment,
+} from "@salt-ds/date-adapters";
 import * as dateInputStories from "@stories/date-input/date-input.stories";
 import { composeStories } from "@storybook/react";
 import { checkAccessibility } from "../../../../../../cypress/tests/checkAccessibility";