Skip to content

Commit 910150b

Browse files
committed
Uninstall recoil
1 parent 4a9b4ec commit 910150b

File tree

5 files changed

+82
-68
lines changed

5 files changed

+82
-68
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This is an opinionated base [Sails v1](https://sailsjs.com) application, using Webpack to handle Bootstrap (SASS) and React.
66

77
# Preface
8-
The `master` branch is experimental, and the [`releases section`](https://github.com/neonexus/sails-react-bootstrap-webpack/releases) is where one should base their use of the template (or simply change the tag to the most recent, stable release in the top left). `master` is **volatile**, likely to change at any time, for any reason; this includes `git push --force`.
8+
The `master` branch is experimental, and the [`releases section`](https://github.com/neonexus/sails-react-bootstrap-webpack/releases) is where one should base their use of this template (or simply change the tag to the most recent, stable release in the top left). `master` is **volatile**, likely to change at any time, for any reason; this includes `git push --force`.
99

1010
**FINAL WARNING: DO NOT RELY ON THE MASTER BRANCH!**
1111

assets/src/Main/Main.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import React from 'react';
22

3-
import {useRecoilValue} from 'recoil';
4-
53
function Main() {
64
return (
75
<>

assets/src/index.jsx

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,15 @@ import {
99
import AdminRouter from './Admin/AdminRouter';
1010
import MainRouter from './Main/MainRouter';
1111

12-
import {
13-
RecoilRoot
14-
} from 'recoil';
15-
1612
function IndexApp() {
17-
const adminInit = {
18-
isAuthenticated: false,
19-
user: null
20-
};
21-
22-
const mainInit = {};
23-
2413
return (
2514
<Router>
2615
<Switch>
2716
<Route path="/admin">
28-
<RecoilRoot initializeState={adminInit}>
29-
<AdminRouter />
30-
</RecoilRoot>
17+
<AdminRouter />
3118
</Route>
3219
<Route path="/main">
33-
<RecoilRoot initializeState={mainInit}>
34-
<MainRouter />
35-
</RecoilRoot>
20+
<MainRouter />
3621
</Route>
3722
<Route>
3823
<Redirect to={{pathname: '/main/'}} />

package-lock.json

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

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717
"moment-timezone": "^0.5.31",
1818
"prop-types": "^15.7.2",
1919
"react": "^16.13.1",
20-
"react-bootstrap": "^1.2.2",
20+
"react-bootstrap": "^1.3.0",
2121
"react-dom": "^16.13.1",
2222
"react-router-dom": "^5.2.0",
2323
"react-transition-group": "^4.4.1",
24-
"recoil": "0.0.10",
2524
"sails": "^1.2.4",
2625
"sails-hook-orm": "^3.0.1",
2726
"sails-hook-sockets": "^2.0.0",
@@ -41,7 +40,7 @@
4140
"chai-spies": "^1.0.0",
4241
"core-js": "^3.6.5",
4342
"css-loader": "^3.6.0",
44-
"eslint": "^7.4.0",
43+
"eslint": "^7.5.0",
4544
"eslint-plugin-react": "^7.20.3",
4645
"favicons-webpack-plugin": "^3.0.1",
4746
"file-loader": "^6.0.0",
@@ -56,7 +55,7 @@
5655
"sass-loader": "^9.0.2",
5756
"style-loader": "^1.2.1",
5857
"supertest": "^4.0.2",
59-
"webpack": "^4.43.0",
58+
"webpack": "^4.44.0",
6059
"webpack-cli": "^3.3.12",
6160
"webpack-dev-server": "^3.11.0",
6261
"webpack-merge": "^5.0.9"

0 commit comments

Comments
 (0)