Skip to content

Commit

Permalink
Merge branch 'release/1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mwarman committed Apr 28, 2019
2 parents f868cce + 2ca19fb commit f124a5f
Show file tree
Hide file tree
Showing 12 changed files with 2,854 additions and 1,870 deletions.
16 changes: 8 additions & 8 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"presets": [
"env",
"react"
],
"plugins": [
"transform-class-properties",
"transform-object-rest-spread"
]
"presets": [
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-object-rest-spread"
]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ typings/

# GitHub release notes (gren)
.grenrc*
CHANGELOG.md

# VS Code files
.vscode/
Expand Down
45 changes: 23 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "skeleton-ui-react",
"version": "1.0.0",
"version": "1.1.0",
"description": "React SPA Starter Project",
"main": "index.js",
"repository": "[email protected]:leanstacks/skeleton-ui-react.git",
Expand All @@ -16,48 +16,49 @@
},
"dependencies": {},
"devDependencies": {
"@fortawesome/fontawesome-free": "^5.5.0",
"@babel/cli": "^7.4.4",
"@babel/core": "^7.4.4",
"@babel/plugin-proposal-class-properties": "^7.4.4",
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
"@babel/polyfill": "^7.4.4",
"@babel/preset-env": "^7.4.4",
"@babel/preset-react": "^7.0.0",
"@fortawesome/fontawesome-free": "^5.8.1",
"axios": "^0.18.0",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-loader": "^7.1.5",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"bootstrap": "4.1.3",
"babel-loader": "^8.0.5",
"bootstrap": "4.3.1",
"clean-webpack-plugin": "^0.1.17",
"copy-webpack-plugin": "^4.3.1",
"css-loader": "^0.28.7",
"dotenv": "^4.0.0",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.6.0",
"enzyme-to-json": "^3.3.4",
"enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.12.1",
"enzyme-to-json": "^3.3.5",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.6",
"history": "^4.7.2",
"html-webpack-plugin": "^2.30.1",
"jest": "^23.6.0",
"jest": "^24.7.1",
"jest-localstorage-mock": "^2.3.0",
"jquery": "^3.3.1",
"lodash": "^4.17.11",
"moment": "^2.22.2",
"moment": "^2.24.0",
"node-sass": "^4.7.2",
"numeral": "^2.0.6",
"popper.js": "^1.14.3",
"popper.js": "^1.15.0",
"postcss-loader": "^3.0.0",
"raf": "^3.4.0",
"react": "^16.6.1",
"react-dom": "^16.6.1",
"react-redux": "^5.1.0",
"react-router-dom": "^4.3.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-redux": "^7.0.2",
"react-router-dom": "^5.0.0",
"redux": "^4.0.1",
"redux-mock-store": "^1.5.3",
"redux-thunk": "^2.3.0",
"sass-loader": "^6.0.6",
"style-loader": "^0.19.0",
"url-loader": "^0.6.2",
"validator": "^10.8.0",
"validator": "^10.11.0",
"webpack": "^3.9.1",
"webpack-dev-server": "^2.9.5",
"webpack-merge": "^4.1.1"
Expand Down
22 changes: 11 additions & 11 deletions public/assets/data/technologies/technologies.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "adbe711c-9698-41f7-bf86-ae3e41ba49eb",
"name": "React",
"type": "application",
"version": "16.6.1",
"version": "16.8.6",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "React is a structural framework for dynamic web apps.",
Expand All @@ -23,7 +23,7 @@
"id": "805356dc-f453-4842-89c8-7d763310c5a3",
"name": "React Router",
"type": "application",
"version": "4.3.1",
"version": "5.0.0",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"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.",
Expand All @@ -43,7 +43,7 @@
"id": "3b5968c7-6109-428b-bc2b-62652d8c6d8d",
"name": "Bootstrap",
"type": "application",
"version": "4.1.3",
"version": "4.3.1",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "Bootstrap is an open source toolkit for developing with HTML, CSS, and JS.",
Expand All @@ -53,7 +53,7 @@
"id": "7d09624e-0256-4fe5-9b9f-bf76683536a1",
"name": "Font Awesome",
"type": "application",
"version": "5.5.0",
"version": "5.8.1",
"license": "Multiple",
"licenseUrl": "https://fontawesome.com/license",
"description": "Font Awesome is an icon toolkit.",
Expand All @@ -73,7 +73,7 @@
"id": "aa636860-0fa5-4093-9592-1cbb6b2f5c3b",
"name": "Moment",
"type": "application",
"version": "2.22.2",
"version": "2.24.0",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "Parse, validate, manipulate, and display dates and times in JavaScript.",
Expand All @@ -93,7 +93,7 @@
"id": "482ffcac-9db2-40d2-a971-fbaf93707d5a",
"name": "Validator",
"type": "application",
"version": "10.8.0",
"version": "10.11.0",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "A javascript library of validators and sanitizers.",
Expand All @@ -113,7 +113,7 @@
"id": "7671e7af-7dc6-4d22-ba65-6a21778d2beb",
"name": "Babel",
"type": "build",
"version": "6.26.3",
"version": "7.4.4",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "Babel is a JavaScript transpiler.",
Expand All @@ -123,7 +123,7 @@
"id": "126d771c-b606-4c10-866b-4385e44b15d3",
"name": "Node.js",
"type": "build",
"version": "8.12.0",
"version": "8.15.1",
"description": "Node.js is a JavaScript runtime.",
"url": "https://nodejs.org/"
},
Expand All @@ -139,7 +139,7 @@
"id": "6cab5852-7750-4af3-b5dc-59220f2ca03e",
"name": "Yarn",
"type": "build",
"version": "1.12.1",
"version": "1.15.2",
"license": "BSD 2-Clause",
"licenseUrl": "https://spdx.org/licenses/BSD-2-Clause.html",
"description": "Yarn is an alternative to the npm client.",
Expand All @@ -149,7 +149,7 @@
"id": "8218cb49-7830-4d88-8df5-4c1ad4d4df4f",
"name": "Jest",
"type": "test",
"version": "23.6.0",
"version": "24.7.1",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "Jest is used by Facebook to test all JavaScript code including React applications.",
Expand All @@ -159,7 +159,7 @@
"id": "f62dd51f-ceae-4051-bbf1-931161ee54fc",
"name": "Enzyme",
"type": "test",
"version": "3.7.0",
"version": "3.9.0",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "Enzyme is a JavaScript Testing utility for React that makes it easier to assert, manipulate, and traverse your React Components' output.",
Expand Down
2 changes: 1 addition & 1 deletion src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { startSetTechnologies, setTechnologies } from './actions/technologies';

