misc: add shopify, webcomponents packages to monorepo

.github/workflows/ci.yml

@@ -153,10 +153,15 @@ jobs:
           path: packages/sdks-tests/playwright-report/
           retention-days: 30
 
-  gen1-sdk-core:
-    name: Gen 1 SDK Core
+  gen1:
+    name: Build (Gen 1)
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        package: ['sdk', 'webcomponents', 'shopify']
+
     steps:
       - name: Setup
         uses: actions/checkout@v4
@@ -176,7 +181,7 @@ jobs:
         run: yarn g:nx test @builder.io/sdk
 
       - name: Build Core
-        run: yarn g:nx build @builder.io/sdk
+        run: yarn g:nx build @builder.io/${{ matrix.package }}
 
   gen1-react-sdk:
     name: Gen 1 React SDK
@@ -241,12 +246,13 @@ jobs:
           retention-days: 30
 
   build:
+    name: Build
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        package: ['webcomponents', 'widgets']
+        package: ['widgets']
 
     steps:
       - uses: actions/checkout@v4

.yarn/versions/550b138a.yml

@@ -0,0 +1,4 @@
+undecided:
+  - "@builder.io/sdk"
+  - "@builder.io/react"
+  - "@builder.io/shopify"

package.json

@@ -10,7 +10,9 @@
     "packages/react-tests/*",
     "packages/sdks/e2e/*",
     "packages/sdks/snippets/*",
-    "packages/sdks/output/*"
+    "packages/sdks/output/*",
+    "packages/webcomponents",
+    "packages/shopify"
   ],
   "devDependencies": {
     "@changesets/cli": "^2.27.1",

packages/core/jest.config.ts

@@ -114,7 +114,7 @@ export default {
   // restoreMocks: false,
 
   // The root directory that Jest should scan for tests and modules within
-  // rootDir: undefined,
+  rootDir: 'src',
 
   // A list of paths to directories that Jest should use to search for files in
   // roots: [

packages/react/src/functions/with-builder.ts

@@ -1,7 +1,17 @@
 import { Component } from '@builder.io/sdk';
 import { BuilderBlock } from '../decorators/builder-block.decorator';
 
-export function withBuilder(component: Function, options: Component) {
+type DeriveReactComponentOrClass<A, B, C> =
+  Component extends React.Component<A, B, C>
+    ? React.Component<A, B, C>
+    : Component extends React.ComponentClass<A, B>
+      ? React.ComponentClass<A, B>
+      : never;
+
+export function withBuilder<A, B, C, T = DeriveReactComponentOrClass<A, B, C>>(
+  component: T,
+  options: Component
+): T {
   BuilderBlock(options)(component as any);
   return component;
 }

packages/shopify/js.js

@@ -1 +1 @@
-export * from './js/index.js';
+export * from './js/dist/index.js';

packages/shopify/js/utils/async.ts

@@ -42,7 +42,7 @@ export function toThenable(val: IterableIterator<any> | Thenable | any): Thenabl
     try {
       state = (val as IterableIterator<any>).next(prev);
     } catch (err) {
-      return mkReject(err);
+      return mkReject(err as Error);
     }
 
     if (state.done) return mkResolve(state.value);
@@ -51,7 +51,7 @@ export function toThenable(val: IterableIterator<any> | Thenable | any): Thenabl
       try {
         state = (val as IterableIterator<any>).throw!(err);
       } catch (e) {
-        return mkReject(e);
+        return mkReject(e as Error);
       }
       if (state.done) return mkResolve(state.value);
       return reduce(state.value);