Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency Audit and Upgrade #839

Merged
81 commits merged into from
Jul 25, 2019
Merged
Show file tree
Hide file tree
Changes from 78 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
cc56591
Ran ncu on frontend folder
pdittaro May 27, 2019
8456f42
Babel import changes
pdittaro May 27, 2019
6435f9b
Various dependency upgrades and previously unrevealed error messages
pdittaro Jun 26, 2019
5eaa45a
Fixed Lottie import
pdittaro Jun 26, 2019
2a726ea
Use Keycloak userInfo rather than userProfile
pdittaro Jun 26, 2019
f4e766b
Snapshots and Promise.finally shim dep
pdittaro Jun 26, 2019
d5cbb2b
Updating puppeteer
pdittaro Jun 26, 2019
c5cf680
Backend requirement updates
pdittaro Jun 26, 2019
aba031c
NCU and Audit of Frontend Public
pdittaro Jun 26, 2019
93b2983
Dependency required changes to frontend public
pdittaro Jun 26, 2019
3d29a07
Adding missed reducerTypes
pdittaro Jun 26, 2019
13cb6e6
Merge remote-tracking branch 'origin/develop' into fix/dependency-upg…
pdittaro Jun 27, 2019
bcdfcd9
Fixing Lottie loader on frontend public
pdittaro Jun 27, 2019
f72d221
Merge branch 'develop' into fix/dependency-upgrade
pdittaro Jun 27, 2019
e1f06ad
Fixed Snapshots using enzyme serializer
pdittaro Jun 27, 2019
34d9049
Extreme webpack performance boost using parallel module build
pdittaro Jun 28, 2019
be5c811
Remove updateSnapshot from CI test
pdittaro Jun 28, 2019
2c5a55e
Merge branch 'develop' into fix/dependency-upgrade
pdittaro Jun 28, 2019
42f70ef
Removing no-cycle import rule (possibly temporary)
pdittaro Jun 28, 2019
d11fc57
Fixed typo in new Minespace user
pdittaro Jun 28, 2019
204a4bc
Remove await and async from keycloak Init
pdittaro Jul 2, 2019
f21f730
Merge remote-tracking branch 'origin/develop' into fix/dependency-upg…
pdittaro Jul 2, 2019
cb6dbd5
WIP changes of Babel upgrades
pdittaro Jul 2, 2019
a22e7dc
Auth guard typo
pdittaro Jul 2, 2019
7ae8a9c
Merge remote-tracking branch 'origin/develop' into fix/dependency-upg…
pdittaro Jul 3, 2019
e96e2ee
Moving lib alias out of path aliases
pdittaro Jul 3, 2019
6bd771e
WIP of babel configuration
pdittaro Jul 3, 2019
3dcf797
Including package-lock
pdittaro Jul 3, 2019
8f959a4
Merge remote-tracking branch 'origin/develop' into fix/dependency-upg…
pdittaro Jul 3, 2019
c750c16
Updating snapshots
pdittaro Jul 3, 2019
b984a02
Merge remote-tracking branch 'origin/develop' into fix/dependency-upg…
pdittaro Jul 3, 2019
ab856a7
Readding async/await to pass unit tests Auth
pdittaro Jul 3, 2019
59e2888
Merge branch 'develop' into fix/dependency-upgrade
Jul 4, 2019
d720061
Merge branch 'develop' into fix/dependency-upgrade
pdittaro Jul 4, 2019
071fa90
Minespace babel configuration
pdittaro Jul 4, 2019
8a6bffa
Removing parallel build plugin
pdittaro Jul 4, 2019
a7812e2
Merge branch 'develop' into fix/dependency-upgrade
pdittaro Jul 8, 2019
68e82e0
Snapshot updates
pdittaro Jul 8, 2019
2022b0a
Permit amendment form safe traversal fix
pdittaro Jul 8, 2019
a08df1e
Merge branch 'develop' into fix/dependency-upgrade
pdittaro Jul 12, 2019
5b36d65
Updating python requirements
pdittaro Jul 12, 2019
8fa611f
Funky validator
pdittaro Jul 12, 2019
8d6d7e0
Null initial value in reducers
pdittaro Jul 12, 2019
58f6896
Null initial value in reducers, pt2
pdittaro Jul 12, 2019
19e2cea
WIP validator
pdittaro Jul 12, 2019
f9f86ad
Merge branch 'funkyvalidator' into fix/dependency-upgrade
pdittaro Jul 15, 2019
a152932
Updating tests to reflect both fields being highlighted
pdittaro Jul 15, 2019
3450116
Merge branch 'develop' into fix/dependency-upgrade
pdittaro Jul 15, 2019
a09a700
Updated snapshots
pdittaro Jul 15, 2019
0bf0bcf
Status Icon stretch css fix
pdittaro Jul 16, 2019
885a04d
Removing deprecated mine manager history download
pdittaro Jul 16, 2019
1b99d9b
Merge branch 'develop' into fix/dependency-upgrade
pdittaro Jul 16, 2019
a8dca64
readding zindex fix
pdittaro Jul 16, 2019
3049b75
Putting zindex:false in correct location
pdittaro Jul 18, 2019
dd176ed
Merge remote-tracking branch 'origin/develop' into fix/dependency-upg…
pdittaro Jul 19, 2019
d61449f
Updating snapshots
pdittaro Jul 19, 2019
501d62d
Second zindex optimization
pdittaro Jul 19, 2019
8763c8b
modifying a test file.
JustinMacaulay Jul 22, 2019
8f1281d
Merge branch 'develop' into fix/dependency-upgrade
JustinMacaulay Jul 22, 2019
fe5d5ab
test cleanup and merge develop.
JustinMacaulay Jul 22, 2019
fbfb56a
Merge branch 'develop' into fix/dependency-upgrade
JustinMacaulay Jul 23, 2019
4eeb20e
testing a config change.
JustinMacaulay Jul 23, 2019
237c7c7
reverting change.
JustinMacaulay Jul 23, 2019
732a630
small dependency change.
JustinMacaulay Jul 23, 2019
051a16d
reverting a version
JustinMacaulay Jul 23, 2019
21af2ab
Merge branch 'develop' into fix/dependency-upgrade
JustinMacaulay Jul 23, 2019
a70a094
reverting keycloak version
JustinMacaulay Jul 23, 2019
8ea9d61
Merge branch 'fix/dependency-upgrade' of github.com:bcgov/mds into fi…
JustinMacaulay Jul 23, 2019
075a2e4
Merge branch 'develop' into fix/dependency-upgrade
Jul 23, 2019
00d81cc
Merge branch 'develop' into fix/dependency-upgrade
Jul 24, 2019
94b588f
increase build resources
Jul 24, 2019
89ef578
Merge branch 'fix/dependency-upgrade' of https://github.com/bcgov/mds…
Jul 24, 2019
80cbf9e
Update node to 10
Jul 25, 2019
619f7a7
Merge branch 'develop' into fix/dependency-upgrade
Jul 25, 2019
c0df229
update snapshots
Jul 25, 2019
cda5443
fix dev resources
Jul 25, 2019
1461d87
update local node to 10
Jul 25, 2019
4305fb6
update README
Jul 25, 2019
060a0ff
Merge branch 'develop' of https://github.com/bcgov/mds into fix/depen…
Jul 25, 2019
45a7a05
update snapshots
Jul 25, 2019
e4b14a9
Merge branch 'develop' into fix/dependency-upgrade
Jul 25, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ cache:

