From d823268b0316baa67e7baf81f562f26bbf2303e5 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Sat, 15 Apr 2023 15:29:01 -0300 Subject: [PATCH] revert api changes --- plugins/fs/package.json | 7 +---- plugins/fs/rollup.config.mjs | 53 ++++++------------------------------ pnpm-lock.yaml | 20 ++------------ 3 files changed, 11 insertions(+), 69 deletions(-) diff --git a/plugins/fs/package.json b/plugins/fs/package.json index 72688b51..0f4348e6 100644 --- a/plugins/fs/package.json +++ b/plugins/fs/package.json @@ -25,12 +25,7 @@ "LICENSE" ], "devDependencies": { - "@rollup/plugin-node-resolve": "^15.0.1", - "@rollup/plugin-typescript": "^11.0.0", - "@types/node": "^18.15.11", - "rollup": "^3.7.4", - "tslib": "^2.4.1", - "typescript": "^4.9.4" + "tslib": "^2.4.1" }, "dependencies": { "@tauri-apps/api": "^1.2.0" diff --git a/plugins/fs/rollup.config.mjs b/plugins/fs/rollup.config.mjs index 93ace524..6555e98b 100644 --- a/plugins/fs/rollup.config.mjs +++ b/plugins/fs/rollup.config.mjs @@ -1,48 +1,11 @@ import { readFileSync } from "fs"; -import { builtinModules } from "module"; -import typescript from "@rollup/plugin-typescript"; -import resolve from "@rollup/plugin-node-resolve"; -const input = "guest-js/index.ts"; -const pkg = JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") -); -const external = [/^@tauri-apps\/api/]; +import { createConfig } from "../../shared/rollup.config.mjs"; -export default [ - { - input, - external: Object.keys(pkg.dependencies || {}) - .concat(Object.keys(pkg.peerDependencies || {})) - .concat(builtinModules) - .concat(external), - onwarn: (warning) => { - throw Object.assign(new Error(), warning); - }, - strictDeprecations: true, - output: { - file: pkg.module, - format: "es", - sourcemap: true, - }, - plugins: [typescript({ sourceMap: true })], - }, - { - input, - onwarn: (warning) => { - throw Object.assign(new Error(), warning); - }, - strictDeprecations: true, - output: { - file: pkg.browser, - format: "es", - sourcemap: true, - entryFileNames: "[name].min.js", - }, - plugins: [ - resolve(), - // terser(), - typescript({ sourceMap: true }), - ], - }, -]; +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/pnpm-lock.yaml b/pnpm-lock.yaml index 65075bb2..8b168db5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,7 +12,7 @@ importers: version: 0.4.0(rollup@3.7.4) '@rollup/plugin-typescript': specifier: ^11.0.0 - version: 11.0.0(rollup@3.7.4)(tslib@2.4.1)(typescript@4.9.4) + version: 11.0.0(rollup@3.7.4)(typescript@4.9.4) '@typescript-eslint/eslint-plugin': specifier: ^5.0.0 version: 5.46.1(@typescript-eslint/parser@5.46.1)(eslint@8.29.0)(typescript@4.9.4) @@ -83,24 +83,9 @@ importers: specifier: ^1.2.0 version: 1.2.0 devDependencies: - '@rollup/plugin-node-resolve': - specifier: ^15.0.1 - version: 15.0.1(rollup@3.7.4) - '@rollup/plugin-typescript': - specifier: ^11.0.0 - version: 11.0.0(rollup@3.7.4)(tslib@2.4.1)(typescript@4.9.4) - '@types/node': - specifier: ^18.15.11 - version: 18.15.11 - rollup: - specifier: ^3.7.4 - version: 3.7.4 tslib: specifier: ^2.4.1 version: 2.4.1 - typescript: - specifier: ^4.9.4 - version: 4.9.4 plugins/fs-watch: dependencies: @@ -551,7 +536,7 @@ packages: terser: 5.16.1 dev: true - /@rollup/plugin-typescript@11.0.0(rollup@3.7.4)(tslib@2.4.1)(typescript@4.9.4): + /@rollup/plugin-typescript@11.0.0(rollup@3.7.4)(typescript@4.9.4): resolution: {integrity: sha512-goPyCWBiimk1iJgSTgsehFD5OOFHiAknrRJjqFCudcW8JtWiBlK284Xnn4flqMqg6YAjVG/EE+3aVzrL5qNSzQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -567,7 +552,6 @@ packages: '@rollup/pluginutils': 5.0.2(rollup@3.7.4) resolve: 1.22.1 rollup: 3.7.4 - tslib: 2.4.1 typescript: 4.9.4 dev: true