fix: improve rollup setup and update dependencies

billykwok · Jun 25, 2022 · ec76336 · ec76336
1 parent 291db6c
commit ec76336
Show file tree

Hide file tree

Showing 28 changed files with 150 additions and 174 deletions.
diff --git a/.changeset/strange-pans-add.md b/.changeset/strange-pans-add.md
@@ -0,0 +1,10 @@
+---
+"@reshoot/core": patch
+"@reshoot/loader": patch
+"@reshoot/macro": patch
+"@reshoot/react": patch
+"@reshoot/remark-mdx-image": patch
+"@reshoot/types": patch
+---
+
+fix: improve rollup setup and update dependencies
diff --git a/babel.config.cjs b/babel.config.cjs
@@ -4,15 +4,4 @@ module.exports = {
     ['@babel/preset-env', { targets: { node: 'current' } }],
     ['@babel/preset-typescript', { isTSX: true, allExtensions: true }],
   ],
-  plugins: [
-    [
-      '@babel/plugin-transform-runtime',
-      {
-        corejs: { version: 3, proposals: true },
-        helpers: true,
-        regenerator: true,
-        useESModules: true,
-      },
-    ],
-  ],
 };
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "rollup-plugin-node-externals": "^4.0.0",
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "rollup-plugin-terser": "^7.0.2",
-    "turbo": "^1.3.0",
+    "turbo": "^1.3.1",
     "typescript": "^4.7.4"
   }
 }
diff --git a/packages/core/.browserslistrc b/packages/core/.browserslistrc
@@ -0,0 +1 @@
+maintained node versions
diff --git a/packages/core/babel.config.cjs b/packages/core/babel.config.cjs
@@ -1,15 +1,9 @@
 module.exports = {
+  targets: { esmodules: true },
   presets: [
-    [
-      '@babel/preset-env',
-      { targets: { node: 'current', esmodules: true }, bugfixes: true },
-    ],
+    ['@babel/preset-env', { bugfixes: true }],
     ['@babel/preset-typescript', { allExtensions: true }],
   ],
-  plugins: [
-    [
-      '@babel/plugin-transform-runtime',
-      { corejs: { version: 3, proposals: true }, helpers: true },
-    ],
-  ],
+  compact: true,
+  minified: true,
 };
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -15,6 +15,7 @@
     "lib",
     "types"
   ],
+  "sideEffects": false,
   "engines": {
     "node": ">=13.0.0"
   },
@@ -34,13 +35,11 @@
   },
   "dependencies": {
     "@reshoot/types": "workspace:^2.0.1",
-    "@babel/runtime-corejs3": "^7",
     "color": "^4.2.3",
-    "sharp": "^0.30.0"
+    "sharp": "^0.30.7"
   },
   "devDependencies": {
     "@types/color": "^3.0.3",
-    "@types/sharp": "^0.30.4",
-    "sharp": "^0.30.7"
+    "@types/sharp": "^0.30.4"
   }
 }
diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
@@ -34,7 +34,7 @@ export default {
     resolve({ extensions: ['.js', '.ts'] }),
     babel({
       babelrc: true,
-      babelHelpers: 'runtime',
+      babelHelpers: 'bundled',
       extensions: ['.ts'],
       exclude: [/\.test\.ts/i, /node_modules\//i],
     }),

diff --git a/packages/loader/.browserslistrc b/packages/loader/.browserslistrc
@@ -0,0 +1 @@
+maintained node versions
diff --git a/packages/loader/babel.config.cjs b/packages/loader/babel.config.cjs
@@ -1,15 +1,9 @@
 module.exports = {
+  targets: { esmodules: true },
   presets: [
-    [
-      '@babel/preset-env',
-      { targets: { node: 'current', esmodules: true }, bugfixes: true },
-    ],
+    ['@babel/preset-env', { bugfixes: true }],
     ['@babel/preset-typescript', { allExtensions: true }],
   ],
-  plugins: [
-    [
-      '@babel/plugin-transform-runtime',
-      { corejs: { version: 3, proposals: true }, helpers: true },
-    ],
-  ],
+  compact: true,
+  minified: true,
 };
diff --git a/packages/loader/package.json b/packages/loader/package.json
@@ -15,6 +15,7 @@
     "lib",
     "types"
   ],
+  "sideEffects": false,
   "engines": {
     "node": ">=13.0.0"
   },
@@ -36,7 +37,6 @@
   "dependencies": {
     "@reshoot/core": "workspace:^2.1.1",
     "@reshoot/types": "workspace:^2.0.2",
-    "@babel/runtime-corejs3": "^7",
     "json5": "^2.2.1",
     "loader-utils": "^3.2.0"
   },
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@types/loader-utils": "^2.0.3",
-    "memfs": "^3.4.6",
+    "memfs": "^3.4.7",
     "webpack": "^5.73.0"
   }
 }
