Skip to content

Commit

Permalink
Merge branch 'next' into tech/add-docs-to-standalone
Browse files Browse the repository at this point in the history
# Conflicts:
#	examples/standalone-preview/package.json
#	examples/standalone-preview/storybook.html
#	examples/standalone-preview/storybook.tsx
  • Loading branch information
ndelangen committed Jun 4, 2020
2 parents f763907 + 9941335 commit cdaf6f0
Show file tree
Hide file tree
Showing 2,461 changed files with 65,724 additions and 65,608 deletions.
19 changes: 6 additions & 13 deletions .babelrc.js
Expand Up @@ -31,6 +31,7 @@ module.exports = {
},
],
['@babel/plugin-proposal-class-properties', { loose: true }],
['@babel/plugin-proposal-private-methods', { loose: true }],
'@babel/plugin-proposal-export-default-from',
'@babel/plugin-syntax-dynamic-import',
['@babel/plugin-proposal-object-rest-spread', { loose: true, useBuiltIns: true }],
Expand All @@ -43,18 +44,11 @@ module.exports = {
overrides: [
{
test: './examples/vue-kitchen-sink',
presets: ['babel-preset-vue'],
presets: ['@vue/babel-preset-jsx'],
env: {
test: withTests,
},
},
{
test: './examples/rax-kitchen-sink',
presets: [
['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
['babel-preset-rax', { development: process.env.BABEL_ENV === 'development' }],
],
},
{
test: './lib',
presets: [
Expand All @@ -75,11 +69,6 @@ module.exports = {
test: withTests,
},
},
{
test: './app/react-native',
presets: ['module:metro-react-native-babel-preset'],
plugins: ['babel-plugin-macros', ['emotion', { sourceMap: true, autoLabel: true }]],
},
{
test: [
'./lib/node-logger',
Expand All @@ -104,6 +93,10 @@ module.exports = {
plugins: [
'emotion',
'babel-plugin-macros',
'@babel/plugin-transform-arrow-functions',
'@babel/plugin-transform-shorthand-properties',
'@babel/plugin-transform-block-scoping',
'@babel/plugin-transform-destructuring',
['@babel/plugin-proposal-class-properties', { loose: true }],
'@babel/plugin-proposal-object-rest-spread',
'@babel/plugin-proposal-export-default-from',
Expand Down
4 changes: 3 additions & 1 deletion .ci/danger/dangerfile.ts
Expand Up @@ -3,7 +3,9 @@ import { execSync } from 'child_process';

execSync('npm install lodash');

const { flatten, intersection, isEmpty } = require('lodash');
const flatten = require('lodash/flatten');
const intersection = require('lodash/intersection');
const isEmpty = require('lodash/isEmpty');

const pkg = require('../../package.json'); // eslint-disable-line import/newline-after-import
const prLogConfig = pkg['pr-log'];
Expand Down

0 comments on commit cdaf6f0

Please sign in to comment.