diff --git a/plugins/authenticator/guest-js/tsconfig.json b/plugins/authenticator/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/authenticator/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/authenticator/guest-js/package.json b/plugins/authenticator/package.json similarity index 57% rename from plugins/authenticator/guest-js/package.json rename to plugins/authenticator/package.json index cbc1995772..6cf8288e37 100644 --- a/plugins/authenticator/guest-js/package.json +++ b/plugins/authenticator/package.json @@ -6,20 +6,20 @@ "Tauri Programme within The Commons Conservancy" ], "type": "module", - "browser": "dist/index.min.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "browser": "guest-js/dist/index.min.js", + "module": "guest-js/dist/index.mjs", + "types": "guest-js/dist/index.d.ts", "exports": { - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "browser": "./dist/index.min.js" + "import": "./guest-js/dist/index.mjs", + "types": "./guest-js/dist/index.d.ts", + "browser": "./guest-js/dist/index.min.js" }, "scripts": { "build": "rollup -c" }, "files": [ - "dist", - "!dist/**/*.map", + "guest-js/dist", + "!guest-js/dist/**/*.map", "README.md", "LICENSE" ], diff --git a/plugins/autostart/guest-js/rollup.config.mjs b/plugins/authenticator/rollup.config.mjs similarity index 68% rename from plugins/autostart/guest-js/rollup.config.mjs rename to plugins/authenticator/rollup.config.mjs index ee88552253..efb94b046f 100644 --- a/plugins/autostart/guest-js/rollup.config.mjs +++ b/plugins/authenticator/rollup.config.mjs @@ -1,8 +1,9 @@ import { readFileSync } from "fs"; -import { createConfig } from "../../../shared/rollup.config.mjs"; +import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ + input: 'guest-js/index.ts', pkg: JSON.parse( readFileSync(new URL("./package.json", import.meta.url), "utf8") ), diff --git a/plugins/authenticator/tsconfig.json b/plugins/authenticator/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/authenticator/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/autostart/guest-js/tsconfig.json b/plugins/autostart/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/autostart/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/autostart/guest-js/package.json b/plugins/autostart/package.json similarity index 57% rename from plugins/autostart/guest-js/package.json rename to plugins/autostart/package.json index b854d383ef..357fc58758 100644 --- a/plugins/autostart/guest-js/package.json +++ b/plugins/autostart/package.json @@ -6,20 +6,20 @@ "Tauri Programme within The Commons Conservancy" ], "type": "module", - "browser": "dist/index.min.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "browser": "guest-js/dist/index.min.js", + "module": "guest-js/dist/index.mjs", + "types": "guest-js/dist/index.d.ts", "exports": { - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "browser": "./dist/index.min.js" + "import": "./guest-js/dist/index.mjs", + "types": "./guest-js/dist/index.d.ts", + "browser": "./guest-js/dist/index.min.js" }, "scripts": { "build": "rollup -c" }, "files": [ - "dist", - "!dist/**/*.map", + "guest-js/dist", + "!guest-js/dist/**/*.map", "README.md", "LICENSE" ], diff --git a/plugins/authenticator/guest-js/rollup.config.mjs b/plugins/autostart/rollup.config.mjs similarity index 68% rename from plugins/authenticator/guest-js/rollup.config.mjs rename to plugins/autostart/rollup.config.mjs index ee88552253..efb94b046f 100644 --- a/plugins/authenticator/guest-js/rollup.config.mjs +++ b/plugins/autostart/rollup.config.mjs @@ -1,8 +1,9 @@ import { readFileSync } from "fs"; -import { createConfig } from "../../../shared/rollup.config.mjs"; +import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ + input: 'guest-js/index.ts', pkg: JSON.parse( readFileSync(new URL("./package.json", import.meta.url), "utf8") ), diff --git a/plugins/autostart/tsconfig.json b/plugins/autostart/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/autostart/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/fs-extra/guest-js/tsconfig.json b/plugins/fs-extra/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/fs-extra/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/fs-extra/guest-js/package.json b/plugins/fs-extra/package.json similarity index 63% rename from plugins/fs-extra/guest-js/package.json rename to plugins/fs-extra/package.json index 2feb2115c7..8929b99621 100644 --- a/plugins/fs-extra/guest-js/package.json +++ b/plugins/fs-extra/package.json @@ -6,13 +6,13 @@ "Tauri Programme within The Commons Conservancy" ], "type": "module", - "browser": "dist/index.min.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "browser": "guest-js/dist/index.min.js", + "module": "guest-js/dist/index.mjs", + "types": "guest-js/dist/index.d.ts", "exports": { - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "browser": "./dist/index.min.js" + "import": "./guest-js/dist/index.mjs", + "types": "./guest-js/dist/index.d.ts", + "browser": "./guest-js/dist/index.min.js" }, "scripts": { "build": "rollup -c" diff --git a/plugins/fs-extra/guest-js/rollup.config.mjs b/plugins/fs-extra/rollup.config.mjs similarity index 68% rename from plugins/fs-extra/guest-js/rollup.config.mjs rename to plugins/fs-extra/rollup.config.mjs index ee88552253..efb94b046f 100644 --- a/plugins/fs-extra/guest-js/rollup.config.mjs +++ b/plugins/fs-extra/rollup.config.mjs @@ -1,8 +1,9 @@ import { readFileSync } from "fs"; -import { createConfig } from "../../../shared/rollup.config.mjs"; +import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ + input: 'guest-js/index.ts', pkg: JSON.parse( readFileSync(new URL("./package.json", import.meta.url), "utf8") ), diff --git a/plugins/fs-extra/tsconfig.json b/plugins/fs-extra/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/fs-extra/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/fs-watch/guest-js/tsconfig.json b/plugins/fs-watch/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/fs-watch/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/fs-watch/guest-js/package.json b/plugins/fs-watch/package.json similarity index 63% rename from plugins/fs-watch/guest-js/package.json rename to plugins/fs-watch/package.json index 522180ebbe..c903f9420d 100644 --- a/plugins/fs-watch/guest-js/package.json +++ b/plugins/fs-watch/package.json @@ -6,13 +6,13 @@ "Tauri Programme within The Commons Conservancy" ], "type": "module", - "browser": "dist/index.min.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "browser": "guest-js/dist/index.min.js", + "module": "guest-js/dist/index.mjs", + "types": "guest-js/dist/index.d.ts", "exports": { - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "browser": "./dist/index.min.js" + "import": "./guest-js/dist/index.mjs", + "types": "./guest-js/dist/index.d.ts", + "browser": "./guest-js/dist/index.min.js" }, "scripts": { "build": "rollup -c" diff --git a/plugins/fs-watch/guest-js/rollup.config.mjs b/plugins/fs-watch/rollup.config.mjs similarity index 68% rename from plugins/fs-watch/guest-js/rollup.config.mjs rename to plugins/fs-watch/rollup.config.mjs index ee88552253..efb94b046f 100644 --- a/plugins/fs-watch/guest-js/rollup.config.mjs +++ b/plugins/fs-watch/rollup.config.mjs @@ -1,8 +1,9 @@ import { readFileSync } from "fs"; -import { createConfig } from "../../../shared/rollup.config.mjs"; +import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ + input: 'guest-js/index.ts', pkg: JSON.parse( readFileSync(new URL("./package.json", import.meta.url), "utf8") ), diff --git a/plugins/fs-watch/tsconfig.json b/plugins/fs-watch/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/fs-watch/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/log/guest-js/rollup.config.mjs b/plugins/log/guest-js/rollup.config.mjs deleted file mode 100644 index ee88552253..0000000000 --- a/plugins/log/guest-js/rollup.config.mjs +++ /dev/null @@ -1,10 +0,0 @@ -import { readFileSync } from "fs"; - -import { createConfig } from "../../../shared/rollup.config.mjs"; - -export default createConfig({ - pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") - ), - external: [/^@tauri-apps\/api/], -}); diff --git a/plugins/log/guest-js/tsconfig.json b/plugins/log/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/log/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/log/guest-js/package.json b/plugins/log/package.json similarity index 63% rename from plugins/log/guest-js/package.json rename to plugins/log/package.json index 1fd3666083..9574a8fca2 100644 --- a/plugins/log/guest-js/package.json +++ b/plugins/log/package.json @@ -6,13 +6,13 @@ "Tauri Programme within The Commons Conservancy" ], "type": "module", - "browser": "dist/index.min.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "browser": "guest-js/dist/index.min.js", + "module": "guest-js/dist/index.mjs", + "types": "guest-js/dist/index.d.ts", "exports": { - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "browser": "./dist/index.min.js" + "import": "./guest-js/dist/index.mjs", + "types": "./guest-js/dist/index.d.ts", + "browser": "./guest-js/dist/index.min.js" }, "scripts": { "build": "rollup -c" diff --git a/plugins/log/rollup.config.mjs b/plugins/log/rollup.config.mjs new file mode 100644 index 0000000000..efb94b046f --- /dev/null +++ b/plugins/log/rollup.config.mjs @@ -0,0 +1,11 @@ +import { readFileSync } from "fs"; + +import { createConfig } from "../../shared/rollup.config.mjs"; + +export default createConfig({ + input: 'guest-js/index.ts', + pkg: JSON.parse( + readFileSync(new URL("./package.json", import.meta.url), "utf8") + ), + external: [/^@tauri-apps\/api/], +}); diff --git a/plugins/log/tsconfig.json b/plugins/log/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/log/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/positioner/guest-js/rollup.config.mjs b/plugins/positioner/guest-js/rollup.config.mjs deleted file mode 100644 index ee88552253..0000000000 --- a/plugins/positioner/guest-js/rollup.config.mjs +++ /dev/null @@ -1,10 +0,0 @@ -import { readFileSync } from "fs"; - -import { createConfig } from "../../../shared/rollup.config.mjs"; - -export default createConfig({ - pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") - ), - external: [/^@tauri-apps\/api/], -}); diff --git a/plugins/positioner/guest-js/tsconfig.json b/plugins/positioner/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/positioner/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/positioner/guest-js/package.json b/plugins/positioner/package.json similarity index 63% rename from plugins/positioner/guest-js/package.json rename to plugins/positioner/package.json index 96219aa32a..5ee7003927 100644 --- a/plugins/positioner/guest-js/package.json +++ b/plugins/positioner/package.json @@ -6,13 +6,13 @@ "Tauri Programme within The Commons Conservancy" ], "type": "module", - "browser": "dist/index.min.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "browser": "guest-js/dist/index.min.js", + "module": "guest-js/dist/index.mjs", + "types": "guest-js/dist/index.d.ts", "exports": { - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "browser": "./dist/index.min.js" + "import": "./guest-js/dist/index.mjs", + "types": "./guest-js/dist/index.d.ts", + "browser": "./guest-js/dist/index.min.js" }, "scripts": { "build": "rollup -c" diff --git a/plugins/positioner/rollup.config.mjs b/plugins/positioner/rollup.config.mjs new file mode 100644 index 0000000000..efb94b046f --- /dev/null +++ b/plugins/positioner/rollup.config.mjs @@ -0,0 +1,11 @@ +import { readFileSync } from "fs"; + +import { createConfig } from "../../shared/rollup.config.mjs"; + +export default createConfig({ + input: 'guest-js/index.ts', + pkg: JSON.parse( + readFileSync(new URL("./package.json", import.meta.url), "utf8") + ), + external: [/^@tauri-apps\/api/], +}); diff --git a/plugins/positioner/tsconfig.json b/plugins/positioner/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/positioner/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/sql/guest-js/rollup.config.mjs b/plugins/sql/guest-js/rollup.config.mjs deleted file mode 100644 index ee88552253..0000000000 --- a/plugins/sql/guest-js/rollup.config.mjs +++ /dev/null @@ -1,10 +0,0 @@ -import { readFileSync } from "fs"; - -import { createConfig } from "../../../shared/rollup.config.mjs"; - -export default createConfig({ - pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") - ), - external: [/^@tauri-apps\/api/], -}); diff --git a/plugins/sql/guest-js/tsconfig.json b/plugins/sql/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/sql/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/sql/guest-js/package.json b/plugins/sql/package.json similarity index 63% rename from plugins/sql/guest-js/package.json rename to plugins/sql/package.json index 95a1036c41..35b279eda8 100644 --- a/plugins/sql/guest-js/package.json +++ b/plugins/sql/package.json @@ -6,13 +6,13 @@ "Tauri Programme within The Commons Conservancy" ], "type": "module", - "browser": "dist/index.min.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "browser": "guest-js/dist/index.min.js", + "module": "guest-js/dist/index.mjs", + "types": "guest-js/dist/index.d.ts", "exports": { - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "browser": "./dist/index.min.js" + "import": "./guest-js/dist/index.mjs", + "types": "./guest-js/dist/index.d.ts", + "browser": "./guest-js/dist/index.min.js" }, "scripts": { "build": "rollup -c" diff --git a/plugins/sql/rollup.config.mjs b/plugins/sql/rollup.config.mjs new file mode 100644 index 0000000000..efb94b046f --- /dev/null +++ b/plugins/sql/rollup.config.mjs @@ -0,0 +1,11 @@ +import { readFileSync } from "fs"; + +import { createConfig } from "../../shared/rollup.config.mjs"; + +export default createConfig({ + input: 'guest-js/index.ts', + pkg: JSON.parse( + readFileSync(new URL("./package.json", import.meta.url), "utf8") + ), + external: [/^@tauri-apps\/api/], +}); diff --git a/plugins/sql/tsconfig.json b/plugins/sql/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/sql/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/store/guest-js/rollup.config.mjs b/plugins/store/guest-js/rollup.config.mjs deleted file mode 100644 index ee88552253..0000000000 --- a/plugins/store/guest-js/rollup.config.mjs +++ /dev/null @@ -1,10 +0,0 @@ -import { readFileSync } from "fs"; - -import { createConfig } from "../../../shared/rollup.config.mjs"; - -export default createConfig({ - pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") - ), - external: [/^@tauri-apps\/api/], -}); diff --git a/plugins/store/guest-js/tsconfig.json b/plugins/store/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/store/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/store/guest-js/package.json b/plugins/store/package.json similarity index 63% rename from plugins/store/guest-js/package.json rename to plugins/store/package.json index 1ec5978412..cc55321fe8 100644 --- a/plugins/store/guest-js/package.json +++ b/plugins/store/package.json @@ -6,13 +6,13 @@ "Tauri Programme within The Commons Conservancy" ], "type": "module", - "browser": "dist/index.min.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "browser": "guest-js/dist/index.min.js", + "module": "guest-js/dist/index.mjs", + "types": "guest-js/dist/index.d.ts", "exports": { - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "browser": "./dist/index.min.js" + "import": "./guest-js/dist/index.mjs", + "types": "./guest-js/dist/index.d.ts", + "browser": "./guest-js/dist/index.min.js" }, "scripts": { "build": "rollup -c" diff --git a/plugins/store/rollup.config.mjs b/plugins/store/rollup.config.mjs new file mode 100644 index 0000000000..efb94b046f --- /dev/null +++ b/plugins/store/rollup.config.mjs @@ -0,0 +1,11 @@ +import { readFileSync } from "fs"; + +import { createConfig } from "../../shared/rollup.config.mjs"; + +export default createConfig({ + input: 'guest-js/index.ts', + pkg: JSON.parse( + readFileSync(new URL("./package.json", import.meta.url), "utf8") + ), + external: [/^@tauri-apps\/api/], +}); diff --git a/plugins/store/tsconfig.json b/plugins/store/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/store/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/stronghold/guest-js/rollup.config.mjs b/plugins/stronghold/guest-js/rollup.config.mjs deleted file mode 100644 index ee88552253..0000000000 --- a/plugins/stronghold/guest-js/rollup.config.mjs +++ /dev/null @@ -1,10 +0,0 @@ -import { readFileSync } from "fs"; - -import { createConfig } from "../../../shared/rollup.config.mjs"; - -export default createConfig({ - pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") - ), - external: [/^@tauri-apps\/api/], -}); diff --git a/plugins/stronghold/guest-js/tsconfig.json b/plugins/stronghold/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/stronghold/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/stronghold/guest-js/package.json b/plugins/stronghold/package.json similarity index 63% rename from plugins/stronghold/guest-js/package.json rename to plugins/stronghold/package.json index 10ed1ba4e0..b929c2c2d1 100644 --- a/plugins/stronghold/guest-js/package.json +++ b/plugins/stronghold/package.json @@ -6,13 +6,13 @@ "Tauri Programme within The Commons Conservancy" ], "type": "module", - "browser": "dist/index.min.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "browser": "guest-js/dist/index.min.js", + "module": "guest-js/dist/index.mjs", + "types": "guest-js/dist/index.d.ts", "exports": { - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "browser": "./dist/index.min.js" + "import": "./guest-js/dist/index.mjs", + "types": "./guest-js/dist/index.d.ts", + "browser": "./guest-js/dist/index.min.js" }, "scripts": { "build": "rollup -c" diff --git a/plugins/stronghold/rollup.config.mjs b/plugins/stronghold/rollup.config.mjs new file mode 100644 index 0000000000..efb94b046f --- /dev/null +++ b/plugins/stronghold/rollup.config.mjs @@ -0,0 +1,11 @@ +import { readFileSync } from "fs"; + +import { createConfig } from "../../shared/rollup.config.mjs"; + +export default createConfig({ + input: 'guest-js/index.ts', + pkg: JSON.parse( + readFileSync(new URL("./package.json", import.meta.url), "utf8") + ), + external: [/^@tauri-apps\/api/], +}); diff --git a/plugins/stronghold/tsconfig.json b/plugins/stronghold/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/stronghold/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/upload/guest-js/rollup.config.mjs b/plugins/upload/guest-js/rollup.config.mjs deleted file mode 100644 index ee88552253..0000000000 --- a/plugins/upload/guest-js/rollup.config.mjs +++ /dev/null @@ -1,10 +0,0 @@ -import { readFileSync } from "fs"; - -import { createConfig } from "../../../shared/rollup.config.mjs"; - -export default createConfig({ - pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") - ), - external: [/^@tauri-apps\/api/], -}); diff --git a/plugins/upload/guest-js/tsconfig.json b/plugins/upload/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/upload/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/upload/guest-js/package.json b/plugins/upload/package.json similarity index 63% rename from plugins/upload/guest-js/package.json rename to plugins/upload/package.json index 8f8313c2c6..8ec9afaf1c 100644 --- a/plugins/upload/guest-js/package.json +++ b/plugins/upload/package.json @@ -6,13 +6,13 @@ "Tauri Programme within The Commons Conservancy" ], "type": "module", - "browser": "dist/index.min.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "browser": "guest-js/dist/index.min.js", + "module": "guest-js/dist/index.mjs", + "types": "guest-js/dist/index.d.ts", "exports": { - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts", - "browser": "./dist/index.min.js" + "import": "./guest-js/dist/index.mjs", + "types": "./guest-js/dist/index.d.ts", + "browser": "./guest-js/dist/index.min.js" }, "scripts": { "build": "rollup -c" diff --git a/plugins/upload/rollup.config.mjs b/plugins/upload/rollup.config.mjs new file mode 100644 index 0000000000..efb94b046f --- /dev/null +++ b/plugins/upload/rollup.config.mjs @@ -0,0 +1,11 @@ +import { readFileSync } from "fs"; + +import { createConfig } from "../../shared/rollup.config.mjs"; + +export default createConfig({ + input: 'guest-js/index.ts', + pkg: JSON.parse( + readFileSync(new URL("./package.json", import.meta.url), "utf8") + ), + external: [/^@tauri-apps\/api/], +}); diff --git a/plugins/upload/tsconfig.json b/plugins/upload/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/upload/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/websocket/guest-js/rollup.config.mjs b/plugins/websocket/guest-js/rollup.config.mjs deleted file mode 100644 index ee88552253..0000000000 --- a/plugins/websocket/guest-js/rollup.config.mjs +++ /dev/null @@ -1,10 +0,0 @@ -import { readFileSync } from "fs"; - -import { createConfig } from "../../../shared/rollup.config.mjs"; - -export default createConfig({ - pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") - ), - external: [/^@tauri-apps\/api/], -}); diff --git a/plugins/websocket/guest-js/tsconfig.json b/plugins/websocket/guest-js/tsconfig.json deleted file mode 120000 index 9c2b2da240..0000000000 --- a/plugins/websocket/guest-js/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -../../../shared/tsconfig.json \ No newline at end of file diff --git a/plugins/websocket/rollup.config.mjs b/plugins/websocket/rollup.config.mjs new file mode 100644 index 0000000000..efb94b046f --- /dev/null +++ b/plugins/websocket/rollup.config.mjs @@ -0,0 +1,11 @@ +import { readFileSync } from "fs"; + +import { createConfig } from "../../shared/rollup.config.mjs"; + +export default createConfig({ + input: 'guest-js/index.ts', + pkg: JSON.parse( + readFileSync(new URL("./package.json", import.meta.url), "utf8") + ), + external: [/^@tauri-apps\/api/], +}); diff --git a/plugins/websocket/tsconfig.json b/plugins/websocket/tsconfig.json new file mode 120000 index 0000000000..7cd38da8fd --- /dev/null +++ b/plugins/websocket/tsconfig.json @@ -0,0 +1 @@ +../../shared/tsconfig.json \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd12e5320c..7da0fecb1d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,7 +34,7 @@ importers: rollup: 3.7.4 typescript: 4.9.4 - plugins/authenticator/guest-js: + plugins/authenticator: specifiers: '@tauri-apps/api': ^1.2.0 tslib: ^2.4.1 @@ -43,7 +43,7 @@ importers: devDependencies: tslib: 2.4.1 - plugins/autostart/guest-js: + plugins/autostart: specifiers: '@tauri-apps/api': ^1.2.0 tslib: ^2.4.1 @@ -52,7 +52,7 @@ importers: devDependencies: tslib: 2.4.1 - plugins/fs-extra/guest-js: + plugins/fs-extra: specifiers: '@tauri-apps/api': ^1.2.0 tslib: ^2.4.1 @@ -61,7 +61,7 @@ importers: devDependencies: tslib: 2.4.1 - plugins/fs-watch/guest-js: + plugins/fs-watch: specifiers: '@tauri-apps/api': ^1.2.0 tslib: ^2.4.1 @@ -70,7 +70,7 @@ importers: devDependencies: tslib: 2.4.1 - plugins/log/guest-js: + plugins/log: specifiers: '@tauri-apps/api': ^1.2.0 tslib: ^2.4.1 @@ -79,7 +79,7 @@ importers: devDependencies: tslib: 2.4.1 - plugins/positioner/guest-js: + plugins/positioner: specifiers: '@tauri-apps/api': ^1.2.0 tslib: ^2.4.1 @@ -88,7 +88,7 @@ importers: devDependencies: tslib: 2.4.1 - plugins/sql/guest-js: + plugins/sql: specifiers: '@tauri-apps/api': ^1.2.0 tslib: ^2.4.1 @@ -97,7 +97,7 @@ importers: devDependencies: tslib: 2.4.1 - plugins/store/guest-js: + plugins/store: specifiers: '@tauri-apps/api': ^1.2.0 tslib: ^2.4.1 @@ -106,7 +106,7 @@ importers: devDependencies: tslib: 2.4.1 - plugins/stronghold/guest-js: + plugins/stronghold: specifiers: '@tauri-apps/api': ^1.2.0 tslib: ^2.4.1 @@ -115,7 +115,7 @@ importers: devDependencies: tslib: 2.4.1 - plugins/upload/guest-js: + plugins/upload: specifiers: '@tauri-apps/api': ^1.2.0 tslib: ^2.4.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 591521cd71..0fa0c2c856 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,2 @@ packages: - - plugins/*/guest-js - plugins/* diff --git a/shared/rollup.config.mjs b/shared/rollup.config.mjs index 7ec69d2a32..9595b929da 100644 --- a/shared/rollup.config.mjs +++ b/shared/rollup.config.mjs @@ -10,10 +10,10 @@ import resolve from "@rollup/plugin-node-resolve"; * @param {string[]} external Imported package.json * @returns {import('rollup').RollupOptions} */ -export function createConfig({ pkg, external = [] }) { +export function createConfig({ input = "index.ts", pkg, external = [] }) { return [ { - input: "index.ts", + input, external: Object.keys(pkg.dependencies || {}) .concat(Object.keys(pkg.peerDependencies || {})) .concat(builtinModules) @@ -30,7 +30,7 @@ export function createConfig({ pkg, external = [] }) { plugins: [typescript({ sourceMap: true })], }, { - input: "index.ts", + input, onwarn: (warning) => { throw Object.assign(new Error(), warning); }, diff --git a/shared/tsconfig.json b/shared/tsconfig.json index 7911d822c0..5098169aa9 100644 --- a/shared/tsconfig.json +++ b/shared/tsconfig.json @@ -1,4 +1,4 @@ { - "extends": "../../../tsconfig.base.json", - "include": ["*.ts", "types/**/*"] + "extends": "../../tsconfig.base.json", + "include": ["guest-js/*.ts"] }