Skip to content

Commit 01cc7bf

Browse files
feat(scripts): add the script to copy dependencies in template json
This commit also fixes the prop types error
1 parent 7fb7941 commit 01cc7bf

File tree

9 files changed

+64
-51
lines changed

9 files changed

+64
-51
lines changed

dependenciesCopy.js

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
const fs = require('fs');
2+
const packageDependencies = require('./package.json');
3+
4+
const filteredDeps = {};
5+
6+
const keys = Object.keys(packageDependencies.dependencies);
7+
8+
const filteredKeys = keys.filter(dep => {
9+
return (
10+
dep !== 'react' &&
11+
dep !== 'react-dom' &&
12+
dep !== 'react-scripts' &&
13+
dep !== '@testing-library/jest-dom' &&
14+
dep !== '@testing-library/react' &&
15+
dep !== '@testing-library/user-event'
16+
);
17+
});
18+
19+
filteredKeys.forEach(dep => {
20+
filteredDeps[dep] = packageDependencies.dependencies[dep];
21+
});
22+
23+
const dependencies = {
24+
dependencies: filteredDeps,
25+
};
26+
27+
fs.writeFile('template.json', JSON.stringify(dependencies, null, 2), function(
28+
err,
29+
) {
30+
if (err) {
31+
console.log('error in writing file to template.json', err);
32+
}
33+
});

package-lock.json

+5-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@
2727
"@testing-library/react": "^9.3.2",
2828
"@testing-library/user-event": "^7.1.2",
2929
"firebase": "^7.1.0",
30-
"formik": "^2.1.1",
30+
"formik": "^2.1.3",
3131
"history": "^4.10.1",
3232
"prop-types": "^15.7.2",
3333
"react": "^16.12.0",
3434
"react-dom": "^16.12.0",
35-
"react-google-button": "^0.7.0",
3635
"react-redux": "^7.1.3",
3736
"react-redux-firebase": "3.0.6",
3837
"react-router-dom": "^5.1.2",
@@ -46,7 +45,7 @@
4645
"build": "react-scripts build",
4746
"test": "react-scripts test",
4847
"eject": "react-scripts eject",
49-
"copy": "cp -a src/. template/src && cp -a public/. template/public && cp -a .gitignore template/gitignore && rm -rf template/src/configDummy.js && rm -rf template/src/config.js && cp .eslintrc template/ && cp src/configDummy.js template/src/config.js",
48+
"copy": "node dependenciesCopy.js && cp -a src/. template/src && cp -a public/. template/public && cp -a .gitignore template/gitignore && rm -rf template/src/configDummy.js && rm -rf template/src/config.js && cp .eslintrc template/ && cp src/configDummy.js template/src/config.js",
5049
"clean": "rm -rf template/src && rm -rf template/public template/gitignore template/.eslintrc",
5150
"prepublishOnly": "npm run clean && npm run copy"
5251
},

src/components/Button/index.js

+11-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,22 @@ Button.defaultProps = {
2121
style: {},
2222
type: 'button',
2323
disabled: false,
24+
children: '',
2425
};
2526

2627
Button.propTypes = {
27-
style: PropTypes.objectOf({}),
28+
style: PropTypes.oneOfType([
29+
PropTypes.objectOf(PropTypes.object),
30+
PropTypes.objectOf(PropTypes.string),
31+
PropTypes.objectOf(PropTypes.number),
32+
]),
2833
type: PropTypes.string,
2934
disabled: PropTypes.bool,
30-
children: PropTypes.element.isRequired,
35+
children: PropTypes.oneOfType([
36+
PropTypes.arrayOf(PropTypes.node),
37+
PropTypes.node,
38+
PropTypes.string,
39+
]),
3140
};
3241

3342
export default Button;

src/components/Toolbar/index.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ Toolbar.defaultProps = {
6363

6464
Toolbar.propTypes = {
6565
title: PropTypes.string.isRequired,
66-
children: PropTypes.arrayOf(PropTypes.elementType),
66+
children: PropTypes.oneOfType([
67+
PropTypes.arrayOf(PropTypes.node),
68+
PropTypes.node,
69+
]),
6770
};
6871

6972
Toolbar.Left = Left;

src/routes/Login/components/LoginForm/LoginForm.js

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ function LoginForm({ onSubmit }) {
2525
validate={validateEmail}
2626
className="input-field"
2727
margin="normal"
28-
fullWidth
2928
/>
3029
</label>
3130
<label className="label-class" htmlFor="password">
@@ -35,7 +34,6 @@ function LoginForm({ onSubmit }) {
3534
name="password"
3635
className="input-field"
3736
margin="normal"
38-
fullWidth
3937
/>
4038
</label>
4139
<div>

src/routes/Reminders/components/Reminder/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
33
import useReminders from '../../hooks/useReminders';
44
import './reminder.css';
55

6-
function Reminder({ key, text, reminderId, date }) {
6+
function Reminder({ text, reminderId, date }) {
77
const { deleteReminder } = useReminders();
88

99
return (
10-
<li key={key} className="li-reminder">
10+
<li className="li-reminder">
1111
<div className="reminder-root">
1212
<div className="reminder-text">{text}</div>
1313
<div className="reminder-date">
@@ -28,7 +28,6 @@ function Reminder({ key, text, reminderId, date }) {
2828
}
2929

3030
Reminder.propTypes = {
31-
key: PropTypes.string.isRequired,
3231
text: PropTypes.string.isRequired,
3332
reminderId: PropTypes.string.isRequired,
3433
date: PropTypes.string.isRequired,

src/utils/router.js

-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// import React from 'react';
2-
// import { Route } from 'react-router-dom';
31
import { connectedRouterRedirect } from 'redux-auth-wrapper/history4/redirect';
42
import locationHelperBuilder from 'redux-auth-wrapper/history4/locationHelper';
53
import { createBrowserHistory } from 'history';
@@ -30,10 +28,6 @@ export const UserIsAuthenticated = connectedRouterRedirect({
3028
redirectAction: newLoc => () => {
3129
// Use push, replace, and go to navigate around.
3230
history.push(newLoc);
33-
// dispatch({
34-
// type: UNAUTHED_REDIRECT,
35-
// payload: { message: 'User is not authenticated.' },
36-
// });
3731
},
3832
});
3933

@@ -58,10 +52,6 @@ export const UserIsNotAuthenticated = connectedRouterRedirect({
5852
redirectAction: newLoc => () => {
5953
// Use push, replace, and go to navigate around.
6054
history.push(newLoc);
61-
// dispatch({
62-
// type: AUTHED_REDIRECT,
63-
// payload: { message: 'User is not authenticated.' },
64-
// });
6555
},
6656
});
6757

template.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"dependencies": {
3+
"firebase": "^7.1.0",
4+
"formik": "^2.1.3",
5+
"history": "^4.10.1",
6+
"prop-types": "^15.7.2",
37
"react-redux": "^7.1.3",
4-
"redux": "^4.0.0",
58
"react-redux-firebase": "3.0.6",
6-
"firebase": "^7.1.0",
7-
"redux-firestore": "latest",
89
"react-router-dom": "^5.1.2",
9-
"@testing-library/react": "^9.3.2",
10-
"@testing-library/jest-dom": "^4.2.4",
11-
"@testing-library/user-event": "^7.1.2"
10+
"redux": "^4.0.0",
11+
"redux-auth-wrapper": "^3.0.0",
12+
"redux-firestore": "latest"
1213
}
1314
}

0 commit comments

Comments
 (0)