database-build:
@echo "+\n++ Performing postgres build ...\n+"
@docker-compose build postgres --parallel flyway
@docker-compose build --parallel postgres flyway

database-run:
@echo "+\n++ Running postgres and Flyway migrations...\n+"
Expand Down Expand Up @@ -133,13 +133,13 @@ database-dump-seed-local:
@echo "+\n++ Seeding locally installed database...\n+"
@pg_restore -U mds -d mds -c pgDump-test.pgCustom

generate-rand100:
@echo "+\n++ Generating 100 random mine records in local database container...\n+"
@docker exec -it mds_backend bash -c "flask create_data 100;"
generate-rand1000:
@echo "+\n++ Generating 1000 random mine records in local database container...\n+"
@docker exec -it mds_backend bash -c "flask create-data 1000;"
pdittaro marked this conversation as resolved.
Show resolved Hide resolved

generate-rand100:
@echo "+\n++ Generating 100 random mine records in local database container...\n+"
@docker exec -it mds_backend bash -c "flask create_data 100;"
@docker exec -it mds_backend bash -c "flask create-data 100;"

database-dump-clean:
@echo "+\n++ Removing dump file...\n+"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
FROM "__FROM_IMAGE_STREAM_DEFINED_IN_TEMPLATE__"

# Install OS dependencies for NPM build success
USER 0
RUN yum install -y nasm build-base libtool libpng-dev autoconf automake
USER 1001

