Skip to content

Commit 041232f

Browse files
committed
Merge branch 'master'
Conflicts: oh-my-cdn.json
2 parents d09ffc9 + f595121 commit 041232f

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

docs/build.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
## Development
44

55
We use Webpack HMR to develop Boostnote.
6-
You can use this command to use our configuration
6+
You can use following commands to use default configuration at the top of project directory.
7+
8+
Install requirement packages.
9+
10+
```
11+
$ npm install
12+
```
13+
14+
Build codes.
715

816
```
9-
npm run webpack
17+
$ npm run webpack
1018
```
1119

1220
After a few seconds, you will see this message.
@@ -17,9 +25,9 @@ webpack: bundle is now VALID.
1725

1826
Then, we have to run the app.
1927
```
20-
npm run hot
28+
$ npm run hot
2129
```
22-
> Actually the app can be start with `npm start@. However, the app will use the compiled script.
30+
> Actually the app can be start with `npm start`. However, the app will use the compiled script.
2331
2432
By this, webpack will watch the code changes and apply it automatically.
2533

oh-my-cdn.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"react": "https://cdnjs.cloudflare.com/ajax/libs/react/15.0.2/react.js",
55
"react-dom": "https://cdnjs.cloudflare.com/ajax/libs/react/15.0.2/react-dom.js",
66
"redux": "https://cdnjs.cloudflare.com/ajax/libs/redux/3.5.2/redux.js",
7-
"react-redux": "https://npmcdn.com/react-redux@4.4.5/dist/react-redux.min.js",
7+
"react-redux": "https://unpkg.com/react-redux@4.4.5/dist/react-redux.min.js"
88
"katex": "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.js",
99
"katex-style": "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.css"
1010
}

0 commit comments

Comments
 (0)