diff --git a/integrations/vscode/package-lock.json b/integrations/vscode/package-lock.json index 76501d461..5955f0a78 100644 --- a/integrations/vscode/package-lock.json +++ b/integrations/vscode/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-paperclip", - "version": "20.3.8", + "version": "20.3.10", "lockfileVersion": 2, "requires": true, "publishConfig": { @@ -9,12 +9,12 @@ "packages": { "": { "name": "vscode-paperclip", - "version": "20.3.8", + "version": "20.3.10", "license": "MIT", "dependencies": { - "@paperclip-ui/common": "^20.3.8", - "@paperclip-ui/proto": "^20.3.8", - "@paperclip-ui/releases": "^20.3.8", + "@paperclip-ui/common": "^20.3.10", + "@paperclip-ui/proto": "^20.3.10", + "@paperclip-ui/releases": "^20.3.10", "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 86b401afa..20321bb19 100644 --- a/integrations/vscode/package.json +++ b/integrations/vscode/package.json @@ -1,7 +1,7 @@ { "name": "vscode-paperclip", "displayName": "Paperclip", - "version": "20.3.8", + "version": "20.3.10", "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.8", - "@paperclip-ui/proto": "^20.3.8", - "@paperclip-ui/releases": "^20.3.8", + "@paperclip-ui/common": "^20.3.10", + "@paperclip-ui/proto": "^20.3.10", + "@paperclip-ui/releases": "^20.3.10", "color": "^4.2.3", "execa": "^5.1.1", "get-port": "^3.2.0", diff --git a/lerna.json b/lerna.json index 4dc89d6d8..3af1d8529 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.8" + "version": "20.3.10" } diff --git a/libs/compiler-react/src/code_compiler.rs b/libs/compiler-react/src/code_compiler.rs index bc036ff49..1b12dd2f1 100644 --- a/libs/compiler-react/src/code_compiler.rs +++ b/libs/compiler-react/src/code_compiler.rs @@ -64,6 +64,7 @@ fn compile_document(document: &ast::Document, context: &mut Context) { collect_imports(document, &mut imports, context); compile_imports(&imports, context); + compile_utils(context); compile_nested_components(document, context); for item in &document.body { match item.get_inner() { @@ -265,6 +266,25 @@ fn compile_imports(imports: &BTreeMap>, context: &mut Con } } +fn compile_utils(context: &mut Context) { + context.add_buffer("\n"); + context.add_buffer("const omit = (obj, keys) => {\n"); + context.start_block(); + context.add_buffer("const newObj = {};\n"); + context.add_buffer("for (const key in obj) {\n"); + context.start_block(); + context.add_buffer("if (!keys.includes(key)) {\n"); + context.start_block(); + context.add_buffer("newObj[key] = obj[key];\n"); + context.end_block(); + context.add_buffer("}\n"); + context.end_block(); + context.add_buffer("}\n"); + context.add_buffer("return newObj;\n"); + context.end_block(); + context.add_buffer("};\n"); +} + macro_rules! compile_children { ($expr: expr, $cb: expr, $context: expr, $include_ary: expr) => {{ if $include_ary { @@ -458,7 +478,13 @@ fn compile_element(element: &ast::Element, info: &Info, context: &mut Context) { context.add_buffer("React.createElement("); if let Some(name) = &element.name { - context.add_buffer(format!("{}.{}.as || ", context.ctx_name, name).as_str()); + context.add_buffer( + format!( + "{}.{} && {}.{}.as || ", + context.ctx_name, name, context.ctx_name, name + ) + .as_str(), + ); } context.add_buffer(format!("{}, ", tag_name).as_str()); @@ -546,7 +572,7 @@ fn compile_element_parameters(element: &ast::Element, info: &Info, context: &mut context.add_buffer("{\n"); context.start_block(); if let Some(name) = &element.name { - context.add_buffer(format!("...{}.{},\n", context.ctx_name, name).as_str()); + context.add_buffer(format!("...omit({}.{}, [\"as\"]),\n", context.ctx_name, name).as_str()); } let mut attrs = raw_attrs.iter().peekable(); diff --git a/libs/compiler-react/src/tests/code.rs b/libs/compiler-react/src/tests/code.rs index c0d098b54..22591de30 100644 --- a/libs/compiler-react/src/tests/code.rs +++ b/libs/compiler-react/src/tests/code.rs @@ -65,6 +65,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("div", { "key": "80f4925f-1", @@ -87,6 +97,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("div", { "key": "80f4925f-1", @@ -112,6 +132,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("div", { "className": "_A-80f4925f-4" + (props.$$scopeClassName ? " " + props.$$scopeClassName : ""), @@ -135,9 +165,19 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { - return React.createElement(props.ab.as || "div", { - ...props.ab, + return React.createElement(props.ab && props.ab.as || "div", { + ...omit(props.ab, ["as"]), "className": "_A-ab-80f4925f-1" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.ab && props.ab.className ? " " + props.ab.className : ""), "key": "80f4925f-1", "ref": ref @@ -160,6 +200,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("span", { "key": "80f4925f-2", @@ -183,6 +233,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("span", { "aria-label": "something", @@ -205,9 +265,19 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { - return React.createElement(props.ab.as || "span", { - ...props.ab, + return React.createElement(props.ab && props.ab.as || "span", { + ...omit(props.ab, ["as"]), "className": "cd" + " " + "_A-ab-80f4925f-3" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.ab && props.ab.className ? " " + props.ab.className : ""), "key": "80f4925f-3", "ref": ref @@ -232,6 +302,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("span", { "key": "80f4925f-2", @@ -257,6 +337,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return "ab"; }; @@ -277,6 +367,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("div", { "key": "80f4925f-2", @@ -300,6 +400,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return props.abba; }; @@ -323,6 +433,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return props.abba || [ "a", @@ -353,6 +473,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return props.abba; }; @@ -389,6 +519,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return props.abba; }; @@ -421,6 +561,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("div", { "key": "80f4925f-3", @@ -447,9 +597,19 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _B = (props, ref) => { - return React.createElement(props.root.as || "div", { - ...props.root, + return React.createElement(props.root && props.root.as || "div", { + ...omit(props.root, ["as"]), "className": "_B-root-80f4925f-1" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.root && props.root.className ? " " + props.root.className : ""), "key": "80f4925f-1", "ref": ref @@ -459,8 +619,8 @@ add_case! { let B = React.memo(React.forwardRef(_B)); const _A = (props, ref) => { - return React.createElement(props.root.as || B, { - ...props.root, + return React.createElement(props.root && props.root.as || B, { + ...omit(props.root, ["as"]), "$$scopeClassName": "_A-root-80f4925f-4" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.root && props.root.className ? " " + props.root.className : ""), "key": "80f4925f-4", "ref": ref @@ -485,6 +645,16 @@ add_case! { import * as test from "/test.pc"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement(test.B, { "$$scopeClassName": "_A-80f4925f-2" + (props.$$scopeClassName ? " " + props.$$scopeClassName : ""), @@ -523,9 +693,19 @@ add_case! { import * as test from "/test.pc"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { - return React.createElement(props.root.as || "div", { - ...props.root, + return React.createElement(props.root && props.root.as || "div", { + ...omit(props.root, ["as"]), "className": props.class + " " + "_A-root-80f4925f-4" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.root && props.root.className ? " " + props.root.className : ""), "key": "80f4925f-4", "ref": ref @@ -568,9 +748,19 @@ add_case! { import * as test from "/test.pc"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { - return React.createElement(props.root.as || "div", { - ...props.root, + return React.createElement(props.root && props.root.as || "div", { + ...omit(props.root, ["as"]), "className": props.class + " " + "_A-root-80f4925f-4" + (props.$$scopeClassName ? " " + props.$$scopeClassName : "") + (props.root && props.root.className ? " " + props.root.className : ""), "key": "80f4925f-4", "ref": ref @@ -613,6 +803,16 @@ add_case! { import * as test from "/test.pc"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("div", { "className": "_A-80f4925f-7" + (props.$$scopeClassName ? " " + props.$$scopeClassName : ""), @@ -648,13 +848,23 @@ add_case! { import * as _f2903221 from "./test.js"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _AB = (props, ref) => { return React.createElement("div", { "key": "80f4925f-7", "ref": ref }, - React.createElement(props.abba.as || "span", { - ...props.abba, + React.createElement(props.abba && props.abba.as || "span", { + ...omit(props.abba, ["as"]), "className": "_AB-abba-80f4925f-6" + (props.abba && props.abba.className ? " " + props.abba.className : ""), "key": "80f4925f-6" }) @@ -696,6 +906,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _AB = (props, ref) => { return React.createElement("div", { "key": "80f4925f-12", @@ -741,14 +961,24 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _AB = (props, ref) => { return React.createElement("div", { "key": "80f4925f-5", "ref": ref }, props.items && props.items.map(props_items => [ - React.createElement(props_items.something.as || "div", { - ...props_items.something, + React.createElement(props_items.something && props_items.something.as || "div", { + ...omit(props_items.something, ["as"]), "className": "_AB-something-80f4925f-3" + (props_items.something && props_items.something.className ? " " + props_items.something.className : ""), "key": "80f4925f-3", "onClick": props_items.onClick @@ -777,6 +1007,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _AB = (props, ref) => { return React.createElement("div", { "key": "80f4925f-3", @@ -812,9 +1052,19 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const ABTest = _12bdbcf9.default(React.forwardRef((props, ref) => { - return React.createElement(props.test.as || "span", { - ...props.test, + return React.createElement(props.test && props.test.as || "span", { + ...omit(props.test, ["as"]), "className": "_test-80f4925f-14" + (props.test && props.test.className ? " " + props.test.className : ""), "key": "80f4925f-14", "onMouseDown": props.onMouseDown, @@ -866,9 +1116,19 @@ add_case! { import * as _4897bf60 from "./item.tsx"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const ABTest = _4897bf60.default(React.forwardRef((props, ref) => { - return React.createElement(props.test.as || "span", { - ...props.test, + return React.createElement(props.test && props.test.as || "span", { + ...omit(props.test, ["as"]), "className": "_test-80f4925f-8" + (props.test && props.test.className ? " " + props.test.className : ""), "key": "80f4925f-8", "onMouseDown": props.onMouseDown, @@ -916,6 +1176,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _AB = (props, ref) => { return React.createElement("div", { "key": "80f4925f-8", @@ -957,6 +1227,17 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + +const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; +}; + const _A = (props, ref) => { return React.createElement("div", { "children": [ @@ -991,6 +1272,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("div", { "key": "80f4925f-4", @@ -1026,6 +1317,16 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; +const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; +}; + const _A = (props, ref) => { return React.createElement("div", { "children": [ @@ -1058,6 +1359,17 @@ add_case! { import "./entry.pc.css"; import * as React from "react"; + + const omit = (obj, keys) => { + const newObj = {}; + for (const key in obj) { + if (!keys.includes(key)) { + newObj[key] = obj[key]; + } + } + return newObj; + }; + const _A = (props, ref) => { return React.createElement("span", { "className": "_A-80f4925f-4" }, "something"); }; diff --git a/libs/config/package.json b/libs/config/package.json index 58be26ad2..85157f6af 100644 --- a/libs/config/package.json +++ b/libs/config/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/config", - "version": "20.3.8", + "version": "20.3.10", "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 3b28fa417..2328800e5 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.8", + "version": "20.3.10", "description": "", "main": "index.js", "private": true, diff --git a/libs/designer/package.json b/libs/designer/package.json index 988e0d803..4e259b8e5 100644 --- a/libs/designer/package.json +++ b/libs/designer/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/designer", - "version": "20.3.8", + "version": "20.3.10", "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.8", - "@paperclip-ui/parser": "^20.3.8", - "@paperclip-ui/workspace": "^20.3.8", + "@paperclip-ui/evaluator": "^20.3.10", + "@paperclip-ui/parser": "^20.3.10", + "@paperclip-ui/workspace": "^20.3.10", "@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.8", - "@paperclip-ui/proto-ext": "^20.3.8", - "@paperclip-ui/web-renderer": "^20.3.8", + "@paperclip-ui/proto": "^20.3.10", + "@paperclip-ui/proto-ext": "^20.3.10", + "@paperclip-ui/web-renderer": "^20.3.10", "@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.8", + "paperclip-loader": "^20.3.10", "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 e532251dd..655b1d166 100644 --- a/libs/evaluator/package.json +++ b/libs/evaluator/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/evaluator", - "version": "20.3.8", + "version": "20.3.10", "private": true, "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "author": "", "license": "ISC", "dependencies": { - "@paperclip-ui/proto": "^20.3.8" + "@paperclip-ui/proto": "^20.3.10" }, "gitHead": "8104e4d9b0b976b8c8eccf1e4eee194a251bc76e" } diff --git a/libs/js-common/package.json b/libs/js-common/package.json index 3f8cb26e2..54fde9d6f 100644 --- a/libs/js-common/package.json +++ b/libs/js-common/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/common", - "version": "20.3.8", + "version": "20.3.10", "description": "", "main": "lib/index.js", "publishConfig": { diff --git a/libs/node-cli/package.json b/libs/node-cli/package.json index 0230b2a2e..49d525b97 100644 --- a/libs/node-cli/package.json +++ b/libs/node-cli/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/cli", - "version": "20.3.8", + "version": "20.3.10", "description": "", "main": "lib/index.js", "publishConfig": { @@ -18,7 +18,7 @@ "author": "", "license": "ISC", "dependencies": { - "@paperclip-ui/releases": "^20.3.8", + "@paperclip-ui/releases": "^20.3.10", "execa": "^5.1.1" }, "gitHead": "9cbfaf54c043385661768ba1b1a41de3ec872d1d" diff --git a/libs/paperclip-loader/package.json b/libs/paperclip-loader/package.json index 773afc30c..01c2294cd 100644 --- a/libs/paperclip-loader/package.json +++ b/libs/paperclip-loader/package.json @@ -1,6 +1,6 @@ { "name": "paperclip-loader", - "version": "20.3.8", + "version": "20.3.10", "description": "", "main": "lib/index.js", "scripts": { @@ -23,7 +23,7 @@ "lodash": "^4.17.21" }, "dependencies": { - "@paperclip-ui/config": "^20.3.8", + "@paperclip-ui/config": "^20.3.10", "loader-utils": "^3.2.0" }, "gitHead": "9cbfaf54c043385661768ba1b1a41de3ec872d1d" diff --git a/libs/parser/package.json b/libs/parser/package.json index d1a20c394..38cd47f2c 100644 --- a/libs/parser/package.json +++ b/libs/parser/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/parser", - "version": "20.3.8", + "version": "20.3.10", "description": "", "main": "lib/index.js", "scripts": { @@ -13,7 +13,7 @@ "author": "", "license": "ISC", "dependencies": { - "@paperclip-ui/proto": "^20.3.8" + "@paperclip-ui/proto": "^20.3.10" }, "gitHead": "9cbfaf54c043385661768ba1b1a41de3ec872d1d" } diff --git a/libs/proto/package.json b/libs/proto/package.json index 6bd5ebca3..6c8d24c22 100644 --- a/libs/proto/package.json +++ b/libs/proto/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/proto", - "version": "20.3.8", + "version": "20.3.10", "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.8", + "@paperclip-ui/common": "^20.3.10", "@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 064873c58..283900709 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.8", + "version": "20.3.10", "description": "", "main": "index.js", "publishConfig": { diff --git a/libs/releases/package.json b/libs/releases/package.json index afbf09a13..c077a8346 100644 --- a/libs/releases/package.json +++ b/libs/releases/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/releases", - "version": "20.3.8", + "version": "20.3.10", "description": "", "main": "lib/index.js", "scripts": { diff --git a/libs/web-renderer/package.json b/libs/web-renderer/package.json index c74241642..b410dd3bb 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.8", + "version": "20.3.10", "description": "", "main": "lib/index.js", "private": true, @@ -14,8 +14,8 @@ "author": "", "license": "ISC", "dependencies": { - "@paperclip-ui/common": "^20.3.8", - "@paperclip-ui/proto": "^20.3.8", + "@paperclip-ui/common": "^20.3.10", + "@paperclip-ui/proto": "^20.3.10", "html-entities": "^1.2.1" }, "gitHead": "8104e4d9b0b976b8c8eccf1e4eee194a251bc76e" diff --git a/libs/workspace/package.json b/libs/workspace/package.json index 786e56449..cb2b15e30 100644 --- a/libs/workspace/package.json +++ b/libs/workspace/package.json @@ -1,6 +1,6 @@ { "name": "@paperclip-ui/workspace", - "version": "20.3.8", + "version": "20.3.10", "description": "", "main": "index.js", "private": true, @@ -41,13 +41,13 @@ "ts-loader": "^9.3.1" }, "dependencies": { - "@paperclip-ui/designer": "^20.3.8", - "@paperclip-ui/proto": "^20.3.8", - "@paperclip-ui/web-renderer": "^20.3.8", + "@paperclip-ui/designer": "^20.3.10", + "@paperclip-ui/proto": "^20.3.10", + "@paperclip-ui/web-renderer": "^20.3.10", "grpc-web": "^1.3.1", "immer": "^9.0.15", "mocha": "^10.1.0", - "paperclip-loader": "^20.3.8", + "paperclip-loader": "^20.3.10", "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 19509ec53..e5fe0ac25 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.8 + "@paperclip-ui/releases": ^20.3.10 execa: ^5.1.1 bin: paperclip: bin/paperclip languageName: unknown linkType: soft -"@paperclip-ui/common@^20.3.8, @paperclip-ui/common@workspace:libs/js-common": +"@paperclip-ui/common@^20.3.10, @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.8, @paperclip-ui/config@workspace:libs/config": +"@paperclip-ui/config@^20.3.10, @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.8, @paperclip-ui/designer@workspace:libs/designer": +"@paperclip-ui/designer@^20.3.10, @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.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 + "@paperclip-ui/evaluator": ^20.3.10 + "@paperclip-ui/parser": ^20.3.10 + "@paperclip-ui/proto": ^20.3.10 + "@paperclip-ui/proto-ext": ^20.3.10 + "@paperclip-ui/web-renderer": ^20.3.10 + "@paperclip-ui/workspace": ^20.3.10 "@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.8 + paperclip-loader: ^20.3.10 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.8, @paperclip-ui/evaluator@workspace:libs/evaluator": +"@paperclip-ui/evaluator@^20.3.10, @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.8 + "@paperclip-ui/proto": ^20.3.10 languageName: unknown linkType: soft -"@paperclip-ui/parser@^20.3.8, @paperclip-ui/parser@workspace:libs/parser": +"@paperclip-ui/parser@^20.3.10, @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.8 + "@paperclip-ui/proto": ^20.3.10 languageName: unknown linkType: soft -"@paperclip-ui/proto-ext@^20.3.8, @paperclip-ui/proto-ext@workspace:libs/proto_ext": +"@paperclip-ui/proto-ext@^20.3.10, @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.8, @paperclip-ui/proto@workspace:libs/proto": +"@paperclip-ui/proto@^20.3.10, @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.8 + "@paperclip-ui/common": ^20.3.10 "@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.8, @paperclip-ui/releases@workspace:libs/releases": +"@paperclip-ui/releases@^20.3.10, @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.8, @paperclip-ui/web-renderer@workspace:libs/web-renderer": +"@paperclip-ui/web-renderer@^20.3.10, @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.8 - "@paperclip-ui/proto": ^20.3.8 + "@paperclip-ui/common": ^20.3.10 + "@paperclip-ui/proto": ^20.3.10 html-entities: ^1.2.1 languageName: unknown linkType: soft -"@paperclip-ui/workspace@^20.3.8, @paperclip-ui/workspace@workspace:^, @paperclip-ui/workspace@workspace:libs/workspace": +"@paperclip-ui/workspace@^20.3.10, @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.8 - "@paperclip-ui/proto": ^20.3.8 - "@paperclip-ui/web-renderer": ^20.3.8 + "@paperclip-ui/designer": ^20.3.10 + "@paperclip-ui/proto": ^20.3.10 + "@paperclip-ui/web-renderer": ^20.3.10 "@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.8 + paperclip-loader: ^20.3.10 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.8, paperclip-loader@workspace:libs/paperclip-loader": +"paperclip-loader@^20.3.10, 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.8 + "@paperclip-ui/config": ^20.3.10 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.8 - "@paperclip-ui/proto": ^20.3.8 - "@paperclip-ui/releases": ^20.3.8 + "@paperclip-ui/common": ^20.3.10 + "@paperclip-ui/proto": ^20.3.10 + "@paperclip-ui/releases": ^20.3.10 "@types/get-port": ^4.2.0 "@types/node": ^18.7.21 "@types/vscode": ^1.73.0