Merge pull request #255 from uswitch/fix-storybook

Fix storybook build
uswitch · Feb 7, 2020 · 527a9ef · 527a9ef
2 parents 4db044a + 3318a2b
commit 527a9ef
Show file tree

Hide file tree

Showing 36 changed files with 44 additions and 7 deletions.
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
@@ -1,12 +1,14 @@
 module.exports = ({ config }) => {
   config.module.rules.push({
     test: /\.tsx?$/,
-    exclude: /node_modules/,
     loader: 'babel-loader',
     options: {
-      presets: ["@babel/typescript", "@babel/preset-react"]
+      presets: ['@babel/typescript', '@babel/preset-react']
     }
   })
   config.resolve.extensions.push('.ts', '.tsx')
+
+  config.resolve.mainFields = ['ts:main', 'main']
+
   return config
 }
diff --git a/README.md b/README.md
@@ -1,13 +1,14 @@
 ## Development
 All commands can be run from individual packages, but it is not necessary to do so.
 
-Run `npm install` at the project root to install the dev dependencies.
-Run `npx lerna exec 'npm install'` to install each package’s dependencies.
-Run `npx lerna bootstrap` to install each package’s dependencies.
-Run `npx lerna run build` to run each package’s build script.
+- Run `npm install` at the project root to install the dev dependencies.
+- Run `npx lerna exec 'npm install'` to install each package’s dependencies.
+- Run `npx lerna bootstrap` to link package dependencies to each other.
 
 To run storybook locally `npm start`.
 
+To run each package’s build script, run `npx lerna run build`. You don't usually have to do this as you don't need it for local development and the publish script runs it for you on publish.
+
 To add a new element, copy the template to the src/elements directory, update the package.json with the name and add your source code.
 
 ## TODO:

diff --git a/_element-template/package.json b/_element-template/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/babel.config.js b/babel.config.js
@@ -14,6 +14,7 @@ module.exports = api => {
       }
     },
     presets: ['@babel/typescript', '@babel/preset-react'],
-    plugins: ['@babel/plugin-proposal-optional-chaining']
+    plugins: ['@babel/plugin-proposal-optional-chaining'],
+    sourceType: 'unambiguous'
   }
 }
diff --git a/src/compounds/side-nav/package.json b/src/compounds/side-nav/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.2",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/accordion/package.json b/src/elements/accordion/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.8",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/author/package.json b/src/elements/author/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.3",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/breadcrumbs/package.json b/src/elements/breadcrumbs/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.8",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/bullet-list-highlight/package.json b/src/elements/bullet-list-highlight/package.json
@@ -3,6 +3,7 @@
   "version": "0.2.48",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "scripts": {
     "--------------- BUILDING": "----------------------",
     "clean": "rm -rf lib",

diff --git a/src/elements/bullet-list-timeline/package.json b/src/elements/bullet-list-timeline/package.json
@@ -3,6 +3,7 @@
   "version": "0.2.41",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/button-link/package.json b/src/elements/button-link/package.json
@@ -3,6 +3,7 @@
   "version": "0.3.8",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/button/package.json b/src/elements/button/package.json
@@ -3,6 +3,7 @@
   "version": "0.7.7",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/call-out/package.json b/src/elements/call-out/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.8",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/category/package.json b/src/elements/category/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.7",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/checkbox-input/package.json b/src/elements/checkbox-input/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.22",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/cta/package.json b/src/elements/cta/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.7",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/drop-down/package.json b/src/elements/drop-down/package.json
@@ -3,6 +3,7 @@
   "version": "0.4.55",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/embedded-video/package.json b/src/elements/embedded-video/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.3",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/fieldset/package.json b/src/elements/fieldset/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.22",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/frozen-input/package.json b/src/elements/frozen-input/package.json
@@ -3,6 +3,7 @@
   "version": "0.3.48",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/global-styles/package.json b/src/elements/global-styles/package.json
@@ -3,6 +3,7 @@
   "version": "0.3.7",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/icon/package.json b/src/elements/icon/package.json
@@ -3,6 +3,7 @@
   "version": "0.2.47",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/imgix-image/package.json b/src/elements/imgix-image/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.24",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/input-alert/package.json b/src/elements/input-alert/package.json
@@ -3,6 +3,7 @@
   "version": "0.2.41",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/input/package.json b/src/elements/input/package.json
@@ -3,6 +3,7 @@
   "version": "0.3.48",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/list/package.json b/src/elements/list/package.json
@@ -3,6 +3,7 @@
   "version": "0.2.7",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/loading-spinner/package.json b/src/elements/loading-spinner/package.json
@@ -3,6 +3,7 @@
   "version": "0.2.41",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/pagination/package.json b/src/elements/pagination/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.8",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/progress-bar/package.json b/src/elements/progress-bar/package.json
@@ -3,6 +3,7 @@
   "version": "0.3.15",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/radio-input/package.json b/src/elements/radio-input/package.json
@@ -3,6 +3,7 @@
   "version": "1.1.13",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/side-drawer/package.json b/src/elements/side-drawer/package.json
@@ -3,6 +3,7 @@
   "version": "0.2.35",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/elements/tile-input/package.json b/src/elements/tile-input/package.json
@@ -3,6 +3,7 @@
   "version": "1.0.49",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/helpers/date/package.json b/src/helpers/date/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.5",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/layout/arrangement/package.json b/src/layout/arrangement/package.json
@@ -3,6 +3,7 @@
   "version": "2.0.6",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/layout/grid/package.json b/src/layout/grid/package.json
@@ -3,6 +3,7 @@
   "version": "2.0.0",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.tsx",
   "publishConfig": {
     "access": "public"
   },

diff --git a/src/styles/package.json b/src/styles/package.json
@@ -3,6 +3,7 @@
   "version": "0.4.23",
   "license": "MIT",
   "main": "lib/index.js",
+  "ts:main": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },