From c7c93dd5ff6cae348868b5f195c43f3b59fa1956 Mon Sep 17 00:00:00 2001 From: mynamesleon Date: Thu, 22 Aug 2024 09:01:44 +0100 Subject: [PATCH] preserveModules experiment --- package-lock.json | 79 ++++++++++------------------------------------- package.json | 7 ++--- rollup.config.js | 4 +++ tsconfig.json | 2 +- 4 files changed, 24 insertions(+), 68 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6d56dc..ac15858 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rea11y-easy-form", - "version": "0.3.6", + "version": "0.3.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rea11y-easy-form", - "version": "0.3.6", + "version": "0.3.7", "license": "MIT", "dependencies": { "@react-hookz/deep-equal": "^2.0.2", @@ -26,7 +26,7 @@ "@babel/core": "^7.25.2", "@babel/preset-env": "^7.25.3", "@babel/preset-typescript": "^7.24.7", - "@chromatic-com/storybook": "^1.6.1", + "@chromatic-com/storybook": "^1.7.0", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-terser": "^0.4.4", @@ -46,7 +46,7 @@ "@testing-library/react": "^16.0.0", "@types/dompurify": "^3.0.5", "@types/jest": "^29.5.12", - "@types/react": "^18.3.3", + "@types/react": "^18.3.4", "@types/react-beautiful-dnd": "^13.1.8", "@types/react-dom": "^18.3.0", "@types/react-is": "^18.3.0", @@ -70,7 +70,6 @@ "rollup-plugin-peer-deps-external": "^2.2.4", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-typescript2": "^0.36.0", - "sass-loader": "^13.3.3", "storybook": "^8.2.9", "ts-jest": "^29.2.4", "typescript": "^5.5.4" @@ -2445,9 +2444,9 @@ "license": "MIT" }, "node_modules/@chromatic-com/storybook": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@chromatic-com/storybook/-/storybook-1.6.1.tgz", - "integrity": "sha512-x1x1NB3j4xpfeSWKr96emc+7ZvfsvH+/WVb3XCjkB24PPbT8VZXb3mJSAQMrSzuQ8+eQE9kDogYHH9Fj3tb/Cw==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@chromatic-com/storybook/-/storybook-1.7.0.tgz", + "integrity": "sha512-0aAkSaNsHaJL37/r+TIbpKjCouIysvoJno61LzUSs1xW4fpxF7gdr8xwIOONQjEsz2Fa0uFHXmzkFYcH6o8kmA==", "dev": true, "dependencies": { "chromatic": "^11.4.0", @@ -5389,9 +5388,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.3.3", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz", - "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==", + "version": "18.3.4", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.4.tgz", + "integrity": "sha512-J7W30FTdfCxDDjmfRM+/JqLHBIyl7xUIp9kwK637FGmY7+mkSFSe6L4jpZzhj5QMfLssSDP4/i75AKkrdC7/Jw==", "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" @@ -15846,43 +15845,6 @@ "dev": true, "license": "MIT" }, - "node_modules/sass-loader": { - "version": "13.3.3", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.3.tgz", - "integrity": "sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==", - "dev": true, - "dependencies": { - "neo-async": "^2.6.2" - }, - "engines": { - "node": ">= 14.15.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "fibers": ">= 3.1.0", - "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", - "sass": "^1.3.0", - "sass-embedded": "*", - "webpack": "^5.0.0" - }, - "peerDependenciesMeta": { - "fibers": { - "optional": true - }, - "node-sass": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-embedded": { - "optional": true - } - } - }, "node_modules/sax": { "version": "1.3.0", "dev": true, @@ -19672,9 +19634,9 @@ "dev": true }, "@chromatic-com/storybook": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@chromatic-com/storybook/-/storybook-1.6.1.tgz", - "integrity": "sha512-x1x1NB3j4xpfeSWKr96emc+7ZvfsvH+/WVb3XCjkB24PPbT8VZXb3mJSAQMrSzuQ8+eQE9kDogYHH9Fj3tb/Cw==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@chromatic-com/storybook/-/storybook-1.7.0.tgz", + "integrity": "sha512-0aAkSaNsHaJL37/r+TIbpKjCouIysvoJno61LzUSs1xW4fpxF7gdr8xwIOONQjEsz2Fa0uFHXmzkFYcH6o8kmA==", "dev": true, "requires": { "chromatic": "^11.4.0", @@ -21609,9 +21571,9 @@ "dev": true }, "@types/react": { - "version": "18.3.3", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz", - "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==", + "version": "18.3.4", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.4.tgz", + "integrity": "sha512-J7W30FTdfCxDDjmfRM+/JqLHBIyl7xUIp9kwK637FGmY7+mkSFSe6L4jpZzhj5QMfLssSDP4/i75AKkrdC7/Jw==", "requires": { "@types/prop-types": "*", "csstype": "^3.0.2" @@ -28622,15 +28584,6 @@ "version": "2.1.2", "dev": true }, - "sass-loader": { - "version": "13.3.3", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.3.tgz", - "integrity": "sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==", - "dev": true, - "requires": { - "neo-async": "^2.6.2" - } - }, "sax": { "version": "1.3.0", "dev": true, diff --git a/package.json b/package.json index ae15fdd..fa7d31d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rea11y-easy-form", - "version": "0.3.6", + "version": "0.3.7", "main": "build/cjs/index.js", "module": "build/esm/index.js", "files": [ @@ -46,7 +46,7 @@ "@babel/core": "^7.25.2", "@babel/preset-env": "^7.25.3", "@babel/preset-typescript": "^7.24.7", - "@chromatic-com/storybook": "^1.6.1", + "@chromatic-com/storybook": "^1.7.0", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-terser": "^0.4.4", @@ -66,7 +66,7 @@ "@testing-library/react": "^16.0.0", "@types/dompurify": "^3.0.5", "@types/jest": "^29.5.12", - "@types/react": "^18.3.3", + "@types/react": "^18.3.4", "@types/react-beautiful-dnd": "^13.1.8", "@types/react-dom": "^18.3.0", "@types/react-is": "^18.3.0", @@ -90,7 +90,6 @@ "rollup-plugin-peer-deps-external": "^2.2.4", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-typescript2": "^0.36.0", - "sass-loader": "^13.3.3", "storybook": "^8.2.9", "ts-jest": "^29.2.4", "typescript": "^5.5.4" diff --git a/rollup.config.js b/rollup.config.js index 1bc640a..58c299e 100755 --- a/rollup.config.js +++ b/rollup.config.js @@ -25,11 +25,15 @@ module.exports = { dir: 'build/cjs', format: 'cjs', sourcemap: true, + preserveModules: true, + preserveModulesRoot: 'src', }, { dir: 'build/esm', format: 'esm', sourcemap: true, + preserveModules: true, + preserveModulesRoot: 'src', }, ], plugins: [ diff --git a/tsconfig.json b/tsconfig.json index 0197084..265a5a7 100755 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "rootDir": "src", - "target": "es6", + "target": "ESNext", "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "declaration": true,