Repo infra overhaul (#2613)

* Switch to changesets for releases
* Update repo to use npm workspaces
* Update repo node / npm version
* Use volta for local dev and CI node version mgmt.
* Modernize and simplify CI steps

Author: trevor-scheer

.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/main/docs/common-questions.md)

.changeset/config.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
+  "changelog": [
+    "@changesets/changelog-github",
+    { "repo": "apollographql/apollo-tooling" }
+  ],
+  "commit": false,
+  "linked": [],
+  "access": "restricted",
+  "baseBranch": "master",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

.circleci/config.yml

@@ -1,145 +1,63 @@
 version: 2.1
 
-# These "CircleCI Orbs" are reusable bits of configuration that can be shared
-# across projects.  See https://circleci.com/orbs/ for more information.
 orbs:
-  # `oss` is a local reference to the package.  The source for Apollo Orbs can
-  # be found at http://github.com/apollographql/CircleCI-Orbs.
-  oss: apollo/[email protected]
-  # win is a windows orb provided by circleci
-  win: circleci/[email protected]
+  node: circleci/[email protected]
 
 commands:
-  # These are the steps used for each version of Node which we're testing
-  # against.  Thanks to YAMLs inability to merge arrays (though it is able
-  # to merge objects), every version of Node must use the exact same steps,
-  # or these steps would need to be repeated in a version of Node that needs
-  # something different.  Probably best to avoid that, out of principle, though.
-  common_test_steps:
-    description: Commands to run on every Node.js environment
+  install-volta:
+    description: Install volta to manage Node/npm versions
     steps:
-      - oss/install_specific_npm_version:
-          version: '7'
-      - checkout
-      - oss/npm_clean_install_with_caching
-      - run: npm run circle
-
-# Important! When adding a new job to `jobs`, make sure to define when it
-# executes by also adding it to the `workflows` section below!
-jobs:
-  # Platform tests, each with the same tests but different platform or version.
-  NodeJS 12:
-    docker:
-      - image: cimg/node:12.22.8
-    steps:
-      - common_test_steps
-
-  NodeJS 14 Windows:
-    executor:
-      name: win/default
-    environment:
-      # Note: This is a no-op at the second, but bear with me on this.  If this
-      # comment is not removed by 2021-06-30 remove it along with the next line.
-      # renovate: datasource=github-tags depName=nodejs/node versioning=node
-      NODE_VERSION: 14.17.5
-      NPM_VERSION: 7.10.0
-    steps:
-      - run: git config --global core.autocrlf false
       - run:
-          name: Install desired Node.js version with nvm
+          name: Install volta
+          # Teach the volta installer to update Circle's special env
+          # file instead of the default.
           command: |
-            nvm install ${Env:NODE_VERSION}
-            nvm on
-      - run:
-          # https://github.com/coreybutler/nvm-windows/issues/300
-          # Have to move the command out of the way because it can't
-          # overwrite itself otherwise.   This is madness, but apparently
-          # accepted.  Other things I tried: using yarn to install npm,
-          # using http://npm.im/npm-windows-upgrade and even shouting.
-          name: Install specific version of npm in a crazy Windows way
-          command: |
-            $node_dir = (get-item (get-command npm).source).directory.fullname
-            foreach ($cmd in @("npm", "npx")) {
-              foreach ($ext in @(".ps1", ".cmd", "")) {
-                if (Test-Path "$node_dir/$cmd$ext") {
-                  rename-item -path (join-path -path $node_dir -childpath "$cmd$ext") "${cmd}-orig${ext}"
-                }
-              }
-            }
-            npm-orig install --global "npm@${Env:NPM_VERSION}"
-      - run:
-          name: Assert Node.js version
-          command: |
-            if ((node --version) -Ne "v${Env:NODE_VERSION}") { exit 1 }
-      - run:
-          name: Assert npm version
-          command: |
-            if ((npm --version) -Ne "${Env:NPM_VERSION}") { exit 1 }
-      - checkout
-      - oss/npm_clean_install_with_caching
-      - run: npm run circle
+            curl https://get.volta.sh | PROFILE="$BASH_ENV" bash
 
