Skip to content

Commit

Permalink
Merge branch 'main' into hs/reverse-pagination
Browse files Browse the repository at this point in the history
  • Loading branch information
Iron-Ham committed Dec 11, 2023
2 parents bf4929b + 1c584be commit dc7bed5
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 14 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,24 @@ jobs:
shell: bash
run: |
./scripts/run-test-codegen-configurations.sh -t
verify-frontend-bundle-latest:
runs-on: macos-13
needs: [changes]
if: ${{ needs.changes.outputs.codegen == 'true' }}
timeout-minutes: 5
name: Verify Frontend Bundle Latest - macOS
steps:
- name: Checkout Repo
uses: actions/checkout@v3
- name: Build JS Bundle
shell: bash
working-directory: apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript
run: npm install && ./auto_rollup.sh
- name: Verify Latest
shell: bash
run: |
git diff --exit-code
run-cocoapods-integration-tests:
runs-on: macos-13
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/usr/bin/env bash
set -e

SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
output_file="$SCRIPT_DIR/../ApolloCodegenFrontendBundle.swift"
$( cd "$SCRIPT_DIR" && rollup -c )
cd "$SCRIPT_DIR" && npm run build
minJS=$(cat "$SCRIPT_DIR/dist/ApolloCodegenFrontend.bundle.js")
printf "%s%s%s" "let ApolloCodegenFrontendBundle: String = #\"" "$minJS" "\"#" > $output_file
printf "%s%s%s" "let ApolloCodegenFrontendBundle: String = #\"" "$minJS" "\"#" > "$output_file"
exit 0
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@
"license": "MIT",
"author": "Apollo GraphQL <[email protected]>",
"scripts": {
"build": "rollup --config",
"build": "rollup --config --bundleConfigAsCjs",
"test": "jest"
},
"engines": {
"npm": ">=7"
},
"dependencies": {
"graphql": "17.0.0-alpha.3",
"graphql": "17.0.0-alpha.2",
"tslib": "^2.3.0"
},
"devDependencies": {
"@rollup/plugin-node-resolve": "15.2.3",
"@rollup/plugin-replace": "5.0.5",
"@rollup/plugin-typescript": "11.1.5",
"@types/common-tags": "1.8.4",
"@types/jest": "26.0.24",
"@types/jest": "29.5.10",
"common-tags": "1.8.2",
"jest": "26.6.3",
"rollup": "2.79.1",
"rollup-plugin-terser": "7.0.2",
"ts-jest": "26.5.6",
"typescript": "4.9.5"
"jest": "29.7.0",
"rollup": "4.6.1",
"@rollup/plugin-terser": "0.4.4",
"ts-jest": "29.1.1",
"typescript": "5.3.2"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import typescript from "@rollup/plugin-typescript";
import { nodeResolve } from "@rollup/plugin-node-resolve";
import replace from "@rollup/plugin-replace";
import { terser } from "rollup-plugin-terser";
import terser from "@rollup/plugin-terser";

/** @type {import('rollup').RollupOptions} */
const options = {
Expand All @@ -21,6 +21,7 @@ const options = {
dedupe: ["graphql"],
}),
replace({
preventAssignment: true,
"process.env.NODE_ENV": JSON.stringify("production"),
}),
terser({
Expand Down
9 changes: 8 additions & 1 deletion apollo-ios-pagination/README.md
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
# apollo-ios-pagination
# README

> [!IMPORTANT]
> This library is currently pre-release and in active development. The API is subject to breaking changes until the first stable release.
## `ApolloPagination` is a simple pagination library for iOS that works with Apollo GraphQL queries

`ApolloPagination` allows you to easily watch paginated queries.
2 changes: 1 addition & 1 deletion apollo-ios/Sources/Apollo/ApolloInterceptor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public protocol ApolloInterceptor {
/// Each operation request has it's own interceptor request chain so the interceptors do not
/// need to be uniquely identifiable between each and every request, only unique between the
/// list of interceptors in a single request.
var id: String { get set }
var id: String { get }

/// Called when this interceptor should do its work.
///
Expand Down

0 comments on commit dc7bed5

Please sign in to comment.