Merge remote-tracking branch 'upstream/master'

Author: xiaoliu-heng

.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/master/docs/common-questions.md)

.changeset/config.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
+  "changelog": "@changesets/cli/changelog",
+  "commit": false,
+  "linked": [],
+  "access": "restricted",
+  "baseBranch": "master",
+  "updateInternalDependencies": "patch",
+  "ignore": [
+    "@graphql-codegen/testing",
+    "@graphql-codegen/website"
+  ]
+}

.github/ISSUE_TEMPLATE/config.yml

@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
   - name: Have a question?
     url: https://github.com/dotansimha/graphql-code-generator/discussions/new
-    about: Not sure about something? need help from the community? have a question to our team? please ask and answer questions here. 
+    about: Not sure about something? need help from the community? have a question to our team? please ask and answer questions here.

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: '/'
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 20

.github/release-drafter.yml

@@ -1,25 +1,31 @@
 name: Canary Release
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
     branches:
       - master
+
 jobs:
   publish-canary:
     name: Publish Canary
-    timeout-minutes: 10
     runs-on: ubuntu-latest
-    if: contains(github.actor, 'renovate') == false
+    if: github.event.pull_request.head.repo.full_name == github.repository
     steps:
       - name: Checkout Master
         uses: actions/checkout@v1
       - name: Use Node
         uses: actions/setup-node@v1
         with:
           node-version: '14.x'
+      - name: Configure Git Credentials
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "theguild-bot"
+          echo "machine github.com login theguild-bot password ${{secrets.GH_API_TOKEN}}" > ~/.netrc
+      - name: Setup NPM credentials
+        run: echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
       - name: Get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -32,26 +38,32 @@ jobs:
             ${{ runner.os }}-14-yarn-
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
-      - name: Build
-        run: yarn build
-
       - name: Release Canary
         id: canary
         uses: 'kamilkisiela/release-canary@master'
-        if: github.repository == 'dotansimha/graphql-code-generator'
         with:
           npm-token: ${{ secrets.NODE_AUTH_TOKEN }}
-          npm-script: 'release:canary'
+          npm-script: 'yarn release:canary'
+          changesets: true
       - name: Publish a message
         if: steps.canary.outputs.released
         uses: 'kamilkisiela/pr-comment@master'
         with:
           message: |
-            The latest changes of this PR are available as alpha in npm: `${{ steps.canary.outputs.version }}`
-
-            Quickly update your package.json by running:
+            The latest changes of this PR are available as alpha in npm (based on the declared `changesets`):
 
-                npx match-version @graphql-codegen ${{ steps.canary.outputs.version }}
+            ```
+            ${{ steps.canary.outputs.changesetsPublishedPackages}}
+            ```
+          bot-token: ${{ secrets.GH_API_TOKEN }}
+          bot: 'theguild-bot'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish a empty message
+        if: steps.canary.outputs.released == 'false'
+        uses: 'kamilkisiela/pr-comment@master'
+        with:
+          message: |
+            The latest changes of this PR are not available as alpha, since there are no linked `changesets` for this PR.
           bot-token: ${{ secrets.GH_API_TOKEN }}
           bot: 'theguild-bot'
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/canary.yml

@@ -11,9 +11,9 @@ on:
 jobs:
   test:
     name: Testing on ${{matrix.os}} and Node ${{matrix.node_version}}
-    timeout-minutes: 10
     runs-on: ${{matrix.os}}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
         node_version: [10, 14]

.github/workflows/main.yml

@@ -1,9 +1,10 @@
-name: NPM Release
+name: Release
 on:
-  release:
-    types: [published]
+  push:
+    branches:
+      - master
 jobs:
-  build:
+  publish:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Master
@@ -40,17 +41,13 @@ jobs:
             ${{ runner.os }}-14-15-yarn-
       - name: Install Dependencies using Yarn
         run: yarn install && git checkout yarn.lock
-      - name: Build
-        run: yarn build
-      - name: Publish to NPM
-        run: npm run release
-        env:
-          RELEASE_VERSION: ${{ github.event.release.tag_name }}
-      - name: Commit updated package.json files
-        run: |
-          git add .
-          git commit -m "${{ github.event.release.tag_name }}"
-      - name: Push all the changes
-        uses: ad-m/github-push-action@master
+      - name: Create Release Pull Request or Publish to npm
+        id: changesets
+        uses: changesets/action@master
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish: yarn release
+          commit: 'chore(release): update monorepo packages versions'
+          title: 'Upcoming Release Changes'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

@@ -2,17 +2,14 @@ name: Website
 
 on:
   push:
-    tags:
-      - 'v*'
     branches:
       - master
 
 jobs:
   test:
     name: Deploy Website
-    timeout-minutes: 10
     runs-on: ubuntu-latest
-    if: contains(github.event.head_commit.message, '[deploy_website]') || contains(github.ref, 'refs/tags/')
+    if: contains(github.event.head_commit.message, '[deploy_website]') || contains(github.event.head_commit.message, 'update monorepo packages versions')
     steps:
       - name: Checkout
         uses: actions/checkout@v1