Skip to content

Commit 18aad5d

Browse files
authored
Merge pull request #46 from neonexus/master
Fixed README.
2 parents 07e42d5 + 41cf057 commit 18aad5d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+81
-81
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## [v3.0.0-beta](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v2.0.0...v3.0.0-beta.3) (2022-04-02)
3+
## [v3.0.0-beta](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v2.0.0...v3.0.0-beta.4) (2022-04-02)
44

55
### Features
66

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ If you would like to use v5 of React Router, make sure you are cloning [v2 of th
2222

2323
## Currently setup with
2424
* [Sails](https://sailsjs.com/) **v1**
25-
* [React](https://reactjs.org/) **v17**
25+
* [React](https://reactjs.org/) **v18**
2626
* [React Router](https://reactrouter.com/) **v6**
2727
* [Bootstrap](https://getbootstrap.com/) **v5**
2828
* [React-Bootstrap](https://react-bootstrap.github.io/) **v2**

package-lock.json

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sails-react-bootstrap-webpack",
3-
"version": "3.0.0-beta.3",
3+
"version": "3.0.0-beta.4",
44
"description": "An opinionated base configuration of Sails, with Webpack for React support, and Bootstrap for styling.",
55
"keywords": [
66
"sails",
@@ -56,14 +56,14 @@
5656
"react": "18.0.0",
5757
"react-bootstrap": "v2.2.2",
5858
"react-dom": "18.0.0",
59-
"react-router-dom": "6.2.2",
59+
"react-router-dom": "6.3.0",
6060
"react-transition-group": "4.4.2",
6161
"rimraf": "3.0.2",
62-
"sass": "1.49.9",
62+
"sass": "1.49.11",
6363
"sass-loader": "12.6.0",
6464
"style-loader": "3.3.1",
6565
"supertest": "6.2.2",
66-
"webpack": "5.70.0",
66+
"webpack": "5.71.0",
6767
"webpack-cli": "4.9.2",
6868
"webpack-dev-server": "4.7.4",
6969
"webpack-merge": "5.8.0"

test/coverage/controllers/admin/create-api-token.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">controllers/
157157
<div class='footer quiet pad2 space-top1 center small'>
158158
Code coverage generated by
159159
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
160-
at Tue Mar 29 2022 23:41:36 GMT-0500 (Central Daylight Time)
160+
at Sat Apr 02 2022 22:44:51 GMT-0500 (Central Daylight Time)
161161
</div>
162162
</div>
163163
<script src="../../prettify.js"></script>

test/coverage/controllers/admin/create-user.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">controllers/
325325
<div class='footer quiet pad2 space-top1 center small'>
326326
Code coverage generated by
327327
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
328-
at Tue Mar 29 2022 23:41:36 GMT-0500 (Central Daylight Time)
328+
at Sat Apr 02 2022 22:44:51 GMT-0500 (Central Daylight Time)
329329
</div>
330330
</div>
331331
<script src="../../prettify.js"></script>

test/coverage/controllers/admin/delete-user.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">controllers/
196196
<div class='footer quiet pad2 space-top1 center small'>
197197
Code coverage generated by
198198
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
199-
at Tue Mar 29 2022 23:41:36 GMT-0500 (Central Daylight Time)
199+
at Sat Apr 02 2022 22:44:51 GMT-0500 (Central Daylight Time)
200200
</div>
201201
</div>
202202
<script src="../../prettify.js"></script>

test/coverage/controllers/admin/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ <h1><a href="../../index.html">All files</a> controllers/admin</h1>
125125
<div class='footer quiet pad2 space-top1 center small'>
126126
Code coverage generated by
127127
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
128-
at Tue Mar 29 2022 23:41:36 GMT-0500 (Central Daylight Time)
128+
at Sat Apr 02 2022 22:44:51 GMT-0500 (Central Daylight Time)
129129
</div>
130130
</div>
131131
<script src="../../prettify.js"></script>

test/coverage/controllers/common/get-me.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">controllers/
154154
<div class='footer quiet pad2 space-top1 center small'>
155155
Code coverage generated by
156156
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
157-
at Tue Mar 29 2022 23:41:36 GMT-0500 (Central Daylight Time)
157+
at Sat Apr 02 2022 22:44:51 GMT-0500 (Central Daylight Time)
158158
</div>
159159
</div>
160160
<script src="../../prettify.js"></script>

test/coverage/controllers/common/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ <h1><a href="../../index.html">All files</a> controllers/common</h1>
125125
<div class='footer quiet pad2 space-top1 center small'>
126126
Code coverage generated by
127127
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
128-
at Tue Mar 29 2022 23:41:36 GMT-0500 (Central Daylight Time)
128+
at Sat Apr 02 2022 22:44:51 GMT-0500 (Central Daylight Time)
129129
</div>
130130
</div>
131131
<script src="../../prettify.js"></script>

0 commit comments

Comments
 (0)