some fixes

TeamJM · Mar 8, 2024 · 4daf47e · 4daf47e
1 parent 38fbde5
commit 4daf47e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,14 +12,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-
-    - name: Java Set-Up
-      # Java 8 by default, doesn't really matter for us
-      uses: olafurpg/setup-scala@v6
+      - uses: actions/checkout@v1
 
-    - name: NodeJS Set-Up
-      run: npm install --save
+      - name: Java Set-Up
+        uses: actions/setup-java@v2
 
-    - name: Gradle Build
-      run: /bin/sh ./gradlew build
+        with:
+          distribution: "adopt"
+          java-version: "8"
+
+      - name: Set up secrets
+        run: 'echo "$NPM_AUTH" >> ~/.npmrc'
+
+        env:
+          NPM_AUTH: ${{secrets.NPM_AUTH}}
+
+      - name: NodeJS Set-Up
+        run: yarn install --save
+
+      - name: Gradle Build
+        run: /bin/sh ./gradlew build
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -13,11 +13,26 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Java Set-Up
-        # Java 8 by default, doesn't really matter for us
-        uses: olafurpg/setup-scala@v6
+        uses: actions/setup-java@v2
+
+        with:
+          distribution: "adopt"
+          java-version: "8"
+
+      - name: Set up secrets
+        run: 'echo "$NPM_AUTH" >> ~/.npmrc'
+
+        env:
+          NPM_AUTH: ${{secrets.NPM_AUTH}}
 
       - name: NodeJS Set-Up
-        run: npm install --save
+        uses: actions/setup-node@v2
+        with:
+          node-version: "16"
+          cache: 'yarn'
+
+      - name: Yarn install
+        run: yarn install
 
       - name: Gradle Build
         run: /bin/sh ./gradlew build

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,12 +1,12 @@
 const MiniCssExtractPlugin = require("mini-css-extract-plugin")
-const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin")
+const OptimizeCSSAssetsPlugin = require("css-minimizer-webpack-plugin")
 const TerserJSPlugin = require("terser-webpack-plugin")
 const VueLoaderPlugin = require("vue-loader/lib/plugin")
 
 const path = require("path")
 
 module.exports = {
-    entry: ["babel-polyfill", "./src/main/js/index.js"],
+    entry: ["./src/main/js/index.js"],
     mode: "production",
 
     devtool: "eval-source-map",