From 15add8d1bee0e1525205521c5ff19d52edfc96f9 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Fri, 15 Dec 2023 00:02:59 -0500 Subject: [PATCH] map2tree --- packages/d3tooltip/tsconfig.json | 2 +- .../map2tree/{.eslintrc.js => .eslintrc.cjs} | 0 packages/map2tree/babel.config.esm.json | 7 ----- packages/map2tree/babel.config.json | 7 ----- packages/map2tree/jest.config.cjs | 13 ++++++++++ packages/map2tree/jest.config.js | 6 ----- packages/map2tree/package.json | 25 ++++++------------ packages/map2tree/src/index.ts | 4 +-- packages/map2tree/test/map2tree.spec.ts | 2 +- packages/map2tree/tsconfig.json | 2 +- packages/map2tree/tsconfig.test.json | 2 +- pnpm-lock.yaml | 26 +++---------------- 12 files changed, 30 insertions(+), 66 deletions(-) rename packages/map2tree/{.eslintrc.js => .eslintrc.cjs} (100%) delete mode 100644 packages/map2tree/babel.config.esm.json delete mode 100644 packages/map2tree/babel.config.json create mode 100644 packages/map2tree/jest.config.cjs delete mode 100644 packages/map2tree/jest.config.js diff --git a/packages/d3tooltip/tsconfig.json b/packages/d3tooltip/tsconfig.json index 73069549..e3160ce3 100644 --- a/packages/d3tooltip/tsconfig.json +++ b/packages/d3tooltip/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.esm.react.base.json", + "extends": "../../tsconfig.esm.base.json", "compilerOptions": { "outDir": "lib" }, diff --git a/packages/map2tree/.eslintrc.js b/packages/map2tree/.eslintrc.cjs similarity index 100% rename from packages/map2tree/.eslintrc.js rename to packages/map2tree/.eslintrc.cjs diff --git a/packages/map2tree/babel.config.esm.json b/packages/map2tree/babel.config.esm.json deleted file mode 100644 index 1c02687e..00000000 --- a/packages/map2tree/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/map2tree/babel.config.json b/packages/map2tree/babel.config.json deleted file mode 100644 index 5ed95986..00000000 --- a/packages/map2tree/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/map2tree/jest.config.cjs b/packages/map2tree/jest.config.cjs new file mode 100644 index 00000000..575fb221 --- /dev/null +++ b/packages/map2tree/jest.config.cjs @@ -0,0 +1,13 @@ +module.exports = { + preset: 'ts-jest', + extensionsToTreatAsEsm: ['.ts'], + moduleNameMapper: { + '^(\\.{1,2}/.*)\\.js$': '$1', + }, + transform: { + '^.+\\.m?[tj]sx?$': [ + 'ts-jest', + { tsconfig: 'tsconfig.test.json', useESM: true }, + ], + }, +}; diff --git a/packages/map2tree/jest.config.js b/packages/map2tree/jest.config.js deleted file mode 100644 index f68efd05..00000000 --- a/packages/map2tree/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - transform: { - '^.+\\.tsx?$': ['ts-jest', { tsconfig: 'tsconfig.test.json' }], - }, -}; diff --git a/packages/map2tree/package.json b/packages/map2tree/package.json index 46d7a082..9d4e9315 100755 --- a/packages/map2tree/package.json +++ b/packages/map2tree/package.json @@ -19,38 +19,29 @@ "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", - "test": "jest", + "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js", "lint": "eslint . --ext .ts", "type-check": "tsc --noEmit", "prepack": "pnpm run clean && pnpm run build", - "prepublish": "pnpm run type-check && pnpm run lint && pnpm run test" + "prepublish": "pnpm run lint && pnpm run test" }, "dependencies": { - "@babel/runtime": "^7.23.5", - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "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/jest": "^29.5.11", - "@types/lodash": "^4.14.202", + "@types/lodash-es": "^4.17.12", "@typescript-eslint/eslint-plugin": "^6.13.2", "@typescript-eslint/parser": "^6.13.2", "eslint": "^8.55.0", diff --git a/packages/map2tree/src/index.ts b/packages/map2tree/src/index.ts index 74e231fb..322379e5 100644 --- a/packages/map2tree/src/index.ts +++ b/packages/map2tree/src/index.ts @@ -1,6 +1,4 @@ -import isArray from 'lodash/isArray'; -import isPlainObject from 'lodash/isPlainObject'; -import mapValues from 'lodash/mapValues'; +import { isArray, isPlainObject, mapValues } from 'lodash-es'; export interface Node { name: string; diff --git a/packages/map2tree/test/map2tree.spec.ts b/packages/map2tree/test/map2tree.spec.ts index 6cd6a10d..415c1e6d 100644 --- a/packages/map2tree/test/map2tree.spec.ts +++ b/packages/map2tree/test/map2tree.spec.ts @@ -1,4 +1,4 @@ -import { map2tree, Node } from '../src'; +import { map2tree, Node } from '../src/index.js'; import * as immutable from 'immutable'; test('# rootNodeKey', () => { diff --git a/packages/map2tree/tsconfig.json b/packages/map2tree/tsconfig.json index 0aade49a..3f516e3e 100644 --- a/packages/map2tree/tsconfig.json +++ b/packages/map2tree/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.react.base.json", + "extends": "../../tsconfig.esm.base.json", "compilerOptions": { "outDir": "lib/types" }, diff --git a/packages/map2tree/tsconfig.test.json b/packages/map2tree/tsconfig.test.json index d0d15f67..52e69314 100644 --- a/packages/map2tree/tsconfig.test.json +++ b/packages/map2tree/tsconfig.test.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.esm.base.json", "compilerOptions": { "types": ["jest"] }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 597991ba..0f0a4c51 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -374,34 +374,16 @@ importers: packages/map2tree: dependencies: - '@babel/runtime': - specifier: ^7.23.5 - version: 7.23.5 - lodash: + lodash-es: specifier: ^4.17.21 version: 4.17.21 devDependencies: - '@babel/cli': - specifier: ^7.23.4 - version: 7.23.4(@babel/core@7.23.5) - '@babel/core': - specifier: ^7.23.5 - version: 7.23.5 - '@babel/eslint-parser': - specifier: ^7.23.3 - version: 7.23.3(@babel/core@7.23.5)(eslint@8.55.0) - '@babel/preset-env': - specifier: ^7.23.5 - version: 7.23.5(@babel/core@7.23.5) - '@babel/preset-typescript': - specifier: ^7.23.3 - version: 7.23.3(@babel/core@7.23.5) '@types/jest': specifier: ^29.5.11 version: 29.5.11 - '@types/lodash': - specifier: ^4.14.202 - version: 4.14.202 + '@types/lodash-es': + specifier: ^4.17.12 + version: 4.17.12 '@typescript-eslint/eslint-plugin': specifier: ^6.13.2 version: 6.13.2(@typescript-eslint/parser@6.13.2)(eslint@8.55.0)(typescript@5.3.3)