From 01a07ebfa0b337fe4a9c6094f15a9fdd914ad3d5 Mon Sep 17 00:00:00 2001 From: Craig Condon Date: Sun, 24 Dec 2023 09:44:39 -0600 Subject: [PATCH 1/2] ability to cast as something different --- libs/compiler-react/src/code_compiler.rs | 4 +- .../compiler-react/src/definition_compiler.rs | 7 +- libs/compiler-react/src/tests/code.rs | 76 +++++++++---------- .../src/tests/typed_definition.rs | 40 +++++----- 4 files changed, 64 insertions(+), 63 deletions(-) diff --git a/libs/compiler-react/src/code_compiler.rs b/libs/compiler-react/src/code_compiler.rs index 4a8dbc7df..bc036ff49 100644 --- a/libs/compiler-react/src/code_compiler.rs +++ b/libs/compiler-react/src/code_compiler.rs @@ -457,8 +457,8 @@ fn compile_element(element: &ast::Element, info: &Info, context: &mut Context) { context.add_buffer("React.createElement("); - if info.is_component_render_node { - context.add_buffer("props.is || "); + if let Some(name) = &element.name { + context.add_buffer(format!("{}.{}.as || ", context.ctx_name, name).as_str()); } context.add_buffer(format!("{}, ", tag_name).as_str()); diff --git a/libs/compiler-react/src/definition_compiler.rs b/libs/compiler-react/src/definition_compiler.rs index 17f688e91..c76b2e158 100644 --- a/libs/compiler-react/src/definition_compiler.rs +++ b/libs/compiler-react/src/definition_compiler.rs @@ -93,7 +93,6 @@ fn compile_component(component: &ast::Component, context: &mut Context) { context.start_block(); // Not yet - // context.add_buffer("\"is\"?: React.ComponentType,\n"); context.add_buffer("\"ref\"?: any,\n"); for (name, prop) in &component_inference.properties { @@ -165,7 +164,9 @@ fn compile_inference(inference: &infer_types::Type, context: &mut Context) { component.name.clone() }; - context.add_buffer(format!("React.ComponentProps", ref_name).as_str()); + context.add_buffer( + format!("{{ as?: any }} & React.ComponentProps", ref_name).as_str(), + ); } else { let el: ast::Element = GetExpr::get_expr(&el.id, &context.dependency.get_document()) @@ -182,7 +183,7 @@ fn compile_inference(inference: &infer_types::Type, context: &mut Context) { .as_str(), ); } else { - context.add_buffer("React.HTMLAttributes"); + context.add_buffer("{ as?: any } & React.HTMLAttributes"); } } } diff --git a/libs/compiler-react/src/tests/code.rs b/libs/compiler-react/src/tests/code.rs index bd5d89cef..c0d098b54 100644 --- a/libs/compiler-react/src/tests/code.rs +++ b/libs/compiler-react/src/tests/code.rs @@ -66,7 +66,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-1", "ref": ref }); @@ -88,7 +88,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-1", "ref": ref }); @@ -113,7 +113,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "className": "_A-80f4925f-4" + (props.$$scopeClassName ? " " + props.$$scopeClassName : ""), "key": "80f4925f-4", "ref": ref @@ -136,7 +136,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement(props.ab.as || "div", { ...props.ab, "className": "_A-ab-80f4925f-1" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.ab && props.ab.className ? " " + props.ab.className : ""), "key": "80f4925f-1", @@ -161,7 +161,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "span", { + return React.createElement("span", { "key": "80f4925f-2", "ref": ref }, @@ -184,7 +184,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "span", { + return React.createElement("span", { "aria-label": "something", "key": "80f4925f-3", "ref": ref @@ -206,7 +206,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "span", { + return React.createElement(props.ab.as || "span", { ...props.ab, "className": "cd" + " " + "_A-ab-80f4925f-3" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.ab && props.ab.className ? " " + props.ab.className : ""), "key": "80f4925f-3", @@ -233,7 +233,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "span", { + return React.createElement("span", { "key": "80f4925f-2", "ref": ref }, @@ -278,7 +278,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-2", "ref": ref }, @@ -360,7 +360,7 @@ add_case! { let A = React.memo(React.forwardRef(_A)); const _B = (props, ref) => { - return React.createElement(props.is || A, { + return React.createElement(A, { "$$scopeClassName": "_B-80f4925f-4" + (props.$$scopeClassName ? " " + props.$$scopeClassName : ""), "key": "80f4925f-4", "ref": ref @@ -396,7 +396,7 @@ add_case! { let A = React.memo(React.forwardRef(_A)); const _B = (props, ref) => { - return React.createElement(props.is || A, { + return React.createElement(A, { "$$scopeClassName": "_B-80f4925f-6" + (props.$$scopeClassName ? " " + props.$$scopeClassName : ""), "abba": [ "Hello" @@ -422,7 +422,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-3", "onClick": props.onClick, "ref": ref @@ -448,7 +448,7 @@ add_case! { import * as React from "react"; const _B = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement(props.root.as || "div", { ...props.root, "className": "_B-root-80f4925f-1" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.root && props.root.className ? " " + props.root.className : ""), "key": "80f4925f-1", @@ -459,7 +459,7 @@ add_case! { let B = React.memo(React.forwardRef(_B)); const _A = (props, ref) => { - return React.createElement(props.is || B, { + return React.createElement(props.root.as || B, { ...props.root, "$$scopeClassName": "_A-root-80f4925f-4" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.root && props.root.className ? " " + props.root.className : ""), "key": "80f4925f-4", @@ -486,7 +486,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || test.B, { + return React.createElement(test.B, { "$$scopeClassName": "_A-80f4925f-2" + (props.$$scopeClassName ? " " + props.$$scopeClassName : ""), "key": "80f4925f-2", "ref": ref @@ -524,7 +524,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement(props.root.as || "div", { ...props.root, "className": props.class + " " + "_A-root-80f4925f-4" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.root && props.root.className ? " " + props.root.className : ""), "key": "80f4925f-4", @@ -535,7 +535,7 @@ add_case! { let A = React.memo(React.forwardRef(_A)); const _B = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-12", "ref": ref }, @@ -569,7 +569,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement(props.root.as || "div", { ...props.root, "className": props.class + " " + "_A-root-80f4925f-4" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.root && props.root.className ? " " + props.root.className : ""), "key": "80f4925f-4", @@ -580,7 +580,7 @@ add_case! { let A = React.memo(React.forwardRef(_A)); const _B = (props, ref) => { - return React.createElement(props.is || A, { + return React.createElement(A, { "$$scopeClassName": "_B-80f4925f-9" + (props.$$scopeClassName ? " " + props.$$scopeClassName : ""), "class": "blarg", "key": "80f4925f-9", @@ -614,7 +614,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "className": "_A-80f4925f-7" + (props.$$scopeClassName ? " " + props.$$scopeClassName : ""), "key": "80f4925f-7", "ref": ref @@ -649,11 +649,11 @@ add_case! { import * as React from "react"; const _AB = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-7", "ref": ref }, - React.createElement("span", { + React.createElement(props.abba.as || "span", { ...props.abba, "className": "_AB-abba-80f4925f-6" + (props.abba && props.abba.className ? " " + props.abba.className : ""), "key": "80f4925f-6" @@ -697,7 +697,7 @@ add_case! { import * as React from "react"; const _AB = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-12", "ref": ref }, @@ -742,12 +742,12 @@ add_case! { import * as React from "react"; const _AB = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-5", "ref": ref }, props.items && props.items.map(props_items => [ - React.createElement("div", { + React.createElement(props_items.something.as || "div", { ...props_items.something, "className": "_AB-something-80f4925f-3" + (props_items.something && props_items.something.className ? " " + props_items.something.className : ""), "key": "80f4925f-3", @@ -778,7 +778,7 @@ add_case! { import * as React from "react"; const _AB = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-3", "ref": ref }, @@ -813,7 +813,7 @@ add_case! { import * as React from "react"; const ABTest = _12bdbcf9.default(React.forwardRef((props, ref) => { - return React.createElement("span", { + return React.createElement(props.test.as || "span", { ...props.test, "className": "_test-80f4925f-14" + (props.test && props.test.className ? " " + props.test.className : ""), "key": "80f4925f-14", @@ -831,7 +831,7 @@ add_case! { })); const _AB = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-15", "ref": ref }, @@ -867,7 +867,7 @@ add_case! { import * as React from "react"; const ABTest = _4897bf60.default(React.forwardRef((props, ref) => { - return React.createElement("span", { + return React.createElement(props.test.as || "span", { ...props.test, "className": "_test-80f4925f-8" + (props.test && props.test.className ? " " + props.test.className : ""), "key": "80f4925f-8", @@ -877,7 +877,7 @@ add_case! { })); const _AB = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-10", "ref": ref }, @@ -917,7 +917,7 @@ add_case! { import * as React from "react"; const _AB = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-8", "ref": ref }); @@ -928,7 +928,7 @@ add_case! { export { AB }; const _ABCD = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-18", "ref": ref }); @@ -958,7 +958,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "children": [ props.show ? [ "hello" @@ -990,12 +990,12 @@ add_case! { r#" import "./entry.pc.css"; import * as React from "react"; - + const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "key": "80f4925f-4", "ref": ref - }, + }, props.children || [ props.show ? [ "hello" @@ -1027,7 +1027,7 @@ add_case! { import * as React from "react"; const _A = (props, ref) => { - return React.createElement(props.is || "div", { + return React.createElement("div", { "children": [ props.stuff && props.stuff.map(props_stuff => [ "hello" @@ -1057,7 +1057,7 @@ add_case! { r#" import "./entry.pc.css"; import * as React from "react"; - + const _A = (props, ref) => { return React.createElement("span", { "className": "_A-80f4925f-4" }, "something"); }; diff --git a/libs/compiler-react/src/tests/typed_definition.rs b/libs/compiler-react/src/tests/typed_definition.rs index 1892363fe..719616348 100644 --- a/libs/compiler-react/src/tests/typed_definition.rs +++ b/libs/compiler-react/src/tests/typed_definition.rs @@ -59,7 +59,7 @@ add_case! { import * as React from "react"; export type BaseAProps = { - + "ref"?: any, }; export const A: React.FC; @@ -99,7 +99,7 @@ add_case! { import * as React from "react"; export type BaseAProps = { - + "ref"?: any, "class"?: string, }; @@ -122,7 +122,7 @@ add_case! { import * as React from "react"; export type BaseAProps = { - + "ref"?: any, "children"?: React.Children, }; @@ -145,7 +145,7 @@ add_case! { import * as React from "react"; export type BaseAProps = { - + "ref"?: any, "fsdfsdfs"?: any, }; @@ -168,9 +168,9 @@ add_case! { import * as React from "react"; export type BaseAProps = { - + "ref"?: any, - "ab"?: React.HTMLAttributes, + "ab"?: { as?: any } & React.HTMLAttributes, }; export const A: React.FC; "# @@ -200,14 +200,14 @@ add_case! { import * as React from "react"; export type BaseAProps = { - + "ref"?: any, - "something": React.ComponentProps, + "something": { as?: any } & React.ComponentProps, }; export const A: React.FC; export type BaseBProps = { - + "ref"?: any, }; export const B: React.FC; @@ -244,9 +244,9 @@ add_case! { import * as React from "react"; export type BaseAProps = { - + "ref"?: any, - "something": React.ComponentProps, + "something": { as?: any } & React.ComponentProps, }; export const A: React.FC; @@ -273,7 +273,7 @@ add_case! { import * as React from "react"; export type BaseAProps = { - + "ref"?: any, }; @@ -308,7 +308,7 @@ add_case! { r#" import * as React from "react"; export type BaseAProps = { - + "ref"?: any, "show"?: "b" | "a", }; @@ -335,7 +335,7 @@ add_case! { r#" import * as React from "react"; export type BaseAProps = { - + "ref"?: any, "items"?: Array<{ "onClick"?: any, @@ -378,7 +378,7 @@ add_case! { r#" import * as React from "react"; export type BaseAProps = { - + "ref"?: any, "a"?: Array<{ "b"?: Array<{ @@ -419,15 +419,15 @@ add_case! { import * as _5e3fc5cb from "./b.tsx"; import * as React from "react"; export type BaseBProps = { - + "ref"?: any, }; export const B: ReturnType; export type BaseAProps = { - + "ref"?: any, "a"?: Array<{ - "bb": React.ComponentProps, + "bb": { as?: any } & React.ComponentProps, }>, }; export const A: React.FC; @@ -453,7 +453,7 @@ add_case! { r#" import * as React from "react"; export type BaseAProps = { - + "ref"?: any, "show"?: boolean, }; @@ -482,7 +482,7 @@ add_case! { r#" import * as React from "react"; export type BaseAProps = { - + "ref"?: any, "show"?: boolean, }; From 2d7b1b8c140ea3ea24104579db9c6f19864f368c Mon Sep 17 00:00:00 2001 From: Craig Condon Date: Sun, 24 Dec 2023 09:44:56 -0600 Subject: [PATCH 2/2] v20.3.8 --- integrations/vscode/package-lock.json | 10 ++--- integrations/vscode/package.json | 8 ++-- lerna.json | 2 +- libs/config/package.json | 2 +- libs/designer-rust/package.json | 2 +- libs/designer/package.json | 16 +++---- libs/evaluator/package.json | 4 +- libs/js-common/package.json | 2 +- libs/node-cli/package.json | 4 +- libs/paperclip-loader/package.json | 4 +- libs/parser/package.json | 4 +- libs/proto/package.json | 4 +- libs/proto_ext/package.json | 2 +- libs/releases/package.json | 2 +- libs/web-renderer/package.json | 6 +-- libs/workspace/package.json | 10 ++--- yarn.lock | 64 +++++++++++++-------------- 17 files changed, 73 insertions(+), 73 deletions(-) diff --git a/integrations/vscode/package-lock.json b/integrations/vscode/package-lock.json index 672d4b54d..76501d461 100644 --- a/integrations/vscode/package-lock.json +++ b/integrations/vscode/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-paperclip", - "version": "20.3.7", + "version": "20.3.8", "lockfileVersion": 2, "requires": true, "publishConfig": { @@ -9,12 +9,12 @@ "packages": { "": { "name": "vscode-paperclip", - "version": "20.3.7", + "version": "20.3.8", "license": "MIT", "dependencies": { - "@paperclip-ui/common": "^20.3.7", - "@paperclip-ui/proto": "^20.3.7", - "@paperclip-ui/releases": "^20.3.7", + "@paperclip-ui/common": "^20.3.8", + "@paperclip-ui/proto": "^20.3.8", + "@paperclip-ui/releases": "^20.3.8", "execa": "^5.1.1", "get-port": "^3.2.0", "immer": "^9.0.15", diff --git a/integrations/vscode/package.json b/integrations/vscode/package.json index 033e50ee9..86b401afa 100644 --- a/integrations/vscode/package.json +++ b/integrations/vscode/package.json @@ -1,7 +1,7 @@ { "name": "vscode-paperclip", "displayName": "Paperclip", - "version": "20.3.7", + "version": "20.3.8", "publisher": "crcn", "preview": true, "private": true, @@ -99,9 +99,9 @@ }, "dependencies": { "@improbable-eng/grpc-web-node-http-transport": "^0.15.0", - "@paperclip-ui/common": "^20.3.7", - "@paperclip-ui/proto": "^20.3.7", - "@paperclip-ui/releases": "^20.3.7", + "@paperclip-ui/common": "^20.3.8", + "@paperclip-ui/proto": "^20.3.8", + "@paperclip-ui/releases": "^20.3.8", "color": "^4.2.3", "execa": "^5.1.1", "get-port": "^3.2.0", diff --git a/lerna.json b/lerna.json index 8b162ea29..4dc89d6d8 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useNx": true, "npmClient": "yarn", - "version": "20.3.7" + "version": "20.3.8" } diff --git a/libs/config/package.json b/libs/config/package.json index a74928d2d..58be26ad2 100644 --- a/libs/config/package.json +++ b/libs/config/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/config", - "version": "20.3.7", + "version": "20.3.8", "description": "Crate for managing paperclip config files + utils for things like:", "main": "index.js", "scripts": { diff --git a/libs/designer-rust/package.json b/libs/designer-rust/package.json index 13ef443ad..3b28fa417 100644 --- a/libs/designer-rust/package.json +++ b/libs/designer-rust/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/designer-rust", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "index.js", "private": true, diff --git a/libs/designer/package.json b/libs/designer/package.json index f709c5a98..988e0d803 100644 --- a/libs/designer/package.json +++ b/libs/designer/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/designer", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "index.js", "private": true, @@ -21,9 +21,9 @@ "@babel/preset-env": "^7.20.2", "@babel/preset-typescript": "^7.18.6", "@improbable-eng/grpc-web-node-http-transport": "^0.15.0", - "@paperclip-ui/evaluator": "^20.3.7", - "@paperclip-ui/parser": "^20.3.7", - "@paperclip-ui/workspace": "^20.3.7", + "@paperclip-ui/evaluator": "^20.3.8", + "@paperclip-ui/parser": "^20.3.8", + "@paperclip-ui/workspace": "^20.3.8", "@types/jest": "^29.2.3", "@types/react": "^18.0.21", "@types/react-dom": "^18.0.6", @@ -49,9 +49,9 @@ "webpack-dev-server": "^4.11.1" }, "dependencies": { - "@paperclip-ui/proto": "^20.3.7", - "@paperclip-ui/proto-ext": "^20.3.7", - "@paperclip-ui/web-renderer": "^20.3.7", + "@paperclip-ui/proto": "^20.3.8", + "@paperclip-ui/proto-ext": "^20.3.8", + "@paperclip-ui/web-renderer": "^20.3.8", "@types/color": "^3.0.3", "classnames": "^2.3.2", "color": "^4.2.3", @@ -60,7 +60,7 @@ "grpc-web": "^1.3.1", "immer": "^9.0.15", "lodash": "^4.17.21", - "paperclip-loader": "^20.3.7", + "paperclip-loader": "^20.3.8", "raw-loader": "^4.0.2", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", diff --git a/libs/evaluator/package.json b/libs/evaluator/package.json index b91072579..e532251dd 100644 --- a/libs/evaluator/package.json +++ b/libs/evaluator/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/evaluator", - "version": "20.3.7", + "version": "20.3.8", "private": true, "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "author": "", "license": "ISC", "dependencies": { - "@paperclip-ui/proto": "^20.3.7" + "@paperclip-ui/proto": "^20.3.8" }, "gitHead": "8104e4d9b0b976b8c8eccf1e4eee194a251bc76e" } diff --git a/libs/js-common/package.json b/libs/js-common/package.json index 04dbe97b4..3f8cb26e2 100644 --- a/libs/js-common/package.json +++ b/libs/js-common/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/common", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "lib/index.js", "publishConfig": { diff --git a/libs/node-cli/package.json b/libs/node-cli/package.json index 4790e61f0..0230b2a2e 100644 --- a/libs/node-cli/package.json +++ b/libs/node-cli/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/cli", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "lib/index.js", "publishConfig": { @@ -18,7 +18,7 @@ "author": "", "license": "ISC", "dependencies": { - "@paperclip-ui/releases": "^20.3.7", + "@paperclip-ui/releases": "^20.3.8", "execa": "^5.1.1" }, "gitHead": "9cbfaf54c043385661768ba1b1a41de3ec872d1d" diff --git a/libs/paperclip-loader/package.json b/libs/paperclip-loader/package.json index 59ade3a2d..773afc30c 100644 --- a/libs/paperclip-loader/package.json +++ b/libs/paperclip-loader/package.json @@ -1,6 +1,6 @@ { "name": "paperclip-loader", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "lib/index.js", "scripts": { @@ -23,7 +23,7 @@ "lodash": "^4.17.21" }, "dependencies": { - "@paperclip-ui/config": "^20.3.7", + "@paperclip-ui/config": "^20.3.8", "loader-utils": "^3.2.0" }, "gitHead": "9cbfaf54c043385661768ba1b1a41de3ec872d1d" diff --git a/libs/parser/package.json b/libs/parser/package.json index 2bf243198..d1a20c394 100644 --- a/libs/parser/package.json +++ b/libs/parser/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/parser", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "lib/index.js", "scripts": { @@ -13,7 +13,7 @@ "author": "", "license": "ISC", "dependencies": { - "@paperclip-ui/proto": "^20.3.7" + "@paperclip-ui/proto": "^20.3.8" }, "gitHead": "9cbfaf54c043385661768ba1b1a41de3ec872d1d" } diff --git a/libs/proto/package.json b/libs/proto/package.json index 119f61cdc..6bd5ebca3 100644 --- a/libs/proto/package.json +++ b/libs/proto/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/proto", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "index.js", "scripts": { @@ -28,7 +28,7 @@ "dependencies": { "@grpc/grpc-js": "^1.7.3", "@improbable-eng/grpc-web": "^0.15.0", - "@paperclip-ui/common": "^20.3.7", + "@paperclip-ui/common": "^20.3.8", "@types/node": "^18.11.9", "browser-headers": "^0.4.1", "rxjs": "^7.5.7", diff --git a/libs/proto_ext/package.json b/libs/proto_ext/package.json index e8c1e766c..064873c58 100644 --- a/libs/proto_ext/package.json +++ b/libs/proto_ext/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/proto-ext", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "index.js", "publishConfig": { diff --git a/libs/releases/package.json b/libs/releases/package.json index a60a53f7b..afbf09a13 100644 --- a/libs/releases/package.json +++ b/libs/releases/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/releases", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "lib/index.js", "scripts": { diff --git a/libs/web-renderer/package.json b/libs/web-renderer/package.json index ec02fb41e..c74241642 100644 --- a/libs/web-renderer/package.json +++ b/libs/web-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/web-renderer", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "lib/index.js", "private": true, @@ -14,8 +14,8 @@ "author": "", "license": "ISC", "dependencies": { - "@paperclip-ui/common": "^20.3.7", - "@paperclip-ui/proto": "^20.3.7", + "@paperclip-ui/common": "^20.3.8", + "@paperclip-ui/proto": "^20.3.8", "html-entities": "^1.2.1" }, "gitHead": "8104e4d9b0b976b8c8eccf1e4eee194a251bc76e" diff --git a/libs/workspace/package.json b/libs/workspace/package.json index 7425ab343..786e56449 100644 --- a/libs/workspace/package.json +++ b/libs/workspace/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/workspace", - "version": "20.3.7", + "version": "20.3.8", "description": "", "main": "index.js", "private": true, @@ -41,13 +41,13 @@ "ts-loader": "^9.3.1" }, "dependencies": { - "@paperclip-ui/designer": "^20.3.7", - "@paperclip-ui/proto": "^20.3.7", - "@paperclip-ui/web-renderer": "^20.3.7", + "@paperclip-ui/designer": "^20.3.8", + "@paperclip-ui/proto": "^20.3.8", + "@paperclip-ui/web-renderer": "^20.3.8", "grpc-web": "^1.3.1", "immer": "^9.0.15", "mocha": "^10.1.0", - "paperclip-loader": "^20.3.7", + "paperclip-loader": "^20.3.8", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", "react-hotkeys-hook": "^3.4.7", diff --git a/yarn.lock b/yarn.lock index 6c6195ad1..19509ec53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2224,14 +2224,14 @@ __metadata: version: 0.0.0-use.local resolution: "@paperclip-ui/cli@workspace:libs/node-cli" dependencies: - "@paperclip-ui/releases": ^20.3.7 + "@paperclip-ui/releases": ^20.3.8 execa: ^5.1.1 bin: paperclip: bin/paperclip languageName: unknown linkType: soft -"@paperclip-ui/common@^20.3.7, @paperclip-ui/common@workspace:libs/js-common": +"@paperclip-ui/common@^20.3.8, @paperclip-ui/common@workspace:libs/js-common": version: 0.0.0-use.local resolution: "@paperclip-ui/common@workspace:libs/js-common" dependencies: @@ -2241,7 +2241,7 @@ __metadata: languageName: unknown linkType: soft -"@paperclip-ui/config@^20.3.7, @paperclip-ui/config@workspace:libs/config": +"@paperclip-ui/config@^20.3.8, @paperclip-ui/config@workspace:libs/config": version: 0.0.0-use.local resolution: "@paperclip-ui/config@workspace:libs/config" languageName: unknown @@ -2255,7 +2255,7 @@ __metadata: languageName: unknown linkType: soft -"@paperclip-ui/designer@^20.3.7, @paperclip-ui/designer@workspace:libs/designer": +"@paperclip-ui/designer@^20.3.8, @paperclip-ui/designer@workspace:libs/designer": version: 0.0.0-use.local resolution: "@paperclip-ui/designer@workspace:libs/designer" dependencies: @@ -2263,12 +2263,12 @@ __metadata: "@babel/preset-env": ^7.20.2 "@babel/preset-typescript": ^7.18.6 "@improbable-eng/grpc-web-node-http-transport": ^0.15.0 - "@paperclip-ui/evaluator": ^20.3.7 - "@paperclip-ui/parser": ^20.3.7 - "@paperclip-ui/proto": ^20.3.7 - "@paperclip-ui/proto-ext": ^20.3.7 - "@paperclip-ui/web-renderer": ^20.3.7 - "@paperclip-ui/workspace": ^20.3.7 + "@paperclip-ui/evaluator": ^20.3.8 + "@paperclip-ui/parser": ^20.3.8 + "@paperclip-ui/proto": ^20.3.8 + "@paperclip-ui/proto-ext": ^20.3.8 + "@paperclip-ui/web-renderer": ^20.3.8 + "@paperclip-ui/workspace": ^20.3.8 "@types/color": ^3.0.3 "@types/jest": ^29.2.3 "@types/react": ^18.0.21 @@ -2291,7 +2291,7 @@ __metadata: lodash: ^4.17.21 mini-css-extract-plugin: ^2.6.1 nodemon: ^2.0.20 - paperclip-loader: ^20.3.7 + paperclip-loader: ^20.3.8 process: ^0.11.10 protoc-gen-grpc-web: ^1.4.0 raw-loader: ^4.0.2 @@ -2310,23 +2310,23 @@ __metadata: languageName: unknown linkType: soft -"@paperclip-ui/evaluator@^20.3.7, @paperclip-ui/evaluator@workspace:libs/evaluator": +"@paperclip-ui/evaluator@^20.3.8, @paperclip-ui/evaluator@workspace:libs/evaluator": version: 0.0.0-use.local resolution: "@paperclip-ui/evaluator@workspace:libs/evaluator" dependencies: - "@paperclip-ui/proto": ^20.3.7 + "@paperclip-ui/proto": ^20.3.8 languageName: unknown linkType: soft -"@paperclip-ui/parser@^20.3.7, @paperclip-ui/parser@workspace:libs/parser": +"@paperclip-ui/parser@^20.3.8, @paperclip-ui/parser@workspace:libs/parser": version: 0.0.0-use.local resolution: "@paperclip-ui/parser@workspace:libs/parser" dependencies: - "@paperclip-ui/proto": ^20.3.7 + "@paperclip-ui/proto": ^20.3.8 languageName: unknown linkType: soft -"@paperclip-ui/proto-ext@^20.3.7, @paperclip-ui/proto-ext@workspace:libs/proto_ext": +"@paperclip-ui/proto-ext@^20.3.8, @paperclip-ui/proto-ext@workspace:libs/proto_ext": version: 0.0.0-use.local resolution: "@paperclip-ui/proto-ext@workspace:libs/proto_ext" dependencies: @@ -2338,13 +2338,13 @@ __metadata: languageName: unknown linkType: soft -"@paperclip-ui/proto@^20.3.7, @paperclip-ui/proto@workspace:libs/proto": +"@paperclip-ui/proto@^20.3.8, @paperclip-ui/proto@workspace:libs/proto": version: 0.0.0-use.local resolution: "@paperclip-ui/proto@workspace:libs/proto" dependencies: "@grpc/grpc-js": ^1.7.3 "@improbable-eng/grpc-web": ^0.15.0 - "@paperclip-ui/common": ^20.3.7 + "@paperclip-ui/common": ^20.3.8 "@types/node": ^18.11.9 browser-headers: ^0.4.1 protoc-gen-grpc-js: ^0.4.0 @@ -2357,7 +2357,7 @@ __metadata: languageName: unknown linkType: soft -"@paperclip-ui/releases@^20.3.7, @paperclip-ui/releases@workspace:libs/releases": +"@paperclip-ui/releases@^20.3.8, @paperclip-ui/releases@workspace:libs/releases": version: 0.0.0-use.local resolution: "@paperclip-ui/releases@workspace:libs/releases" dependencies: @@ -2370,17 +2370,17 @@ __metadata: languageName: unknown linkType: soft -"@paperclip-ui/web-renderer@^20.3.7, @paperclip-ui/web-renderer@workspace:libs/web-renderer": +"@paperclip-ui/web-renderer@^20.3.8, @paperclip-ui/web-renderer@workspace:libs/web-renderer": version: 0.0.0-use.local resolution: "@paperclip-ui/web-renderer@workspace:libs/web-renderer" dependencies: - "@paperclip-ui/common": ^20.3.7 - "@paperclip-ui/proto": ^20.3.7 + "@paperclip-ui/common": ^20.3.8 + "@paperclip-ui/proto": ^20.3.8 html-entities: ^1.2.1 languageName: unknown linkType: soft -"@paperclip-ui/workspace@^20.3.7, @paperclip-ui/workspace@workspace:^, @paperclip-ui/workspace@workspace:libs/workspace": +"@paperclip-ui/workspace@^20.3.8, @paperclip-ui/workspace@workspace:^, @paperclip-ui/workspace@workspace:libs/workspace": version: 0.0.0-use.local resolution: "@paperclip-ui/workspace@workspace:libs/workspace" dependencies: @@ -2388,9 +2388,9 @@ __metadata: "@babel/preset-env": ^7.20.2 "@babel/preset-typescript": ^7.18.6 "@improbable-eng/grpc-web-node-http-transport": ^0.15.0 - "@paperclip-ui/designer": ^20.3.7 - "@paperclip-ui/proto": ^20.3.7 - "@paperclip-ui/web-renderer": ^20.3.7 + "@paperclip-ui/designer": ^20.3.8 + "@paperclip-ui/proto": ^20.3.8 + "@paperclip-ui/web-renderer": ^20.3.8 "@types/lodash": ^4.14.191 "@types/react": ^18.0.21 "@types/react-dom": ^18.0.6 @@ -2408,7 +2408,7 @@ __metadata: mini-css-extract-plugin: ^2.6.1 mocha: ^10.1.0 nodemon: ^2.0.20 - paperclip-loader: ^20.3.7 + paperclip-loader: ^20.3.8 process: ^0.11.10 protoc-gen-grpc-web: ^1.4.0 react: ^18.2.0 @@ -11578,11 +11578,11 @@ __metadata: languageName: node linkType: hard -"paperclip-loader@^20.3.7, paperclip-loader@workspace:libs/paperclip-loader": +"paperclip-loader@^20.3.8, paperclip-loader@workspace:libs/paperclip-loader": version: 0.0.0-use.local resolution: "paperclip-loader@workspace:libs/paperclip-loader" dependencies: - "@paperclip-ui/config": ^20.3.7 + "@paperclip-ui/config": ^20.3.8 cargo-cp-artifact: ^0.1 loader-utils: ^3.2.0 lodash: ^4.17.21 @@ -15210,9 +15210,9 @@ __metadata: resolution: "vscode-paperclip@workspace:integrations/vscode" dependencies: "@improbable-eng/grpc-web-node-http-transport": ^0.15.0 - "@paperclip-ui/common": ^20.3.7 - "@paperclip-ui/proto": ^20.3.7 - "@paperclip-ui/releases": ^20.3.7 + "@paperclip-ui/common": ^20.3.8 + "@paperclip-ui/proto": ^20.3.8 + "@paperclip-ui/releases": ^20.3.8 "@types/get-port": ^4.2.0 "@types/node": ^18.7.21 "@types/vscode": ^1.73.0