@CodeSplit (#519)

* @autoCodesplit * node version in CI * handle conditionals via variables * handle conditionals * ci * up ncc * cache * ci * ci * adapt to aliased fragments * autoCodesplit -> codesplit * changelog * use main branch * ci * ci
zth · Jul 14, 2024 · 73953de · 73953de
1 parent acb4a4f
commit 73953de
Show file tree

Hide file tree

Showing 35 changed files with 1,423 additions and 45 deletions.
diff --git a/.github/workflows/bindings.yml b/.github/workflows/bindings.yml
@@ -17,13 +17,13 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
         env:
           CI: true
       - name: Install esy
         run: npm install -g esy
       - name: Build PPX
-        uses: esy/github-action@master
+        uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744
         with:
           cache-key: ${{ hashFiles('esy.lock/index.json') }}
           working-directory: packages/rescript-relay/rescript-relay-ppx

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
         env:
           CI: true
       - name: Esy install
@@ -70,15 +70,15 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
         env:
           CI: true
       - name: Install esy
         run: npm install -g esy
       - name: Build PPX
-        uses: esy/github-action@master
+        uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744
         with:
-          cache-key: ${{ matrix.platform }}-${{ hashFiles('esy.lock/index.json') }}-v3
+          cache-key: ${{ matrix.platform }}-${{ hashFiles('esy.lock/index.json') }}-v4
           working-directory: packages/rescript-relay/rescript-relay-ppx
       - name: Strip PPX binary
         if: runner.os != 'Windows'
@@ -154,15 +154,15 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: 16
+          node-version: 20
         env:
           CI: true
       - name: Install esy
         run: npm install -g esy
       - name: Build PPX
-        uses: esy/github-action@v1
+        uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744
         with:
-          cache-key: ${{ hashFiles('esy.lock/index.json') }}
+          cache-key: ${{ hashFiles('esy.lock/index.json') }}-v4
           working-directory: packages/rescript-relay/rescript-relay-ppx
       - name: Build assets
         env:

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.19.0
+          node-version: 20
         env:
           CI: true
       - name: Install

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -16,7 +16,7 @@ jobs:
           submodules: "true"
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
         env:
           CI: true
       - uses: actions-rs/toolchain@v1
@@ -25,12 +25,12 @@ jobs:
           override: true
       - name: Install esy
         run: npm install -g esy
-      - uses: esy/github-action@master
+      - uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744
         with:
           cache-key: ${{ hashFiles('esy.lock/index.json') }}
           working-directory: packages/rescript-relay/rescript-relay-ppx
       - name: Build PPX
-        uses: esy/github-action@master
+        uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744
         with:
           cache-key: ${{ hashFiles('esy.lock/index.json') }}
           working-directory: packages/rescript-relay/rescript-relay-ppx

diff --git a/.github/workflows/ppx.yml b/.github/workflows/ppx.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 20.x
         env:
           CI: true
       - name: Esy install
@@ -64,13 +64,13 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 20.x
         env:
           CI: true
       - name: Install esy
         run: npm install -g esy
       - name: Build PPX
-        uses: esy/github-action@master
+        uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744
         with:
           cache-key: ${{ matrix.platform }}-${{ hashFiles('esy.lock/index.json') }}-v3
           working-directory: packages/rescript-relay/rescript-relay-ppx

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 # Unreleased
 
 - Support `@alias` fragments.
+- Experimental support for `@codesplit`, a RescriptRelay exclusive directive that's essentially a client side version of [Relay data-driven dependencies (3D)](https://relay.dev/docs/glossary/#3d).
 
 # 3.0.0-rc.9
 

diff --git a/packages/relay b/packages/relay
diff --git a/packages/rescript-relay-cli/package.json b/packages/rescript-relay-cli/package.json
@@ -18,7 +18,7 @@
     "@types/node": "15.12.5",
     "@types/prettier": "2.3.0",
     "@types/relay-config": "6.0.1",
-    "@vercel/ncc": "0.28.6",
+    "@vercel/ncc": "0.38.1",
     "fast-glob": "3.2.6",
     "jest": "27.0.6",
     "ts-jest": "27.0.3",

diff --git a/packages/rescript-relay-cli/yarn.lock b/packages/rescript-relay-cli/yarn.lock
@@ -693,10 +693,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@vercel/ncc@0.28.6":
-  version "0.28.6"
-  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.28.6.tgz#073c0ce8e0269210c0a9f180fb0bf949eecc20e0"
-  integrity sha512-t4BoSSuyK8BZaUE0gV18V6bkFs4st7baumtFGa50dv1tMu2GDBEBF8sUZaKBdKiL6DzJ2D2+XVCwYWWDcQOYdQ==
+"@vercel/ncc@0.38.1":
+  version "0.38.1"
+  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.38.1.tgz#13f08738111e1d9e8a22fd6141f3590e54d9a60e"
+  integrity sha512-IBBb+iI2NLu4VQn3Vwldyi2QwaXt5+hTyh58ggAMoCGE6DJmPvwL3KPBWcJl1m9LYPChBLE980Jw+CS4Wokqxw==
 
 abab@^2.0.3, abab@^2.0.5:
   version "2.0.5"

diff --git a/packages/rescript-relay/__tests__/GroupAvatar.res b/packages/rescript-relay/__tests__/GroupAvatar.res
@@ -0,0 +1,11 @@
+module Fragment = %relay(`
+  fragment GroupAvatar_group on Group {
+    name
+  }
+`)
+
+@react.component
+let make = (~group: RescriptRelay.fragmentRefs<[#GroupAvatar_group]>) => {
+  let group = Fragment.use(group)
+  React.string("Group name: " ++ group.name)
+}
diff --git a/packages/rescript-relay/__tests__/HasNameComponent.res b/packages/rescript-relay/__tests__/HasNameComponent.res
@@ -0,0 +1,12 @@
+module Fragment = %relay(`
+  fragment HasNameComponent_hasName on HasName {
+    name
+  }
+`)
+
+@react.component
+let make = (~hasName: RescriptRelay.fragmentRefs<[#HasNameComponent_hasName]>) => {
+  let hasName = Fragment.use(hasName)
+
+  <div> {React.string("Has name: " ++ hasName.name)} </div>
+}
diff --git a/packages/rescript-relay/__tests__/RelayEnv.res b/packages/rescript-relay/__tests__/RelayEnv.res
@@ -23,7 +23,9 @@ let fetchQuery: RescriptRelay.Network.fetchFunctionPromise = async (
   )
 
   if Response.ok(resp) {
-    await Response.json(resp)
+    let json = await Response.json(resp)
+    RescriptRelay.Network.preloadResources(~operation, ~variables, ~response=json)
+    json
   } else {
     raise(Graphql_error("Request failed: " ++ Response.statusText(resp)))
   }

diff --git a/packages/rescript-relay/__tests__/RichContent.res b/packages/rescript-relay/__tests__/RichContent.res
@@ -0,0 +1,12 @@
+module Fragment = %relay(`
+  fragment RichContent_content on RichContent {
+    content
+  }
+`)
+
+@react.component
+let make = (~content: RescriptRelay.fragmentRefs<[#RichContent_content]>) => {
+  let content = Fragment.use(content)
+
+  <div> {React.string("Rich content: " ++ content.content)} </div>
+}
diff --git a/packages/rescript-relay/__tests__/Test_aliasedFragments.res b/packages/rescript-relay/__tests__/Test_aliasedFragments.res
@@ -23,12 +23,8 @@ module Test = {
   @react.component
   let make = () => {
     let query = Query.use(~variables={skipThing: false})
-    let firstNameData = FragmentFirstName.use(
-      query.loggedInUser.testAliasedFragments_userFirstName.fragmentRefs,
-    )
-    let lastNameData = FragmentLastName.useOpt(
-      query.loggedInUser.testAliasedFragments_userLastName->Belt.Option.map(f => f.fragmentRefs),
-    )
+    let firstNameData = FragmentFirstName.use(query.loggedInUser.testAliasedFragments_userFirstName)
+    let lastNameData = FragmentLastName.useOpt(query.loggedInUser.testAliasedFragments_userLastName)
 
     <div>
       {React.string(