Skip to content
This repository was archived by the owner on Sep 6, 2022. It is now read-only.

Commit d1c4520

Browse files
authored
Dependency upgrades and fixes (#2374)
- Fixes - Linting/prettier - Dependency upgrades - Switch Appveyor to `npm ci` - More incoming
1 parent f8a738a commit d1c4520

File tree

16 files changed

+4499
-4644
lines changed

16 files changed

+4499
-4644
lines changed

.eslintrc.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
const fs = require('fs');
22
const path = require('path');
33

4-
const prettierOptions = JSON.parse(fs.readFileSync(path.resolve(__dirname, '.prettierrc'), 'utf8'));
4+
const prettierOptions = JSON.parse(
5+
fs.readFileSync(path.resolve(__dirname, '.prettierrc'), 'utf8'),
6+
);
57

68
module.exports = {
79
parser: 'babel-eslint',
@@ -42,13 +44,16 @@ module.exports = {
4244
],
4345
'jsx-a11y/aria-props': 2,
4446
'jsx-a11y/heading-has-content': 0,
45-
"jsx-a11y/label-has-associated-control": [2, {
46-
// NOTE: If this error triggers, either disable it or add
47-
// your custom components, labels and attributes via these options
48-
// See https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/label-has-associated-control.md
49-
"controlComponents": ["Input"],
50-
}],
51-
"jsx-a11y/label-has-for": 0,
47+
'jsx-a11y/label-has-associated-control': [
48+
2,
49+
{
50+
// NOTE: If this error triggers, either disable it or add
51+
// your custom components, labels and attributes via these options
52+
// See https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/label-has-associated-control.md
53+
controlComponents: ['Input'],
54+
},
55+
],
56+
'jsx-a11y/label-has-for': 0,
5257
'jsx-a11y/mouse-events-have-key-events': 2,
5358
'jsx-a11y/role-has-required-aria-props': 2,
5459
'jsx-a11y/role-supports-aria-props': 2,

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on something that might not end up being merged into the project.
1010
Before opening a pull request, please ensure:
1111

1212
- [ ] You have followed our [**contributing guidelines**](https://github.com/react-boilerplate/react-boilerplate/blob/master/CONTRIBUTING.md)
13-
- [ ] double-check your branch is based on `dev` and targets `dev`
13+
- [ ] double-check your branch is based on `dev` and targets `dev`
1414
- [ ] Pull request has tests (we are going for 100% coverage!)
1515
- [ ] Code is well-commented, linted and follows project conventions
1616
- [ ] Documentation is updated (if necessary)

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: node_js
22

33
node_js:
4-
- "node"
5-
- "lts/*"
4+
- 'node'
5+
- 'lts/*'
66

77
script:
88
- node ./internals/scripts/generate-templates-for-linting

app/translations/de.json

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,30 @@
11
{
2-
"boilerplate.components.Footer.author.message":
3-
"Mit Liebe gemacht von {author}.",
4-
"boilerplate.components.Footer.license.message":
5-
"Dieses Projekt wird unter der MIT-Lizenz veröffentlicht.",
2+
"boilerplate.components.Footer.author.message": "Mit Liebe gemacht von {author}.",
3+
"boilerplate.components.Footer.license.message": "Dieses Projekt wird unter der MIT-Lizenz veröffentlicht.",
64
"boilerplate.components.Header.features": "",
75
"boilerplate.components.Header.home": "",
86
"boilerplate.containers.FeaturePage.css.header": "",
9-
"boilerplate.containers.FeaturePage.css.message":
10-
"Die nächste Generation von CSS",
7+
"boilerplate.containers.FeaturePage.css.message": "Die nächste Generation von CSS",
118
"boilerplate.containers.FeaturePage.feedback.header": "Sofortiges Feedback",
12-
"boilerplate.containers.FeaturePage.feedback.message":
13-
"Genießen Sie die beste Entwicklungserfahrung und programmieren Sie Ihre App so schnell wie noch nie! Ihre Änderungen an dem CSS und JavaScript sind sofort reflektiert, ohne die Seite aktualisieren zu müssen. So bleibt der Anwendungszustand bestehen, auch wenn Sie etwas in dem darunter liegenden Code aktualisieren!",
9+
"boilerplate.containers.FeaturePage.feedback.message": "Genießen Sie die beste Entwicklungserfahrung und programmieren Sie Ihre App so schnell wie noch nie! Ihre Änderungen an dem CSS und JavaScript sind sofort reflektiert, ohne die Seite aktualisieren zu müssen. So bleibt der Anwendungszustand bestehen, auch wenn Sie etwas in dem darunter liegenden Code aktualisieren!",
1410
"boilerplate.containers.FeaturePage.header": "",
15-
"boilerplate.containers.FeaturePage.internationalization.header":
16-
"Komplette i18n Standard-Internationalisierung und Pluralisierung",
17-
"boilerplate.containers.FeaturePage.internationalization.message":
18-
"Das Internet ist global. Mehrsprachige- und Pluralisierungsunterstützung ist entscheidend für große Web-Anwendungen.",
19-
"boilerplate.containers.FeaturePage.javascript.header":
20-
"Das Internet ist global. Mehrsprachige- und Pluralisierungsunterstützung ist entscheidend für große Web-Anwendungen.",
21-
"boilerplate.containers.FeaturePage.javascript.message":
22-
"Benutzen Sie ES6 template strings, object destructuring, arrow functions, JSX syntax und mehr, heute.",
11+
"boilerplate.containers.FeaturePage.internationalization.header": "Komplette i18n Standard-Internationalisierung und Pluralisierung",
12+
"boilerplate.containers.FeaturePage.internationalization.message": "Das Internet ist global. Mehrsprachige- und Pluralisierungsunterstützung ist entscheidend für große Web-Anwendungen.",
13+
"boilerplate.containers.FeaturePage.javascript.header": "Das Internet ist global. Mehrsprachige- und Pluralisierungsunterstützung ist entscheidend für große Web-Anwendungen.",
14+
"boilerplate.containers.FeaturePage.javascript.message": "Benutzen Sie ES6 template strings, object destructuring, arrow functions, JSX syntax und mehr, heute.",
2315
"boilerplate.containers.FeaturePage.network.header": "",
24-
"boilerplate.containers.FeaturePage.network.message":
25-
"The next frontier in performant web apps: availability without a\n network connection from the instant your users load the app.",
16+
"boilerplate.containers.FeaturePage.network.message": "The next frontier in performant web apps: availability without a\n network connection from the instant your users load the app.",
2617
"boilerplate.containers.FeaturePage.routing.header": "Standard Routing",
27-
"boilerplate.containers.FeaturePage.routing.message":
28-
"Schreiben Sie CSS, das am selben Ort wie ihre Komponenten ist. Deterministisch generierte, einzigartige Klassennamen halten die Spezifität niedrig während styling Konflikte vermieden werden. Senden Sie nur das CSS an ihre Benutzer welches dann wirklich sichtbar ist für die schnellste Performance!",
29-
"boilerplate.containers.FeaturePage.scaffolding.header":
30-
"Schnelles Scaffolding",
31-
"boilerplate.containers.FeaturePage.scaffolding.message":
32-
"Automatisieren Sie die Kreation von Komponenten, Containern, Routen, Selektoren und Sagas – und ihre Tests – direkt von dem Terminal!",
33-
"boilerplate.containers.FeaturePage.state_management.header":
34-
"Berechenbare Stateverwaltung",
35-
"boilerplate.containers.FeaturePage.state_management.message":
36-
"Unidirectional data flow erlaubt uns alle Änderungen ihrer Applikation zu loggen und time travel debugging einzusetzen.",
37-
"boilerplate.containers.HomePage.start_project.header":
38-
"Beginnen Sie Ihr nächstes React Projekt in Sekunden",
39-
"boilerplate.containers.HomePage.start_project.message":
40-
"Ein skalierendes, offline-first Fundament mit der besten DX und einem Fokus auf Performance und bewährte Methoden",
18+
"boilerplate.containers.FeaturePage.routing.message": "Schreiben Sie CSS, das am selben Ort wie ihre Komponenten ist. Deterministisch generierte, einzigartige Klassennamen halten die Spezifität niedrig während styling Konflikte vermieden werden. Senden Sie nur das CSS an ihre Benutzer welches dann wirklich sichtbar ist für die schnellste Performance!",
19+
"boilerplate.containers.FeaturePage.scaffolding.header": "Schnelles Scaffolding",
20+
"boilerplate.containers.FeaturePage.scaffolding.message": "Automatisieren Sie die Kreation von Komponenten, Containern, Routen, Selektoren und Sagas – und ihre Tests – direkt von dem Terminal!",
21+
"boilerplate.containers.FeaturePage.state_management.header": "Berechenbare Stateverwaltung",
22+
"boilerplate.containers.FeaturePage.state_management.message": "Unidirectional data flow erlaubt uns alle Änderungen ihrer Applikation zu loggen und time travel debugging einzusetzen.",
23+
"boilerplate.containers.HomePage.start_project.header": "Beginnen Sie Ihr nächstes React Projekt in Sekunden",
24+
"boilerplate.containers.HomePage.start_project.message": "Ein skalierendes, offline-first Fundament mit der besten DX und einem Fokus auf Performance und bewährte Methoden",
4125
"boilerplate.containers.HomePage.tryme.atPrefix": "",
4226
"boilerplate.containers.HomePage.tryme.header": "Probiere mich!",
43-
"boilerplate.containers.HomePage.tryme.message":
44-
"Zeige die Github Repositories von",
27+
"boilerplate.containers.HomePage.tryme.message": "Zeige die Github Repositories von",
4528
"boilerplate.containers.LocaleToggle.de": "",
4629
"boilerplate.containers.LocaleToggle.en": "",
4730
"boilerplate.containers.NotFoundPage.header": "Seite nicht gefunden."

app/translations/en.json

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,30 @@
11
{
22
"boilerplate.components.Footer.author.message": "Made with love by {author}.",
3-
"boilerplate.components.Footer.license.message":
4-
"This project is licensed under the MIT license.",
3+
"boilerplate.components.Footer.license.message": "This project is licensed under the MIT license.",
54
"boilerplate.components.Header.features": "Features",
65
"boilerplate.components.Header.home": "Home",
76
"boilerplate.containers.FeaturePage.css.header": "Features",
87
"boilerplate.containers.FeaturePage.css.message": "Next generation CSS",
98
"boilerplate.containers.FeaturePage.feedback.header": "Instant feedback",
10-
"boilerplate.containers.FeaturePage.feedback.message":
11-
"Enjoy the best DX and code your app at the speed of thought! Your\n saved changes to the CSS and JS are reflected instantaneously\n without refreshing the page. Preserve application state even when\n you update something in the underlying code!",
9+
"boilerplate.containers.FeaturePage.feedback.message": "Enjoy the best DX and code your app at the speed of thought! Your\n saved changes to the CSS and JS are reflected instantaneously\n without refreshing the page. Preserve application state even when\n you update something in the underlying code!",
1210
"boilerplate.containers.FeaturePage.header": "Features",
13-
"boilerplate.containers.FeaturePage.internationalization.header":
14-
"Complete i18n Standard Internationalization & Pluralization",
15-
"boilerplate.containers.FeaturePage.internationalization.message":
16-
"Scalable apps need to support multiple languages, easily add and support multiple languages with `react-intl`.",
17-
"boilerplate.containers.FeaturePage.javascript.header":
18-
"Next generation JavaScript",
19-
"boilerplate.containers.FeaturePage.javascript.message":
20-
"Use template strings, object destructuring, arrow functions, JSX\n syntax and more, today.",
11+
"boilerplate.containers.FeaturePage.internationalization.header": "Complete i18n Standard Internationalization & Pluralization",
12+
"boilerplate.containers.FeaturePage.internationalization.message": "Scalable apps need to support multiple languages, easily add and support multiple languages with `react-intl`.",
13+
"boilerplate.containers.FeaturePage.javascript.header": "Next generation JavaScript",
14+
"boilerplate.containers.FeaturePage.javascript.message": "Use template strings, object destructuring, arrow functions, JSX\n syntax and more, today.",
2115
"boilerplate.containers.FeaturePage.network.header": "Offline-first",
22-
"boilerplate.containers.FeaturePage.network.message":
23-
"The next frontier in performant web apps: availability without a\n network connection from the instant your users load the app.",
24-
"boilerplate.containers.FeaturePage.routing.header":
25-
"Industry-standard routing",
26-
"boilerplate.containers.FeaturePage.routing.message":
27-
"Write composable CSS that's co-located with your components for\n complete modularity. Unique generated class names keep the\n specificity low while eliminating style clashes. Ship only the\n styles that are on the page for the best performance.",
16+
"boilerplate.containers.FeaturePage.network.message": "The next frontier in performant web apps: availability without a\n network connection from the instant your users load the app.",
17+
"boilerplate.containers.FeaturePage.routing.header": "Industry-standard routing",
18+
"boilerplate.containers.FeaturePage.routing.message": "Write composable CSS that's co-located with your components for\n complete modularity. Unique generated class names keep the\n specificity low while eliminating style clashes. Ship only the\n styles that are on the page for the best performance.",
2819
"boilerplate.containers.FeaturePage.scaffolding.header": "Quick scaffolding",
29-
"boilerplate.containers.FeaturePage.scaffolding.message":
30-
"Automate the creation of components, containers, routes, selectors\n and sagas - and their tests - right from the CLI!",
31-
"boilerplate.containers.FeaturePage.state_management.header":
32-
"Predictable state management",
33-
"boilerplate.containers.FeaturePage.state_management.message":
34-
"Unidirectional data flow allows for change logging and time travel\n debugging.",
35-
"boilerplate.containers.HomePage.start_project.header":
36-
"Start your next react project in seconds",
37-
"boilerplate.containers.HomePage.start_project.message":
38-
"A highly scalable, offline-first foundation with the best DX and a focus on performance and best practices",
20+
"boilerplate.containers.FeaturePage.scaffolding.message": "Automate the creation of components, containers, routes, selectors\n and sagas - and their tests - right from the CLI!",
21+
"boilerplate.containers.FeaturePage.state_management.header": "Predictable state management",
22+
"boilerplate.containers.FeaturePage.state_management.message": "Unidirectional data flow allows for change logging and time travel\n debugging.",
23+
"boilerplate.containers.HomePage.start_project.header": "Start your next react project in seconds",
24+
"boilerplate.containers.HomePage.start_project.message": "A highly scalable, offline-first foundation with the best DX and a focus on performance and best practices",
3925
"boilerplate.containers.HomePage.tryme.atPrefix": "@",
4026
"boilerplate.containers.HomePage.tryme.header": "Try me!",
41-
"boilerplate.containers.HomePage.tryme.message":
42-
"Show Github repositories by",
27+
"boilerplate.containers.HomePage.tryme.message": "Show Github repositories by",
4328
"boilerplate.containers.LocaleToggle.de": "de",
4429
"boilerplate.containers.LocaleToggle.en": "en",
4530
"boilerplate.containers.NotFoundPage.header": "Page not found."

appveyor.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
# http://www.appveyor.com/docs/appveyor-yml
22

33
# Set build version format here instead of in the admin panel
4-
version: "{build}"
4+
version: '{build}'
55

66
# Do not build on gh tags
77
skip_tags: true
88

99
# Test against these versions of Node.js
1010
environment:
11-
1211
matrix:
1312
# Node versions to run
14-
- nodejs_version: "Current"
15-
- nodejs_version: "LTS"
13+
- nodejs_version: 'Current'
14+
- nodejs_version: 'LTS'
1615

1716
# Fix line endings in Windows. (runs before repo cloning)
1817
init:
@@ -24,10 +23,7 @@ install:
2423
- choco install -y googlechrome --ignore-checksums
2524
# Install the latest stable version of Node
2625
- ps: Install-Product node $env:nodejs_version
27-
- npm install
28-
29-
# TODO: Switch to using npm ci instead of install
30-
# once Node LTS ships with npm 5.7 (with ci)
26+
- npm ci
3127

3228
# Disable automatic builds
3329
build: off

babel.config.js

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
module.exports = {
2+
plugins: [
3+
'styled-components',
4+
'@babel/plugin-syntax-dynamic-import',
5+
'@babel/plugin-syntax-import-meta',
6+
'@babel/plugin-proposal-class-properties',
7+
'@babel/plugin-proposal-json-strings',
8+
[
9+
'@babel/plugin-proposal-decorators',
10+
{
11+
legacy: true,
12+
},
13+
],
14+
'@babel/plugin-proposal-function-sent',
15+
'@babel/plugin-proposal-export-namespace-from',
16+
'@babel/plugin-proposal-numeric-separator',
17+
'@babel/plugin-proposal-throw-expressions',
18+
'@babel/plugin-proposal-export-default-from',
19+
'@babel/plugin-proposal-logical-assignment-operators',
20+
'@babel/plugin-proposal-optional-chaining',
21+
[
22+
'@babel/plugin-proposal-pipeline-operator',
23+
{
24+
proposal: 'minimal',
25+
},
26+
],
27+
'@babel/plugin-proposal-nullish-coalescing-operator',
28+
'@babel/plugin-proposal-do-expressions',
29+
'@babel/plugin-proposal-function-bind',
30+
],
31+
presets: [
32+
[
33+
'@babel/preset-env',
34+
{
35+
modules: false,
36+
},
37+
],
38+
'@babel/preset-react',
39+
],
40+
env: {
41+
production: {
42+
only: ['app'],
43+
plugins: [
44+
'transform-react-remove-prop-types',
45+
'@babel/plugin-transform-react-inline-elements',
46+
'@babel/plugin-transform-react-constant-elements',
47+
],
48+
},
49+
test: {
50+
plugins: [
51+
'@babel/plugin-transform-modules-commonjs',
52+
'dynamic-import-node',
53+
],
54+
},
55+
},
56+
};

docs/css/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ Below creates two styled react components (`<Title>`, `<Wrapper>`) and renders t
5151
as children of the `<Header>` component:
5252

5353
```jsx
54-
import React from "react";
55-
import styled from "styled-components";
54+
import React from 'react';
55+
import styled from 'styled-components';
5656

5757
// Create a <Title> react component that renders an <h1> which is
5858
// centered, palevioletred and sized at 1.5em
@@ -105,8 +105,8 @@ into a JavaScript:
105105
**`Button.js`**
106106

107107
```js
108-
import React from "react";
109-
import "./Button.css"; // Tell Webpack that Button.js uses these styles
108+
import React from 'react';
109+
import './Button.css'; // Tell Webpack that Button.js uses these styles
110110

111111
class Button extends React.Component {
112112
render() {
@@ -159,8 +159,8 @@ The key difference in CSS Modules is that you import styles to a variable.
159159
**`Button.js`**
160160

161161
```js
162-
import React from "react";
163-
import styles from "./Button.css"; // different import compared to stylesheets
162+
import React from 'react';
163+
import styles from './Button.css'; // different import compared to stylesheets
164164

165165
class Button extends React.Component {
166166
render() {
@@ -213,8 +213,8 @@ $error-color: red;
213213
**`Button.js`**
214214

215215
```js
216-
import React from "react";
217-
import "./Button.scss";
216+
import React from 'react';
217+
import './Button.scss';
218218

219219
class Button extends React.Component {
220220
render() {
@@ -272,8 +272,8 @@ to look like:
272272
**`Button.js`**
273273

274274
```js
275-
import React from "react";
276-
import "./Button.less";
275+
import React from 'react';
276+
import './Button.less';
277277

278278
class Button extends React.Component {
279279
render() {
@@ -284,4 +284,4 @@ class Button extends React.Component {
284284

285285
> For more information about LESS and the `less-loader` see https://github.com/webpack-contrib/less-loader.
286286
287-
[webpackconfig]: ../../internals/webpack/webpack.base.babel.js "Webpack config"
287+
[webpackconfig]: ../../internals/webpack/webpack.base.babel.js 'Webpack config'

docs/electron/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ ElectronJS is very popular open source library developed by github to create cro
88

99
## OR
1010

11-
## [Convert This Boilerplate To Electron Application](https://github.com/mjangir/reactron/wiki/Convert-Existing-To-Electron)
11+
## [Convert This Boilerplate To Electron Application](https://github.com/mjangir/reactron/wiki/Convert-Existing-To-Electron)

docs/general/faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
- [OS X / Linux:](#os-x--linux)
99
- [Windows](#windows)
1010
- [Issue with local caching when running in production mode (F5 / ctrl+F5 / cmd+r weird behavior)](#issue-with-local-caching-when-running-in-production-mode-f5--ctrlf5--cmdr-weird-behavior)
11-
- [Quick fix on your local browser:](#quick-fix-on-your-local-browser)
12-
- [Full in-depth explanation](#full-in-depth-explanation)
11+
- [Quick fix on your local browser:](#quick-fix-on-your-local-browser)
12+
- [Full in-depth explanation](#full-in-depth-explanation)
1313
- [Local webfonts not working for development](#local-webfonts-not-working-for-development)
1414
- [Non-route containers](#non-route-containers)
1515
- [Where do I put the reducer?](#where-do-i-put-the-reducer)

0 commit comments

Comments
 (0)