@apollo/rover 0.5.0-rc.1 → 0.5.2

package/README.md

@@ -37,7 +37,7 @@ rover graph publish --schema ./path-to-valid-schema test@cats
 ## Command-line options
 
 ```console
-Rover 0.5.0-rc.1
+Rover 0.5.2
 
 Rover - Your Graph Companion
 Read the getting started guide by running:
@@ -102,7 +102,6 @@ SUBCOMMANDS:
     config        Configuration profile commands
     docs          Interact with Rover's documentation
     explain       Explain error codes
-    fed2          Federation 2 Alpha commands
     graph         Graph API schema commands
     help          Prints this message or the help of the given subcommand(s)
     subgraph      Subgraph schema commands
@@ -142,7 +141,7 @@ To install a specific version of Rover (note the `v` prefixing the version numbe
 > Note: If you're installing Rover in a CI environment, it's best to target a specific version rather than using the latest URL, since future major breaking changes could affect CI workflows otherwise.
 
 ```bash
-curl -sSL https://rover.apollo.dev/nix/v0.5.0-rc.1 | sh
+curl -sSL https://rover.apollo.dev/nix/v0.5.2 | sh
 ```
 
 You will need `curl` installed on your system to run the above installation commands. You can get the latest version from [the curl downloads page](https://curl.se/download.html).
@@ -160,7 +159,7 @@ To install a specific version of Rover (note the `v` prefixing the version numbe
 > Note: If you're installing Rover in a CI environment, it's best to target a specific version rather than using the latest URL, since future major breaking changes could affect CI workflows otherwise.
 
 ```bash
-iwr 'https://rover.apollo.dev/win/v0.5.0-rc.1' | iex
+iwr 'https://rover.apollo.dev/win/v0.5.2' | iex
 ```
 
 #### npm installer

package/binary.js

@@ -3,7 +3,7 @@ const os = require("os");
 const cTable = require("console.table");
 const libc = require("detect-libc");
 const { join } = require("path");
-const { spawnSync } = require("child_process");
+const { configureProxy } = require("axios-proxy-builder");
 
 const error = (msg) => {
   console.error(msg);
@@ -95,49 +95,28 @@ const getBinary = () => {
   const url = `https://rover.apollo.dev/tar/${name}/${platform.RUST_TARGET}/v${version}`;
   let binary = new Binary(platform.BINARY_NAME, url);
 
-  // binary-install doesn't put the binary in the right place, so just patch it.
-  binary.installDirectory = join(__dirname, "node_modules", ".bin");
-  binary.binaryPath = join(binary.installDirectory, binary.name);
   // setting this allows us to extract supergraph plugins to the proper directory
   // the variable itself is read in Rust code
   process.env.APOLLO_NODE_MODULES_BIN_DIR = binary.installDirectory;
   return binary;
 };
 
-const run = () => {
-  const binary = getBinary();
-  binary.run();
-};
-
 const install = () => {
   const binary = getBinary();
-  binary.install();
-  let pluginInstallCommand = `${binary.binaryPath} install --plugin`;
-  let commands = [
-    `${pluginInstallCommand} supergraph@latest-0`,
-    `${pluginInstallCommand} supergraph@latest-2`,
-  ];
-  for (command of commands) {
-    try {
-      spawnSync(command, {
-        stdio: "inherit",
-        shell: true,
-      });
-    } catch (e) {
-      console.error(
-        `'${command.replace(
-          binary.binaryPath,
-          binary.name
-        )}' failed with message '${
-          e.message
-        }'. 'rover supergraph compose' might not work properly on your machine.`
-      );
-    }
-  }
+  const proxy = configureProxy(binary.url);
+  binary.install(proxy);
+
+  // these messages are duplicated in `src/command/install/mod.rs`
+  // for the curl installer.
+  console.log(
+    "If you would like to disable Rover's anonymized usage collection, you can set APOLLO_TELEMETRY_DISABLED=1"
+  );
+  console.log(
+    "You can check out our documentation at https://go.apollo.dev/r/docs."
+  );
 };
 
 module.exports = {
   install,
-  run,
   getBinary,
 };

package/install.js

@@ -2,16 +2,3 @@
 
 const { install } = require("./binary");
 install();
-
-// use setTimeout so the message prints after the install happens.zzs
-setTimeout(() => {
-  // these messages are duplicated in `src/command/install/mod.rs`
-  // for the curl installer.
-  console.log(
-    "If you would like to disable Rover's anonymized usage collection, you can set APOLLO_TELEMETRY_DISABLED=1"
-  );
-  console.log(
-    "You can check out our documentation at https://go.apollo.dev/r/docs."
-  ),
-    400;
-});

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "@apollo/rover",
-  "version": "0.5.0-rc.1",
+  "version": "0.5.2",
   "description": "The new Apollo CLI",
   "main": "index.js",
-  "bin": {
-    "rover": "run.js"
-  },
   "scripts": {
     "prepack": "cp ../../README.md . && cp ../../LICENSE .",
     "postinstall": "node ./install.js",
@@ -33,15 +30,16 @@
   },
   "volta": {
     "node": "17.5.0",
-    "npm": "8.5.4"
+    "npm": "8.7.0"
   },
   "homepage": "https://github.com/apollographql/rover#readme",
   "dependencies": {
-    "binary-install": "^0.1.1",
+    "axios-proxy-builder": "^0.1.1",
+    "binary-install": "^1.0.0",
     "console.table": "^0.10.0",
     "detect-libc": "^2.0.0"
   },
   "devDependencies": {
-    "prettier": "2.6.0"
+    "prettier": "2.6.2"
   }
 }

package/run.js

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-const { run } = require("./binary");
-run();