diff --git a/.circleci/config.yml b/.circleci/config.yml index 87677e8c4c33..257f599f7382 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,28 +72,6 @@ jobs: name: "Build vue kitchen-sink" command: | cd examples/vue-kitchen-sink && npm run build-storybook - example-test-cra: - <<: *defaults - steps: - - checkout - - restore_cache: - keys: - - root-dependencies-{{ checksum "package.json" }} - - root-dependencies- - - run: - name: "Install root dependencies" - command: | - yarn install - - run: - name: "Bootstrapping" - command: | - npm run bootstrap - npm run build-packs - npm run bootstrap:test-cra - - run: - name: "Build test-cra" - command: | - cd examples/test-cra && npm run build-storybook example-react-native: <<: *defaults steps: @@ -189,7 +167,6 @@ workflows: - validate - build - example-kitchen-sinks - - example-test-cra - example-react-native - docs - lint diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 06cdc399d360..578f6dd5f32c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,7 +41,7 @@ To test your project against the current latest version of storybook, you can cl The best way to help figure out an issue you are having is to produce a minimal reproduction against the `master` branch. -A good way to do that is using the example `test-cra` app embedded in this repository: +A good way to do that is using the example `cra-kitchen-sink` app embedded in this repository: ```bash # Download and build this repository: @@ -50,7 +50,7 @@ cd storybook npm install npm run bootstrap -cd examples/test-cra +cd examples/cra-kitchen-sink # make changes to try and reproduce the problem, such as adding components + stories npm start storybook diff --git a/examples/test-cra/.gitignore b/examples/test-cra/.gitignore deleted file mode 100644 index 927d17bb9c5b..000000000000 --- a/examples/test-cra/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# See https://help.github.com/ignore-files/ for more about ignoring files. - -# dependencies -/node_modules - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env -npm-debug.log* -yarn-debug.log* -yarn-error.log* - diff --git a/examples/test-cra/.storybook/addons.js b/examples/test-cra/.storybook/addons.js deleted file mode 100644 index f66454f60388..000000000000 --- a/examples/test-cra/.storybook/addons.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@storybook/addon-actions/register'; -import '@storybook/addon-options/register'; -import '@storybook/addon-links/register'; diff --git a/examples/test-cra/.storybook/config.js b/examples/test-cra/.storybook/config.js deleted file mode 100644 index 66d31c26adcc..000000000000 --- a/examples/test-cra/.storybook/config.js +++ /dev/null @@ -1,10 +0,0 @@ -import { configure } from '@storybook/react'; -import { setOptions } from '@storybook/addon-options'; - -setOptions({ sidebarAnimations: false, }), - -function loadStories() { - require('../src/stories'); -} - -configure(loadStories, module); diff --git a/examples/test-cra/README.md b/examples/test-cra/README.md deleted file mode 100644 index 8b137891791f..000000000000 --- a/examples/test-cra/README.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/examples/test-cra/package.json b/examples/test-cra/package.json deleted file mode 100644 index 146660f82ded..000000000000 --- a/examples/test-cra/package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "test-cra", - "version": "1.0.0", - "scripts": { - "build": "react-scripts build", - "build-storybook": "build-storybook -s public", - "eject": "react-scripts eject", - "start": "react-scripts start", - "storybook": "start-storybook -p 9009 -s public", - "pretest": "npm install", - "test": "react-scripts test --env=jsdom" - }, - "dependencies": { - "global": "^4.3.2", - "prop-types": "^15.5.10", - "react": "^15.6.1", - "react-dom": "^15.6.1" - }, - "devDependencies": { - "@storybook/addon-actions": "file:../../packs/storybook-addon-actions.tgz", - "@storybook/addon-links": "file:../../packs/storybook-addon-links.tgz", - "@storybook/addon-options": "file:../../packs/storybook-addon-options.tgz", - "@storybook/addons": "file:../../packs/storybook-addons.tgz", - "@storybook/channel-postmessage": "file:../../packs/storybook-channel-postmessage.tgz", - "@storybook/channels": "file:../../packs/storybook-channels.tgz", - "@storybook/components": "file:../../packs/storybook-components.tgz", - "@storybook/react": "file:../../packs/storybook-react.tgz", - "@storybook/ui": "file:../../packs/storybook-ui.tgz", - "react-scripts": "1.0.2", - "react-test-renderer": "^15.4.2" - }, - "private": true -} diff --git a/examples/test-cra/public/favicon.ico b/examples/test-cra/public/favicon.ico deleted file mode 100644 index 5c125de5d897..000000000000 Binary files a/examples/test-cra/public/favicon.ico and /dev/null differ diff --git a/examples/test-cra/public/index.html b/examples/test-cra/public/index.html deleted file mode 100644 index aab5e3b00ce4..000000000000 --- a/examples/test-cra/public/index.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - React App - - -
- - - diff --git a/examples/test-cra/src/App.css b/examples/test-cra/src/App.css deleted file mode 100644 index 15adfdc710ca..000000000000 --- a/examples/test-cra/src/App.css +++ /dev/null @@ -1,24 +0,0 @@ -.App { - text-align: center; -} - -.App-logo { - animation: App-logo-spin infinite 20s linear; - height: 80px; -} - -.App-header { - background-color: #222; - height: 150px; - padding: 20px; - color: white; -} - -.App-intro { - font-size: large; -} - -@keyframes App-logo-spin { - from { transform: rotate(0deg); } - to { transform: rotate(360deg); } -} diff --git a/examples/test-cra/src/App.js b/examples/test-cra/src/App.js deleted file mode 100644 index 74635391da60..000000000000 --- a/examples/test-cra/src/App.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import logo from './logo.svg'; -import './App.css'; - -const App = () => -
-
- logo -

Welcome to React

-
-

- To get started, edit src/App.js and save to reload. -

-
; - -export default App; diff --git a/examples/test-cra/src/App.test.js b/examples/test-cra/src/App.test.js deleted file mode 100644 index 7c29c048d76c..000000000000 --- a/examples/test-cra/src/App.test.js +++ /dev/null @@ -1,10 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import { document } from 'global'; - -import App from './App'; - -it('renders without crashing', () => { - const div = document.createElement('div'); - ReactDOM.render(, div); -}); diff --git a/examples/test-cra/src/index.css b/examples/test-cra/src/index.css deleted file mode 100644 index b4cc7250b98c..000000000000 --- a/examples/test-cra/src/index.css +++ /dev/null @@ -1,5 +0,0 @@ -body { - margin: 0; - padding: 0; - font-family: sans-serif; -} diff --git a/examples/test-cra/src/index.js b/examples/test-cra/src/index.js deleted file mode 100644 index 0d9b8750cfaf..000000000000 --- a/examples/test-cra/src/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import { document } from 'global'; - -import App from './App'; -import './index.css'; - -ReactDOM.render(, document.getElementById('root')); diff --git a/examples/test-cra/src/logo.svg b/examples/test-cra/src/logo.svg deleted file mode 100644 index 6b60c1042f58..000000000000 --- a/examples/test-cra/src/logo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/examples/test-cra/src/stories/ComponentWithRef.js b/examples/test-cra/src/stories/ComponentWithRef.js deleted file mode 100644 index a8bf2c6d869a..000000000000 --- a/examples/test-cra/src/stories/ComponentWithRef.js +++ /dev/null @@ -1,20 +0,0 @@ -import React, { Component } from 'react'; - -class ComponentWithRef extends Component { - componentDidMount() { - // Read the scroll width off the DOM element - this.scrollWidth = this.ref.scrollWidth; - } - scrollWidth = 0; - render() { - return ( -
{ - this.ref = r; - }} - /> - ); - } -} - -export default ComponentWithRef; diff --git a/examples/test-cra/src/stories/index.js b/examples/test-cra/src/stories/index.js deleted file mode 100644 index d86c08937a16..000000000000 --- a/examples/test-cra/src/stories/index.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; - -import { storiesOf } from '@storybook/react'; -import { action } from '@storybook/addon-actions'; -import { linkTo } from '@storybook/addon-links'; - -import { Button, Welcome } from '@storybook/react/demo'; -import ComponentWithRef from './ComponentWithRef'; - -storiesOf('Welcome', module).add('to Storybook', () => ); - -storiesOf('Button', module) - .add('with text', () => ) - .add('with some emoji', () => ); - -storiesOf('ComponentWithRef', module).add('basic', () => ); diff --git a/jest.config.js b/jest.config.js index b97bf6bd126c..fab43ecfcce1 100644 --- a/jest.config.js +++ b/jest.config.js @@ -11,7 +11,6 @@ module.exports = { '/app', '/lib', '/examples/cra-kitchen-sink', - '/examples/test-cra', ], testPathIgnorePatterns: ['/node_modules/'], collectCoverage: false, diff --git a/lerna.json b/lerna.json index 9e94167a38b5..5f9cc8abe700 100644 --- a/lerna.json +++ b/lerna.json @@ -4,7 +4,6 @@ "bootstrap": { "ignore": [ "crna-kitchen-sink", - "test-cra", "react-native-vanilla" ] }, @@ -12,7 +11,6 @@ "ignore": [ "cra-kitchen-sink", "crna-kitchen-sink", - "test-cra", "react-native-vanilla", "vue-example" ] diff --git a/package.json b/package.json index 7ddedcb4f368..915a4c3bf9d8 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "bootstrap:docs": "cd docs && yarn install", "bootstrap:react-native-vanilla": "lerna exec --scope react-native-vanilla -- npm install", "bootstrap:crna-kitchen-sink": "lerna exec --scope crna-kitchen-sink -- npm install", - "bootstrap:test-cra": "lerna exec --scope test-cra -- npm install", "build-packs": "lerna exec --scope '@storybook/*' --parallel -- ../../scripts/build-pack.sh ../../packs", "start": "lerna run --stream --scope cra-kitchen-sink storybook", "changelog": "pr-log --sloppy", diff --git a/packs/README.md b/packs/README.md index bf283ac65a48..49703f9d3ad7 100644 --- a/packs/README.md +++ b/packs/README.md @@ -2,4 +2,4 @@ This directory is filled with git packs of our packages when you run the `build-packs` command. -The purpose of this is to enable the `test-cra` app to use the packs as "local" installs without linking, and thus behave like a normal app would, yet still use our latest code. It's awkward for development but good to double check things, especially in CI. +The purpose of this is to enable the example apps to use the packs as "local" installs without linking, and thus behave like a normal app would, yet still use our latest code. It's awkward for development but good to double check things, especially in CI.