Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update LPLs eslint config to 3.0.1 #26

Merged
merged 14 commits into from
Apr 11, 2023
Merged

Update LPLs eslint config to 3.0.1 #26

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
31d209f
fix workspace naming, and update deps
oroth8 Apr 10, 2023
b7a3e9b
renamed babelrc to modern naming
oroth8 Apr 10, 2023
c50c15c
added default url resolver to devolopment webpack config
oroth8 Apr 10, 2023
d011b51
fixed linting errors
oroth8 Apr 10, 2023
c1bf3e8
add eslint to backend and add eslint prettier config to backend
oroth8 Apr 10, 2023
2b0e8a0
update be eslint config and run prettier
oroth8 Apr 10, 2023
5261140
revert fe babel cs version
oroth8 Apr 10, 2023
ef8ce74
Merge branch 'main' into update-eslint-config
oroth8 Apr 10, 2023
9d21a66
update yarn lock
oroth8 Apr 10, 2023
9b01c9e
remove stale ignores
oroth8 Apr 10, 2023
abee28f
update gitignore and remove node_modules
oroth8 Apr 10, 2023
f4e4e86
update lint-staged script to include cjs files
oroth8 Apr 10, 2023
ca66164
rerun prettier using .prettierrc config
oroth8 Apr 10, 2023
ecc8493
Merge branch 'main' into update-eslint-config
oroth8 Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed ...che/babel-loader/bc9d409bd3cae8e2c68925fc4d7d11000b33cc6a86b10c5e609f0981e2b67d1c.json.gz
View file
Open in desktop
Binary file not shown.
Binary file removed ...che/babel-loader/fbbbdb9df6f1f26af728f2e5fe39fce44ad3040ac771c0d8ec6eef5d626bf6ea.json.gz
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions be/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@veritext-replacement-template/be",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this being addressed in #21 ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vanderhoop correct, I implemented it here so I could continue working on a separate branch. Whatever branch gets merged first I will make sure it is updated.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merged #21 into main so this is no longer an issue. Updated PR body