diff --git a/packages/loader/rollup.config.js b/packages/loader/rollup.config.js
@@ -37,7 +37,7 @@ export default {
     resolve(),
     babel({
       babelrc: true,
-      babelHelpers: 'runtime',
+      babelHelpers: 'bundled',
       extensions: ['.ts'],
       exclude: [/\.test\.ts/i, /node_modules\//i],
     }),

diff --git a/packages/macro/.browserslistrc b/packages/macro/.browserslistrc
@@ -0,0 +1 @@
+maintained node versions
diff --git a/packages/macro/babel.config.cjs b/packages/macro/babel.config.cjs
@@ -1,15 +1,9 @@
 module.exports = {
+  targets: { esmodules: true },
   presets: [
-    [
-      '@babel/preset-env',
-      { targets: { node: 'current', esmodules: true }, bugfixes: true },
-    ],
+    ['@babel/preset-env', { bugfixes: true }],
     ['@babel/preset-typescript', { allExtensions: true }],
   ],
-  plugins: [
-    [
-      '@babel/plugin-transform-runtime',
-      { corejs: { version: 3, proposals: true }, helpers: true },
-    ],
-  ],
+  compact: true,
+  minified: true,
 };
diff --git a/packages/macro/package.json b/packages/macro/package.json
@@ -15,6 +15,7 @@
     "lib",
     "types"
   ],
+  "sideEffects": false,
   "engines": {
     "node": ">=13.0.0"
   },
@@ -36,7 +37,6 @@
   "dependencies": {
     "@reshoot/types": "workspace:^2.0.2",
     "@babel/core": "^7",
-    "@babel/runtime-corejs3": "^7",
     "@babel/template": "^7",
     "@babel/types": "^7"
   },

diff --git a/packages/macro/rollup.config.js b/packages/macro/rollup.config.js
@@ -36,7 +36,7 @@ export default {
     resolve({ extensions: ['.js', '.ts'] }),
     babel({
       babelrc: true,
-      babelHelpers: 'runtime',
+      babelHelpers: 'bundled',
       extensions: ['.ts'],
       exclude: [/\.test\.ts/i, /node_modules\//i],
     }),

diff --git a/packages/macro/test/__snapshots__/index.test.ts.snap b/packages/macro/test/__snapshots__/index.test.ts.snap
@@ -6,10 +6,7 @@ import Img from "@reshoot/react";
 import { createElement } from "react";
 const meta = __0____asset_image_png_color__f4f4f4__;
 export default function ExampleImg(props) {
-  return createElement(Img, {
-    meta,
-    ...props,
-  });
+  return createElement(Img, { meta, ...props });
 }
 
 `;
@@ -20,10 +17,7 @@ import Img from "@reshoot/react";
 import { createElement } from "react";
 const meta = __0____asset_image_png_color__23f4f4f4__;
 export default function ExampleImg(props) {
-  return createElement(Img, {
-    meta,
-    ...props,
-  });
+  return createElement(Img, { meta, ...props });
 }
 
 `;
@@ -34,10 +28,7 @@ import Img from "@reshoot/react";
 import { createElement } from "react";
 const meta = __0____asset_image_png_reshoot_color__23f4f4f4__;
 export default function ExampleImg(props) {
-  return createElement(Img, {
-    meta,
-    ...props,
-  });
+  return createElement(Img, { meta, ...props });
 }
 
 `;
@@ -48,10 +39,7 @@ import Img from "@reshoot/react";
 import { createElement } from "react";
 const meta = __0____asset_image_png_color__23f4f4f4__;
 export default function ExampleImg(props) {
-  return createElement(Img, {
-    meta,
-    ...props,
-  });
+  return createElement(Img, { meta, ...props });
 }
 export const meta2 = __0____asset_image_png_color__23f4f4f4__;
 

diff --git a/packages/macro/test/index.test.ts b/packages/macro/test/index.test.ts
@@ -14,7 +14,7 @@ const BABEL_TRANSFORM_OPTIONS: TransformOptions = {
     [
       '@babel/preset-env',
       {
-        targets: { node: 'current', esmodules: false },
+        targets: { esmodules: false },
         exclude: ['transform-async-to-generator', 'transform-regenerator'],
         modules: false,
       },

diff --git a/.browserslistrc → packages/react/.browserslistrc b/.browserslistrc → packages/react/.browserslistrc
diff --git a/packages/react/babel.config.cjs b/packages/react/babel.config.cjs
@@ -1,4 +1,5 @@
 module.exports = {
+  targets: { esmodules: true },
   presets: [
     ['@babel/preset-env', { targets: { esmodules: true }, bugfixes: true }],
     ['@babel/preset-typescript', { isTSX: true, allExtensions: true }],
@@ -8,7 +9,9 @@ module.exports = {
   plugins: [
     [
       '@babel/plugin-transform-runtime',
-      { corejs: { version: 3, proposals: true }, helpers: true },
+      { corejs: { version: 3 }, helpers: true },
     ],
   ],
+  compact: true,
+  minified: true,
 };
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -46,7 +46,7 @@
     "@babel/runtime-corejs3": "^7",
     "@reshoot/types": "workspace:^2.0.1",
     "react": "^17 || ^18",
-    "use-lifecycle-ref": "^1.0.4"
+    "use-lifecycle-ref": "^1.0.5"
   },
   "devDependencies": {
     "@babel/core": "^7.18.5",
@@ -60,8 +60,8 @@
     "@types/react": "^18.0.14",
     "@types/react-dom": "^18.0.5",
     "eslint": "^8.18.0",
-    "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-react": "^7.30.0",
+    "eslint-plugin-jsx-a11y": "^6.6.0",
+    "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest-environment-jsdom": "^28.1.1",
     "postcss": "^8.4.14",

diff --git a/packages/remark-mdx-image/.browserslistrc b/packages/remark-mdx-image/.browserslistrc
@@ -0,0 +1 @@
+maintained node versions
diff --git a/packages/remark-mdx-image/babel.config.cjs b/packages/remark-mdx-image/babel.config.cjs
@@ -1,15 +1,9 @@
 module.exports = {
+  targets: { esmodules: true },
   presets: [
-    [
-      '@babel/preset-env',
-      { targets: { node: 'current', esmodules: true }, bugfixes: true },
-    ],
+    ['@babel/preset-env', { bugfixes: true }],
     ['@babel/preset-typescript', { allExtensions: true }],
   ],
-  plugins: [
-    [
-      '@babel/plugin-transform-runtime',
-      { corejs: { version: 3, proposals: true }, helpers: true },
-    ],
-  ],
+  compact: true,
+  minified: true,
 };
diff --git a/packages/remark-mdx-image/package.json b/packages/remark-mdx-image/package.json
@@ -15,6 +15,7 @@
     "lib",
     "types"
   ],
+  "sideEffects": false,
   "engines": {
     "node": ">=13.0.0"
   },
@@ -35,7 +36,6 @@
   },
   "dependencies": {
     "@reshoot/types": "workspace:^2.0.2",
-    "@babel/runtime-corejs3": "^7",
     "unist-util-visit-parents": "^5.1.0",
     "json5": "^2.2.1"
   },

diff --git a/packages/remark-mdx-image/rollup.config.js b/packages/remark-mdx-image/rollup.config.js
@@ -36,7 +36,7 @@ export default {
     resolve({ extensions: ['.js', '.ts'] }),
     babel({
       babelrc: true,
-      babelHelpers: 'runtime',
+      babelHelpers: 'bundled',
       extensions: ['.ts'],
       exclude: [/\.test\.ts/i, /node_modules\//i],
     }),

diff --git a/packages/types/.browserslistrc b/packages/types/.browserslistrc
@@ -0,0 +1,3 @@
+defaults
+not IE 11
+maintained node versions
diff --git a/packages/types/babel.config.cjs b/packages/types/babel.config.cjs
@@ -1,12 +1,15 @@
 module.exports = {
+  targets: { esmodules: true },
   presets: [
-    ['@babel/preset-env', { targets: { esmodules: true }, bugfixes: true }],
+    ['@babel/preset-env', { bugfixes: true }],
     ['@babel/preset-typescript', { allExtensions: true }],
   ],
   plugins: [
     [
       '@babel/plugin-transform-runtime',
-      { corejs: { version: 3, proposals: true }, helpers: true },
+      { corejs: { version: 3 }, helpers: true },
     ],
   ],
+  compact: true,
+  minified: true,
 };
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -15,6 +15,7 @@
     "lib",
     "types"
   ],
+  "sideEffects": false,
   "engines": {
     "node": ">=13.0.0"
   },
@@ -31,5 +32,8 @@
     "lint": "eslint ./src ./test",
     "build": "rollup -c rollup.config.js && tsc --project tsconfig.types.json",
     "test": "NODE_OPTIONS=--experimental-vm-modules pnpm jest"
+  },
+  "dependencies": {
+    "@babel/runtime-corejs3": "^7"
   }
 }