Skip to content

Commit a78fbb9

Browse files
authored
Merge pull request #4 from one-react/update-scaffold
update scaffold to or-template@v2.4.1
2 parents 2bae8e2 + 6b05159 commit a78fbb9

File tree

11 files changed

+34
-33
lines changed

11 files changed

+34
-33
lines changed

.babelrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const presets = [
1010
]
1111

1212
const plugins = [
13+
'@babel/plugin-transform-runtime',
1314
'@babel/plugin-proposal-class-properties',
1415
'@babel/plugin-proposal-object-rest-spread'
1516
]

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@ jobs:
3535

3636
# run tests!
3737
- run: yarn test
38-

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,9 @@ typings/
6161
lib
6262
es
6363

64+
# storybook examples outputs
65+
site
66+
6467
package-lock.json
68+
69+
.DS_Store

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"singleQuote": true,
3-
"semi": false
3+
"semi": false,
4+
"trailingComma": "none"
45
}

examples/.storybook/webpack.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ module.exports = (baseConfig, env, defaultConfig) => {
1414
},
1515
require.resolve('react-docgen-typescript-loader')
1616
]
17-
}, {
18-
test: /\.scss$/,
19-
use: ['style-loader', 'css-loader', 'sass-loader']
2017
})
2118

2219
defaultConfig.resolve.alias['or-code-previewer'] = path.resolve(__dirname, '../../src')

examples/package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,26 @@
44
"description": "",
55
"main": "index.js",
66
"scripts": {
7+
"type-check": "tsc --noEmit",
78
"dev": "start-storybook -s public -p 9001 -c .storybook",
89
"build": "build-storybook -s public -o site"
910
},
1011
"author": "foryuki <foryuki@outlook.com>",
1112
"license": "MIT",
1213
"devDependencies": {
13-
"@babel/core": "^7.0.1",
14-
"@storybook/addon-actions": "^4.0.0-alpha.23",
15-
"@storybook/addon-info": "^4.0.0-alpha.23",
16-
"@storybook/addon-options": "^4.0.0-alpha.23",
17-
"@storybook/react": "^4.0.0-alpha.23",
14+
"@babel/core": "^7.1.2",
15+
"@storybook/addon-actions": "^4.0.2",
16+
"@storybook/addon-info": "^4.0.2",
17+
"@storybook/addon-options": "^4.0.2",
18+
"@storybook/react": "^4.0.2",
1819
"@types/storybook__addon-actions": "^3.4.1",
1920
"@types/storybook__addon-info": "^3.4.2",
2021
"@types/storybook__react": "^3.0.9",
2122
"babel-loader": "^8.0.2",
22-
"css-loader": "^1.0.0",
23-
"node-sass": "^4.7.2",
23+
"node-sass": "^4.9.4",
24+
"or-code-previewer": "^1.0.0",
2425
"raw-loader": "^0.5.1",
2526
"react-docgen-typescript-loader": "^3.0.0",
26-
"sass-loader": "^7.1.0",
27-
"style-loader": "^0.23.0",
2827
"typescript": "^3.0.3"
2928
},
3029
"dependencies": {

examples/stories/util.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import React from 'react'
22

33
import CodePreviewer from 'or-code-previewer'
44

5-
export function previewCode(code: string): any {
5+
export function previewCode(code: string) {
66
return <CodePreviewer title="Story Source" lang="tsx" code={code} />
77
}

examples/types/declarations.d.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@ import * as React from 'react'
66
import { Options } from '@storybook/addon-info'
77

88
declare module '@storybook/react' {
9+
interface ExtOptions extends Options {
10+
text?: string | React.ReactNode
11+
}
912
export interface Story {
1013
readonly kind: string
1114
add(
1215
storyName: string,
1316
callback: RenderFunction,
14-
options?: { info: Options & { text?: string | React.ReactNode } }
17+
options?: { info: ExtOptions }
1518
): this
1619
addDecorator(decorator: StoryDecorator): this
1720
}

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
2929
},
3030
"homepage": "https://github.com/one-react/code-previewer#readme",
3131
"devDependencies": {
32-
"@babel/cli": "^7.0.0",
33-
"@babel/core": "^7.0.1",
34-
"@babel/plugin-proposal-class-properties": "^7.0.0",
32+
"@babel/cli": "^7.1.2",
33+
"@babel/core": "^7.1.2",
34+
"@babel/plugin-proposal-class-properties": "^7.1.0",
3535
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
36-
"@babel/plugin-transform-modules-commonjs": "^7.0.0",
37-
"@babel/preset-env": "^7.0.0",
36+
"@babel/plugin-transform-modules-commonjs": "^7.1.0",
37+
"@babel/plugin-transform-runtime": "^7.1.0",
38+
"@babel/preset-env": "^7.1.0",
3839
"@babel/preset-react": "^7.0.0",
39-
"@babel/preset-typescript": "^7.0.0",
40+
"@babel/preset-typescript": "^7.1.0",
4041
"@commitlint/cli": "^7.1.2",
4142
"@commitlint/config-angular": "^7.1.2",
4243
"@types/enzyme": "^3.1.14",
@@ -50,7 +51,7 @@
5051
"enzyme-adapter-react-16": "^1.1.0",
5152
"husky": "^1.0.0-rc.14",
5253
"jest": "^23.6.0",
53-
"lint-staged": "^7.2.2",
54+
"lint-staged": "^8.0.0",
5455
"prettier": "^1.14.2",
5556
"raf": "^3.4.0",
5657
"react": "^16.1.1",
@@ -64,6 +65,7 @@
6465
"typescript": "^3.0.3"
6566
},
6667
"dependencies": {
68+
"@babel/runtime": "^7.1.2",
6769
"classnames": "^2.2.6",
6870
"or-theme": "^1.2.0",
6971
"react-copy-to-clipboard": "^5.0.1",

readme.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# One React Component: code-previewer
22

3-
4-
<p align="center"><img width="150" src="https://cdn.rawgit.com/one-react/assets/2a4f10b4/logo%402x.png" alt="logo"></p>
3+
<p align="center"><img width="150" src="https://cdn.rawgit.com/one-react/assets/master/logo%402x.png" alt="logo"></p>
54

65
[![TravisCI Build](https://img.shields.io/travis/one-react/code-previewer.svg)](https://travis-ci.org/one-react/code-previewer)
76
[![CircieCI Build](https://img.shields.io/circleci/project/github/one-react/code-previewer.svg)](https://circleci.com/gh/one-react/code-previewer)
@@ -10,10 +9,7 @@
109
[![Chat](https://img.shields.io/gitter/room/one-react-org/Lobby.svg)](https://gitter.im/one-react-org/Lobby)
1110
[![License: MIT](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
1211
[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
13-
[![Greenkeeper badge](https://badges.greenkeeper.io/one-react/code-previewer.svg)](https://greenkeeper.io/)
14-
15-
## Inspired by `@storybook/addon-info`
16-
* and styles/views are similar with `@storybook/addon-info`
12+
[![Greenkeeper badge](https://badges.greenkeeper.io/one-react/code-previewer.svg)](https://greenkeeper.io/)
1713

1814
## Installation
1915
```

0 commit comments

Comments
 (0)