Skip to content

Commit

Permalink
Merge branch 'next' into fix/viewport
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen authored Aug 26, 2019
2 parents b772221 + a45bc68 commit bde0c12
Show file tree
Hide file tree
Showing 617 changed files with 10,644 additions and 6,810 deletions.
8 changes: 2 additions & 6 deletions .babelrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ module.exports = {
},
{
test: './lib',
exclude: './addons/storysource/src/loader',
presets: [
['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
'@babel/preset-react',
Expand All @@ -75,14 +74,11 @@ module.exports = {
},
{
test: [
'./lib/core/src/server',
'./lib/node-logger',
'./lib/codemod',
'./lib/source-loader/src',
'./addons/storyshots',
'./addons/storysource/src/loader',
'./app/**/src/server/**',
'./app/**/src/bin/**',
'**/src/server/**',
'**/src/bin/**',
],
presets: [
[
Expand Down
7 changes: 1 addition & 6 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,7 @@ If applicable, add screenshots to help explain your problem.
If applicable, add code samples to help explain your problem.

**System:**
- OS: [e.g. iOS, Windows10, MacOS]
- Device: [e.g. iPhoneX, Macbook Pro 2018]
- Browser: [e.g. chrome, safari]
- Framework: [e.g. react, vue, angular]
- Addons: [if relevant]
- Version: [e.g. 4.0.0]
Please paste the results of `npx -p @storybook/cli@next sb info` here.

**Additional context**
Add any other context about the problem here.
2 changes: 1 addition & 1 deletion .github/automention.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'app: preact': ['BartWaardenburg']
'app: react-native': ['benoitdion', 'gongreg']
'app: react-native-server': ['benoitdion', 'gongreg']
'app: svelte': ['cam-stitt', 'plumpNation']
'app: svelte': ['rixo', 'cam-stitt', 'plumpNation']
'app: vue': ['backbone87', 'elevatebart', 'pksunkara']
'api: addons': ['ndelangen']
'addon: a11y': ['CodeByAlex', 'Armanio', 'jsomsanith']
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Node CI

on: [push]

jobs:
build:

name: Test on node ${{ matrix.node_version }} and ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [8, 10, 12]
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v1
with:
version: ${{ matrix.node_version }}
- name: install, build, and test
run: |
yarn bootstrap --core
yarn test --core
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ scripts/storage
htpasswd
/false
storybook-out
/addons/docs/common/config-*
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ script:

jobs:
include:
- script: yarn test --cli
- script: yarn test-latest-cra
- script: travis_wait 30 yarn test --cli
- script: travis_wait 30 yarn test-latest-cra
Loading

0 comments on commit bde0c12

Please sign in to comment.