Skip to content

Commit f868cce

Browse files
committed
Merge branch 'release/v1.0.0'
2 parents d2c48a7 + b3398f7 commit f868cce

File tree

5 files changed

+1458
-247
lines changed

5 files changed

+1458
-247
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Start with nginx alpine
2-
FROM nginx:1.14-alpine
2+
FROM nginx:1.15-alpine
33
# Copy nginx configuration file(s)
44
COPY etc/nginx/*.conf /etc/nginx/conf.d/
55
# Remove default nginx configuration file

etc/nginx/spa.conf

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# Basic NGINX configuration for a Single-Page Application (SPA)
22
server {
3-
listen 80;
4-
server_name localhost;
3+
listen 80 default_server;
4+
listen [::]:80 default_server;
5+
6+
# HSTS - Add HSTS header to all responses
7+
add_header Strict-Transport-Security "max-age=600; includeSubDomains" always;
58

69
location / {
7-
root /usr/share/nginx/html;
8-
index index.html index.htm;
10+
root /usr/share/nginx/html;
11+
index index.html index.htm;
912

1013
# This try_files statement facilitates SPA framework routing
11-
try_files $uri $uri/ /index.html;
14+
try_files $uri $uri/ /index.html;
1215
}
1316
}

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "skeleton-ui-react",
3-
"version": "0.6.1",
3+
"version": "1.0.0",
44
"description": "React SPA Starter Project",
55
"main": "index.js",
66
"repository": "[email protected]:leanstacks/skeleton-ui-react.git",
@@ -16,7 +16,7 @@
1616
},
1717
"dependencies": {},
1818
"devDependencies": {
19-
"@fortawesome/fontawesome-free": "^5.1.0",
19+
"@fortawesome/fontawesome-free": "^5.5.0",
2020
"axios": "^0.18.0",
2121
"babel-cli": "^6.26.0",
2222
"babel-core": "^6.26.3",
@@ -26,38 +26,38 @@
2626
"babel-polyfill": "^6.26.0",
2727
"babel-preset-env": "^1.7.0",
2828
"babel-preset-react": "^6.24.1",
29-
"bootstrap": "4.1.1",
29+
"bootstrap": "4.1.3",
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.3.0",
35-
"enzyme-adapter-react-16": "^1.1.1",
34+
"enzyme": "^3.7.0",
35+
"enzyme-adapter-react-16": "^1.6.0",
3636
"enzyme-to-json": "^3.3.4",
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.3.0",
42-
"jest-localstorage-mock": "^2.2.0",
41+
"jest": "^23.6.0",
42+
"jest-localstorage-mock": "^2.3.0",
4343
"jquery": "^3.3.1",
44-
"lodash": "^4.17.10",
44+
"lodash": "^4.17.11",
4545
"moment": "^2.22.2",
4646
"node-sass": "^4.7.2",
4747
"numeral": "^2.0.6",
4848
"popper.js": "^1.14.3",
4949
"raf": "^3.4.0",
50-
"react": "^16.4.1",
51-
"react-dom": "^16.4.1",
52-
"react-redux": "^5.0.7",
50+
"react": "^16.6.1",
51+
"react-dom": "^16.6.1",
52+
"react-redux": "^5.1.0",
5353
"react-router-dom": "^4.3.1",
54-
"redux": "^4.0.0",
54+
"redux": "^4.0.1",
5555
"redux-mock-store": "^1.5.3",
5656
"redux-thunk": "^2.3.0",
5757
"sass-loader": "^6.0.6",
5858
"style-loader": "^0.19.0",
5959
"url-loader": "^0.6.2",
60-
"validator": "^10.4.0",
60+
"validator": "^10.8.0",
6161
"webpack": "^3.9.1",
6262
"webpack-dev-server": "^2.9.5",
6363
"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.4.1",
6+
"version": "16.6.1",
77
"license": "MIT",
88
"licenseUrl": "https://spdx.org/licenses/MIT.html",
99
"description": "React is a structural framework for dynamic web apps.",
@@ -13,7 +13,7 @@
1313
"id": "0360ff87-0f87-411e-8231-797806583067",
1414
"name": "Redux",
1515
"type": "application",
16-
"version": "4.0.0",
16+
"version": "4.0.1",
1717
"license": "MIT",
1818
"licenseUrl": "https://spdx.org/licenses/MIT.html",
1919
"description": "Redux is a predictable state container for JavaScript apps.",
@@ -43,7 +43,7 @@
4343
"id": "3b5968c7-6109-428b-bc2b-62652d8c6d8d",
4444
"name": "Bootstrap",
4545
"type": "application",
46-
"version": "4.1.1",
46+
"version": "4.1.3",
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.1.0",
56+
"version": "5.5.0",
5757
"license": "Multiple",
5858
"licenseUrl": "https://fontawesome.com/license",
5959
"description": "Font Awesome is an icon toolkit.",
@@ -63,7 +63,7 @@
6363
"id": "8f2d877d-d17a-4b3c-bbc3-690f460a57e0",
6464
"name": "Lodash",
6565
"type": "application",
66-
"version": "4.17.10",
66+
"version": "4.17.11",
6767
"license": "MIT",
6868
"licenseUrl": "https://spdx.org/licenses/MIT.html",
6969
"description": "A modern JavaScript utility library delivering modularity, performance & extras.",
@@ -93,7 +93,7 @@
9393
"id": "482ffcac-9db2-40d2-a971-fbaf93707d5a",
9494
"name": "Validator",
9595
"type": "application",
96-
"version": "10.4.0",
96+
"version": "10.8.0",
9797
"license": "MIT",
9898
"licenseUrl": "https://spdx.org/licenses/MIT.html",
9999
"description": "A javascript library of validators and sanitizers.",
@@ -123,23 +123,23 @@
123123
"id": "126d771c-b606-4c10-866b-4385e44b15d3",
124124
"name": "Node.js",
125125
"type": "build",
126-
"version": "8.11.3",
126+
"version": "8.12.0",
127127
"description": "Node.js is a JavaScript runtime.",
128128
"url": "https://nodejs.org/"
129129
},
130130
{
131131
"id": "079dd1b7-f5b1-4c32-a0af-c7ea65e94976",
132132
"name": "NPM",
133133
"type": "build",
134-
"version": "5.6.0",
134+
"version": "6.4.1",
135135
"description": "npm is the Node.js package manager.",
136136
"url": "https://www.npmjs.com/"
137137
},
138138
{
139139
"id": "6cab5852-7750-4af3-b5dc-59220f2ca03e",
140140
"name": "Yarn",
141141
"type": "build",
142-
"version": "1.7.0",
142+
"version": "1.12.1",
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.3.0",
152+
"version": "23.6.0",
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.3.0",
162+
"version": "3.7.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.",

0 commit comments

Comments
 (0)