From 467bcb90afa8251fae14005b4c17e0ab75d04edb Mon Sep 17 00:00:00 2001
From: Fabian-Lars <fabianlars@fabianlars.de>
Date: Thu, 12 Jan 2023 16:55:21 +0100
Subject: [PATCH] fix: change dist for js files, fixes #76 for yarn3 (#88)

---
 .gitignore                         |  3 ++-
 plugins/authenticator/package.json | 16 ++++++++--------
 plugins/autostart/package.json     | 16 ++++++++--------
 plugins/fs-extra/package.json      | 16 ++++++++--------
 plugins/fs-watch/package.json      | 16 ++++++++--------
 plugins/log/package.json           | 16 ++++++++--------
 plugins/positioner/package.json    | 16 ++++++++--------
 plugins/sql/package.json           | 16 ++++++++--------
 plugins/store/package.json         | 16 ++++++++--------
 plugins/stronghold/package.json    | 16 ++++++++--------
 plugins/upload/package.json        | 16 ++++++++--------
 plugins/websocket/package.json     | 16 ++++++++--------
 shared/template/package.json       | 16 ++++++++--------
 tsconfig.base.json                 |  2 +-
 14 files changed, 99 insertions(+), 98 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c6d35b6a..9a05fc88b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 target
 node_modules
-dist
\ No newline at end of file
+dist
+dist-js
\ No newline at end of file
diff --git a/plugins/authenticator/package.json b/plugins/authenticator/package.json
index e0c7725ea..d859eef49 100644
--- a/plugins/authenticator/package.json
+++ b/plugins/authenticator/package.json
@@ -7,20 +7,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/plugins/autostart/package.json b/plugins/autostart/package.json
index 357fc5875..dd5304677 100644
--- a/plugins/autostart/package.json
+++ b/plugins/autostart/package.json
@@ -6,20 +6,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/plugins/fs-extra/package.json b/plugins/fs-extra/package.json
index eaaf4613d..d6a32f423 100644
--- a/plugins/fs-extra/package.json
+++ b/plugins/fs-extra/package.json
@@ -7,20 +7,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/plugins/fs-watch/package.json b/plugins/fs-watch/package.json
index 771533de0..2f080773b 100644
--- a/plugins/fs-watch/package.json
+++ b/plugins/fs-watch/package.json
@@ -7,20 +7,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/plugins/log/package.json b/plugins/log/package.json
index 4b5ead278..fefd3c339 100644
--- a/plugins/log/package.json
+++ b/plugins/log/package.json
@@ -7,20 +7,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json
index c054080b7..0cc584282 100644
--- a/plugins/positioner/package.json
+++ b/plugins/positioner/package.json
@@ -7,20 +7,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/plugins/sql/package.json b/plugins/sql/package.json
index ed9fe37fc..f60d81167 100644
--- a/plugins/sql/package.json
+++ b/plugins/sql/package.json
@@ -7,20 +7,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/plugins/store/package.json b/plugins/store/package.json
index 76cbf4b63..921f39aeb 100644
--- a/plugins/store/package.json
+++ b/plugins/store/package.json
@@ -7,20 +7,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/plugins/stronghold/package.json b/plugins/stronghold/package.json
index 9a5f79f2e..e3d97521c 100644
--- a/plugins/stronghold/package.json
+++ b/plugins/stronghold/package.json
@@ -7,20 +7,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/plugins/upload/package.json b/plugins/upload/package.json
index dadb24212..ef67badbf 100644
--- a/plugins/upload/package.json
+++ b/plugins/upload/package.json
@@ -7,20 +7,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/plugins/websocket/package.json b/plugins/websocket/package.json
index 998252ba7..911213a75 100644
--- a/plugins/websocket/package.json
+++ b/plugins/websocket/package.json
@@ -6,20 +6,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/shared/template/package.json b/shared/template/package.json
index 56450d21d..e62c3c9fa 100644
--- a/shared/template/package.json
+++ b/shared/template/package.json
@@ -6,20 +6,20 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "guest-js/dist/index.min.js",
-  "module": "guest-js/dist/index.mjs",
-  "types": "guest-js/dist/index.d.ts",
+  "browser": "dist-js/index.min.js",
+  "module": "dist-js/index.mjs",
+  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./guest-js/dist/index.mjs",
-    "types": "./guest-js/dist/index.d.ts",
-    "browser": "./guest-js/dist/index.min.js"
+    "import": "./dist-js/index.mjs",
+    "types": "./dist-js/index.d.ts",
+    "browser": "./dist-js/index.min.js"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
-    "guest-js/dist",
-    "!guest-js/dist/**/*.map",
+    "dist-js",
+    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 1b66d4471..d9443f595 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -16,5 +16,5 @@
     "declaration": true,
     "declarationDir": "dist"
   },
-  "exclude": ["guest-js/dist", "node_modules", "test/types"]
+  "exclude": ["dist-js", "node_modules", "test/types"]
 }