Merge pull request #11 from js-templates/feat/update-rollup-config

Update rollup config

Author: Evgeny Zakharov

package.json

@@ -25,10 +25,11 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "@rollup/plugin-typescript": "^8.3.2",
     "@types/jest": "^27.5.1",
     "esbuild": "^0.14.39",
     "eslint": "^8.16.0",
-    "eslint-kit": "^5.1.1",
+    "eslint-kit": "^5.1.4",
     "jest": "^28.1.0",
     "jest-serializer-path": "^0.1.15",
     "rollup": "^2.73.0",

rollup.config.js

@@ -1,39 +1,52 @@
+/* eslint-disable import/no-default-export */
+/* eslint-disable no-unused-vars */
+
+import typescript from '@rollup/plugin-typescript'
 import { defineConfig } from 'rollup'
 import bundleSize from 'rollup-plugin-bundle-size'
 import dts from 'rollup-plugin-dts'
 import esbuild from 'rollup-plugin-esbuild'
 import { terser } from 'rollup-plugin-terser'
+import pkg from './package.json'
+
+const TYPECHECK = true
+const MINIFY = true
 
 const src = (file) => `src/${file}`
 const dist = (file) => `dist/${file}`
 
-const bundle = (input, config) =>
+const bundle = (input, { plugins = [], ...config }) =>
   defineConfig({
     ...config,
     input,
+    plugins: plugins.filter(Boolean).concat(bundleSize()),
+
+    // do not bundle packages
     external: (id) => !/^[./]/.test(id),
-    plugins: [...(config.plugins || []), bundleSize()],
   })
 
 const config = defineConfig([
+  /* Compiled JS (CommonJS, ESM) */
   bundle(src('index.ts'), {
-    plugins: [esbuild(), terser()],
+    plugins: [TYPECHECK && typescript(), esbuild(), MINIFY && terser()],
     output: [
       {
-        file: dist('index.js'),
+        file: pkg.main,
         format: 'cjs',
       },
       {
-        file: dist('index.mjs'),
+        file: pkg.module,
         format: 'es',
       },
     ],
   }),
+
+  /* TS declarations */
   bundle(src('index.ts'), {
     plugins: [dts()],
     output: [
       {
-        file: dist('index.d.ts'),
+        file: pkg.types,
         format: 'es',
       },
     ],

yarn.lock

@@ -687,6 +687,23 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@rollup/plugin-typescript@^8.3.2":
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.3.2.tgz#e1b719e2ed3e752bbc092001656c48378f2d15f0"
+  integrity sha512-MtgyR5LNHZr3GyN0tM7gNO9D0CS+Y+vflS4v/PHmrX17JCkHUYKvQ5jN5o3cz1YKllM3duXUqu3yOHwMPUxhDg==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    resolve "^1.17.0"
+
+"@rollup/pluginutils@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
+  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
+  dependencies:
+    "@types/estree" "0.0.39"
+    estree-walker "^1.0.1"
+    picomatch "^2.2.2"
+
 "@rollup/pluginutils@^4.1.1":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
@@ -747,6 +764,11 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/[email protected]":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+
 "@types/graceful-fs@^4.1.3":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
@@ -1658,6 +1680,15 @@ eslint-import-resolver-custom-alias@^1.3.0:
     glob-parent "^5.1.0"
     resolve "^1.3.0"
 
+eslint-import-resolver-jsconfig@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-jsconfig/-/eslint-import-resolver-jsconfig-1.1.0.tgz#7e2ea0868205fff33fd1d9ed79642cdeaa1e42df"
+  integrity sha512-MEiD/zyEkVVwnblRI058/0liYrKXMUwgAtM4EKrTldrThb1AvgPIQeR4emDKC2IotTuWF7KzekvGP+KLhtM3rw==
+  dependencies:
+    find-root "^1.1.0"
+    glob-parent "^6.0.1"
+    resolve "^1.20.0"
+
 eslint-import-resolver-node@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
@@ -1677,10 +1708,10 @@ eslint-import-resolver-typescript@^2.7.1:
     resolve "^1.22.0"
     tsconfig-paths "^3.14.1"
 
-eslint-kit@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-kit/-/eslint-kit-5.1.1.tgz#6b6548dfde43dede2fb303de483d86fae0b35b05"
-  integrity sha512-4At5ZZLoyZcwJ2TBTWJniMVWMf4nlRN1GQ6i5wOd4MOfQLvMMmq5Jev1yviewE3OxeBlzgyOF83x+HhrLaVtNg==
+eslint-kit@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/eslint-kit/-/eslint-kit-5.1.4.tgz#521a20953e4b5a89043c3772ee6f0c5047fb5342"
+  integrity sha512-LjzkcERD8wEMzN72M/fe3lxKlvpUJ2nZYr3RC0Af/TLvpdvGeE/CaO4SvazK4hoUEbhsIYZj6VTwAkUYhBaRCw==
   dependencies:
     "@babel/core" "^7.18.0"
     "@babel/eslint-parser" "^7.17.0"
@@ -1690,6 +1721,7 @@ eslint-kit@^5.1.1:
     "@typescript-eslint/parser" "5.27.0"
     babel-preset-solid "^1.4.2"
     eslint-import-resolver-custom-alias "^1.3.0"
+    eslint-import-resolver-jsconfig "^1.1.0"
     eslint-import-resolver-typescript "^2.7.1"
     eslint-plugin-effector "0.6.0"
     eslint-plugin-import "2.26.0"
@@ -1963,6 +1995,11 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
+estree-walker@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
+  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
+
 estree-walker@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
@@ -2071,6 +2108,11 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+find-root@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
+
 find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -3638,7 +3680,7 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.0:
+resolve@^1.10.0, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==