🔧 Rollup config improvements

config/templates/package.dflt.json

@@ -10,10 +10,8 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "scripts": {
-    "clean": "rimraf dist",
+    "watch": "rollup -c -w",
-    "nodebuild": "rollup -c -o dist/index.js -f cjs",
+    "build": "rollup -c",
-    "modulebuild": "rollup -c -o dist/index.mjs -f es",
-    "build": "npm run clean && npm run nodebuild && npm run modulebuild",
     "publish": "npm run build && npm publish --access public"
   },
   "peerDependencies": {},

config/templates/rollup.config.dflt.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/aaron/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/bent/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/brian/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/bruce/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/carlita/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/carlton/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/cathrin/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/components/src/Icon/icons.js

@@ -17,11 +17,20 @@ const google =
 const facebook =
   "M22.676 0H1.324C.593 0 0 .593 0 1.324v21.352C0 23.408.593 24 1.324 24h11.494v-9.294H9.689v-3.621h3.129V8.41c0-3.099 1.894-4.785 4.659-4.785 1.325 0 2.464.097 2.796.141v3.24h-1.921c-1.5 0-1.792.721-1.792 1.771v2.311h3.584l-.465 3.63H16.56V24h6.115c.733 0 1.325-.592 1.325-1.324V1.324C24 .593 23.408 0 22.676 0";
 
+const note =
+  "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z";
+const tip =
+  "M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z";
+const warning = "M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z";
+
 export default {
   gitter,
   github,
   twitter,
   instagram,
   google,
-  facebook
+  facebook,
+  note,
+  tip,
+  warning
 };

packages/components/src/Icon/index.js

@@ -5,7 +5,7 @@ import icons from "./icons";
 const Icon = props => {
   return (
     <svg
-      className={props.classes}
+      className={props.className}
       xmlns="http://www.w3.org/2000/svg"
       width={props.size}
       height={props.size}

packages/components/src/Navbar/index.js

@@ -55,14 +55,16 @@ const Navbar = props => {
       <a {...homeProps}>{props.emblem}</a>
     </div>
   );
-
+  console.log(props);
   return (
     <header className="navbar">
       <div>
         <div className="only-xs">
-          {Object.keys(props.navs.mleft).map(key =>
+          {
-            renderNav(key, props.navs.mleft[key])
+            //Object.keys(props.navs.mleft).map(key =>
-          )}
+            //renderNav(key, props.navs.mleft[key])
+            //)
+          }
         </div>
         <div className="not-xs">
           {logo}
@@ -78,9 +80,11 @@ const Navbar = props => {
           </div>
         </div>
         <div className="only-xs">
-          {Object.keys(props.navs.mright).map(key =>
+          {
-            renderNav(key, props.navs.mright[key])
+            //Object.keys(props.navs.mright).map(key =>
-          )}
+            //renderNav(key, props.navs.mright[key])
+            // )
+          }
         </div>
         <div className="not-xs">
           {Object.keys(props.navs.right).map(key =>
@@ -103,7 +107,7 @@ Navbar.propTypes = {
 
 Navbar.defaultProps = {
   home: "https://freesewing.org/",
-  navs: { left: [], right: [] },
+  navs: { left: [], right: [], mleft: {}, mright: {} },
   logo: <Logo embed color="#e9ecef" />,
   emblem: <Emblem />
 };

packages/components/src/Workbench/index.js

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import withGist from "../withGist";
 import { MuiThemeProvider, createMuiTheme } from "@material-ui/core/styles";
-import Navbar from "../Navbar";
+//import Navbar from "../Navbar";
 import { defaultGist, storage } from "@freesewing/utils";
 import { dark, light } from "@freesewing/mui-theme";
 import withLanguage from "../withLanguage";
@@ -118,7 +118,9 @@ const Workbench = props => {
       }
     }
   };
-
+  // FIXME:
+  navs.mleft = navs.left;
+  navs.mright = navs.right;
   let main = null;
   switch (display) {
     case "languages":
@@ -182,7 +184,7 @@ const Workbench = props => {
           theme === "light" ? "theme-wrapper light" : "theme-wrapper dark"
         }
       >
-        {display !== "welcome" ? (
+        {display !== "welcome" && false ? (
           <Navbar navs={navs} home={() => saveDisplay("welcome")} />
         ) : null}
         {main}

packages/components/src/index.js

@@ -1,3 +1,4 @@
+export { default as Blockquote } from "./Blockquote";
 export { default as Draft } from "./Draft";
 export { default as DraftConfigurator } from "./DraftConfigurator";
 export { default as Emblem } from "./Emblem";

packages/create-freesewing-pattern/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/create-freesewing-pattern/template/default/example/.env

@@ -0,0 +1 @@
+SKIP_PREFLIGHT_CHECK=true

packages/create-freesewing-pattern/template/default/example/package.json

@@ -4,20 +4,20 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@freesewing/components": "alpha",
+    "@freesewing/components": "beta",
-    "@freesewing/core": "alpha",
+    "@freesewing/core": "beta",
-    "@freesewing/css-theme": "alpha",
+    "@freesewing/css-theme": "beta",
-    "@freesewing/i18n": "alpha",
+    "@freesewing/i18n": "beta",
-    "@freesewing/models": "alpha",
+    "@freesewing/models": "beta",
-    "@freesewing/mui-theme": "alpha",
+    "@freesewing/mui-theme": "beta",
-    "@freesewing/pattern-info": "alpha",
+    "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "alpha",
+    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "alpha",
+    "@freesewing/plugin-designer": "beta",
-    "@freesewing/plugin-i18n": "alpha",
+    "@freesewing/plugin-i18n": "beta",
-    "@freesewing/plugin-svgattr": "alpha",
+    "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "alpha",
+    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "alpha",
+    "@freesewing/plugin-validate": "beta",
-    "@freesewing/utils": "alpha",
+    "@freesewing/utils": "beta",
     "@material-ui/core": "^3.9.3",
     "@material-ui/icons": "^3.0.2",
     "@material-ui/lab": "^3.0.0-alpha.30",

packages/florent/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/huey/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/hugo/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/i18n/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/jaeger/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/models/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/mui-theme/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/mui-theme/src/index.js

@@ -1,5 +1,5 @@
 const darkBg = "#212529";
-const lightBg = "#f8f9fa";
+const lightBg = "#ffffff";
 const colors = {
   light: {
     primary: darkBg,

packages/pattern-info/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/patterns/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-banner/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-bundle/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-bust/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-buttons/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-cutonfold/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-debug/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-designer/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-dimension/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-flip/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-grainline/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-i18n/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-logo/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-round/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-scalebox/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-sprinkle/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-svgattr/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-title/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/plugin-validate/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/rendertest/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/shin/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/simon/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/sven/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/tamiko/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/trayvon/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/utils/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }

packages/wahid/rollup.config.js

@@ -8,18 +8,26 @@ import url from "rollup-plugin-url";
 import postcss from "rollup-plugin-postcss";
 import svgr from "@svgr/rollup";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import { name, version, description, author, license } from "./package.json";
+import {
+  name,
+  version,
+  description,
+  author,
+  license,
+  main,
+  module
+} from "./package.json";
 
 export default {
   input: "src/index.js",
   output: [
     {
-      file: "dist/index.js",
+      file: main,
       format: "cjs",
       sourcemap: true
     },
     {
-      file: "dist/index.mjs",
+      file: module,
       format: "es",
       sourcemap: true
     }