Skip to content

Commit

Permalink
refactor: update Nx & GraphQL to 15.0.13 & 0.79.3 (#71)
Browse files Browse the repository at this point in the history
  • Loading branch information
domjtalbot committed Nov 18, 2022
1 parent d23008b commit 68d8a7c
Show file tree
Hide file tree
Showing 546 changed files with 17,745 additions and 11,430 deletions.
5 changes: 5 additions & 0 deletions .changeset/neat-rules-glow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'nx-mesh': major
---

Update Nx to 15 & GraphQL Mesh to 0.79
5 changes: 5 additions & 0 deletions .changeset/silly-zoos-jump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'nx-mesh': minor
---

Add an option for choosing the GraphQL Mesh example project. Users can select from `javascript-wiki` (default), `stackexchange`, `trippin` & `weatherbit`.
5 changes: 5 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"rules": {}
},
{
"files": "*.json",
"parser": "jsonc-eslint-parser",
"rules": {}
}
]
}
4 changes: 2 additions & 2 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ runs:
steps:
- name: Setup Volta
if: inputs.node-version == 'config'
uses: volta-cli/action@485f6887c3c8b888e1bd55f0e0518423205fb2c5 # tag=v3.0.1
uses: volta-cli/action@v4.0.0

- name: Setup Volta
if: inputs.node-version != 'config'
uses: volta-cli/action@485f6887c3c8b888e1bd55f0e0518423205fb2c5 # tag=v3.0.1
uses: volta-cli/action@v4.0.0
with:
node-version: ${{ inputs.node-version }}

Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ on:
NX__TRIPPIN__API_KEY:
description: 'The Trippin API Key'
required: true
NX__WEATHERBIT__API_KEY:
description: 'The Weatherbit API Key'
required: true
NX_CLOUD_ACCESS_TOKEN:
description: 'The NX Cloud API token'
required: true
Expand All @@ -28,7 +25,6 @@ concurrency:

env:
NX__TRIPPIN__API_KEY: ${{ secrets.NX__TRIPPIN__API_KEY }}
NX__WEATHERBIT__API_KEY: ${{ secrets.NX__WEATHERBIT__API_KEY }}
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}

jobs:
Expand Down
50 changes: 6 additions & 44 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ on:
VERCEL_ORG_ID:
description: 'The Vercel ORG ID'
required: true
NX__NEXTJS_TRIPPIN__VERCEL_PROJECT_ID:
NX__NEXTJS__VERCEL_PROJECT_ID:
description: 'The nextjs/trippin Vercel Project Id'
required: true
NX__NEXTJS_TRIPPIN_SWC__VERCEL_PROJECT_ID:
description: 'The nextjs/trippin-swc Vercel Project Id'
required: true
VERCEL_TOKEN:
description: 'The Vercel API token'
required: true
Expand All @@ -30,45 +27,10 @@ concurrency:
group: deploy-${{ github.workflow }}-${{ github.ref }}

jobs:
deploy-nextjs-trippin:
name: Deploy NextJS Trippin
if: contains(inputs.apps, 'nextjs-trippin')
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
with:
fetch-depth: 0

- name: Deploy env
id: deploy-env
shell: bash
run: |
name=Preview
if [ ${{ inputs.production }} = true ]; then
name=Production
fi
echo The env is $name
echo ::set-output name=name::$name
- name: Deploy to Vercel Action
uses: BetaHuhn/deploy-to-vercel-action@efa119c0d369199d2c7b836131caae430faf15ed # tag=v1
with:
GITHUB_DEPLOYMENT_ENV: nextjs/trippin ${{ steps.deploy-env.outputs.name }}
GITHUB_DEPLOYMENT: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_LABELS: vercel
PRODUCTION: ${{ inputs.production }}
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.NX__NEXTJS_TRIPPIN__VERCEL_PROJECT_ID }}
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}

deploy-nextjs-trippin-swc:
name: Deploy NextJS Trippin SWC
deploy-nextjs:
name: Deploy NextJS
if: contains(inputs.apps, 'nextjs')
runs-on: ubuntu-latest
if: contains(inputs.apps, 'nextjs-trippin-swc')
steps:
- name: Check out repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
Expand All @@ -91,11 +53,11 @@ jobs:
- name: Deploy to Vercel Action
uses: BetaHuhn/deploy-to-vercel-action@efa119c0d369199d2c7b836131caae430faf15ed # tag=v1
with:
GITHUB_DEPLOYMENT_ENV: nextjs/trippin-swc ${{ steps.deploy-env.outputs.name }}
GITHUB_DEPLOYMENT_ENV: nextjs ${{ steps.deploy-env.outputs.name }}
GITHUB_DEPLOYMENT: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_LABELS: vercel
PRODUCTION: ${{ inputs.production }}
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.NX__NEXTJS_TRIPPIN_SWC__VERCEL_PROJECT_ID }}
VERCEL_PROJECT_ID: ${{ secrets.NX__NEXTJS__VERCEL_PROJECT_ID }}
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
1 change: 0 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ concurrency:

env:
NX__TRIPPIN__API_KEY: ${{ secrets.NX__TRIPPIN__API_KEY }}
NX__WEATHERBIT__API_KEY: ${{ secrets.NX__WEATHERBIT__API_KEY }}
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
NX_CLOUD_ENV_NAME: node-lts

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ concurrency:

env:
NX__TRIPPIN__API_KEY: ${{ secrets.NX__TRIPPIN__API_KEY }}
NX__WEATHERBIT__API_KEY: ${{ secrets.NX__WEATHERBIT__API_KEY }}
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
NX_CLOUD_ENV_NAME: node-lts

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,4 @@ typings/
!/.yarn/releases
!/.yarn/sdks
.yarn-integrity
/.pnp.*
/.pnp.*
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"eslint.validate": ["json"]
}
Loading

0 comments on commit 68d8a7c

Please sign in to comment.