From 3764bfc1eb2d14d4e46ac290306faa3c382e2135 Mon Sep 17 00:00:00 2001 From: Michel Dismer Date: Wed, 28 Jun 2023 08:44:48 +0200 Subject: [PATCH 1/2] add esm build, remove duplicate dependency --- package-lock.json | 14 +++++++------- package.json | 8 ++++---- rollup.esm.config.js | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 rollup.esm.config.js diff --git a/package-lock.json b/package-lock.json index 15302b98b..592e7a3a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "react-dnd-html5-backend": "^11.1.3", "react-sortable-tree-patch-react-17": "^2.9.0", "react-to-print": "^2.8.0", - "tss-react": "^3.6.0" + "tss-react": "^4.1.3" }, "devDependencies": { "@babel/core": "^7.10.2", @@ -15769,9 +15769,9 @@ } }, "node_modules/tss-react": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/tss-react/-/tss-react-3.7.1.tgz", - "integrity": "sha512-dfWUoxBlKZfIG9UC1A2h02OmcE/Ni0itCmmZu94E9g+KyBhKMHKcsKvUm0bNlRqTmYjXiCgPJDmj5fyc8CSrLg==", + "version": "4.8.6", + "resolved": "https://registry.npmjs.org/tss-react/-/tss-react-4.8.6.tgz", + "integrity": "sha512-+ucvy+SLFUUxd3zA3QS9Q7bo5FerR8VIUOHieyvYYMoBqtpVinnOA0aTOSXcSdl4lqjFc/9gNA5x0B5iIWk7hA==", "dependencies": { "@emotion/cache": "*", "@emotion/serialize": "*", @@ -30175,9 +30175,9 @@ } }, "tss-react": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/tss-react/-/tss-react-3.7.1.tgz", - "integrity": "sha512-dfWUoxBlKZfIG9UC1A2h02OmcE/Ni0itCmmZu94E9g+KyBhKMHKcsKvUm0bNlRqTmYjXiCgPJDmj5fyc8CSrLg==", + "version": "4.8.6", + "resolved": "https://registry.npmjs.org/tss-react/-/tss-react-4.8.6.tgz", + "integrity": "sha512-+ucvy+SLFUUxd3zA3QS9Q7bo5FerR8VIUOHieyvYYMoBqtpVinnOA0aTOSXcSdl4lqjFc/9gNA5x0B5iIWk7hA==", "requires": { "@emotion/cache": "*", "@emotion/serialize": "*", diff --git a/package.json b/package.json index fe517108c..d9758b8e4 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,9 @@ { - "name": "mui-datatables", + "name": "mui-datatables-mara", "version": "4.3.0", "description": "Datatables for React using Material-UI", "main": "dist/index.js", + "module": "dist/esm/index.js", "files": [ "dist" ], @@ -18,7 +19,7 @@ "coverage:html": "cross-env NODE_ENV=test nyc check-coverage --lines 55 --reporter=html --reporter=text mocha --require @babel/register test/*.js && nyc report --reporter=html", "prettier": "find src/ docs/ test/ -type f -name \"*.js\" ! -path \"*/.next/*\" | xargs prettier --write", "lint": "eslint src", - "build": "cross-env NODE_ENV=production npm run prettier && rollup -c", + "build": "cross-env NODE_ENV=production npm run prettier && rollup -c && rollup -c rollup.esm.config.js", "prepare": "npm run build" }, "repository": { @@ -122,8 +123,7 @@ "react-dnd": "^11.1.3", "react-dnd-html5-backend": "^11.1.3", "react-sortable-tree-patch-react-17": "^2.9.0", - "react-to-print": "^2.8.0", - "tss-react": "^3.6.0" + "react-to-print": "^2.8.0" }, "side-effects": false, "nyc": { diff --git a/rollup.esm.config.js b/rollup.esm.config.js new file mode 100644 index 000000000..b4fd324c2 --- /dev/null +++ b/rollup.esm.config.js @@ -0,0 +1,41 @@ +import babel from '@rollup/plugin-babel'; +import commonjs from '@rollup/plugin-commonjs'; +import replace from '@rollup/plugin-replace'; +import uglify from '@lopatnov/rollup-plugin-uglify'; + +export default { + input: 'src/index.js', + plugins: [ + replace({ + 'process.env.NODE_ENV': JSON.stringify('production'), + }), + commonjs({ + include: ['node_modules/**'], + }), + babel({ + babelHelpers: 'runtime', + babelrc: true, + }), + uglify({ + compress: { + conditionals: true, + unused: true, + comparisons: true, + sequences: true, + dead_code: true, + evaluate: true, + if_return: true, + join_vars: true, + }, + output: { + comments: false, + }, + }), + ], + output: { + file: 'dist/esm/index.js', + format: 'esm', + exports: 'named', + sourcemap: true, + }, +}; From 4e6623456792acbae34ecdeaf8dacdd762153389 Mon Sep 17 00:00:00 2001 From: Michel Dismer Date: Wed, 28 Jun 2023 09:04:21 +0200 Subject: [PATCH 2/2] revert package name change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9758b8e4..e6625c53b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "mui-datatables-mara", + "name": "mui-datatables", "version": "4.3.0", "description": "Datatables for React using Material-UI", "main": "dist/index.js",