Skip to content

Commit

Permalink
Latest updates from develop (#675)
Browse files Browse the repository at this point in the history
* Update dependency eslint-plugin-react to v7.14.3

* Update dependency flow-bin to v0.104.0

* Update dependency lint-staged to v9.2.1

* Update dependency query-string to v6.8.2

* Update dependency react-hot-loader to v4.12.10

* Update dependency @sentry/webpack-plugin to v1.8.0

* Update dependency webpack-bundle-analyzer to v3.4.1

* Update dependency react-emoji-render to v1

* Lock file maintenance

* Update dependency @material-ui/core to v4.3.1

* Update dependency @mdx-js/loader to v1.1.5

* Update dependency eslint-plugin-flowtype to v3.13.0

* Update dependency webpack to v4.39.1

* Update dependency flow-bin to v0.105.0

* [General] Updated renovate config

* Update dependency @sentry/browser to v5.6.1

* Update dependency babel-plugin-smart-webpack-import to v1.5.0

* Update dependency @material-ui/core to v4.3.2

* Update dependency css-loader to v3.2.0

* Update dependency file-loader to v4.2.0

* Update dependency sass-loader to v7.2.0

* Update dependency webpack-dev-server to v3.8.0

* Update react monorepo to v16.9.0

* Update dependency flow-bin to v0.105.1

* Update dependency eslint-plugin-flowtype to v4

* Update dependency style-loader to v1

* Update Node.js to v8.16.1

* Update dependency @mdx-js/loader to v1.3.0

* Update dependency flow-bin to v0.105.2

* Update dependency gradle to v5.6.0

* Update dependency react-hot-loader to v4.12.11

* Update dependency webpack to v4.39.2

* Update gradle Docker tag to v5.6.0

* Update dependency lint-staged to v9.2.2

* Update dependency lint-staged to v9.2.3

* Update dependency webpack-cli to v3.3.7

* Update dependency @mdx-js/loader to v1.3.1

* Update dependency solid-auth-client to v2.3.1

* Update dependency eslint to v6.2.0

* [Frontend] Updated lockfile with latest dependencies

* [Frontend] Getting rid of verbose webpack logs

* PR with dependency updates and travis fixes (#674)

* Update dependency @sentry/browser to v5.6.2

* Update dependency @material-ui/core to v4.3.3

* Update dependency eslint to v6.2.2

* Update dependency eslint-config-prettier to v6.1.0

* Update dependency flow-bin to v0.106.1

* Update dependency sass-loader to v7.3.1

* Update dependency uuid to v3.3.3

* Update dependency rambda to v3

* Revert "PR with dependency updates and travis fixes (#674)"

This reverts commit 3916fd4.

* [Hotfix] Resolving solid-auth-client bug on production frontend

* [Deployment] Improving travis frontend builds
  • Loading branch information
aorumbayev authored Aug 24, 2019
1 parent 44bda59 commit b573161
Show file tree
Hide file tree
Showing 8 changed files with 1,806 additions and 1,706 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- src/frontend/node_modules
- src/frontend/eslint
script:
- yarn install --frozen-lockfile --check-files --network-concurrency 1
- until yarn install --frozen-lockfile ; do echo 'Retrying yarn build' ; done
- yarn run eslint
- yarn run build

Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
- src/frontend/node_modules
- src/frontend/eslint
script:
- yarn install --frozen-lockfile --check-files --network-concurrency 1
- until yarn install --frozen-lockfile ; do echo 'Retrying yarn build' ; done
- yarn run eslint
- yarn run build
- yarn run docz:build
Expand Down
16 changes: 13 additions & 3 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
{
"extends": ["config:base"],
"extends": [
"config:base"
],
"schedule": "every weekend",
"assignees": ["aorumbayev"],
"baseBranches": ["dependency_updates"],
"assignees": [
"aorumbayev"
],
"baseBranches": [
"dependency_updates"
],
"separateMajorMinor": true,
"rebaseStalePrs": true,
"automerge": true,
"major": {
"automerge": false
},
"minor": {
"automerge": true
},
Expand Down
2 changes: 1 addition & 1 deletion src/backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Using OpenJDK 11
FROM gradle:5.5.1-jdk11 as builder
FROM gradle:5.6.0-jdk11 as builder

# Tomcat will eventually create directories here
VOLUME /tmp
Expand Down
2 changes: 1 addition & 1 deletion src/backend/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
5 changes: 2 additions & 3 deletions src/frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base image
FROM node:8.16.0-alpine
FROM node:10.16.3-alpine

ENV YARN_VERSION 1.17.0
# Install packages using Yarn
Expand All @@ -24,8 +24,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl \

# Install packages
WORKDIR /tmp
RUN yarn cache clean
RUN yarn install --frozen-lockfile --network-concurrency 1
RUN until yarn install --frozen-lockfile ; do echo "Retrying yarn install..."; done

# Create a symlink to node_modules
RUN mkdir -p /app
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/Dockerfile-prod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build environment
FROM node:8.16.0-alpine as builder
FROM node:10.16.3-alpine as builder

ENV YARN_VERSION 1.17.0
# Install packages using Yarn
Expand All @@ -23,7 +23,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl \
&& apk del .build-deps-yarn

# Install packages
RUN cd /tmp && yarn install --frozen-lockfile --check-files --network-concurrency 1
RUN cd /tmp && until yarn install --frozen-lockfile ; do echo "Retrying yarn install..."; done

# Create a symlink to node_modules
RUN mkdir -p /usr/src/app && cd /usr/src/app && ln -s /tmp/node_modules
Expand Down
58 changes: 29 additions & 29 deletions src/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"license": "MIT",
"scripts": {
"eslint": "eslint --cache --cache-location ./eslint/.eslintcache --no-color --ext .jsx src/",
"startLocalDev": "cross-env NODE_ENV=development BASE_SERVER_PORT=9001 BASE_BACKEND_URL=http://localhost:9005/api/ SOCKET_RECONNECT=false webpack-dev-server --progress",
"startLocalDevSockets": "cross-env NODE_ENV=development BASE_SERVER_PORT=9001 BASE_BACKEND_URL=http://localhost:9005/api/ BASE_SOCKET_URL=http://localhost:9092 SOCKET_RECONNECT=true webpack-dev-server --progress",
"startLocalProdSockets": "cross-env NODE_ENV=production BASE_SERVER_PORT=9001 BASE_BACKEND_URL=http://localhost:9005/api/ BASE_SOCKET_URL=http://localhost:9092 SOCKET_RECONNECT=true webpack-dev-server --progress",
"startDockerDev": "cross-env NODE_ENV=development BASE_SERVER_PORT=9001 SOCKET_RECONNECT=true webpack-dev-server --progress",
"build": "NODE_OPTIONS=--max_old_space_size=8000 cross-env NODE_ENV=production SOCKET_RECONNECT=true webpack --progress",
"buildWithPreview": "NODE_OPTIONS=--max_old_space_size=8000 cross-env NODE_ENV=production BUNDLE_ANALYZER_ENABLED=true SOCKET_RECONNECT=true webpack --progress",
"startLocalDev": "cross-env NODE_ENV=development BASE_SERVER_PORT=9001 BASE_BACKEND_URL=http://localhost:9005/api/ SOCKET_RECONNECT=false webpack-dev-server",
"startLocalDevSockets": "cross-env NODE_ENV=development BASE_SERVER_PORT=9001 BASE_BACKEND_URL=http://localhost:9005/api/ BASE_SOCKET_URL=http://localhost:9092 SOCKET_RECONNECT=true webpack-dev-server",
"startLocalProdSockets": "cross-env NODE_ENV=production BASE_SERVER_PORT=9001 BASE_BACKEND_URL=http://localhost:9005/api/ BASE_SOCKET_URL=http://localhost:9092 SOCKET_RECONNECT=true webpack-dev-server",
"startDockerDev": "cross-env NODE_ENV=development BASE_SERVER_PORT=9001 SOCKET_RECONNECT=true webpack-dev-server",
"build": "NODE_OPTIONS=--max_old_space_size=8000 cross-env NODE_ENV=production SOCKET_RECONNECT=true webpack",
"buildWithPreview": "NODE_OPTIONS=--max_old_space_size=8000 cross-env NODE_ENV=production BUNDLE_ANALYZER_ENABLED=true SOCKET_RECONNECT=true webpack",
"docz:dev": "docz dev",
"docz:build": "CI=false NODE_OPTIONS=--max_old_space_size=8000 docz build"
},
Expand All @@ -32,9 +32,9 @@
"@babel/runtime": "7.5.5",
"@comunica/actor-init-sparql-rdfjs": "^1.7.2",
"@mapbox/geo-viewport": "^0.4.0",
"@material-ui/core": "4.2.1",
"@material-ui/core": "4.3.2",
"@material-ui/icons": "4.2.1",
"@sentry/browser": "5.5.0",
"@sentry/browser": "5.6.1",
"@turf/bbox": "^6.0.1",
"@turf/helpers": "^6.1.4",
"activitystrea.ms": "^2.1.3",
Expand All @@ -56,14 +56,14 @@
"pigeon-marker": "^0.3.4",
"prop-types": "15.7.2",
"q": "^1.5.1",
"query-string": "6.8.1",
"query-string": "6.8.2",
"rambda": "^2.10.2",
"rdflib": "git+https://github.com/aorumbayev/rdflib.js.git",
"react": "16.8.6",
"react": "16.9.0",
"react-chord-diagram": "1.2.0",
"react-copy-to-clipboard": "5.0.1",
"react-dom": "16.8.6",
"react-emoji-render": "0.6.0",
"react-dom": "16.9.0",
"react-emoji-render": "1.0.0",
"react-error-boundary": "1.2.5",
"react-filepond": "^7.0.1",
"react-ga": "^2.5.7",
Expand Down Expand Up @@ -93,46 +93,46 @@
"@babel/preset-env": "7.5.5",
"@babel/preset-flow": "7.0.0",
"@babel/preset-react": "7.0.0",
"@mdx-js/loader": "1.1.0",
"@sentry/webpack-plugin": "1.7.0",
"@mdx-js/loader": "1.3.1",
"@sentry/webpack-plugin": "1.8.0",
"babel-cli": "6.26.0",
"babel-eslint": "10.0.2",
"babel-loader": "8.0.6",
"babel-plugin-module-resolver": "3.2.0",
"babel-plugin-smart-webpack-import": "1.4.6",
"babel-plugin-smart-webpack-import": "1.5.0",
"babel-preset-flow": "6.23.0",
"cross-env": "5.2.0",
"css-loader": "3.1.0",
"css-loader": "3.2.0",
"docz": "1.2.0",
"docz-plugin-css": "0.11.0",
"docz-theme-default": "1.2.0",
"eslint": "6.1.0",
"eslint": "6.2.0",
"eslint-config-airbnb": "17.1.1",
"eslint-config-prettier": "6.0.0",
"eslint-import-resolver-babel-module": "5.1.0",
"eslint-import-resolver-webpack": "0.11.1",
"eslint-plugin-babel": "5.3.0",
"eslint-plugin-flowtype": "3.12.1",
"eslint-plugin-flowtype": "4.2.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-material-ui": "1.0.1",
"eslint-plugin-prettier": "3.1.0",
"eslint-plugin-react": "7.14.2",
"file-loader": "4.1.0",
"flow-bin": "0.103.0",
"eslint-plugin-react": "7.14.3",
"file-loader": "4.2.0",
"flow-bin": "0.105.2",
"html-loader": "0.5.5",
"html-webpack-plugin": "3.2.0",
"lint-staged": "9.2.0",
"lint-staged": "9.2.3",
"node-sass": "4.12.0",
"prettier": "1.18.2",
"pretty-quick": "1.11.1",
"react-hot-loader": "4.12.8",
"sass-loader": "7.1.0",
"style-loader": "0.23.1",
"webpack": "4.36.1",
"webpack-bundle-analyzer": "3.3.2",
"webpack-cli": "3.3.6",
"react-hot-loader": "4.12.11",
"sass-loader": "7.2.0",
"style-loader": "1.0.0",
"webpack": "4.39.2",
"webpack-bundle-analyzer": "3.4.1",
"webpack-cli": "3.3.7",
"webpack-conditional-loader": "1.0.12",
"webpack-dev-server": "3.7.2"
"webpack-dev-server": "3.8.0"
}
}
Loading

0 comments on commit b573161

Please sign in to comment.