Merge branch 'master' into notification-high-contrast-style

carbon-design-system · May 23, 2019 · 70ae352 · 70ae352
2 parents a06d7fe + 37ec9dd
commit 70ae352
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 5 deletions.
diff --git a/packages/browserslist-config-carbon/README.md b/packages/browserslist-config-carbon/README.md
@@ -0,0 +1,29 @@
+# browserslist-config-carbon
+
+> Browserslist config for the Carbon Design System
+
+## Getting started
+
+To install `browserslist-config-carbon` in your project, you will need to run
+the following command using [npm](https://www.npmjs.com/):
+
+```bash
+npm install -S browserslist-config-carbon
+```
+
+If you prefer [Yarn](https://yarnpkg.com/en/), use the following command
+instead:
+
+```bash
+yarn add browserslist-config-carbon
+```
+
+## 🙌 Contributing
+
+We're always looking for contributors to help us fix bugs, build new features,
+or help us improve the project documentation. If you're interested, definitely
+check out our [Contributing Guide](/.github/CONTRIBUTING.md) ! 👀
+
+## 📝 License
+
+Licensed under the [Apache 2.0 License](/LICENSE).
diff --git a/packages/browserslist-config-carbon/index.js b/packages/browserslist-config-carbon/index.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright IBM Corp. 2018, 2018
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+module.exports = ['last 1 versions', 'ie >= 11', 'Firefox ESR'];
diff --git a/packages/browserslist-config-carbon/package.json b/packages/browserslist-config-carbon/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "browserslist-config-carbon",
+  "description": "Browserslist config for the Carbon Design System",
+  "version": "10.2.0",
+  "license": "Apache-2.0",
+  "main": "index.js",
+  "repository": "https://github.com/IBM/carbon-elements/tree/master/packages/browserslist-config-carbon",
+  "bugs": "https://github.com/IBM/carbon-elements/issues",
+  "keywords": [
+    "eyeglass-module",
+    "ibm",
+    "elements",
+    "carbon",
+    "carbon-elements",
+    "carbon-design-system"
+  ],
+  "publishConfig": {
+    "access": "public"
+  }
+}
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -97,6 +97,7 @@
     "babel-plugin-rewire": "^1.1.0",
     "bluebird": "~3.1.1",
     "browser-sync": "^2.26.3",
+    "browserslist-config-carbon": "10.2.0",
     "carbon-components": "^9.0.0",
     "carbon-components-react": "^6.0.0",
     "chokidar": "^2.0.0",

diff --git a/packages/components/src/components/tabs/README.md b/packages/components/src/components/tabs/README.md
@@ -17,13 +17,13 @@ Modifiers are used with various classes for Tabs.
 ##### ES2015
 
 ```javascript
-import { Tabs } from 'carbon-components';
+import { Tab } from 'carbon-components';
 ```
 
 ##### With pre-build bundle (`carbon-components.min.js`)
 
 ```javascript
-var Tabs = CarbonComponents.Tabs;
+var Tab = CarbonComponents.Tab;
 ```
 
 #### Instantiating

diff --git a/packages/components/tools/env.js b/packages/components/tools/env.js
@@ -9,7 +9,7 @@ module.exports = () => ({
       {
         modules: BABEL_ENV !== 'test' ? false : 'commonjs',
         targets: {
-          browsers: ['last 1 versions', 'Firefox ESR', 'ie >= 11'],
+          browsers: ['extends browserslist-config-carbon'],
         },
       },
     ],

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -168,6 +168,7 @@
     "babel-plugin-dev-expression": "^0.2.1",
     "babel-plugin-react-docgen": "^2.0.0",
     "babel-plugin-transform-inline-environment-variables": "^0.4.0",
+    "browserslist-config-carbon": "10.2.0",
     "carbon-components": "10.2.0",
     "carbon-icons": "^7.0.5",
     "chalk": "^2.3.0",

diff --git a/packages/react/scripts/env.js b/packages/react/scripts/env.js
@@ -9,7 +9,7 @@ module.exports = () => ({
       {
         modules: BABEL_ENV === 'es' ? false : 'commonjs',
         targets: {
-          browsers: ['last 1 versions', 'Firefox ESR'],
+          browsers: ['extends browserslist-config-carbon'],
         },
       },
     ],

diff --git a/tasks/jest/jsTransform.js b/tasks/jest/jsTransform.js
@@ -8,7 +8,7 @@ const babelOptions = {
       '@babel/preset-env',
       {
         targets: {
-          browsers: ['last 1 version', 'ie >= 11', 'Firefox ESR'],
+          browsers: ['extends browserslist-config-carbon'],
         },
       },
     ],