diff --git a/package-lock.json b/package-lock.json index 872ac125986..83f6f9b23c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33757,6 +33757,7 @@ "npm-run-all": "^4.1.5", "prettier": "^2.5.0", "ts-jest": "^27.1.3", + "tsup": "*", "typescript": "*" }, "engines": { @@ -33788,7 +33789,7 @@ "@types/js-cookie": "^3.0.2", "js-cookie": "^3.0.1", "swr": "^1.3.0", - "tsup": "^6.2.3", + "tsup": "*", "typescript": "*", "vitest": "^0.23.4" }, @@ -37026,6 +37027,7 @@ "snakecase-keys": "3.2.1", "ts-jest": "^27.1.3", "tslib": "2.4.1", + "tsup": "*", "typescript": "*" }, "dependencies": { @@ -37133,7 +37135,7 @@ "@types/js-cookie": "^3.0.2", "js-cookie": "^3.0.1", "swr": "^1.3.0", - "tsup": "^6.2.3", + "tsup": "*", "typescript": "*", "vitest": "^0.23.4" } diff --git a/packages/sdk-node/cjs/instance.d.ts b/packages/sdk-node/cjs/instance.d.ts index 731eed9c8c3..3b3f0f2d375 100644 --- a/packages/sdk-node/cjs/instance.d.ts +++ b/packages/sdk-node/cjs/instance.d.ts @@ -1,2 +1,2 @@ -export * from '../dist/cjs/instance'; -export { default } from '../dist/cjs/instance'; +export * from '../dist/types/instance'; +export { default } from '../dist/types/instance'; diff --git a/packages/sdk-node/cjs/instance.js b/packages/sdk-node/cjs/instance.js index 879f07c57bf..7b9a9c0ee6f 100644 --- a/packages/sdk-node/cjs/instance.js +++ b/packages/sdk-node/cjs/instance.js @@ -1 +1 @@ -module.exports = require('../dist/cjs/instance'); +module.exports = require('./../dist/instance'); diff --git a/packages/sdk-node/esm/instance.d.ts b/packages/sdk-node/esm/instance.d.ts index 0448b865770..3b3f0f2d375 100644 --- a/packages/sdk-node/esm/instance.d.ts +++ b/packages/sdk-node/esm/instance.d.ts @@ -1,2 +1,2 @@ -export * from '../dist/esm/instance'; -export { default } from '../dist/esm/instance'; +export * from '../dist/types/instance'; +export { default } from '../dist/types/instance'; diff --git a/packages/sdk-node/esm/instance.js b/packages/sdk-node/esm/instance.js index bda6d1b1ecb..b216a148d7e 100644 --- a/packages/sdk-node/esm/instance.js +++ b/packages/sdk-node/esm/instance.js @@ -1 +1 @@ -module.exports = require('../dist/esm/instance'); +export * from './../dist/instance.mjs'; diff --git a/packages/sdk-node/package.json b/packages/sdk-node/package.json index 65fe529fe1d..6631557c664 100644 --- a/packages/sdk-node/package.json +++ b/packages/sdk-node/package.json @@ -1,12 +1,28 @@ { "version": "4.5.12", "license": "MIT", - "main": "dist/cjs/index.js", - "module": "dist/esm/index.js", - "typings": "dist/cjs/index.d.ts", + "type": "commonjs", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "types": "./dist/types/index.d.ts", + "exports": { + ".": { + "types": "./dist/types/index.d.ts", + "require": "./dist/index.js", + "import": "./dist/index.mjs", + "default": "./dist/index.js" + }, + "./esm/instance": { + "types": "./dist/types/instance.d.ts", + "default": "./dist/instance.mjs" + }, + "./cjs/instance": { + "types": "./dist/types/instance.d.ts", + "default": "./dist/instance.js" + } + }, "files": [ "dist", - "package.json", "esm", "cjs" ], @@ -14,9 +30,8 @@ "node": ">=14" }, "scripts": { - "build:es5": "node ./scripts/info.js && tsc -p tsconfig.build.json", - "build:esm": "node ./scripts/info.js && tsc -p tsconfig.esm.json", - "build": "run-p build:es5 build:esm", + "dev": "tsup --watch", + "build": "tsup --env.NODE_ENV production", "clean": "rimraf ./dist", "lint": "eslint .", "test": "jest", @@ -34,6 +49,7 @@ "npm-run-all": "^4.1.5", "prettier": "^2.5.0", "ts-jest": "^27.1.3", + "tsup": "*", "typescript": "*" }, "dependencies": { diff --git a/packages/sdk-node/tsconfig.build.json b/packages/sdk-node/tsconfig.build.json deleted file mode 100644 index b3642032c70..00000000000 --- a/packages/sdk-node/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "dist/cjs", - "module": "commonjs" - }, - "include": ["src/**/*"] -} diff --git a/packages/sdk-node/tsconfig.esm.json b/packages/sdk-node/tsconfig.esm.json deleted file mode 100644 index 3e035075513..00000000000 --- a/packages/sdk-node/tsconfig.esm.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "dist/esm", - "module": "ES6" - }, - "include": ["src/**/*"] -} diff --git a/packages/sdk-node/tsconfig.json b/packages/sdk-node/tsconfig.json index 250a1830f13..1bf7434c2a4 100644 --- a/packages/sdk-node/tsconfig.json +++ b/packages/sdk-node/tsconfig.json @@ -1,19 +1,21 @@ { - "include": ["src"], - "exclude": ["dist", "esm", "src/__tests__"], "compilerOptions": { - "strict": true, "declaration": true, - "declarationMap": false, - "downlevelIteration": true, - "sourceMap": false, + "declarationDir": "dist/types", + "declarationMap": true, + "emitDeclarationOnly": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, "importHelpers": true, + "moduleResolution": "node", "noImplicitReturns": true, "noUnusedLocals": true, "noUnusedParameters": true, - "forceConsistentCasingInFileNames": true, - "target": "ES2020", - "moduleResolution": "node", - "esModuleInterop": true - } + "resolveJsonModule": true, + "sourceMap": false, + "strict": true, + "target": "ES2020" + }, + "exclude": ["node_modules"], + "include": ["src/index.ts", "src/instance.ts"] } diff --git a/packages/sdk-node/tsup.config.ts b/packages/sdk-node/tsup.config.ts new file mode 100644 index 00000000000..91cc332a304 --- /dev/null +++ b/packages/sdk-node/tsup.config.ts @@ -0,0 +1,24 @@ +import { defineConfig } from 'tsup'; + +import { name, version } from './package.json'; + +console.log({ name, version }); +export default defineConfig(overrideOptions => { + const isProd = overrideOptions.env?.NODE_ENV === 'production'; + + return { + entry: ['src/index.ts', 'src/instance.ts'], + onSuccess: 'tsc', + clean: true, + // minify: isProd, + minify: false, + sourcemap: true, + format: ['cjs', 'esm'], + define: { + PACKAGE_NAME: `"${name}"`, + PACKAGE_VERSION: `"${version}"`, + __DEV__: `${!isProd}`, + }, + external: [], + }; +}); diff --git a/packages/shared/package.json b/packages/shared/package.json index 12650138b72..287811a3031 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -26,7 +26,7 @@ "@types/js-cookie": "^3.0.2", "js-cookie": "^3.0.1", "swr": "^1.3.0", - "tsup": "^6.2.3", + "tsup": "*", "typescript": "*", "vitest": "^0.23.4" },