import 'bootstrap/dist/js/bootstrap';
import 'bootstrap/dist/css/bootstrap.css';
import '@fortawesome/fontawesome-free/js/all';
import '@fortawesome/fontawesome-free/css/all.css';
import './styles/styles.scss';

const store = configureStore();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ exports[`should render LandingPage correctly 1`] = `
</strong>
React starter project. This project provides a template to kickstart React single-page applications utilizing a curated
<Link
replace={false}
to="/stacks"
>
Technology Stack
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ exports[`should render NotFoundPage correctly 1`] = `
>
Return to the
<Link
replace={false}
to="/"
>
stacks
Expand Down
1 change: 0 additions & 1 deletion src/tests/components/__snapshots__/Stack.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ exports[`should render Stack correctly 1`] = `
</li>
</ul>
<Link
replace={false}
to="/stacks/application"
>
Learn More 
Expand Down
18 changes: 0 additions & 18 deletions src/tests/components/__snapshots__/StackDetailPage.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="adbe711c-9698-41f7-bf86-ae3e41ba49eb"
>
<Link
replace={false}
to="/stacks/application/technologies/adbe711c-9698-41f7-bf86-ae3e41ba49eb"
>
React
Expand All @@ -52,7 +51,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="0360ff87-0f87-411e-8231-797806583067"
>
<Link
replace={false}
to="/stacks/application/technologies/0360ff87-0f87-411e-8231-797806583067"
>
Redux
Expand All @@ -62,7 +60,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="805356dc-f453-4842-89c8-7d763310c5a3"
>
<Link
replace={false}
to="/stacks/application/technologies/805356dc-f453-4842-89c8-7d763310c5a3"
>
React Router
Expand All @@ -72,7 +69,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="4b5b3180-2169-4d80-a22c-1ca4248cb049"
>
<Link
replace={false}
to="/stacks/application/technologies/4b5b3180-2169-4d80-a22c-1ca4248cb049"
>
Axios
Expand All @@ -82,7 +78,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="3b5968c7-6109-428b-bc2b-62652d8c6d8d"
>
<Link
replace={false}
to="/stacks/application/technologies/3b5968c7-6109-428b-bc2b-62652d8c6d8d"
>
Bootstrap
Expand All @@ -92,7 +87,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="7d09624e-0256-4fe5-9b9f-bf76683536a1"
>
<Link
replace={false}
to="/stacks/application/technologies/7d09624e-0256-4fe5-9b9f-bf76683536a1"
>
Font Awesome
Expand All @@ -102,7 +96,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="8f2d877d-d17a-4b3c-bbc3-690f460a57e0"
>
<Link
replace={false}
to="/stacks/application/technologies/8f2d877d-d17a-4b3c-bbc3-690f460a57e0"
>
Lodash
Expand All @@ -112,7 +105,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="aa636860-0fa5-4093-9592-1cbb6b2f5c3b"
>
<Link
replace={false}
to="/stacks/application/technologies/aa636860-0fa5-4093-9592-1cbb6b2f5c3b"
>
Moment
Expand All @@ -122,7 +114,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="e7b38c23-e22d-4cc3-9626-dffce5c5bd2a"
>
<Link
replace={false}
to="/stacks/application/technologies/e7b38c23-e22d-4cc3-9626-dffce5c5bd2a"
>
Numeral
Expand All @@ -132,7 +123,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="d142466a-e461-474b-9aac-3490a37906d8"
>
<Link
replace={false}
to="/stacks/application/technologies/d142466a-e461-474b-9aac-3490a37906d8"
>
Webpack
Expand All @@ -142,7 +132,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="7671e7af-7dc6-4d22-ba65-6a21778d2beb"
>
<Link
replace={false}
to="/stacks/application/technologies/7671e7af-7dc6-4d22-ba65-6a21778d2beb"
>
Babel
Expand All @@ -152,7 +141,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="126d771c-b606-4c10-866b-4385e44b15d3"
>
<Link
replace={false}
to="/stacks/application/technologies/126d771c-b606-4c10-866b-4385e44b15d3"
>
Node.js
Expand All @@ -162,7 +150,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="079dd1b7-f5b1-4c32-a0af-c7ea65e94976"
>
<Link
replace={false}
to="/stacks/application/technologies/079dd1b7-f5b1-4c32-a0af-c7ea65e94976"
>
NPM
Expand All @@ -172,7 +159,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="6cab5852-7750-4af3-b5dc-59220f2ca03e"
>
<Link
replace={false}
to="/stacks/application/technologies/6cab5852-7750-4af3-b5dc-59220f2ca03e"
>
Yarn
Expand All @@ -182,7 +168,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="8218cb49-7830-4d88-8df5-4c1ad4d4df4f"
>
<Link
replace={false}
to="/stacks/application/technologies/8218cb49-7830-4d88-8df5-4c1ad4d4df4f"
>
Jest
Expand All @@ -192,7 +177,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="f62dd51f-ceae-4051-bbf1-931161ee54fc"
>
<Link
replace={false}
to="/stacks/application/technologies/f62dd51f-ceae-4051-bbf1-931161ee54fc"
>
Enzyme
Expand All @@ -202,7 +186,6 @@ exports[`should render StackDetailPage correctly 1`] = `
key="878a061d-2605-4839-ba44-8b2eced0e982"
>
<Link
replace={false}
to="/stacks/application/technologies/878a061d-2605-4839-ba44-8b2eced0e982"
>
Redux Mock Store
Expand All @@ -213,7 +196,6 @@ exports[`should render StackDetailPage correctly 1`] = `
className="mt-4"
>
<Link
replace={false}
to="/stacks"
>
<i
Expand Down
Loading

0 comments on commit f124a5f

Please sign in to comment.