"name": "be",
"version": "1.0.0",
"scripts": {
"dev": "nodemon server.js",
"server": "node server.js"
},
"dependencies": {
"@prisma/client": "^4.12.0",
"@veritext-replacement-template/fe": "1.0.0",
"fe": "1.0.0",
"bcrypt": "^5.1.0",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
Expand Down
12 changes: 11 additions & 1 deletion fe/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
const path = require('path')

module.exports = {
extends: ['@launchpadlab/eslint-config/react-rails'],
root: true,
extends: ['@launchpadlab/eslint-config/react'],
parser: '@babel/eslint-parser',
parserOptions: {
sourceType: 'module',
babelOptions: {
configFile: path.join(__dirname, 'babel.config.json')
}
},
settings: {
'import/resolver': {
webpack: {
Expand Down
3 changes: 2 additions & 1 deletion fe/.babelrc → fe/babel.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
{
"env": {
"useBuiltIns": "usage",
"corejs": "3.19"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is technically a downgrade. Any particular reason we'd downgrade?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vanderhoop thanks, fixed this

"corejs": "3.6.5"
}
}
]
]
}

3 changes: 2 additions & 1 deletion fe/config/webpack.config.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ module.exports = {
{
loader: 'babel-loader',
options: {
cacheDirectory: true
cacheDirectory: true,
vanderhoop marked this conversation as resolved.
Show resolved Hide resolved
}
},
],
Expand Down Expand Up @@ -154,6 +154,7 @@ module.exports = {
// https://stackoverflow.com/questions/64557638/how-to-polyfill-node-core-modules-in-webpack-5
// for possible solutions, perhaps using https://github.com/Richienb/node-polyfill-webpack-plugin.
fallback: {
url: require.resolve('url/'),
fs: false,
net: false,
tls: false,
Expand Down
5 changes: 3 additions & 2 deletions fe/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@veritext-replacement-template/fe",
"name": "fe",
"version": "1.0.0",
"private": true,
"engines": {
Expand Down Expand Up @@ -66,11 +66,12 @@
"sass": "^1.56.2",
"sass-loader": "^13.2.0",
"style-loader": "^3.3.1",
"url": "^0.11.0",
"webpack": "^5.71.0",
"webpack-cli": "^5.0.1"
},
"devDependencies": {
"@launchpadlab/eslint-config": "^2.7.0",
"@launchpadlab/eslint-config": "^3.0.1",
"@launchpadlab/lp-subsection-generator": "^7.2.1",
"chalk": "^5.2.0",
"cli-prompt": "^0.6.0",
Expand Down
58 changes: 36 additions & 22 deletions fe/src/js/main/styleguide/components/Inputs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,41 @@ function Inputs() {
</td>
<td>
<fieldset>
<label>Label</label>
<label htmlFor="i-1">Label</label>
<div className="input-wrapper">
<input type="text" name="" placeholder="Placeholder Text" />
<input
type="text"
name=""
placeholder="Placeholder Text"
id="i-1"
/>
</div>
</fieldset>
</td>
<td>
<fieldset>
<label>Label</label>
<label htmlFor="i-2">Label</label>
<div className="input-wrapper">
<input
type="text"
name=""
placeholder="Placeholder Text"
defaultValue="John Smith"
id="i-2"
/>
</div>
</fieldset>
</td>
<td>
<fieldset className="error">
<label>Label</label>
<label htmlFor="i-3">Label</label>
<div className="input-wrapper">
<input type="text" name="" placeholder="Placeholder Text" />
<input
type="text"
name=""
placeholder="Placeholder Text"
id="i-3"
/>
</div>
<span className="error-message">Label can't be blank</span>
</fieldset>
Expand All @@ -57,9 +68,10 @@ function Inputs() {
</td>
<td>
<fieldset>
<label>Label</label>
<label htmlFor="i-4">Label</label>
<div className="input-wrapper">
<textarea
id="i-4"
name="message"
placeholder="Placeholder Text"
></textarea>
Expand All @@ -68,9 +80,10 @@ function Inputs() {
</td>
<td>
<fieldset>
<label>Label</label>
<label htmlFor="i-5">Label</label>
<div className="input-wrapper">
<textarea
id="i-5"
name="message"
placeholder="Placeholder Text"
defaultValue="Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Expand All @@ -82,9 +95,10 @@ function Inputs() {
</td>
<td>
<fieldset className="error">
<label>Label</label>
<label htmlFor="i-6">Label</label>
<div className="input-wrapper">
<textarea
id="i-6"
name="message"
placeholder="Placeholder Text"
></textarea>
Expand All @@ -99,9 +113,9 @@ function Inputs() {
</td>
<td>
<fieldset>
<label>Label</label>
<label htmlFor="i-7">Label</label>
<div className="input-wrapper">
<select name="time">
<select name="time" id="i-7">
<option value="select">Select</option>
<option value="afternoon">Option 1</option>
<option value="evening">Option 2</option>
Expand All @@ -111,9 +125,9 @@ function Inputs() {
</td>
<td>
<fieldset>
<label>Label</label>
<label htmlFor="i-8">Label</label>
<div className="input-wrapper">
<select name="time">
<select name="time" id="i-8">
<option value="select" disabled>
Select
</option>
Expand All @@ -125,9 +139,9 @@ function Inputs() {
</td>
<td>
<fieldset className="error">
<label>Label</label>
<label htmlFor="i-9">Label</label>
<div className="input-wrapper">
<select name="time">
<select name="time" id="i-9">
<option value="select">Select</option>
<option value="afternoon">Option 1</option>
<option value="evening">Option 2</option>
Expand Down Expand Up @@ -338,7 +352,7 @@ function Inputs() {
</td>
<td>
<fieldset>
<label>Label</label>
<label htmlFor="fileToUpload">Label</label>
<div
className="fileupload fileupload-new"
data-provides="fileupload"
Expand All @@ -350,7 +364,7 @@ function Inputs() {
</span>
<span className="fileupload-preview"></span>
<a
href="#"
href="/#"
className="close fileupload-exists"
data-dismiss="fileupload"
>
Expand All @@ -361,19 +375,19 @@ function Inputs() {
</td>
<td>
<fieldset>
<label>Label</label>
<label htmlFor="fileToUpload2">Label</label>
<div
className="fileupload fileupload-exists"
data-provides="fileupload"
>
<span className="button-secondary-light">
<span className="fileupload-new">Select File</span>
<span className="fileupload-exists">Change</span>
<input type="file" name="fileToUpload" id="fileToUpload" />
<input type="file" name="fileToUpload" id="fileToUpload2" />
</span>
<span className="fileupload-preview">File Name Preview</span>
<a
href="#"
href="/#"
className="close fileupload-exists"
data-dismiss="fileupload"
>
Expand All @@ -384,19 +398,19 @@ function Inputs() {
</td>
<td>
<fieldset className="error">
<label>Label</label>
<label htmlFor="fileToUpload4">Label</label>
<div
className="fileupload fileupload-new"
data-provides="fileupload"
>
<span className="button-secondary-light">
<span className="fileupload-new">Select File</span>
<span className="fileupload-exists">Change</span>
<input type="file" name="fileToUpload" id="fileToUpload" />
<input type="file" name="fileToUpload" id="fileToUpload3" />
</span>
<span className="fileupload-preview"></span>
<a
href="#"
href="/#"
className="close fileupload-exists"
data-dismiss="fileupload"
>
Expand Down
4 changes: 2 additions & 2 deletions fe/src/js/main/styleguide/components/Modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ function Modal() {
cancel your membership.
</p>
<div className="button-block">
<a href="#" className="button-primary">
<a href="/#" className="button-primary">
vanderhoop marked this conversation as resolved.
Show resolved Hide resolved
Yes, Send Cancellation Request
</a>
<a href="#" className="button-primary-outline">
<a href="/#" className="button-primary-outline">
No, Nevermind!
</a>
</div>
Expand Down
12 changes: 6 additions & 6 deletions fe/src/js/main/styleguide/components/Pagination.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ function Pagination() {
<div>
<ul className="pagination">
<li className="prev">
<a>Prev</a>
<a href="/#">Prev</a>
vanderhoop marked this conversation as resolved.
Show resolved Hide resolved
</li>
<li>
<a>1</a>
<a href="/#">1</a>
</li>
<li className="active">
<a>2</a>
<a href="/#">2</a>
</li>
<li>
<a>3</a>
<a href="/#">3</a>
</li>
<li>
<span className="delimiter">...</span>
</li>
<li>
<a>138</a>
<a href="/#">138</a>
</li>
<li className="next">
<a>Next</a>
<a href="/#">Next</a>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion fe/src/js/main/styleguide/components/Typography.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function Typography() {
<code>a</code>
</td>
<td>
<a>The quick brown fox jumps over the lazy dog</a>
<a href="/#">The quick brown fox jumps over the lazy dog</a>
</td>
</tr>
</tbody>
Expand Down
Loading