Merge branch 'main' of https://github.com/gridaco/designto-code into staging

Author: softmarshmallow

packages/builder-web-core/builders/build-style-map.ts

@@ -1,7 +1,7 @@
 import { CSSProperties } from "@coli.codes/css";
 import { WidgetKeyId, StylableJsxWidget, JsxWidget } from "@web-builder/core";
 import { JSXAttributes, JSXIdentifier, ScopedVariableNamer } from "coli";
-import { buildStyledComponentConfig } from "../../builder-web-styled-components";
+import { buildStyledComponentConfig } from "@web-builder/styled";
 
 export interface JSXWithStyleElementConfig {
   id: string;

…builder-web-nodejs/package/dependency.ts …uilder-web-nodejs/_package/dependency.tspackages/builder-web-nodejs/package/dependency.ts renamed to packages/builder-web-nodejs/_package/dependency.ts packages/builder-web-nodejs/package/dependency.ts renamed to packages/builder-web-nodejs/_package/dependency.ts

@@ -1,5 +1,5 @@
-// the name "package" is reserved. using "packages" with "s" instead.
-export * as packages from "./package";
+// the name "package" is reserved. (will cause import issue while compiling) using "_package" with "_" instead.
+export * from "./_package";
 
 // no-repacking - already packed inside. export "standard_libraries"
 export * from "./stdlib";

…ages/builder-web-nodejs/package/index.ts …ges/builder-web-nodejs/_package/index.tspackages/builder-web-nodejs/package/index.ts renamed to packages/builder-web-nodejs/_package/index.ts packages/builder-web-nodejs/package/index.ts renamed to packages/builder-web-nodejs/_package/index.ts

@@ -1,4 +1,4 @@
-import { PackageManifest } from "../../../builder-web-nodejs/package/manifest";
+import { PackageManifest } from "@coli.codes/nodejs-builder";
 
 /**
  * ```
@@ -37,10 +37,9 @@ import { PackageManifest } from "../../../builder-web-nodejs/package/manifest";
 }
  * ```
  */
-export const CRA_TYPESCRIPT_PACKAGE_PRESET: PackageManifest = new PackageManifest(
-  {
-    name: "@packages.bridged.xyz/react-typescript",
-    description: "Bridged React Typescript Preset",
+export const CRA_TYPESCRIPT_PACKAGE_PRESET: PackageManifest =
+  new PackageManifest({
+    name: "@packages.grida.co/react-typescript",
+    description: "Grida React Typescript Preset",
     version: "0.0.0",
-  }
-);
+  });

…s/builder-web-nodejs/package/manifest.ts …/builder-web-nodejs/_package/manifest.tspackages/builder-web-nodejs/package/manifest.ts renamed to packages/builder-web-nodejs/_package/manifest.ts packages/builder-web-nodejs/package/manifest.ts renamed to packages/builder-web-nodejs/_package/manifest.ts

@@ -30,16 +30,16 @@ export type WrappingToken =
  * @returns
  */
 export function unwrappedChild(maybeWrapped: Widget): Widget {
-  const wrapped =
+  if (
     maybeWrapped instanceof SizedBox ||
     maybeWrapped instanceof Stretched ||
     maybeWrapped instanceof Positioned ||
     maybeWrapped instanceof OverflowBox ||
     maybeWrapped instanceof Rotation ||
     maybeWrapped instanceof Opacity ||
     maybeWrapped instanceof Blurred ||
-    maybeWrapped instanceof ClipRRect;
-  if (wrapped) {
+    maybeWrapped instanceof ClipRRect
+  ) {
     return unwrappedChild(maybeWrapped.child);
   }
   return maybeWrapped;