Skip to content

Commit c27ab1a

Browse files
committed
Merge branch 'master' into redux
2 parents ab02e88 + f0eefd9 commit c27ab1a

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

README.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ The source code should be placed in `src`; public/static files should be placed
4545

4646
If you want to start with a clean and minimal source code without the predefined components and tests, just use the `src-clean` instead by renaming it to `src` (and removing or renaming the older one to something like `src-example`).
4747

48+
Because of [webpack's config](https://github.com/diegohaz/arc/blob/5c752968c52d013f7218b514021eae08f6ddf07c/webpack.config.js#L19-L21), we can import our source modules without relative paths.
49+
```js
50+
import { Button, HomePage } from 'components' // src/components
51+
import App from 'components/App' // src/components/App
52+
import routes from 'routes' // src/routes
53+
```
54+
4855
### Components
4956

5057
This project leverages the [Atomic Design](http://bradfrost.com/blog/post/atomic-web-design/) methodology to create a scalable and easy to maintain component folder structure. See [why](https://github.com/diegohaz/arc#why).
@@ -162,8 +169,7 @@ When issuing, use the following patterns in the title for better understanding:
162169
```bash
163170
[v0.3.1-redux] Something wrong is not right # the v0.3.1 release of the redux branch
164171
[redux] Something wrong is not right # the actual code of the redux branch
165-
[master] Something right is not wrong # the actual code of the master branch
166-
Something wrong is right # general or not directly related to any branch
172+
Something wrong is right # general, related to master or not directly related to any branch
167173
```
168174

169175
PRs are very appreciated. For bugs/features consider creating an issue before sending a PR. But there're other things you can contribute directly:

0 commit comments

Comments
 (0)