2motion
diff --git a/‎.babelrc
Lines changed: 8 additions & 16 deletions b/‎.babelrc
Lines changed: 8 additions & 16 deletions
diff --git a/‎.github/CODE_OF_CONDUCT.md
Lines changed: 6 additions & 6 deletions b/‎.github/CODE_OF_CONDUCT.md
Lines changed: 6 additions & 6 deletions
diff --git a/‎.github/CONTRIBUTING.md
Lines changed: 8 additions & 8 deletions b/‎.github/CONTRIBUTING.md
Lines changed: 8 additions & 8 deletions
diff --git a/‎.github/ISSUE_TEMPLATE.md
Lines changed: 18 additions & 18 deletions b/‎.github/ISSUE_TEMPLATE.md
Lines changed: 18 additions & 18 deletions
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 5 additions & 5 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 5 additions & 5 deletions
diff --git a/‎.storybook/webpack.config.es6.js
Lines changed: 0 additions & 33 deletions b/‎.storybook/webpack.config.es6.js
Lines changed: 0 additions & 33 deletions
diff --git a/‎.storybook/webpack.config.js
Lines changed: 33 additions & 5 deletions b/‎.storybook/webpack.config.js
Lines changed: 33 additions & 5 deletions
diff --git a/‎.vscode/settings.json
Lines changed: 4 additions & 0 deletions b/‎.vscode/settings.json
Lines changed: 4 additions & 0 deletions
@@ -1,22 +1,14 @@
 {
+  "presets": ["@babel/preset-env", "@babel/preset-react"],
+  "plugins": [
+    "@babel/plugin-transform-runtime",
+    "@babel/plugin-proposal-class-properties",
+    "babel-plugin-add-react-displayname"
+  ],
   "env": {
-    // Workaround Babel 6's weird config inheritance by not having any root
-    // config (`{"modules":false}` gets overridden). This can be improved with
-    // Babel 7's `.babelrc.js` support.
-    "development": {
-      "presets": ["env", "react", "stage-0"]
-    },
-    "test": {
-      "presets": ["env", "react", "stage-0"]
-    },
-    "production": {
-      "presets": ["env", "react", "stage-0"]
-    },
-    "commonjs": {
-      "presets": ["env", "react", "stage-0"]
-    },
     "esm": {
-      "presets": [["env", { "modules": false }], "react", "stage-0"]
+      "presets": [["@babel/preset-env", { "modules": false }]],
+      "plugins": [["@babel/plugin-transform-runtime", { "useESModules": true }]]
     }
   }
 }
@@ -8,12 +8,12 @@ In the interest of fostering an open and welcoming environment, we as contributo
 
 Examples of behavior that contributes to creating a positive environment include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-* Examples of unacceptable behavior by participants include:
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+- Examples of unacceptable behavior by participants include:
 
 The use of sexualized language or imagery and unwelcome sexual attention or advances
 Trolling, insulting/derogatory comments, and personal or political attacks
 
@@ -25,17 +25,17 @@ Include this in your issue if possible.
 We hope to formalize the 🌲 Evergreen design language more as we go.
 As a general rule of thumb try to follow these constraints:
 
-* Use `color` and the `typography` components.
-* 8px soft grid, (4px under 40px is also good).
-* Don't force line heights on grid if it looks poorly.
+- Use `color` and the `typography` components.
+- 8px soft grid, (4px under 40px is also good).
+- Don't force line heights on grid if it looks poorly.
 
 ### Component API
 
-* Write down how you would like to use this component.
-* Write down the component API and prop types.
-* Try to use `ui-box` for your components.
-* Try to make all heights possible.
-* Base the text style (font size) on the height.
+- Write down how you would like to use this component.
+- Write down the component API and prop types.
+- Try to use `ui-box` for your components.
+- Try to make all heights possible.
+- Base the text style (font size) on the height.
 
 Include this in your issue if possible.
 
 
@@ -13,33 +13,33 @@ _Bug fixes and documentation fixes are welcome._
 
 Please consider the following items when filing a bug report:
 
-* Issue and steps to reproduce.
-* Versions.
-* Screenshots.
-* Expected.
-* Actual.
-* Link to your project.
-* Browser name and version.
-* Operating system.
+- Issue and steps to reproduce.
+- Versions.
+- Screenshots.
+- Expected.
+- Actual.
+- Link to your project.
+- Browser name and version.
+- Operating system.
 
 ## In the case of a feature/component request ✍️
 
 Please consider the following items when filing a feature request:
 
-* **Usage**, component API if applicable.
-* **Design Example**, screenshot of what the design should look like.
-* Problem that feature/component addresses.
-* Examples in other projects of feature/component.
-* Screenshots if design changes.
+- **Usage**, component API if applicable.
+- **Design Example**, screenshot of what the design should look like.
+- Problem that feature/component addresses.
+- Examples in other projects of feature/component.
+- Screenshots if design changes.
 
 See the contributing guide for more details.
 
 ## Respect earns Respect 👏
 
 Please respect our Code of Conduct, in short:
 
-* Using welcoming and inclusive language.
-* Being respectful of differing viewpoints and experiences.
-* Gracefully accepting constructive criticism.
-* Focusing on what is best for the community.
-* Showing empathy towards other community members.
+- Using welcoming and inclusive language.
+- Being respectful of differing viewpoints and experiences.
+- Gracefully accepting constructive criticism.
+- Focusing on what is best for the community.
+- Showing empathy towards other community members.
@@ -11,8 +11,8 @@ thank you for your time, and close the issue.
 
 Please respect our Code of Conduct, in short:
 
-* Using welcoming and inclusive language.
-* Being respectful of differing viewpoints and experiences.
-* Gracefully accepting constructive criticism.
-* Focusing on what is best for the community.
-* Showing empathy towards other community members.
+- Using welcoming and inclusive language.
+- Being respectful of differing viewpoints and experiences.
+- Gracefully accepting constructive criticism.
+- Focusing on what is best for the community.
+- Showing empathy towards other community members.
@@ -1,5 +1,33 @@
-// Storybook config does not work with ES6 just yet.
-// This is a workaround.
-// https://github.com/storybooks/storybook/issues/155
-require('babel-register')
-module.exports = require('./webpack.config.es6.js')
+const path = require('path')
+const webpack = require('webpack')
+
+module.exports = storybookBaseConfig => {
+  // Return the altered config
+  return {
+    ...storybookBaseConfig,
+    plugins: [
+      ...storybookBaseConfig.plugins,
+      new webpack.LoaderOptionsPlugin({
+        debug: true
+      })
+    ],
+    module: {
+      ...storybookBaseConfig.module,
+      rules: [
+        ...storybookBaseConfig.module.rules,
+        {
+          test: /\.(png\?.*|jpg\?.*|jpg|png)$/,
+          loader: 'url-loader'
+        },
+        {
+          test: /\.(blob)/,
+          loader: 'file-loader'
+        },
+        {
+          test: /\.(json)/,
+          loader: 'json-loader'
+        }
+      ]
+    }
+  }
+}
@@ -0,0 +1,4 @@
+{
+  "eslint.enable": false,
+  "xo.enable": true
+}
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "eslint.enable": false,
 +  "xo.enable": true
 +}