Skip to content

Commit

Permalink
Fix extraneous dependencies linting setup + some maintenance (#2753)
Browse files Browse the repository at this point in the history
  • Loading branch information
julienben committed Sep 23, 2019
1 parent eb2fea6 commit 76da01a
Show file tree
Hide file tree
Showing 13 changed files with 159 additions and 135 deletions.
9 changes: 8 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ module.exports = {
'import/imports-first': 0,
'import/newline-after-import': 0,
'import/no-dynamic-require': 0,
'import/no-extraneous-dependencies': 0,
'import/no-named-as-default': 0,
'import/no-unresolved': 2,
'import/no-webpack-loader-syntax': 0,
Expand Down Expand Up @@ -80,6 +79,14 @@ module.exports = {
'redux-saga/yield-effects': 2,
'require-yield': 0,
},
overrides: [
{
files: ['internals/**/*.*', 'server/**/*.*'],
rules: {
'import/no-extraneous-dependencies': 0,
},
},
],
settings: {
'import/resolver': {
webpack: {
Expand Down
15 changes: 7 additions & 8 deletions .github/issue-close-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ If you're reporting a bug, it's especially important that you provide detailed s
Please note that requests for help should go to [our Spectrum channel](https://spectrum.chat/react-boilerplate?tab=posts)."

issueConfigs:

- content:
- Description
- Steps to reproduce
- Versions
- Description
- Steps to reproduce
- Versions

- content:
- Is your feature request related to a problem
- Describe the solution you'd like
- Describe alternatives you've considered
- Additional context
- Is your feature request related to a problem
- Describe the solution you'd like
- Describe alternatives you've considered
- Additional context
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ But wait... there's more!
- _Catch problems:_ AppVeyor and TravisCI setups included by default, so your
tests get run automatically on Windows and Unix.

There’s also a <a href="https://vimeo.com/168648012">fantastic video</a> on how to structure your React.js apps with scalability in mind. It provides rationale for the majority of boilerplate's design decisions.
There’s also a <a href="https://vimeo.com/168648012">fantastic video</a> on how to structure your React apps with scalability in mind. It provides rationale for the majority of boilerplate's design decisions.

<sub><i>Keywords: React.js, Redux, Hot Reloading, ESNext, Babel, react-router, Offline First, ServiceWorker, `styled-components`, redux-saga, FontFaceObserver</i></sub>

Expand Down
6 changes: 3 additions & 3 deletions app/containers/App/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ export default function App() {
return (
<AppWrapper>
<Helmet
titleTemplate="%s - React.js Boilerplate"
defaultTitle="React.js Boilerplate"
titleTemplate="%s - React Boilerplate"
defaultTitle="React Boilerplate"
>
<meta name="description" content="A React.js Boilerplate application" />
<meta name="description" content="A React Boilerplate application" />
</Helmet>
<Header />
<Switch>
Expand Down
6 changes: 3 additions & 3 deletions app/containers/App/tests/__snapshots__/index.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
exports[`<App /> should render and match the snapshot 1`] = `
<ForwardRef(App__AppWrapper)>
<HelmetWrapper
defaultTitle="React.js Boilerplate"
defaultTitle="React Boilerplate"
defer={true}
encodeSpecialCharacters={true}
titleTemplate="%s - React.js Boilerplate"
titleTemplate="%s - React Boilerplate"
>
<meta
content="A React.js Boilerplate application"
content="A React Boilerplate application"
name="description"
/>
</HelmetWrapper>
Expand Down
2 changes: 1 addition & 1 deletion app/containers/FeaturePage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function FeaturePage() {
<title>Feature Page</title>
<meta
name="description"
content="Feature page of React.js Boilerplate application"
content="Feature page of React Boilerplate application"
/>
</Helmet>
<H1>
Expand Down
2 changes: 1 addition & 1 deletion app/containers/HomePage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default function HomePage() {
<title>Home Page</title>
<meta
name="description"
content="A React.js Boilerplate application homepage"
content="A React Boilerplate application homepage"
/>
</Helmet>
<div>
Expand Down
12 changes: 6 additions & 6 deletions app/index.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">

<head>
<!-- The first thing in any HTML file should be the charset -->
<meta charset="utf-8">
<meta charset="utf-8" />

<!-- Make the page mobile compatible -->
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1" />

<!-- Allow installing the app to the homescreen -->
<meta name="mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes" />

<link rel="icon" href="/favicon.ico" />
<title>React.js Boilerplate</title>
<title>React Boilerplate</title>
</head>

<body>
Expand All @@ -25,7 +25,7 @@
<div id="app"></div>

<!-- Open Sans Font -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" />

<!-- A lot of magic happens in this file. HtmlWebpackPlugin automatically injects all assets (e.g. bundle.js, main.css) with the correct HTML tags, which is why they are missing in this file. Don't add any assets here! (Check out webpack.dev.babel.js and webpack.prod.babel.js if you want to know more) -->
</body>
Expand Down
5 changes: 3 additions & 2 deletions docs/general/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,10 @@ eb deploy {target environment name}
## Azure

### Easy 3-Step Deployment Process
_Step 1:_ Within Azure Portal, add a 'Web App' resource to your resource group. Select the appropriate version of Node (i.e. 10.14) and verify that the operating system is set to Linux to ensure that Node is being run natively and not via IIS (iisnode). Note that several of the quick start guides (such as https://docs.microsoft.com/en-us/azure/app-service/app-service-web-get-started-nodejs) result in a Windows + IIS Node configuration that is incompatible with react-boilerplate.

_Step 2:_ When the resource has finished deploying, go to its deployment center and select Local Git (other methods will work as well but the rest of these steps assume this approach) and 'App Service' for the build provider. Note the Git Clone Uri that is presented when the wizard is finished.
_Step 1:_ Within Azure Portal, add a 'Web App' resource to your resource group. Select the appropriate version of Node (i.e. 10.14) and verify that the operating system is set to Linux to ensure that Node is being run natively and not via IIS (iisnode). Note that several of the quick start guides (such as https://docs.microsoft.com/en-us/azure/app-service/app-service-web-get-started-nodejs) result in a Windows + IIS Node configuration that is incompatible with react-boilerplate.

_Step 2:_ When the resource has finished deploying, go to its deployment center and select Local Git (other methods will work as well but the rest of these steps assume this approach) and 'App Service' for the build provider. Note the Git Clone Uri that is presented when the wizard is finished.

_Step 3:_ Within the root of your react-boilerplate source folder, execute the following commands to publish to Azure:

Expand Down
10 changes: 5 additions & 5 deletions internals/templates/index.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">

<head>
<!-- The first thing in any HTML file should be the charset -->
<meta charset="utf-8">
<meta charset="utf-8" />

<!-- Make the page mobile compatible -->
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1" />

<!-- Allow installing the app to the homescreen -->
<meta name="mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes" />

<link rel="icon" href="/favicon.ico" />
<title>React.js Boilerplate</title>
<title>React Boilerplate</title>
</head>

<body>
Expand Down
2 changes: 1 addition & 1 deletion internals/templates/tests/store.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Test store addons
*/

import { browserHistory } from 'react-router';
import { browserHistory } from 'react-router-dom';
import configureStore from '../configureStore';

describe('configureStore', () => {
Expand Down
Loading

0 comments on commit 76da01a

Please sign in to comment.