# Install sonar-scanner
RUN curl -sLo /tmp/sonar-scanner-cli.zip https://dl.bintray.com/sonarsource/SonarQube/org/sonarsource/scanner/cli/sonar-scanner-cli/3.2.0.1227/sonar-scanner-cli-3.2.0.1227-linux.zip && \
mkdir ${APP_ROOT}/sonar-scanner-cli && unzip -q /tmp/sonar-scanner-cli.zip -d ${APP_ROOT}/sonar-scanner-cli && \
Expand All @@ -17,8 +12,5 @@ RUN curl -sLo /tmp/sonar-scanner-cli.zip https://dl.bintray.com/sonarsource/Sona
COPY package.json ${APP_ROOT}/src
COPY package-lock.json ${APP_ROOT}/src

# Install latest npm to /tmp
RUN source ${APP_ROOT}/etc/scl_enable && npm install --prefix /tmp npm@6.9.0

# Install dependencies
RUN source ${APP_ROOT}/etc/scl_enable && cd ${APP_ROOT}/src && npm set progress=false && /tmp/node_modules/.bin/npm ci
RUN cd ${APP_ROOT}/src && npm set progress=false && npm ci
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
FROM "__FROM_IMAGE_STREAM_DEFINED_IN_TEMPLATE__"

# Install OS dependencies for NPM build success
USER 0
RUN yum install -y nasm build-base libtool libpng-dev autoconf automake
USER 1001

# Install sonar-scanner
RUN curl -sLo /tmp/sonar-scanner-cli.zip https://dl.bintray.com/sonarsource/SonarQube/org/sonarsource/scanner/cli/sonar-scanner-cli/3.2.0.1227/sonar-scanner-cli-3.2.0.1227-linux.zip && \
mkdir ${APP_ROOT}/sonar-scanner-cli && unzip -q /tmp/sonar-scanner-cli.zip -d ${APP_ROOT}/sonar-scanner-cli && \
Expand All @@ -17,8 +12,5 @@ RUN curl -sLo /tmp/sonar-scanner-cli.zip https://dl.bintray.com/sonarsource/Sona
COPY package.json ${APP_ROOT}/src
COPY package-lock.json ${APP_ROOT}/src

# Install latest npm to /tmp
RUN source ${APP_ROOT}/etc/scl_enable && npm install --prefix /tmp npm@6.9.0

# Install dependencies
RUN source ${APP_ROOT}/etc/scl_enable && cd ${APP_ROOT}/src && npm set progress=false && /tmp/node_modules/.bin/npm ci
RUN cd ${APP_ROOT}/src && npm set progress=false && npm ci
17 changes: 14 additions & 3 deletions frontend-public/.babelrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
{
"presets": ["env", "react", "stage-2"],
"presets": [
[
"@babel/preset-env",
{
"useBuiltIns": "entry",
"corejs": 3,
"targets": { "node": "current", "ie": "8" }
}
],
["@babel/preset-react"]
],
"plugins": [
[
"transform-runtime",
"@babel/transform-runtime",
NWCalvank marked this conversation as resolved.
Show resolved Hide resolved
{
"regenerator": true
"corejs": 3
}
],
["@babel/plugin-proposal-class-properties"],
["react-hot-loader/babel"]
]
}
1 change: 1 addition & 0 deletions frontend-public/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ module.exports = {
"jsx-a11y/anchor-is-valid": 0,
"react/destructuring-assignment": ["error", "never"],
camelcase: 0,
"import/no-cycle": 0,
},
};
2 changes: 1 addition & 1 deletion frontend-public/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:8
FROM node:10

# Create working directory
RUN mkdir /app
Expand Down
2 changes: 1 addition & 1 deletion frontend-public/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Frontend application

The project uses a [Node.js (v8)](https://nodejs.org/en/) runtime environment and [React.js](https://reactjs.org/) library for the frontend.
The project uses a [Node.js (v10)](https://nodejs.org/en/) runtime environment and [React.js](https://reactjs.org/) library for the frontend.

## Module and Library dependencies

Expand Down
Loading