-  NodeJS 14:
-    docker:
-      - image: cimg/node:14.18.2
+  setup-node:
+    parameters:
+      node-version:
+        type: string
+        default: ""
     steps:
-      - common_test_steps
-      # We will save the results of this one particular invocation to use in
-      # the publish step. Not only does this make the publishing step take less
-      # time, this also ensures that a passing version gets deployed even if,
-      # theoretically, rebuilding the same commit on the same version of
-      # Node.js should yield the same results!
-      - persist_to_workspace:
-          root: .
-          paths:
-            - ./**
-
-  NodeJS 16:
-    docker:
-      - image: cimg/node:16.13.1
-    steps:
-      - common_test_steps
+      - install-volta
+      - checkout
+      - when:
+          condition: << parameters.node-version >>
+          steps:
+            - run: volta pin node@<< parameters.node-version >>
+      - run: node --version
+      - run: npm --version
+      - node/install-packages
 
-  Publish GitHub Release:
+jobs:
+  NodeJS:
+    parameters:
+      node-version:
+        type: string
     docker:
-      - image: cimg/go:1.17.8
+      - image: cimg/base:stable
     steps:
-      - attach_workspace:
-          # Must be absolute path or relative path from working_directory
-          at: .
-      - run:
-          name: "Publish Release on GitHub"
-          command: |
-            set +e
-            test -d oclif-dist/channels && exit 1 || echo "Not a pre-release, continuing with publishing"
-            /usr/local/go/bin/go get github.com/tcnksm/ghr
-            VERSION=$(ls oclif-dist | cut -d 'v' -f2)
-            echo "Publishing apollo@${VERSION} to GitHub Releases using ghr"
-            ls ./oclif-dist/apollo-v${VERSION}/
-            ghr -t ${GH_TOKEN} -c ${CIRCLE_SHA1} -delete apollo@${VERSION} "./oclif-dist/apollo-v${VERSION}/"
+      - setup-node:
+          node-version: <<parameters.node-version>>
+      - run: npm run test:ci
+      - store_test_results:
+          path: junit.xml
 
   # Other tests, unrelated to typical code tests.
   Linting:
     docker:
-      - image: cimg/node:12.22.8
+      - image: cimg/base:stable
     steps:
-      - oss/install_specific_npm_version:
-          version: '7'
-      - checkout
-      # (speed) --ignore-scripts to skip unnecessary Lerna build during linting.
-      - run: npm install --ignore-scripts
+      - setup-node
       - run: npm run lint
 
   Query Check:
     docker:
-      - image: cimg/node:12.22.8
+      - image: cimg/base:stable
     steps:
-      - oss/install_specific_npm_version:
-          version: '7'
-      - checkout
-      - oss/npm_clean_install_with_caching
+      - setup-node
       - run:
-          name:
           command: |
             if [ -z "$CHECKS_API_KEY" ]; then
               echo "NO CHECKS_API_KEY! CANNOT RUN! This is normal on PRs from Forks."
@@ -149,12 +67,9 @@ jobs:
 
   Generated Types Check:
     docker:
-      - image: cimg/node:12.22.8
+      - image: cimg/base:stable
     steps:
-      - oss/install_specific_npm_version:
-          version: '7'
-      - checkout
-      - oss/npm_clean_install_with_caching
+      - setup-node
       - run:
           name: Generate types locally and compare type files
           command: |
@@ -165,84 +80,18 @@ jobs:
             npx apollo client:codegen --key=$CHECKS_API_KEY --outputFlat --target=typescript currentTypes.ts
             cmp --silent currentTypes.ts ./packages/apollo-language-server/src/graphqlTypes.ts || (echo "Type check failed. Run 'npm run client:codegen'" && exit 1)
 
-common_non_publish_filters: &common_non_publish_filters
-  filters:
-    # Ensure every job has `tags` filters since the publish steps have tags.
-    # This is some wild configuration thing that's pretty hard to figure out.
-    tags:
-      only: /.*/
-
-common_publish_filters: &common_publish_filters
-  filters:
-    # Only run pre-publish and publish steps on specific tags.
-    tags:
-      only: /^publish\/[0-9]+$/
-    # We want the publish to trigger on the above tag, not any branch.
-    branches:
-      ignore: /.*/
-
 workflows:
   version: 2
   Build:
     jobs:
