Skip to content

Commit f124a5f

Browse files
mwarmanmwarman
committed
Merge branch 'release/1.1.0'
2 parents f868cce + 2ca19fb commit f124a5f

File tree

12 files changed

+2854
-1870
lines changed

12 files changed

+2854
-1870
lines changed

‎.babelrc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"presets": [
3-
"env",
4-
"react"
5-
],
6-
"plugins": [
7-
"transform-class-properties",
8-
"transform-object-rest-spread"
9-
]
2+
"presets": [
3+
"@babel/preset-env",
4+
"@babel/preset-react"
5+
],
6+
"plugins": [
7+
"@babel/plugin-proposal-class-properties",
8+
"@babel/plugin-proposal-object-rest-spread"
9+
]
1010
}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ typings/
6262

6363
# GitHub release notes (gren)
6464
.grenrc*
65+
CHANGELOG.md
6566

6667
# VS Code files
6768
.vscode/

‎package.json‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "skeleton-ui-react",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"description": "React SPA Starter Project",
55
"main": "index.js",
66
"repository": "[email protected]:leanstacks/skeleton-ui-react.git",
@@ -16,48 +16,49 @@
1616
},
1717
"dependencies": {},
1818
"devDependencies": {
19-
"@fortawesome/fontawesome-free": "^5.5.0",
19+
"@babel/cli": "^7.4.4",
20+
"@babel/core": "^7.4.4",
21+
"@babel/plugin-proposal-class-properties": "^7.4.4",
22+
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
23+
"@babel/polyfill": "^7.4.4",
24+
"@babel/preset-env": "^7.4.4",
25+
"@babel/preset-react": "^7.0.0",
26+
"@fortawesome/fontawesome-free": "^5.8.1",
2027
"axios": "^0.18.0",
21-
"babel-cli": "^6.26.0",
22-
"babel-core": "^6.26.3",
23-
"babel-loader": "^7.1.5",
24-
"babel-plugin-transform-class-properties": "^6.24.1",
25-
"babel-plugin-transform-object-rest-spread": "^6.26.0",
26-
"babel-polyfill": "^6.26.0",
27-
"babel-preset-env": "^1.7.0",
28-
"babel-preset-react": "^6.24.1",
29-
"bootstrap": "4.1.3",
28+
"babel-loader": "^8.0.5",
29+
"bootstrap": "4.3.1",
3030
"clean-webpack-plugin": "^0.1.17",
3131
"copy-webpack-plugin": "^4.3.1",
3232
"css-loader": "^0.28.7",
3333
"dotenv": "^4.0.0",
34-
"enzyme": "^3.7.0",
35-
"enzyme-adapter-react-16": "^1.6.0",
36-
"enzyme-to-json": "^3.3.4",
34+
"enzyme": "^3.9.0",
35+
"enzyme-adapter-react-16": "^1.12.1",
36+
"enzyme-to-json": "^3.3.5",
3737
"extract-text-webpack-plugin": "^3.0.2",
3838
"file-loader": "^1.1.6",
3939
"history": "^4.7.2",
4040
"html-webpack-plugin": "^2.30.1",
41-
"jest": "^23.6.0",
41+
"jest": "^24.7.1",
4242
"jest-localstorage-mock": "^2.3.0",
4343
"jquery": "^3.3.1",
4444
"lodash": "^4.17.11",
45-
"moment": "^2.22.2",
45+
"moment": "^2.24.0",
4646
"node-sass": "^4.7.2",
4747
"numeral": "^2.0.6",
48-
"popper.js": "^1.14.3",
48+
"popper.js": "^1.15.0",
49+
"postcss-loader": "^3.0.0",
4950
"raf": "^3.4.0",
50-
"react": "^16.6.1",
51-
"react-dom": "^16.6.1",
52-
"react-redux": "^5.1.0",
53-
"react-router-dom": "^4.3.1",
51+
"react": "^16.8.6",
52+
"react-dom": "^16.8.6",
53+
"react-redux": "^7.0.2",
54+
"react-router-dom": "^5.0.0",
5455
"redux": "^4.0.1",
5556
"redux-mock-store": "^1.5.3",
5657
"redux-thunk": "^2.3.0",
5758
"sass-loader": "^6.0.6",
5859
"style-loader": "^0.19.0",
5960
"url-loader": "^0.6.2",
60-
"validator": "^10.8.0",
61+
"validator": "^10.11.0",
6162
"webpack": "^3.9.1",
6263
"webpack-dev-server": "^2.9.5",
6364
"webpack-merge": "^4.1.1"

‎public/assets/data/technologies/technologies.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"id": "adbe711c-9698-41f7-bf86-ae3e41ba49eb",
44
"name": "React",
55
"type": "application",
6-
"version": "16.6.1",
6+
"version": "16.8.6",
77
"license": "MIT",
88
"licenseUrl": "https://spdx.org/licenses/MIT.html",
99
"description": "React is a structural framework for dynamic web apps.",
@@ -23,7 +23,7 @@
2323
"id": "805356dc-f453-4842-89c8-7d763310c5a3",
2424
"name": "React Router",
2525
"type": "application",
26-
"version": "4.3.1",
26+
"version": "5.0.0",
2727
"license": "MIT",
2828
"licenseUrl": "https://spdx.org/licenses/MIT.html",
2929
"description": "Components are the heart of React's powerful, declarative programming model. React Router is a collection of navigational components that compose declaratively with your application.",
@@ -43,7 +43,7 @@
4343
"id": "3b5968c7-6109-428b-bc2b-62652d8c6d8d",
4444
"name": "Bootstrap",
4545
"type": "application",
46-
"version": "4.1.3",
46+
"version": "4.3.1",
4747
"license": "MIT",
4848
"licenseUrl": "https://spdx.org/licenses/MIT.html",
4949
"description": "Bootstrap is an open source toolkit for developing with HTML, CSS, and JS.",
@@ -53,7 +53,7 @@
5353
"id": "7d09624e-0256-4fe5-9b9f-bf76683536a1",
5454
"name": "Font Awesome",
5555
"type": "application",
56-
"version": "5.5.0",
56+
"version": "5.8.1",
5757
"license": "Multiple",
5858
"licenseUrl": "https://fontawesome.com/license",
5959
"description": "Font Awesome is an icon toolkit.",
@@ -73,7 +73,7 @@
7373
"id": "aa636860-0fa5-4093-9592-1cbb6b2f5c3b",
7474
"name": "Moment",
7575
"type": "application",
76-
"version": "2.22.2",
76+
"version": "2.24.0",
7777
"license": "MIT",
7878
"licenseUrl": "https://spdx.org/licenses/MIT.html",
7979
"description": "Parse, validate, manipulate, and display dates and times in JavaScript.",
@@ -93,7 +93,7 @@
9393
"id": "482ffcac-9db2-40d2-a971-fbaf93707d5a",
9494
"name": "Validator",
9595
"type": "application",
96-
"version": "10.8.0",
96+
"version": "10.11.0",
9797
"license": "MIT",
9898
"licenseUrl": "https://spdx.org/licenses/MIT.html",
9999
"description": "A javascript library of validators and sanitizers.",
@@ -113,7 +113,7 @@
113113
"id": "7671e7af-7dc6-4d22-ba65-6a21778d2beb",
114114
"name": "Babel",
115115
"type": "build",
116-
"version": "6.26.3",
116+
"version": "7.4.4",
117117
"license": "MIT",
118118
"licenseUrl": "https://spdx.org/licenses/MIT.html",
119119
"description": "Babel is a JavaScript transpiler.",
@@ -123,7 +123,7 @@
123123
"id": "126d771c-b606-4c10-866b-4385e44b15d3",
124124
"name": "Node.js",
125125
"type": "build",
126-
"version": "8.12.0",
126+
"version": "8.15.1",
127127
"description": "Node.js is a JavaScript runtime.",
128128
"url": "https://nodejs.org/"
129129
},
@@ -139,7 +139,7 @@
139139
"id": "6cab5852-7750-4af3-b5dc-59220f2ca03e",
140140
"name": "Yarn",
141141
"type": "build",
142-
"version": "1.12.1",
142+
"version": "1.15.2",
143143
"license": "BSD 2-Clause",
144144
"licenseUrl": "https://spdx.org/licenses/BSD-2-Clause.html",
145145
"description": "Yarn is an alternative to the npm client.",
@@ -149,7 +149,7 @@
149149
"id": "8218cb49-7830-4d88-8df5-4c1ad4d4df4f",
150150
"name": "Jest",
151151
"type": "test",
152-
"version": "23.6.0",
152+
"version": "24.7.1",
153153
"license": "MIT",
154154
"licenseUrl": "https://spdx.org/licenses/MIT.html",
155155
"description": "Jest is used by Facebook to test all JavaScript code including React applications.",
@@ -159,7 +159,7 @@
159159
"id": "f62dd51f-ceae-4051-bbf1-931161ee54fc",
160160
"name": "Enzyme",
161161
"type": "test",
162-
"version": "3.7.0",
162+
"version": "3.9.0",
163163
"license": "MIT",
164164
"licenseUrl": "https://spdx.org/licenses/MIT.html",
165165
"description": "Enzyme is a JavaScript Testing utility for React that makes it easier to assert, manipulate, and traverse your React Components' output.",

