Skip to content

Commit

Permalink
PR with latest linkedpipes-storage integration (#909)
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

* PR with latest dependency updates (#724)

* 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

* [Deployment] Latest frontend updates, fixing docker build in travis

* Update dependency lint-staged to v9.2.4

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

* Update dependency babel-eslint to v10.0.3

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

* Update dependency @sentry/browser to v5.6.3

* Update dependency eslint to v6.3.0

* Update dependency flow-bin to v0.106.3

* Update dependency gradle to v5.6.1

* Update dependency lint-staged to v9.2.5

* Update dependency react-chord-diagram to v1.3.0

* Update dependency react-google-charts to v3.0.15

* Update dependency pigeon-maps to ^0.14.0

* Update dependency query-string to v6.8.3

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

* Update dependency react-redux to v7.1.1

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

* Update dependency webpack to v4.39.3

* Update gradle Docker tag to v5.6.1

* Update dependency cross-env to v5.2.1

* Lock file maintenance

* Update babel monorepo to v7.6.0

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

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

* Update dependency docz to v1.3.2

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

* Update dependency eslint-plugin-flowtype to v4.3.0

* Update dependency flow-bin to v0.107.0

* Update mui monorepo to v4.4.1

* Update dependency gradle to v5.6.2

* Update dependency react-chord-diagram to v1.4.0

* Update dependency webpack-cli to v3.3.8

* Update gradle Docker tag to v5.6.2

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

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

* Update dependency eslint to v6.4.0

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

* Update dependency react-chord-diagram to v1.5.0

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

* Update dependency webpack to v4.40.2

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

* Update dependency eslint-plugin-prettier to v3.1.1

* Update dependency flow-bin to v0.108.0

* Update dependency socket.io-client to v2.3.0

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

* Update dependency webpack-cli to v3.3.9

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

* [Frontend] Updating yarn.lock

* [Frontend] Upgrading yarn lock

* Update dependency lint-staged to v9.3.0

* Update mui monorepo to v4.4.3

* Update babel monorepo to v7.6.2

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

* Update dependency lint-staged to v9.4.0

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

* Update dependency react-toastify to v5.4.0

* Update dependency styled-components to v4.4.0

* Update dependency webpack to v4.41.0

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

* Update react monorepo to v16.10.0

* [HOTFIX] Downgrading solid-auth-client; Adding new provider

* PR with refactoring integration with NSS v5.x (#908)

* 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

* [Deployment] Latest frontend updates, fixing docker build in travis

* Update dependency lint-staged to v9.2.4

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

* Update dependency babel-eslint to v10.0.3

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

* Update dependency @sentry/browser to v5.6.3

* Update dependency eslint to v6.3.0

* Update dependency flow-bin to v0.106.3

* Update dependency gradle to v5.6.1

* Update dependency lint-staged to v9.2.5

* Update dependency react-chord-diagram to v1.3.0

* Update dependency react-google-charts to v3.0.15

* Update dependency pigeon-maps to ^0.14.0

* Update dependency query-string to v6.8.3

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

* Update dependency react-redux to v7.1.1

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

* Update dependency webpack to v4.39.3

* Update gradle Docker tag to v5.6.1

* Update dependency cross-env to v5.2.1

* Lock file maintenance

* Update babel monorepo to v7.6.0

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

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

* Update dependency docz to v1.3.2

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

* Update dependency eslint-plugin-flowtype to v4.3.0

* Update dependency flow-bin to v0.107.0

* Update mui monorepo to v4.4.1

* Update dependency gradle to v5.6.2

* Update dependency react-chord-diagram to v1.4.0

* Update dependency webpack-cli to v3.3.8

* Update gradle Docker tag to v5.6.2

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

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

* Update dependency eslint to v6.4.0

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

* Update dependency react-chord-diagram to v1.5.0

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

* Update dependency webpack to v4.40.2

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

* Update dependency eslint-plugin-prettier to v3.1.1

* Update dependency flow-bin to v0.108.0

* Update dependency socket.io-client to v2.3.0

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

* Update dependency webpack-cli to v3.3.9

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

* [Frontend] Updating yarn.lock

* [Frontend] Upgrading yarn lock

* Update dependency lint-staged to v9.3.0

* Update mui monorepo to v4.4.3

* Update babel monorepo to v7.6.2

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

* Update dependency lint-staged to v9.4.0

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

* Update dependency react-toastify to v5.4.0

* Update dependency styled-components to v4.4.0

* Update dependency webpack to v4.41.0

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

* Update react monorepo to v16.10.0

* Update react monorepo to v16.10.1

* Lock file maintenance

* Update dependency eslint to v6.5.1

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

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

* Update dependency eslint-plugin-react to v7.16.0

* Update dependency flow-bin to v0.109.0

* Update dependency lint-staged to v9.4.1

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

* Update react monorepo to v16.10.2

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

* Fixing infamous NSS >5 errors

* Update babel monorepo

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

* Update dependency @sentry/browser to v5.7.0

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

* Update dependency lint-staged to v9.4.2

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

* Update dependency webpack to v4.41.1

* Update mui monorepo to v4.5.1

* Update dependency @sentry/browser to v5.7.1

* Update dependency gradle to v5.6.3

* Update dependency webpack to v4.41.2

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

* Update gradle Docker tag to v5.6.3

* Update Node.js to v10.17.0

* Update dependency eslint to v6.6.0

* Update dependency flow-bin to v0.110.1

* Update dependency node-sass to v4.13.0

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

* Update react monorepo to v16.11.0

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

* Lock file maintenance

* Lock file maintenance

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

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

* Update dependency flow-bin to v0.111.1

* Update dependency gradle to v5.6.4

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

* Update dependency styled-components to v4.4.1

* Update dependency webpack-cli to v3.3.10

* Update babel monorepo

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

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

* Update dependency flow-bin to v0.111.3

* Update dependency prettier to v1.19.0

* Update dependency react-copy-to-clipboard to v5.0.2

* Update dependency react-emoji-render to v1.1.0

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

* Update dependency react-redux to v7.1.3

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

* Update dependency prettier to v1.19.1

* Update gradle Docker tag to v5.6.4

* Update dependency react-toastify to v5.4.1

* WIP Refining integration with storage package

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

* Update dependency @sentry/browser to v5.9.0

* Update dependency eslint-plugin-flowtype to v4.4.1

* Update dependency flow-bin to v0.112.0

* Update dependency lint-staged to v9.4.3

* Update dependency query-string to v6.9.0

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

* Update react monorepo to v16.12.0

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

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

* Update babel monorepo to v7.7.4

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

* Update dependency @sentry/browser to v5.9.1

* Update dependency com.eden.orchidPlugin:com.eden.orchidPlugin.gradle.plugin to v0.17.7

* Update dependency com.fasterxml.jackson.core:jackson-annotations to v2.10.1

* Update dependency com.fasterxml.jackson.core:jackson-core to v2.10.1

* Update dependency com.palantir.docker-run:com.palantir.docker-run.gradle.plugin to v0.22.1

* Update dependency com.typesafe:config to v1.4.0

* Update dependency commons-io:commons-io to v2.6

* Update dependency eslint to v6.7.0

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

* Update dependency file-loader to v4.3.0

* Update dependency io.github.javaeden.orchid:OrchidBsDoc to v0.17.7

* Update dependency io.sentry:sentry-spring to v1.7.28

* Update dependency javax.xml.bind:jaxb-api to v2.3.1

* Update dependency org.apache.httpcomponents:httpclient to v4.5.10

* Update dependency org.apache.httpcomponents:httpmime to v4.5.10

* Update dependency org.apache.jena:apache-jena-libs to v3.13.1

* Update dependency org.apache.jena:jena-querybuilder to v3.13.1

* Update dependency org.junit.jupiter:junit-jupiter-api to v5.5.2

* Update dependency org.junit.jupiter:junit-jupiter-engine to v5.5.2

* Update dependency org.junit.jupiter:junit-jupiter-params to v5.5.2

* Update dependency org.postgresql:postgresql to v42.2.8

* Update dependency org.springframework.boot:spring-boot-gradle-plugin to v2.2.1.RELEASE

* Update dependency eslint-plugin-flowtype to v4.5.2

* Update dependency eslint to v6.7.1

* Update dependency eslint-plugin-react to v7.17.0

* Update dependency lint-staged to v9.5.0

* Update dependency style-loader to v1.0.1

* Update dependency eslint to v6.7.2

* Lock file maintenance

* Lock file maintenance

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

* Update babel monorepo to v7.7.5

* Update dependency @sentry/browser to v5.10.1

* Update dependency css-loader to v3.2.1

* Update dependency flow-bin to v0.113.0

* Update dependency org.springframework.boot:spring-boot-gradle-plugin to v2.2.2.RELEASE

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

* Update babel monorepo to v7.7.6

* Update dependency react-emoji-render to v1.2.0

* Update dependency eslint-import-resolver-webpack to v0.12.0

* Update dependency org.postgresql:postgresql to v42.2.9

* Update dependency @sentry/browser to v5.10.2

* Update dependency com.eden.orchidPlugin:com.eden.orchidPlugin.gradle.plugin to v0.18.0

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

* Update dependency css-loader to v3.3.2

* Update dependency eslint-plugin-import to v2.19.1

* Update dependency flow-bin to v0.114.0

* Update dependency io.github.javaeden.orchid:OrchidBsDoc to v0.18.0

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

* Update dependency eslint-plugin-prettier to v3.1.2

* Update Node.js to v10.18.0

* Update babel monorepo to v7.7.7

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

* Update dependency com.eden.orchidPlugin:com.eden.orchidPlugin.gradle.plugin to v0.18.1

* Update dependency css-loader to v3.4.0

* Update dependency eslint to v6.8.0

* Update dependency io.github.javaeden.orchid:OrchidBsDoc to v0.18.1

* Update dependency io.sentry:sentry-spring to v1.7.29

* Update dependency style-loader to v1.1.1

* Update dependency webpack to v4.41.4

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

* WIP

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

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

* Update dependency react-emoji-render to v1.2.1

* Update dependency redux to v4.0.5

* Update dependency style-loader to v1.1.2

* Update dependency webpack to v4.41.5

* WIP

* Lock file maintenance

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

* Update dependency css-loader to v3.4.1

* Update dependency eslint-plugin-flowtype to v4.5.3

* Update dependency flow-bin to v0.115.0

* Update dependency react-toastify to v5.5.0

* Update dependency com.fasterxml.jackson.core:jackson-annotations to v2.10.2

* Update dependency com.fasterxml.jackson.core:jackson-core to v2.10.2

* WIP

* WIP

* Updating CI for merge

* Finalizing PR

* Quick hotifx

Co-authored-by: Renovate Bot <[email protected]>

* E2E Tests Hotfix

* E2E Tests Hotfix

* Updated lockfile

Co-authored-by: Renovate Bot <[email protected]>
  • Loading branch information
@aorumbayev @renovate-bot
aorumbayev and renovate-bot authored Jan 5, 2020
1 parent b573161 commit ad1070b
Show file tree
Hide file tree
Showing 26 changed files with 3,971 additions and 3,904 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,5 @@ appdata/
src/frontend/eslint/

src/frontend/docs/

src/tests/.venv/
3 changes: 0 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ jobs:
- cd src/frontend
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.17.0
- export PATH="$HOME/.yarn/bin:$PATH"
- npm install netlify-cli -g
cache:
yarn: true
directories:
Expand All @@ -70,8 +69,6 @@ jobs:
- until yarn install --frozen-lockfile ; do echo 'Retrying yarn build' ; done
- yarn run eslint
- yarn run build
- yarn run docz:build
- netlify deploy -s $NETLIFY_FRONTEND_ID --auth $NETLIFY_ACCESS_TOKEN -p --dir ./docs

- name: "Backend"
language: java
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<a href="https://docs.frontend.applications.linkedpipes.com"><img src="https://img.shields.io/badge/Documentation-Frontend-blue.svg" alt="Frontend" /></a>
<a href="https://docs.backend.applications.linkedpipes.com"><img src="https://img.shields.io/badge/Documentation-Backend-blue.svg" alt="Javadoc" /></a>
<a href="https://linkedpipes.docs.apiary.io"><img src="https://img.shields.io/badge/Documentation-Backend API-Blue.svg" alt="Apiary" /></a>

</p>

## 📃 About
Expand Down
14 changes: 4 additions & 10 deletions renovate.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"extends": [
"config:base"
],
"schedule": "every weekend",
"assignees": [
"aorumbayev"
],
"baseBranches": [
"dependency_updates"
],
"extends": ["config:base"],
"schedule": "before 3am on the first day of the month",
"assignees": ["aorumbayev"],
"baseBranches": ["dependency_updates"],
"separateMajorMinor": true,
"rebaseStalePrs": true,
"automerge": true,
Expand Down
2 changes: 1 addition & 1 deletion src/backend/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Using OpenJDK 11
FROM gradle:5.6.0-jdk11 as builder
FROM gradle:5.6.4-jdk11 as builder

# Tomcat will eventually create directories here
VOLUME /tmp
Expand Down
32 changes: 16 additions & 16 deletions src/backend/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '2.1.3.RELEASE'
springBootVersion = '2.2.2.RELEASE'
}
repositories {
mavenCentral()
Expand All @@ -11,7 +11,7 @@ buildscript {
}

plugins {
id 'com.palantir.docker-run' version '0.20.1'
id 'com.palantir.docker-run' version '0.22.1'
id "org.flywaydb.flyway" version "5.2.4"
}

Expand Down Expand Up @@ -43,33 +43,33 @@ dependencies {

compile 'org.jetbrains:annotations:17.0.0'

compile 'com.fasterxml.jackson.core:jackson-core:2.9.8'
compile 'com.fasterxml.jackson.core:jackson-core:2.10.2'
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.8'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.10.2'

compile 'org.apache.jena:apache-jena-libs:3.10.0'
compile 'org.apache.jena:jena-querybuilder:3.10.0'
compile 'com.typesafe:config:1.3.3'
compile 'org.apache.jena:apache-jena-libs:3.13.1'
compile 'org.apache.jena:jena-querybuilder:3.13.1'
compile 'com.typesafe:config:1.4.0'
compile 'commons-validator:commons-validator:1.6'
codacy 'com.github.codacy:codacy-coverage-reporter:-SNAPSHOT'

compile 'org.springframework.boot:spring-boot-starter-data-jpa'
compile 'org.postgresql:postgresql:42.2.5'
runtime 'javax.xml.bind:jaxb-api:2.3.0'
compile 'org.postgresql:postgresql:42.2.9'
runtime 'javax.xml.bind:jaxb-api:2.3.1'

compile 'io.sentry:sentry-spring:1.7.16'
compile 'io.sentry:sentry-spring:1.7.29'

compile 'com.corundumstudio.socketio:netty-socketio:1.7.17'

compile 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'

compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.9'
compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.9'
compile group: 'commons-io', name: 'commons-io', version: '2.5'
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.10'
compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.10'
compile group: 'commons-io', name: 'commons-io', version: '2.6'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.3.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
}

sourceSets {
Expand Down
4 changes: 2 additions & 2 deletions src/backend/docs/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.eden.orchidPlugin" version "0.17.1"
id "com.eden.orchidPlugin" version "0.18.1"
}

repositories {
Expand All @@ -9,7 +9,7 @@ repositories {
}

dependencies {
def orchid_version = '0.17.1'
def orchid_version = '0.18.1'
compile "io.github.javaeden.orchid:OrchidCore:${orchid_version}"
orchidCompile "io.github.javaeden.orchid:OrchidCore:${orchid_version}"
orchidRuntime "io.github.javaeden.orchid:OrchidPages:${orchid_version}"
Expand Down
2 changes: 1 addition & 1 deletion src/backend/gradle/wrapper/gradle-wrapper.properties
View file
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.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
2 changes: 1 addition & 1 deletion src/frontend/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base image
FROM node:10.16.3-alpine
FROM node:10.18.0-alpine

ENV YARN_VERSION 1.17.0
# Install packages using Yarn
Expand Down
112 changes: 55 additions & 57 deletions src/frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
},
"flow:status": "flow status --quiet",
"dependencies": {
"@babel/core": "7.5.5",
"@babel/runtime": "7.5.5",
"@babel/core": "7.7.7",
"@babel/runtime": "7.7.7",
"@comunica/actor-init-sparql-rdfjs": "^1.7.2",
"@mapbox/geo-viewport": "^0.4.0",
"@material-ui/core": "4.3.2",
"@material-ui/icons": "4.2.1",
"@sentry/browser": "5.6.1",
"@material-ui/core": "4.8.2",
"@material-ui/icons": "4.5.1",
"@sentry/browser": "5.10.2",
"@turf/bbox": "^6.0.1",
"@turf/helpers": "^6.1.4",
"activitystrea.ms": "^2.1.3",
Expand All @@ -47,92 +47,90 @@
"immutability-helper": "^3.0.0",
"json-form-data": "^1.4.1",
"jsonld": "^1.6.2",
"ldflex": "^2.2.1",
"linkedpipes-storage": "1.0.12",
"moment": "^2.24.0",
"n3": "^1.1.1",
"normalize.css": "8.0.1",
"pigeon-cluster": "^0.0.6",
"pigeon-maps": "^0.13.0",
"pigeon-maps": "^0.14.0",
"pigeon-marker": "^0.3.4",
"prop-types": "15.7.2",
"q": "^1.5.1",
"query-string": "6.8.2",
"rambda": "^2.10.2",
"rdflib": "git+https://github.com/aorumbayev/rdflib.js.git",
"react": "16.9.0",
"react-chord-diagram": "1.2.0",
"react-copy-to-clipboard": "5.0.1",
"react-dom": "16.9.0",
"react-emoji-render": "1.0.0",
"query-string": "6.9.0",
"rambda": "^3.0.0",
"react": "16.12.0",
"react-chord-diagram": "1.5.0",
"react-copy-to-clipboard": "5.0.2",
"react-dom": "16.12.0",
"react-emoji-render": "1.2.1",
"react-error-boundary": "1.2.5",
"react-filepond": "^7.0.1",
"react-ga": "^2.5.7",
"react-google-charts": "3.0.14",
"react-google-charts": "3.0.15",
"react-loading-overlay": "^1.0.1",
"react-particles-js": "^2.6.0",
"react-redux": "7.1.0",
"react-redux": "7.1.3",
"react-router-dom": "4.3.1",
"react-swipeable-views": "^0.13.3",
"react-toastify": "5.3.2",
"redux": "4.0.4",
"react-toastify": "5.5.0",
"redux": "4.0.5",
"redux-logger": "3.0.6",
"redux-thunk": "2.3.0",
"socket.io-client": "2.2.0",
"solid-auth-client": "2.3.0",
"socket.io-client": "2.3.0",
"streamify-array": "^1.0.1",
"string-hash": "1.1.3",
"styled-components": "4.3.2",
"uuid": "3.3.2"
"styled-components": "4.4.1",
"uuid": "3.3.3"
},
"devDependencies": {
"@babel/cli": "7.5.5",
"@babel/plugin-proposal-class-properties": "7.5.5",
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
"@babel/plugin-syntax-dynamic-import": "7.2.0",
"@babel/plugin-transform-runtime": "7.5.5",
"@babel/preset-env": "7.5.5",
"@babel/preset-flow": "7.0.0",
"@babel/preset-react": "7.0.0",
"@mdx-js/loader": "1.3.1",
"@sentry/webpack-plugin": "1.8.0",
"@babel/cli": "7.7.7",
"@babel/plugin-proposal-class-properties": "7.7.4",
"@babel/plugin-proposal-object-rest-spread": "7.7.7",
"@babel/plugin-syntax-dynamic-import": "7.7.4",
"@babel/plugin-transform-runtime": "7.7.6",
"@babel/preset-env": "7.7.7",
"@babel/preset-flow": "7.7.4",
"@babel/preset-react": "7.7.4",
"@mdx-js/loader": "1.5.3",
"@sentry/webpack-plugin": "1.9.3",
"babel-cli": "6.26.0",
"babel-eslint": "10.0.2",
"babel-eslint": "10.0.3",
"babel-loader": "8.0.6",
"babel-plugin-module-resolver": "3.2.0",
"babel-plugin-smart-webpack-import": "1.5.0",
"babel-plugin-smart-webpack-import": "1.5.2",
"babel-preset-flow": "6.23.0",
"cross-env": "5.2.0",
"css-loader": "3.2.0",
"docz": "1.2.0",
"cross-env": "5.2.1",
"css-loader": "3.4.1",
"docz": "1.3.2",
"docz-plugin-css": "0.11.0",
"docz-theme-default": "1.2.0",
"eslint": "6.2.0",
"eslint": "6.8.0",
"eslint-config-airbnb": "17.1.1",
"eslint-config-prettier": "6.0.0",
"eslint-config-prettier": "6.9.0",
"eslint-import-resolver-babel-module": "5.1.0",
"eslint-import-resolver-webpack": "0.11.1",
"eslint-import-resolver-webpack": "0.12.0",
"eslint-plugin-babel": "5.3.0",
"eslint-plugin-flowtype": "4.2.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-flowtype": "4.5.3",
"eslint-plugin-import": "2.19.1",
"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.3",
"file-loader": "4.2.0",
"flow-bin": "0.105.2",
"eslint-plugin-prettier": "3.1.2",
"eslint-plugin-react": "7.17.0",
"file-loader": "4.3.0",
"flow-bin": "0.115.0",
"html-loader": "0.5.5",
"html-webpack-plugin": "3.2.0",
"lint-staged": "9.2.3",
"node-sass": "4.12.0",
"prettier": "1.18.2",
"lint-staged": "9.5.0",
"node-sass": "4.13.0",
"prettier": "1.19.1",
"pretty-quick": "1.11.1",
"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",
"react-hot-loader": "4.12.18",
"sass-loader": "7.3.1",
"style-loader": "1.1.2",
"webpack": "4.41.5",
"webpack-bundle-analyzer": "3.6.0",
"webpack-cli": "3.3.10",
"webpack-conditional-loader": "1.0.12",
"webpack-dev-server": "3.8.0"
"webpack-dev-server": "3.10.1"
}
}
8 changes: 2 additions & 6 deletions src/frontend/src/AppRouter.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import * as Sentry from '@sentry/browser';
import { userActions } from '@ducks/userDuck';
import ErrorBoundary from 'react-error-boundary';
import { toast, ToastContainer } from 'react-toastify';
import { StorageAuthenticationManager } from 'linkedpipes-storage';
import { Invitation } from '@storage/models';
import { discoveryActions } from '@ducks/discoveryDuck';
import { StoragePage, StorageToolbox, StorageInboxDialog } from '@storage';
Expand Down Expand Up @@ -195,11 +196,7 @@ class AppRouter extends React.PureComponent<Props, State> {
setupSessionTracker = async () => {
const { handleSetUserWebId, handleUpdateApplicationsFolder } = this.props;
const self = this;
const authClient = await import(
/* webpackChunkName: "solid-auth-client" */ 'solid-auth-client'
);

authClient.trackSession(session => {
StorageAuthenticationManager.trackSession(session => {
if (session) {
handleSetUserWebId(session.webId);

Expand Down Expand Up @@ -236,7 +233,6 @@ class AppRouter extends React.PureComponent<Props, State> {
setTimeout(() => {
StorageToolbox.getValidAppFolder(session.webId).then(
async newFolder => {
Log.info(newFolder);
Log.info(newFolder);
if (newFolder) {
Log.warn('Called internal global');
Expand Down
6 changes: 2 additions & 4 deletions src/frontend/src/components/HeaderControls/HeaderControlsContainer.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { HeaderControlsComponent } from './HeaderControlsComponent';
import { withRouter } from 'react-router-dom';
import { connect } from 'react-redux';
import { globalActions } from '@ducks/globalDuck';
import { solidAuthClient } from 'linkedpipes-storage';
import { SocketContext, GlobalUtils, Log } from '@utils';

type Props = {
Expand All @@ -29,10 +30,7 @@ class HeaderControlsContainer extends PureComponent<Props, State> {

performLogout = async () => {
try {
const authClient = await import(
/* webpackChunkName: "solid-auth-client" */ 'solid-auth-client'
);
await authClient.logout();
await solidAuthClient.logout();
// Remove localStorage
localStorage.removeItem('solid-auth-client');
// Clear cookies
Expand Down
Loading

0 comments on commit ad1070b

Please sign in to comment.