From 4fcf1df61f40440441d763558cbeedc816c4fcca Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Fri, 9 Feb 2024 05:07:34 -0800 Subject: [PATCH] Move plugins to build folder --- plugins/filter-jsonpath/vite.config.js | 2 +- plugins/filter-xpath/vite.config.js | 2 +- plugins/importer-insomnia/vite.config.js | 2 +- plugins/importer-postman/vite.config.js | 2 +- plugins/importer-yaak/vite.config.js | 2 +- .../plugins/{ => build}/filter-jsonpath/index.mjs | 0 src-tauri/plugins/{ => build}/filter-xpath/index.mjs | 0 .../plugins/{ => build}/importer-insomnia/index.mjs | 0 .../plugins/{ => build}/importer-postman/index.mjs | 0 src-tauri/plugins/{ => build}/importer-yaak/index.mjs | 0 src-tauri/src/plugin.rs | 10 +++++----- 11 files changed, 10 insertions(+), 10 deletions(-) rename src-tauri/plugins/{ => build}/filter-jsonpath/index.mjs (100%) rename src-tauri/plugins/{ => build}/filter-xpath/index.mjs (100%) rename src-tauri/plugins/{ => build}/importer-insomnia/index.mjs (100%) rename src-tauri/plugins/{ => build}/importer-postman/index.mjs (100%) rename src-tauri/plugins/{ => build}/importer-yaak/index.mjs (100%) diff --git a/plugins/filter-jsonpath/vite.config.js b/plugins/filter-jsonpath/vite.config.js index 17baae7e..7a165919 100644 --- a/plugins/filter-jsonpath/vite.config.js +++ b/plugins/filter-jsonpath/vite.config.js @@ -8,6 +8,6 @@ export default defineConfig({ fileName: 'index', formats: ['es'], }, - outDir: resolve(__dirname, '../../src-tauri/plugins/filter-jsonpath'), + outDir: resolve(__dirname, '../../src-tauri/plugins/build/filter-jsonpath'), }, }); diff --git a/plugins/filter-xpath/vite.config.js b/plugins/filter-xpath/vite.config.js index 18a43a2a..a7238839 100644 --- a/plugins/filter-xpath/vite.config.js +++ b/plugins/filter-xpath/vite.config.js @@ -8,6 +8,6 @@ export default defineConfig({ fileName: 'index', formats: ['es'], }, - outDir: resolve(__dirname, '../../src-tauri/plugins/filter-xpath'), + outDir: resolve(__dirname, '../../src-tauri/plugins/build/filter-xpath'), }, }); diff --git a/plugins/importer-insomnia/vite.config.js b/plugins/importer-insomnia/vite.config.js index b7c7bbf6..52856e29 100644 --- a/plugins/importer-insomnia/vite.config.js +++ b/plugins/importer-insomnia/vite.config.js @@ -8,6 +8,6 @@ export default defineConfig({ fileName: 'index', formats: ['es'], }, - outDir: resolve(__dirname, '../../src-tauri/plugins/importer-insomnia'), + outDir: resolve(__dirname, '../../src-tauri/plugins/build/importer-insomnia'), }, }); diff --git a/plugins/importer-postman/vite.config.js b/plugins/importer-postman/vite.config.js index 1c261948..f6d0834c 100644 --- a/plugins/importer-postman/vite.config.js +++ b/plugins/importer-postman/vite.config.js @@ -8,6 +8,6 @@ export default defineConfig({ fileName: 'index', formats: ['es'], }, - outDir: resolve(__dirname, '../../src-tauri/plugins/importer-postman'), + outDir: resolve(__dirname, '../../src-tauri/plugins/build/importer-postman'), }, }); diff --git a/plugins/importer-yaak/vite.config.js b/plugins/importer-yaak/vite.config.js index 33824ded..6ea993c2 100644 --- a/plugins/importer-yaak/vite.config.js +++ b/plugins/importer-yaak/vite.config.js @@ -8,6 +8,6 @@ export default defineConfig({ fileName: 'index', formats: ['es'], }, - outDir: resolve(__dirname, '../../src-tauri/plugins/importer-yaak'), + outDir: resolve(__dirname, '../../src-tauri/plugins/build/importer-yaak'), }, }); diff --git a/src-tauri/plugins/filter-jsonpath/index.mjs b/src-tauri/plugins/build/filter-jsonpath/index.mjs similarity index 100% rename from src-tauri/plugins/filter-jsonpath/index.mjs rename to src-tauri/plugins/build/filter-jsonpath/index.mjs diff --git a/src-tauri/plugins/filter-xpath/index.mjs b/src-tauri/plugins/build/filter-xpath/index.mjs similarity index 100% rename from src-tauri/plugins/filter-xpath/index.mjs rename to src-tauri/plugins/build/filter-xpath/index.mjs diff --git a/src-tauri/plugins/importer-insomnia/index.mjs b/src-tauri/plugins/build/importer-insomnia/index.mjs similarity index 100% rename from src-tauri/plugins/importer-insomnia/index.mjs rename to src-tauri/plugins/build/importer-insomnia/index.mjs diff --git a/src-tauri/plugins/importer-postman/index.mjs b/src-tauri/plugins/build/importer-postman/index.mjs similarity index 100% rename from src-tauri/plugins/importer-postman/index.mjs rename to src-tauri/plugins/build/importer-postman/index.mjs diff --git a/src-tauri/plugins/importer-yaak/index.mjs b/src-tauri/plugins/build/importer-yaak/index.mjs similarity index 100% rename from src-tauri/plugins/importer-yaak/index.mjs rename to src-tauri/plugins/build/importer-yaak/index.mjs diff --git a/src-tauri/src/plugin.rs b/src-tauri/src/plugin.rs index ddec2970..2118fdad 100644 --- a/src-tauri/src/plugin.rs +++ b/src-tauri/src/plugin.rs @@ -1,11 +1,11 @@ use std::fs; -use boa_engine::{ - Context, js_string, JsNativeError, JsValue, Module, module::SimpleModuleLoader, - property::Attribute, Source, -}; use boa_engine::builtins::promise::PromiseState; use boa_engine::module::ModuleLoader; +use boa_engine::{ + js_string, module::SimpleModuleLoader, property::Attribute, Context, JsNativeError, JsValue, + Module, Source, +}; use boa_runtime::Console; use log::{debug, error}; use serde::{Deserialize, Serialize}; @@ -87,7 +87,7 @@ fn run_plugin( ) -> serde_json::Value { let plugin_dir = app_handle .path_resolver() - .resolve_resource("plugins") + .resolve_resource("plugins/build") .expect("failed to resolve plugin directory resource") .join(plugin_name); let plugin_index_file = plugin_dir.join("index.mjs");