-      - NodeJS 12:
-          <<: *common_non_publish_filters
-      #- NodeJS 14 Windows:
-      #    <<: *common_non_publish_filters
-      - NodeJS 14:
-          <<: *common_non_publish_filters
-      - NodeJS 16:
-          <<: *common_non_publish_filters
-      - Linting:
-          <<: *common_non_publish_filters
-      - Query Check:
-          <<: *common_non_publish_filters
-      - Generated Types Check:
-          <<: *common_non_publish_filters
-      - oss/oclif_pack_from_verdaccio_storage:
-          name: Build CLI
-          package: apollo
-          <<: *common_non_publish_filters
-          requires:
-            - Package tarballs
-      - oss/lerna_tarballs:
-          name: Package tarballs
-          <<: *common_non_publish_filters
-          requires:
-            - NodeJS 12
-            #- NodeJS 14 Windows
-            - NodeJS 14
-            - NodeJS 16
-      - Publish GitHub Release:
-          <<: *common_publish_filters
-          requires:
-            - Confirmation
-            - Build CLI
-      - oss/dry_run:
-          name: Dry-run
-          <<: *common_publish_filters
-          requires:
-            - NodeJS 12
-            #- NodeJS 14 Windows
-            - NodeJS 14
-            - NodeJS 16
-            - Build CLI
-      - oss/confirmation:
-          name: Confirmation
-          type: approval
-          <<: *common_publish_filters
-          requires:
-            - Dry-run
-            - Build CLI
-      - oss/publish:
-          name: Publish
-          <<: *common_publish_filters
-          requires:
-            - Confirmation
-            # This "Dry-run" is also gated behind "Confirmation", but being left here
-            # as a dependency in case "Confirmation" is ever removed from this workflow
-            # so we have a clear picture of the actual dependency (as multiple go through
-            # the Confirmation step).
-            - Dry-run
-
-
+      - NodeJS:
+          name: NodeJS << matrix.node-version >>
+          matrix:
+            parameters:
+              node-version:
+                - "12"
+                - "14"
+                - "16"
+      - Linting
+      - Query Check
+      - Generated Types Check

.codesandbox/ci.json

@@ -1,4 +1,5 @@
 {
   "sandboxes": [],
-  "node": "16"
+  "node": "16",
+  "installCommand": "install-with-npm-8.5"
 }

.envrc

@@ -0,0 +1,10 @@
+export VOLTA_HOME="$PWD/.volta"
+PATH_add "$VOLTA_HOME/bin"
+
+if ! [ -f "$VOLTA_HOME/bin/volta" ]; then
+  echo "Volta not found in $VOLTA_HOME/bin/volta, installing..."
+  curl https://get.volta.sh/ | bash
+fi
+
+# Allow you to run jest and other things in node_modules/.bin without npx.
+layout node

.github/workflows/release-pr.yml

@@ -0,0 +1,35 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+        with:
+          # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
+          fetch-depth: 0
+
+      - name: Setup Node.js 16.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16.x
+
+      - name: Ensure npm version 8.5.0
+        run: npm i -g [email protected]
+      - name: Install Dependencies
+        run: npm i
+
+      - name: Create Release Pull Request / NPM Publish
+        uses: changesets/action@v1
+        with:
+          publish: npm run changeset-publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -18,8 +18,6 @@ packages/*/package-lock.json
 
 .DS_Store
 
-lerna-debug.log
-
 .env
 
 # files generated from tests
@@ -28,3 +26,6 @@ __tmp__*
 
 #idea folder
 .idea/
+
+# volta files installed within the project if using direnv
+.volta