From 3aa26e6b172b54f90e06fad192571a6a253ce192 Mon Sep 17 00:00:00 2001 From: owjs3901 Date: Tue, 28 Jan 2025 02:09:32 +0900 Subject: [PATCH] Fix convert --- .changeset/tame-doors-rest.md | 6 ++++++ bindings/devup-ui-wasm/src/lib.rs | 8 +++----- packages/webpack-plugin/package.json | 3 ++- packages/webpack-plugin/src/loader.ts | 2 +- packages/webpack-plugin/src/plugin.ts | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 .changeset/tame-doors-rest.md diff --git a/.changeset/tame-doors-rest.md b/.changeset/tame-doors-rest.md new file mode 100644 index 00000000..f6bedc22 --- /dev/null +++ b/.changeset/tame-doors-rest.md @@ -0,0 +1,6 @@ +--- +"@devup-ui/webpack-plugin": patch +"@devup-ui/wasm": patch +--- + +Fix convert issue diff --git a/bindings/devup-ui-wasm/src/lib.rs b/bindings/devup-ui-wasm/src/lib.rs index a15e0600..a962bc77 100644 --- a/bindings/devup-ui-wasm/src/lib.rs +++ b/bindings/devup-ui-wasm/src/lib.rs @@ -20,6 +20,8 @@ pub struct Output { extern "C" { #[wasm_bindgen(js_namespace = console)] fn log(s: &JsValue); + #[wasm_bindgen(js_namespace = console, js_name = log)] + fn log_str(s: &str); } #[wasm_bindgen] @@ -100,11 +102,7 @@ pub fn code_extract( }, ) { Ok(output) => Ok(Output { - code: if output.styles.is_empty() { - code.to_string() - } else { - output.code - }, + code: output.code, styles: output.styles, }), Err(error) => Err(JsValue::from_str(error.to_string().as_str())), diff --git a/packages/webpack-plugin/package.json b/packages/webpack-plugin/package.json index f9a8aaa5..cfc8aaa3 100644 --- a/packages/webpack-plugin/package.json +++ b/packages/webpack-plugin/package.json @@ -25,7 +25,8 @@ "./css-loader": { "import": "./dist/css-loader.js", "require": "./dist/css-loader.cjs" - } + }, + "./dist/*": "./dist/*" }, "files": [ "dist" diff --git a/packages/webpack-plugin/src/loader.ts b/packages/webpack-plugin/src/loader.ts index 31f16329..921c543e 100644 --- a/packages/webpack-plugin/src/loader.ts +++ b/packages/webpack-plugin/src/loader.ts @@ -27,7 +27,7 @@ const devupUILoader: RawLoaderDefinitionFunction = try { const { code, css } = codeExtract( - this.resourcePath, + id, source.toString(), libPackage, cssFile, diff --git a/packages/webpack-plugin/src/plugin.ts b/packages/webpack-plugin/src/plugin.ts index 6d93d9a7..1acf83d0 100644 --- a/packages/webpack-plugin/src/plugin.ts +++ b/packages/webpack-plugin/src/plugin.ts @@ -30,7 +30,7 @@ export class DevupUIWebpackPlugin { cssFile = join(_dirname, 'devup-ui.css'), devupPath = 'devup.json', interfacePath = '.df', - }: Partial) { + }: Partial = {}) { this.options = { package: libPackage, cssFile,