From 77dd8970d529e7b27658dbde847f0f4068d2e88f Mon Sep 17 00:00:00 2001 From: Otavio Augusto Date: Mon, 20 Nov 2023 10:10:09 -0800 Subject: [PATCH] do not bundle or minify, generate declaration map Using tsup only to transpile ts files. Disabled bundling, minifying and declaration generation. Using tsup onSuccess to use tsc to emit declaration and declaration sourcemap --- examples/data-generator/package.json | 2 +- packages/ra-core/package.json | 4 ++-- packages/ra-core/tsconfig.json | 2 +- packages/ra-data-fakerest/package.json | 4 ++-- packages/ra-data-fakerest/tsconfig.json | 2 +- packages/ra-data-graphql-simple/package.json | 4 ++-- packages/ra-data-graphql-simple/tsconfig.json | 2 +- packages/ra-data-graphql/package.json | 4 ++-- packages/ra-data-graphql/tsconfig.json | 2 +- packages/ra-data-json-server/package.json | 4 ++-- packages/ra-data-json-server/tsconfig.json | 2 +- packages/ra-data-localforage/package.json | 4 ++-- packages/ra-data-localforage/tsconfig.json | 2 +- packages/ra-data-localstorage/package.json | 4 ++-- packages/ra-data-localstorage/tsconfig.json | 2 +- packages/ra-data-simple-rest/package.json | 4 ++-- packages/ra-data-simple-rest/tsconfig.json | 2 +- packages/ra-i18n-i18next/package.json | 4 ++-- packages/ra-i18n-i18next/tsconfig.json | 2 +- packages/ra-i18n-polyglot/package.json | 4 ++-- packages/ra-i18n-polyglot/tsconfig.json | 2 +- packages/ra-input-rich-text/package.json | 4 ++-- packages/ra-input-rich-text/tsconfig.json | 16 ++++++++-------- packages/ra-language-english/package.json | 4 ++-- packages/ra-language-english/tsconfig.json | 2 +- packages/ra-language-french/package.json | 4 ++-- packages/ra-language-french/tsconfig.json | 2 +- packages/ra-no-code/package.json | 4 ++-- packages/ra-no-code/tsconfig.json | 7 ++----- packages/ra-ui-materialui/package.json | 4 ++-- packages/ra-ui-materialui/tsconfig.json | 11 ++++++++--- packages/react-admin/package.json | 4 ++-- packages/react-admin/tsconfig.json | 2 +- tsconfig.json | 3 ++- tsup.config.ts | 15 +++++++++++---- 35 files changed, 77 insertions(+), 67 deletions(-) diff --git a/examples/data-generator/package.json b/examples/data-generator/package.json index ae9231685f7..a0245d566f3 100644 --- a/examples/data-generator/package.json +++ b/examples/data-generator/package.json @@ -9,7 +9,7 @@ "types": "dist/index.d.ts", "scripts": { "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "watch": "yarn tsup --watch" }, "dependencies": { "date-fns": "^2.19.0", diff --git a/packages/ra-core/package.json b/packages/ra-core/package.json index 2326ad92e6c..54c8cca6c5e 100644 --- a/packages/ra-core/package.json +++ b/packages/ra-core/package.json @@ -27,8 +27,8 @@ "bugs": "https://github.com/marmelab/react-admin/issues", "license": "MIT", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "devDependencies": { "@hookform/resolvers": "^3.2.0", diff --git a/packages/ra-core/tsconfig.json b/packages/ra-core/tsconfig.json index 6fb08aeb372..4fc99e7ce69 100644 --- a/packages/ra-core/tsconfig.json +++ b/packages/ra-core/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-data-fakerest/package.json b/packages/ra-data-fakerest/package.json index 5930a7cdaff..2dcefb0a02e 100644 --- a/packages/ra-data-fakerest/package.json +++ b/packages/ra-data-fakerest/package.json @@ -38,8 +38,8 @@ }, "homepage": "https://github.com/marmelab/react-admin#readme", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "fakerest": "^3.0.0" diff --git a/packages/ra-data-fakerest/tsconfig.json b/packages/ra-data-fakerest/tsconfig.json index a18665f388c..57c68223c8b 100644 --- a/packages/ra-data-fakerest/tsconfig.json +++ b/packages/ra-data-fakerest/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-data-graphql-simple/package.json b/packages/ra-data-graphql-simple/package.json index c2685899717..4a8152ca2c5 100644 --- a/packages/ra-data-graphql-simple/package.json +++ b/packages/ra-data-graphql-simple/package.json @@ -34,8 +34,8 @@ ], "license": "MIT", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "@apollo/client": "^3.3.19", diff --git a/packages/ra-data-graphql-simple/tsconfig.json b/packages/ra-data-graphql-simple/tsconfig.json index d4980ef9fa6..28274dcf752 100644 --- a/packages/ra-data-graphql-simple/tsconfig.json +++ b/packages/ra-data-graphql-simple/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-data-graphql/package.json b/packages/ra-data-graphql/package.json index 9ec302d5f5a..9782996e3e7 100644 --- a/packages/ra-data-graphql/package.json +++ b/packages/ra-data-graphql/package.json @@ -34,8 +34,8 @@ ], "license": "MIT", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "@apollo/client": "^3.3.19", diff --git a/packages/ra-data-graphql/tsconfig.json b/packages/ra-data-graphql/tsconfig.json index d4980ef9fa6..28274dcf752 100644 --- a/packages/ra-data-graphql/tsconfig.json +++ b/packages/ra-data-graphql/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-data-json-server/package.json b/packages/ra-data-json-server/package.json index c50d803a771..bc7eb840f23 100644 --- a/packages/ra-data-json-server/package.json +++ b/packages/ra-data-json-server/package.json @@ -26,8 +26,8 @@ "bugs": "https://github.com/marmelab/react-admin/issues", "license": "MIT", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "query-string": "^7.1.1", diff --git a/packages/ra-data-json-server/tsconfig.json b/packages/ra-data-json-server/tsconfig.json index a18665f388c..57c68223c8b 100644 --- a/packages/ra-data-json-server/tsconfig.json +++ b/packages/ra-data-json-server/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-data-localforage/package.json b/packages/ra-data-localforage/package.json index 66b084ce65a..6d9e5272c9f 100644 --- a/packages/ra-data-localforage/package.json +++ b/packages/ra-data-localforage/package.json @@ -41,8 +41,8 @@ }, "homepage": "https://github.com/marmelab/react-admin#readme", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "localforage": "^1.7.1", diff --git a/packages/ra-data-localforage/tsconfig.json b/packages/ra-data-localforage/tsconfig.json index f9f0259f05b..3e3f48efc2c 100644 --- a/packages/ra-data-localforage/tsconfig.json +++ b/packages/ra-data-localforage/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "declaration": true, "declarationMap": true, diff --git a/packages/ra-data-localstorage/package.json b/packages/ra-data-localstorage/package.json index 3dc6045b7ad..a98ec974007 100644 --- a/packages/ra-data-localstorage/package.json +++ b/packages/ra-data-localstorage/package.json @@ -38,8 +38,8 @@ }, "homepage": "https://github.com/marmelab/react-admin#readme", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "lodash": "~4.17.5", diff --git a/packages/ra-data-localstorage/tsconfig.json b/packages/ra-data-localstorage/tsconfig.json index a18665f388c..57c68223c8b 100644 --- a/packages/ra-data-localstorage/tsconfig.json +++ b/packages/ra-data-localstorage/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-data-simple-rest/package.json b/packages/ra-data-simple-rest/package.json index f11a20e4c07..11a373cace0 100644 --- a/packages/ra-data-simple-rest/package.json +++ b/packages/ra-data-simple-rest/package.json @@ -26,8 +26,8 @@ "bugs": "https://github.com/marmelab/react-admin/issues", "license": "MIT", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "query-string": "^7.1.1" diff --git a/packages/ra-data-simple-rest/tsconfig.json b/packages/ra-data-simple-rest/tsconfig.json index a18665f388c..57c68223c8b 100644 --- a/packages/ra-data-simple-rest/tsconfig.json +++ b/packages/ra-data-simple-rest/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-i18n-i18next/package.json b/packages/ra-i18n-i18next/package.json index 27308292452..d50026c0cb9 100644 --- a/packages/ra-i18n-i18next/package.json +++ b/packages/ra-i18n-i18next/package.json @@ -26,8 +26,8 @@ "bugs": "https://github.com/marmelab/react-admin/issues", "license": "MIT", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "i18next": "^23.5.1", diff --git a/packages/ra-i18n-i18next/tsconfig.json b/packages/ra-i18n-i18next/tsconfig.json index 6fb08aeb372..4fc99e7ce69 100644 --- a/packages/ra-i18n-i18next/tsconfig.json +++ b/packages/ra-i18n-i18next/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-i18n-polyglot/package.json b/packages/ra-i18n-polyglot/package.json index 64249153add..6295bbdfcea 100644 --- a/packages/ra-i18n-polyglot/package.json +++ b/packages/ra-i18n-polyglot/package.json @@ -26,8 +26,8 @@ "bugs": "https://github.com/marmelab/react-admin/issues", "license": "MIT", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "node-polyglot": "^2.2.2", diff --git a/packages/ra-i18n-polyglot/tsconfig.json b/packages/ra-i18n-polyglot/tsconfig.json index a18665f388c..57c68223c8b 100644 --- a/packages/ra-i18n-polyglot/tsconfig.json +++ b/packages/ra-i18n-polyglot/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-input-rich-text/package.json b/packages/ra-input-rich-text/package.json index 6de55987a36..3205224c426 100644 --- a/packages/ra-input-rich-text/package.json +++ b/packages/ra-input-rich-text/package.json @@ -24,8 +24,8 @@ }, "sideEffects": false, "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "@tiptap/core": "^2.0.3", diff --git a/packages/ra-input-rich-text/tsconfig.json b/packages/ra-input-rich-text/tsconfig.json index 70874690c29..57c68223c8b 100644 --- a/packages/ra-input-rich-text/tsconfig.json +++ b/packages/ra-input-rich-text/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", - "compilerOptions": { - "outDir": "lib", - "rootDir": "src", - "allowJs": false - }, - "exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.spec.js"], - "include": ["src"] + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src", + "allowJs": false + }, + "exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.spec.js"], + "include": ["src"] } diff --git a/packages/ra-language-english/package.json b/packages/ra-language-english/package.json index 68010f5c0b5..92f234c47d6 100644 --- a/packages/ra-language-english/package.json +++ b/packages/ra-language-english/package.json @@ -22,8 +22,8 @@ } }, "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "ra-core": "^4.15.5" diff --git a/packages/ra-language-english/tsconfig.json b/packages/ra-language-english/tsconfig.json index a18665f388c..57c68223c8b 100644 --- a/packages/ra-language-english/tsconfig.json +++ b/packages/ra-language-english/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-language-french/package.json b/packages/ra-language-french/package.json index 012bcfda503..3c1098909e5 100644 --- a/packages/ra-language-french/package.json +++ b/packages/ra-language-french/package.json @@ -22,8 +22,8 @@ } }, "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "dependencies": { "ra-core": "^4.15.5" diff --git a/packages/ra-language-french/tsconfig.json b/packages/ra-language-french/tsconfig.json index a18665f388c..57c68223c8b 100644 --- a/packages/ra-language-french/tsconfig.json +++ b/packages/ra-language-french/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/packages/ra-no-code/package.json b/packages/ra-no-code/package.json index e39f5c25a6a..e9a065aa9b9 100644 --- a/packages/ra-no-code/package.json +++ b/packages/ra-no-code/package.json @@ -26,8 +26,8 @@ "bugs": "https://github.com/marmelab/react-admin/issues", "license": "MIT", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "devDependencies": { "@testing-library/react": "^11.2.3", diff --git a/packages/ra-no-code/tsconfig.json b/packages/ra-no-code/tsconfig.json index d358bd5bccf..6f8a6ee9bc0 100644 --- a/packages/ra-no-code/tsconfig.json +++ b/packages/ra-no-code/tsconfig.json @@ -1,13 +1,10 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false, - "types": [ - "jest", - "@types/node" - ] + "types": ["jest", "@types/node"] }, "exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.spec.js"], "include": ["src"] diff --git a/packages/ra-ui-materialui/package.json b/packages/ra-ui-materialui/package.json index 098c1aeb842..3e8af3c2a35 100644 --- a/packages/ra-ui-materialui/package.json +++ b/packages/ra-ui-materialui/package.json @@ -28,8 +28,8 @@ "bugs": "https://github.com/marmelab/react-admin/issues", "license": "MIT", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "devDependencies": { "@mui/icons-material": "^5.0.1", diff --git a/packages/ra-ui-materialui/tsconfig.json b/packages/ra-ui-materialui/tsconfig.json index d7db12171d0..624cfc76aff 100644 --- a/packages/ra-ui-materialui/tsconfig.json +++ b/packages/ra-ui-materialui/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", - "rootDir": "src", + "outDir": "dist", + "rootDir": "src" }, - "exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.spec.js", "**/*.stories.tsx"], + "exclude": [ + "**/*.spec.ts", + "**/*.spec.tsx", + "**/*.spec.js", + "**/*.stories.tsx" + ], "include": ["src"] } diff --git a/packages/react-admin/package.json b/packages/react-admin/package.json index 67e38e34693..edfc307473e 100644 --- a/packages/react-admin/package.json +++ b/packages/react-admin/package.json @@ -28,8 +28,8 @@ "bugs": "https://github.com/marmelab/react-admin/issues", "license": "MIT", "scripts": { - "build": "yarn tsup", - "watch": "tsc --outDir dist/esm --module es2015 --watch" + "build": "yarn tsup --onSuccess tsc", + "watch": "yarn tsup --watch" }, "devDependencies": { "cross-env": "^5.2.0", diff --git a/packages/react-admin/tsconfig.json b/packages/react-admin/tsconfig.json index a18665f388c..57c68223c8b 100644 --- a/packages/react-admin/tsconfig.json +++ b/packages/react-admin/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "rootDir": "src", "allowJs": false }, diff --git a/tsconfig.json b/tsconfig.json index 1893c8665f7..85735948c7c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,13 +12,14 @@ "jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */, "declaration": true /* Generates corresponding '.d.ts' file. */, "declarationMap": true /* Generates a sourcemap for each corresponding '.d.ts' file. */, + "emitDeclarationOnly": true, "sourceMap": true /* Generates corresponding '.map' file. */, // "outFile": "./", /* Concatenate and emit output to single file. */ // "outDir": "./lib", /* Redirect output structure to the directory. */ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "composite": true, /* Enable project compilation */ // "removeComments": true, /* Do not emit comments to output. */ - "noEmit": true /* Do not emit outputs. */, + // "noEmit": true /* Do not emit outputs. */, "allowArbitraryExtensions": true, // "importHelpers": true, /* Import emit helpers from 'tslib'. */ // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ diff --git a/tsup.config.ts b/tsup.config.ts index 11f8892383d..7bac216c5db 100644 --- a/tsup.config.ts +++ b/tsup.config.ts @@ -1,12 +1,19 @@ import { defineConfig } from 'tsup'; export default defineConfig({ - entry: ['src/index.ts'], + entry: [ + 'src/**/*.{ts,tsx}', + '!src/**/*.spec.{ts,tsx}', + '!src/**/*.stories.{ts,tsx}', + '!src/**/*.d.{ts,tsx}', + ], outDir: 'dist', - splitting: false, - sourcemap: false, + bundle: false, + minify: false, + sourcemap: true, clean: true, - dts: true, + dts: false, format: ['esm', 'cjs'], target: 'es2015', + silent: true, });