Full dependency update

.github/workflows/main.yml

@@ -4,9 +4,8 @@ name: Main
 # Run in master and dev branches and in all pull requests to those branches
 on:
   push:
-    branches: [ master, dev ]
-  pull_request:
-    branches: [ master, dev ]
+    branches: [ master, dev, "Mp2.0-rc" ]
+  pull_request: {}
 
 env:
   DOCKER_IMAGE: radarbase/management-portal
@@ -22,14 +21,14 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      - name: Use Node.js 15
+      - name: Use Node.js 16
         uses: actions/setup-node@v1
         with:
-          node-version: 15
+          node-version: 16
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "::set-output name=dir::.yarn/cache"
 
       - uses: actions/setup-java@v1
         with:

.github/workflows/pre-release.yml

@@ -19,14 +19,14 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      - name: Use Node.js 15
+      - name: Use Node.js 16
         uses: actions/setup-node@v1
         with:
-          node-version: 15
+          node-version: 16
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "::set-output name=dir::.yarn/cache"
 
       - uses: actions/setup-java@v1
         with:

.github/workflows/release.yml

@@ -18,14 +18,14 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      - name: Use Node.js 15
+      - name: Use Node.js 16
         uses: actions/setup-node@v1
         with:
-          node-version: 15
+          node-version: 16
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "::set-output name=dir::.yarn/cache"
 
       - uses: actions/setup-java@v1
         with:

.gitignore

@@ -165,3 +165,12 @@ Desktop.ini
 !/libs/**/*.jar
 
 /public
+
+## Yarn 2
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.1.0.cjs

Dockerfile

@@ -1,58 +1,42 @@
 # Build stage
-FROM azul/zulu-openjdk:11 as builder
+FROM gradle:7.2-jdk11 as builder
 
-# Install cURL...
-RUN apt-get update && \
-    apt-get install --no-install-recommends -yq curl && \
-    curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
-# ...then install NodeJS
+# Install NodeJS and Yarn
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
     apt-get install --no-install-recommends -yq nodejs build-essential && \
-    npm install -g npm && \
     npm install -g yarn && \
-# ...then install everything needed for Headless Chrome to work
-    apt-get install --no-install-recommends -yq \
-        ca-certificates fonts-liberation libappindicator3-1 libasound2 \
-        libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
-        libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 \
-        libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 \
-        libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 \
-        libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 libxshmfence1 \
-        lsb-release \
-        wget xdg-utils && \
 # ...and clean up the dependencies
     apt autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 # installing the node and java packages before adding the src directory
 # will allow us to re-use these image layers when only the souce code changes
-WORKDIR /app
+WORKDIR /code
 
-ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.project.prod=true"
+ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.project.prod=true" \
+    GRADLE_USER_HOME=/code/.gradlecache
 
-COPY package.json yarn.lock /app/
+COPY package.json yarn.lock .yarnrc.yml /code/
+COPY .yarn /code/.yarn
 RUN yarn install
 
-COPY gradlew /app/
-COPY gradle/wrapper gradle/wrapper
-RUN ./gradlew --version
-
-COPY gradle gradle
-COPY build.gradle gradle.properties settings.gradle /app/
+COPY gradle/*.gradle gradle/
+COPY build.gradle gradle.properties settings.gradle /code/
 COPY radar-auth/build.gradle radar-auth/
 COPY radar-auth/deprecated-auth0/build.gradle radar-auth/deprecated-auth0/
 COPY oauth-client-util/build.gradle oauth-client-util/
 
-RUN ./gradlew downloadDependencies :radar-auth:shadowJar
+RUN gradle downloadDependencies :radar-auth:shadowJar --no-watch-fs
 
 # now we copy our application source code and build it
 
 COPY angular.json proxy.conf.json tsconfig.app.json \
-    tsconfig.spec.json tsconfig.json tslint.json /app/
+    tsconfig.spec.json tsconfig.json tslint.json /code/
 COPY webpack webpack
 
 COPY radar-auth radar-auth
 COPY src src
-RUN ./gradlew -s bootWar
+RUN gradle -s bootWar --no-watch-fs
 
 # Run stage
 FROM azul/zulu-openjdk-alpine:11-jre-headless
@@ -64,8 +48,8 @@ ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
 RUN apk --no-cache add curl
 
 # Add the war and changelogs files from build stage
-COPY --from=builder /app/build/libs/*.war /app.war
-COPY --from=builder /app/src/main/docker/etc /mp-includes
+COPY --from=builder /code/build/libs/*.war /app.war
+COPY --from=builder /code/src/main/docker/etc /mp-includes
 
 EXPOSE 8080 5701/udp
 CMD echo "The application will start in ${JHIPSTER_SLEEP}s..." && \

angular.json

@@ -37,6 +37,9 @@
             "styles": [
               "src/main/webapp/content/scss/global.scss"
             ],
+            "allowedCommonJsDependencies": [
+              "qrcode"
+            ],
             "scripts": []
           },
           "configurations": {
@@ -146,4 +149,4 @@
   "cli": {
     "defaultCollection": "@angular-eslint/schematics"
   }
-}
+}