Skip to content

Commit 4921359

Browse files
committed
fix build issues
1 parent 64a4310 commit 4921359

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ node_js:
33
- "node"
44

55
before_script:
6-
- npm run setup
6+
- yarn run setup
77

88
script:
9-
- npm test
9+
- yarn test

README.md

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<dl>
2-
<dt>Update</dt>
3-
<dd>The next version is in the works. Check it out <a href="https://github.com/iamvijaydev/react-base-code/tree/next">next</a>. Read the <a href="https://github.com/iamvijaydev/react-base-code/blob/next/TODO.md">todo</a>.</dd>
4-
</dl>
5-
61
React base code
72
===============
83

@@ -16,6 +11,7 @@ An opinionated and scalable base tech stack for a modern React app.
1611
- **styled-components:** The styling and theming library
1712
- **react-router-dom:** The routing library
1813
- **react-loadable:** The lazy loading library
14+
- **react-spring:** The spring-physics based animation library
1915
- **axios:** The XHR library
2016
- **react-intl-universal:** The internationalization library
2117
- **jest & enzyme:** The testing libraries
@@ -32,39 +28,39 @@ An opinionated and scalable base tech stack for a modern React app.
3228

3329
## Get the code
3430
- *clone:* the repository via `git clone git@github.com:iamvijaydev/react-base-code.git` (You will have to change the remote)
35-
- *zip:* [v1.2.0.zip](https://github.com/iamvijaydev/react-base-code/archive/v1.2.0.zip)
36-
- *tar.gz:* [v1.2.0.tar.gz](https://github.com/iamvijaydev/react-base-code/archive/v1.2.0.tar.gz)
31+
- *zip:* [v1.2.0.zip](https://github.com/iamvijaydev/react-base-code/archive/v1.3.0.zip)
32+
- *tar.gz:* [v1.2.0.tar.gz](https://github.com/iamvijaydev/react-base-code/archive/v1.3.0.tar.gz)
3733

3834
## Install packages
3935
```shell
40-
npm install
36+
yarn install
4137
```
4238

4339
## Create env.js from env.example.js
4440
This file `env.js` contains any environment-related contents. Update then as you see fit. Add more if required.
4541

4642
## Start dev server
4743
```shell
48-
npm start
44+
yarn start
4945
```
5046

5147
## Build dist
5248
```shell
53-
npm run dist
49+
yarn run dist
5450
```
5551

5652
## Unit test
5753
```shell
58-
npm test
54+
yarn test
5955
```
6056

6157
## Update unit test snapshots
6258
```shell
63-
npm run test:u
59+
yarn test -u
6460
```
6561

6662
## Intl
6763
All the language translations are added to `/config/locale/<locale code>/<fragments>.json`. During both dev and prod build, an additional script is run to aggregate all the fragments to a single file at `/config/locale/<locale code>.json`. Meaning, you can create as many fragments as you like. Make sure to apply any modifications or additions are applied on all locale folders. Since aggregation is a separate script, you need to restart the dev server to apply the new changes.
6864

6965
## TODO
70-
[TODO.md](https://github.com/iamvijaydev/react-base-code/blob/next/TODO.md)
66+
[TODO.md](https://github.com/iamvijaydev/react-base-code/blob/master/TODO.md)

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
},
1010
"license": "MIT",
1111
"scripts": {
12-
"setup": "npm install",
12+
"setup": "yarn install",
1313
"test": "jest --colors",
1414
"test:u": "echo \"updating snapshots...\" && jest -u --colors",
1515
"langs": "node build/intl/translator.js",
16-
"dist": "npm run langs && webpack -p --env.env=prod",
17-
"start": "npm run langs && webpack-dev-server --env.env=dev"
16+
"dist": "yarn run langs && webpack -p --env.env=prod",
17+
"start": "yarn run langs && webpack-dev-server --env.env=dev"
1818
},
1919
"dependencies": {
2020
"@rematch/core": "^1.1.0",
2121
"@rematch/loading": "^1.1.3",
2222
"axios": "^0.19.0",
2323
"base-href-webpack-plugin": "^2.0.0",
24-
"lodash": "^4.17.11",
24+
"lodash": "^4.17.15",
2525
"prop-types": "^15.7.2",
2626
"react": "^16.8.6",
2727
"react-dom": "^16.8.6",

yarn.lock

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5471,11 +5471,16 @@ lodash.sortby@^4.7.0:
54715471
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
54725472
integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
54735473

5474-
lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
5474+
lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
54755475
version "4.17.11"
54765476
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
54775477
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
54785478

5479+
lodash@^4.17.11, lodash@^4.17.15:
5480+
version "4.17.15"
5481+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
5482+
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
5483+
54795484
loglevel@^1.6.3:
54805485
version "1.6.3"
54815486
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.3.tgz#77f2eb64be55a404c9fd04ad16d57c1d6d6b1280"

0 commit comments

Comments
 (0)