Revert: Revert unrelated changes

sdercolin · May 21, 2024 · 5d3b64b · 5d3b64b
1 parent 256f96f
commit 5d3b64b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 83 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -22,5 +22,4 @@ jobs:
 
             -   name: Build with Gradle
                 run: |
-                    ./gradlew kotlinUpgradeYarnLock
                     ./gradlew build
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -69,7 +69,6 @@ kotlin {
                 implementation(npm("raw-loader", "4.0.2"))
                 implementation(npm("file-loader", "6.2.0"))
                 implementation(npm("js-cookie", "2.2.1"))
-                implementation(npm("glob", "10.3.15"))
             }
         }
         val jsTest by getting {

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -14,9 +14,7 @@ kotlin {
         binaries.library()
         browser()
         generateTypeScriptDefinitions()
-        if (System.getenv("USE_ES_MODULES") == "true") {
-            useEsModules()
-        }
+        useEsModules()
         dependencies {
             implementation("com.sdercolin.utaformatix:utaformatix-data:1.0.0")
             implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.6.4")

diff --git a/webpack.config.d/coreRedirect.js b/webpack.config.d/coreRedirect.js
diff --git a/webpack.config.d/resources.js b/webpack.config.d/resources.js
@@ -1,42 +1,32 @@
-config.module.rules.push(
-  {
+config.module.rules.push({
     test: /\.vsqx$/i,
-    loader: "raw-loader",
-  },
-  {
+    loader: 'raw-loader'
+}, {
     test: /\.vprjson$/i,
-    loader: "raw-loader",
-  },
-  {
+    loader: 'raw-loader'
+}, {
     test: /\.svp$/i,
-    loader: "raw-loader",
-  },
-  {
+    loader: 'raw-loader'
+}, {
     test: /\.s5p$/i,
-    loader: "raw-loader",
-  },
-  {
+    loader: 'raw-loader'
+}, {
     test: /\.musicxml/i,
-    loader: "raw-loader",
-  },
-  {
+    loader: 'raw-loader'
+}, {
     test: /\.ccs$/i,
-    loader: "raw-loader",
-  },
-  {
+    loader: 'raw-loader'
+}, {
     test: /\.ustx/i,
-    loader: "raw-loader",
-  },
-  {
+    loader: 'raw-loader'
+}, {
     test: /\.txt/i,
-    loader: "raw-loader",
-  },
-  {
+    loader: 'raw-loader'
+}, {
     test: /\.(png|jpe?g|gif)$/i,
     use: [
-      {
-        loader: "file-loader",
-      },
+        {
+            loader: 'file-loader',
+        },
     ],
-  },
-);
+});