‎src/app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { startSetTechnologies, setTechnologies } from './actions/technologies';
1212

1313
import 'bootstrap/dist/js/bootstrap';
1414
import 'bootstrap/dist/css/bootstrap.css';
15-
import '@fortawesome/fontawesome-free/js/all';
15+
import '@fortawesome/fontawesome-free/css/all.css';
1616
import './styles/styles.scss';
1717

1818
const store = configureStore();

‎src/tests/components/__snapshots__/LandingPage.test.js.snap‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ exports[`should render LandingPage correctly 1`] = `
105105
</strong>
106106
React starter project. This project provides a template to kickstart React single-page applications utilizing a curated
107107
<Link
108-
replace={false}
109108
to="/stacks"
110109
>
111110
Technology Stack

‎src/tests/components/__snapshots__/NotFoundPage.test.js.snap‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ exports[`should render NotFoundPage correctly 1`] = `
2424
>
2525
Return to the
2626
<Link
27-
replace={false}
2827
to="/"
2928
>
3029
stacks

‎src/tests/components/__snapshots__/Stack.test.js.snap‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ exports[`should render Stack correctly 1`] = `
9595
</li>
9696
</ul>
9797
<Link
98-
replace={false}
9998
to="/stacks/application"
10099
>
101100
Learn More 

‎src/tests/components/__snapshots__/StackDetailPage.test.js.snap‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ exports[`should render StackDetailPage correctly 1`] = `
4242
key="adbe711c-9698-41f7-bf86-ae3e41ba49eb"
4343
>
4444
<Link
45-
replace={false}
4645
to="/stacks/application/technologies/adbe711c-9698-41f7-bf86-ae3e41ba49eb"
4746
>
4847
React
@@ -52,7 +51,6 @@ exports[`should render StackDetailPage correctly 1`] = `
5251
key="0360ff87-0f87-411e-8231-797806583067"
5352
>
5453
<Link
55-
replace={false}
5654
to="/stacks/application/technologies/0360ff87-0f87-411e-8231-797806583067"
5755
>
5856
Redux
@@ -62,7 +60,6 @@ exports[`should render StackDetailPage correctly 1`] = `
6260
key="805356dc-f453-4842-89c8-7d763310c5a3"
6361
>
6462
<Link
65-
replace={false}
6663
to="/stacks/application/technologies/805356dc-f453-4842-89c8-7d763310c5a3"
6764
>
6865
React Router
@@ -72,7 +69,6 @@ exports[`should render StackDetailPage correctly 1`] = `
7269
key="4b5b3180-2169-4d80-a22c-1ca4248cb049"
7370
>
7471
<Link
75-
replace={false}
7672
to="/stacks/application/technologies/4b5b3180-2169-4d80-a22c-1ca4248cb049"
7773
>
7874
Axios
@@ -82,7 +78,6 @@ exports[`should render StackDetailPage correctly 1`] = `
8278
key="3b5968c7-6109-428b-bc2b-62652d8c6d8d"
8379
>
8480
<Link
85-
replace={false}
8681
to="/stacks/application/technologies/3b5968c7-6109-428b-bc2b-62652d8c6d8d"
8782
>
8883
Bootstrap
@@ -92,7 +87,6 @@ exports[`should render StackDetailPage correctly 1`] = `
9287
key="7d09624e-0256-4fe5-9b9f-bf76683536a1"
9388
>
9489
<Link
95-
replace={false}
9690
to="/stacks/application/technologies/7d09624e-0256-4fe5-9b9f-bf76683536a1"
9791
>
9892
Font Awesome
@@ -102,7 +96,6 @@ exports[`should render StackDetailPage correctly 1`] = `
10296
key="8f2d877d-d17a-4b3c-bbc3-690f460a57e0"
10397
>
10498
<Link
105-
replace={false}
10699
to="/stacks/application/technologies/8f2d877d-d17a-4b3c-bbc3-690f460a57e0"
107100
>
108101
Lodash
@@ -112,7 +105,6 @@ exports[`should render StackDetailPage correctly 1`] = `
112105
key="aa636860-0fa5-4093-9592-1cbb6b2f5c3b"
113106
>
114107
<Link
115-
replace={false}
116108
to="/stacks/application/technologies/aa636860-0fa5-4093-9592-1cbb6b2f5c3b"
117109
>
118110
Moment
@@ -122,7 +114,6 @@ exports[`should render StackDetailPage correctly 1`] = `
122114
key="e7b38c23-e22d-4cc3-9626-dffce5c5bd2a"
123115
>
124116
<Link
125-
replace={false}
126117
to="/stacks/application/technologies/e7b38c23-e22d-4cc3-9626-dffce5c5bd2a"
127118
>
128119
Numeral
@@ -132,7 +123,6 @@ exports[`should render StackDetailPage correctly 1`] = `
132123
key="d142466a-e461-474b-9aac-3490a37906d8"
133124
>
134125
<Link
135-
replace={false}
136126
to="/stacks/application/technologies/d142466a-e461-474b-9aac-3490a37906d8"
137127
>
138128
Webpack
@@ -142,7 +132,6 @@ exports[`should render StackDetailPage correctly 1`] = `
142132
key="7671e7af-7dc6-4d22-ba65-6a21778d2beb"
143133
>
144134
<Link
145-
replace={false}
146135
to="/stacks/application/technologies/7671e7af-7dc6-4d22-ba65-6a21778d2beb"
147136
>
148137
Babel
@@ -152,7 +141,6 @@ exports[`should render StackDetailPage correctly 1`] = `
152141
key="126d771c-b606-4c10-866b-4385e44b15d3"
153142
>
154143
<Link
155-
replace={false}
156144
to="/stacks/application/technologies/126d771c-b606-4c10-866b-4385e44b15d3"
157145
>
158146
Node.js
@@ -162,7 +150,6 @@ exports[`should render StackDetailPage correctly 1`] = `
162150
key="079dd1b7-f5b1-4c32-a0af-c7ea65e94976"
163151
>
164152
<Link
165-
replace={false}
166153
to="/stacks/application/technologies/079dd1b7-f5b1-4c32-a0af-c7ea65e94976"
167154
>
168155
NPM
@@ -172,7 +159,6 @@ exports[`should render StackDetailPage correctly 1`] = `
172159
key="6cab5852-7750-4af3-b5dc-59220f2ca03e"
173160
>
174161
<Link
175-
replace={false}
176162
to="/stacks/application/technologies/6cab5852-7750-4af3-b5dc-59220f2ca03e"
177163
>
178164
Yarn
@@ -182,7 +168,6 @@ exports[`should render StackDetailPage correctly 1`] = `
182168
key="8218cb49-7830-4d88-8df5-4c1ad4d4df4f"
183169
>
184170
<Link
185-
replace={false}
186171
to="/stacks/application/technologies/8218cb49-7830-4d88-8df5-4c1ad4d4df4f"
187172
>
188173
Jest
@@ -192,7 +177,6 @@ exports[`should render StackDetailPage correctly 1`] = `
192177
key="f62dd51f-ceae-4051-bbf1-931161ee54fc"
193178
>
194179
<Link
195-
replace={false}
196180
to="/stacks/application/technologies/f62dd51f-ceae-4051-bbf1-931161ee54fc"
197181
>
198182
Enzyme
@@ -202,7 +186,6 @@ exports[`should render StackDetailPage correctly 1`] = `
202186
key="878a061d-2605-4839-ba44-8b2eced0e982"
203187
>
204188
<Link
205-
replace={false}
206189
to="/stacks/application/technologies/878a061d-2605-4839-ba44-8b2eced0e982"
207190
>
208191
Redux Mock Store
@@ -213,7 +196,6 @@ exports[`should render StackDetailPage correctly 1`] = `
213196
className="mt-4"
214197
>
215198
<Link
216-
replace={false}
217199
to="/stacks"
218200
>
219201
<i

0 commit comments

Comments
 (0)