Skip to content

Commit

Permalink
Merge branch 'next' into ts-migration/app-angular
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/angular/src/client/preview/index.js
#	scripts/compile-babel.js
#	yarn.lock
  • Loading branch information
ndelangen committed Jul 9, 2019
2 parents 134867c + 93f116c commit 997ce27
Show file tree
Hide file tree
Showing 858 changed files with 33,296 additions and 76,911 deletions.
3 changes: 3 additions & 0 deletions .babelrc.js
Expand Up @@ -13,6 +13,7 @@ const withTests = {
};

module.exports = {
ignore: ['./lib/codemod/src/transforms/__testfixtures__'],
presets: [
['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
'@babel/preset-typescript',
Expand Down Expand Up @@ -53,6 +54,7 @@ module.exports = {
},
{
test: './lib',
exclude: './addons/storysource/src/loader',
presets: [
['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
'@babel/preset-react',
Expand All @@ -76,6 +78,7 @@ module.exports = {
'./lib/core/src/server',
'./lib/node-logger',
'./lib/codemod',
'./lib/source-loader/src',
'./addons/storyshots',
'./addons/storysource/src/loader',
'./app/**/src/server/**',
Expand Down
14 changes: 14 additions & 0 deletions .circleci/config.yml
Expand Up @@ -50,6 +50,17 @@ jobs:
- run:
name: Run chromatic on the pre-built storybook
command: yarn chromatic -- -d ./storybook-static
packtracker:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: .
- run:
name: Report webpack stats for manager of official storybook
command: |
cd examples/official-storybook
yarn packtracker
examples:
<<: *defaults
steps:
Expand Down Expand Up @@ -350,6 +361,9 @@ workflows:
- smoke-tests:
requires:
- build
- packtracker:
requires:
- build
- native-smoke-tests:
requires:
- build
Expand Down
5 changes: 1 addition & 4 deletions .eslintignore
Expand Up @@ -10,6 +10,7 @@ lib/cli/test
scripts/storage
*.bundle.js
*.js.map
*.d.ts

!.remarkrc.js
!.babelrc.js
Expand All @@ -18,7 +19,3 @@ scripts/storage
!.jest.config.js
!.storybook

REACT_NATIVE
examples-native
react-native
ondevice-*
4 changes: 2 additions & 2 deletions .github/automention.yml
Expand Up @@ -5,9 +5,9 @@
'app: polymer': ['stijnkoopal', 'ndelangen']
'app: preact': ['BartWaardenburg']
'app: react-native': ['benoitdion', 'gongreg']
'app: react-native-server': ['benoitdion', 'igor-dv']
'app: react-native-server': ['benoitdion', 'gongreg']
'app: svelte': ['cam-stitt', 'plumpNation']
'app: vue': ['backbone87', 'elevatebart']
'app: vue': ['backbone87', 'elevatebart', 'pksunkara']
'api: addons': ['ndelangen']
'addon: a11y': ['CodeByAlex', 'Armanio', 'jsomsanith']
'addon: contexts': ['leoyli']
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -27,3 +27,5 @@ lib/**/dll
.expo/packager-info.json
scripts/storage
htpasswd
/false
storybook-out

0 comments on commit 997ce27

Please sign in to comment.