From e629c248ea34dc887ee8d39209a2f2ff8b5c7b7c Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Fri, 15 Dec 2023 00:07:10 -0500 Subject: [PATCH] d3-state-visualizer --- .../{.eslintrc.js => .eslintrc.cjs} | 0 .../d3-state-visualizer/babel.config.esm.json | 7 ------- packages/d3-state-visualizer/babel.config.json | 7 ------- packages/d3-state-visualizer/package.json | 17 ++++------------- .../d3-state-visualizer/src/charts/index.ts | 4 ++-- .../d3-state-visualizer/src/charts/tree/tree.ts | 6 +++--- .../src/charts/tree/utils.ts | 4 ++-- packages/d3-state-visualizer/src/index.ts | 9 +++++++-- packages/d3-state-visualizer/tsconfig.json | 4 ++-- packages/map2tree/tsconfig.json | 2 +- 10 files changed, 21 insertions(+), 39 deletions(-) rename packages/d3-state-visualizer/{.eslintrc.js => .eslintrc.cjs} (100%) delete mode 100644 packages/d3-state-visualizer/babel.config.esm.json delete mode 100644 packages/d3-state-visualizer/babel.config.json diff --git a/packages/d3-state-visualizer/.eslintrc.js b/packages/d3-state-visualizer/.eslintrc.cjs similarity index 100% rename from packages/d3-state-visualizer/.eslintrc.js rename to packages/d3-state-visualizer/.eslintrc.cjs diff --git a/packages/d3-state-visualizer/babel.config.esm.json b/packages/d3-state-visualizer/babel.config.esm.json deleted file mode 100644 index 1c02687e..00000000 --- a/packages/d3-state-visualizer/babel.config.esm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "presets": [ - ["@babel/preset-env", { "targets": "defaults", "modules": false }], - "@babel/preset-typescript" - ], - "plugins": ["@babel/plugin-transform-runtime"] -} diff --git a/packages/d3-state-visualizer/babel.config.json b/packages/d3-state-visualizer/babel.config.json deleted file mode 100644 index 5ed95986..00000000 --- a/packages/d3-state-visualizer/babel.config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "presets": [ - ["@babel/preset-env", { "targets": "defaults" }], - "@babel/preset-typescript" - ], - "plugins": ["@babel/plugin-transform-runtime"] -} diff --git a/packages/d3-state-visualizer/package.json b/packages/d3-state-visualizer/package.json index b698a28b..9b7ad8ce 100644 --- a/packages/d3-state-visualizer/package.json +++ b/packages/d3-state-visualizer/package.json @@ -20,19 +20,16 @@ "lib", "src" ], - "main": "lib/cjs/index.js", - "module": "lib/esm/index.js", - "types": "lib/types/index.d.ts", + "main": "lib/index.js", + "types": "lib/index.d.ts", "sideEffects": false, + "type": "module", "repository": { "type": "git", "url": "https://github.com/reduxjs/redux-devtools.git" }, "scripts": { - "build": "pnpm run build:cjs && pnpm run build:esm && pnpm run build:types", - "build:cjs": "babel src --extensions \".ts\" --out-dir lib/cjs", - "build:esm": "babel src --config-file ./babel.config.esm.json --extensions \".ts\" --out-dir lib/esm", - "build:types": "tsc --emitDeclarationOnly", + "build": "tsc", "clean": "rimraf lib", "lint": "eslint . --ext .ts", "type-check": "tsc --noEmit", @@ -40,7 +37,6 @@ "prepublish": "pnpm run type-check && pnpm run lint" }, "dependencies": { - "@babel/runtime": "^7.23.5", "@types/d3": "^7.4.3", "d3": "^7.8.5", "d3tooltip": "^3.0.0", @@ -49,11 +45,6 @@ "ramda": "^0.29.1" }, "devDependencies": { - "@babel/cli": "^7.23.4", - "@babel/core": "^7.23.5", - "@babel/eslint-parser": "^7.23.3", - "@babel/preset-env": "^7.23.5", - "@babel/preset-typescript": "^7.23.3", "@types/ramda": "^0.29.9", "@typescript-eslint/eslint-plugin": "^6.13.2", "@typescript-eslint/parser": "^6.13.2", diff --git a/packages/d3-state-visualizer/src/charts/index.ts b/packages/d3-state-visualizer/src/charts/index.ts index 90e07fa8..c3b555d1 100644 --- a/packages/d3-state-visualizer/src/charts/index.ts +++ b/packages/d3-state-visualizer/src/charts/index.ts @@ -1,4 +1,4 @@ export type { HierarchyPointNode } from 'd3'; export type { StyleValue } from 'd3tooltip'; -export { default as tree } from './tree/tree'; -export type { Node, Options } from './tree/tree'; +export { default as tree } from './tree/tree.js'; +export type { Node, Options } from './tree/tree.js'; diff --git a/packages/d3-state-visualizer/src/charts/tree/tree.ts b/packages/d3-state-visualizer/src/charts/tree/tree.ts index 368c6811..6122e563 100644 --- a/packages/d3-state-visualizer/src/charts/tree/tree.ts +++ b/packages/d3-state-visualizer/src/charts/tree/tree.ts @@ -4,14 +4,14 @@ import { isEmpty } from 'ramda'; import { map2tree } from 'map2tree'; import type { Node } from 'map2tree'; import deepmerge from 'deepmerge'; +import { tooltip } from 'd3tooltip'; +import type { StyleValue } from 'd3tooltip'; import { getTooltipString, toggleChildren, visit, getNodeGroupByDepthCount, -} from './utils'; -import { tooltip } from 'd3tooltip'; -import type { StyleValue } from 'd3tooltip'; +} from './utils.js'; export interface Options { // eslint-disable-next-line @typescript-eslint/ban-types diff --git a/packages/d3-state-visualizer/src/charts/tree/utils.ts b/packages/d3-state-visualizer/src/charts/tree/utils.ts index 8f229cae..b63baf74 100644 --- a/packages/d3-state-visualizer/src/charts/tree/utils.ts +++ b/packages/d3-state-visualizer/src/charts/tree/utils.ts @@ -1,6 +1,6 @@ import { is, join, pipe, replace } from 'ramda'; -import sortAndSerialize from './sortAndSerialize'; -import type { InternalNode } from './tree'; +import sortAndSerialize from './sortAndSerialize.js'; +import type { InternalNode } from './tree.js'; export function collapseChildren(node: InternalNode) { if (node.children) { diff --git a/packages/d3-state-visualizer/src/index.ts b/packages/d3-state-visualizer/src/index.ts index a2ce88d8..e73eb6c6 100644 --- a/packages/d3-state-visualizer/src/index.ts +++ b/packages/d3-state-visualizer/src/index.ts @@ -1,2 +1,7 @@ -export { tree } from './charts'; -export type { HierarchyPointNode, Node, Options, StyleValue } from './charts'; +export { tree } from './charts/index.js'; +export type { + HierarchyPointNode, + Node, + Options, + StyleValue, +} from './charts/index.js'; diff --git a/packages/d3-state-visualizer/tsconfig.json b/packages/d3-state-visualizer/tsconfig.json index 19e4e718..e3160ce3 100644 --- a/packages/d3-state-visualizer/tsconfig.json +++ b/packages/d3-state-visualizer/tsconfig.json @@ -1,7 +1,7 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.esm.base.json", "compilerOptions": { - "outDir": "lib/types" + "outDir": "lib" }, "include": ["src"] } diff --git a/packages/map2tree/tsconfig.json b/packages/map2tree/tsconfig.json index 3f516e3e..e3160ce3 100644 --- a/packages/map2tree/tsconfig.json +++ b/packages/map2tree/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.esm.base.json", "compilerOptions": { - "outDir": "lib/types" + "outDir": "lib" }, "include": ["src"] }