@graphprotocol/graph-cli 0.46.2-alpha-20230413184333-359d69f → 0.46.2-alpha-20230413191858-806ff8a

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.46.2-alpha-20230413184333-359d69f
+## 0.46.2-alpha-20230413191858-806ff8a
 
 ### Patch Changes
 
@@ -30,10 +30,6 @@
   Thanks [@saihaj](https://github.com/saihaj)! - refactor out immutable.js usage from schema
   generation
 
-- [#1291](https://github.com/graphprotocol/graph-tooling/pull/1291)
-  [`569bb80`](https://github.com/graphprotocol/graph-tooling/commit/569bb80f387da90f8e054bc2f332e5b0de96a523)
-  Thanks [@saihaj](https://github.com/saihaj)! - append /api/v0 automatically to Graph IPFS endpoint
-
 ## 0.46.1
 
 ### Patch Changes

package/dist/command-helpers/compiler.js

@@ -26,32 +26,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCompiler = exports.appendApiVersionForGraph = void 0;
+exports.createCompiler = void 0;
 const url_1 = require("url");
 const toolbox = __importStar(require("gluegun"));
 const ipfs_http_client_1 = require("ipfs-http-client");
 const compiler_1 = __importDefault(require("../compiler"));
-/**
- * Appends /api/v0 to the end of a The Graph IPFS URL
- */
-function appendApiVersionForGraph(inputString) {
-    // Check if the input string is a valid The Graph IPFS URL
-    const pattern = /^(https?:\/\/)?([\w-]+\.)+thegraph\.com\/ipfs\/?$/;
-    if (pattern.test(inputString)) {
-        // account for trailing slash
-        if (inputString.endsWith('/')) {
-            return inputString.slice(0, -1) + '/api/v0';
-        }
-        return inputString + '/api/v0';
-    }
-    return inputString;
-}
-exports.appendApiVersionForGraph = appendApiVersionForGraph;
 // Helper function to construct a subgraph compiler
 function createCompiler(manifest, { ipfs, headers, outputDir, outputFormat, skipMigrations, blockIpfsMethods, protocol, }) {
     // Validate the IPFS URL (if a node address was provided)
     try {
-        if (ipfs && typeof ipfs === 'string')
+        if (ipfs)
             new url_1.URL(ipfs);
     }
     catch (e) {
@@ -60,11 +44,9 @@ The IPFS URL must be of the following format: http(s)://host[:port]/[path]`);
         return null;
     }
     // Connect to the IPFS node (if a node address was provided)
-    const ipfsClient = ipfs
-        ? (0, ipfs_http_client_1.create)({ url: appendApiVersionForGraph(ipfs.toString()), headers })
-        : undefined;
+    ipfs = ipfs ? (0, ipfs_http_client_1.create)({ url: ipfs, headers }) : undefined;
     return new compiler_1.default({
-        ipfs: ipfsClient,
+        ipfs,
         subgraphManifest: manifest,
         outputDir,
         outputFormat,

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.46.2-alpha-20230413184333-359d69f",
+  "version": "0.46.2-alpha-20230413191858-806ff8a",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.46.2-alpha-20230413184333-359d69f",
+  "version": "0.46.2-alpha-20230413191858-806ff8a",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {

package/dist/command-helpers/compiler.test.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const compiler_1 = require("./compiler");
-describe('appendApiVersionForGraph', () => {
-    it('append /api/v0 to Prod URL with trailing slash', () => {
-        expect((0, compiler_1.appendApiVersionForGraph)('https://api.thegraph.com/ipfs/')).toBe('https://api.thegraph.com/ipfs/api/v0');
-    });
-    it('append /api/v0 to Prod URL without trailing slash', () => {
-        expect((0, compiler_1.appendApiVersionForGraph)('https://api.thegraph.com/ipfs')).toBe('https://api.thegraph.com/ipfs/api/v0');
-    });
-    it('append /api/v0 to Staging URL without trailing slash', () => {
-        expect((0, compiler_1.appendApiVersionForGraph)('https://staging.api.thegraph.com/ipfs')).toBe('https://staging.api.thegraph.com/ipfs/api/v0');
-    });
-    it('do nothing if Prod URL has /api/v0', () => {
-        expect((0, compiler_1.appendApiVersionForGraph)('https://api.thegraph.com/ipfs/api/v0')).toBe('https://api.thegraph.com/ipfs/api/v0');
-    });
-    it('do nothing if Prod URL has no /ipfs', () => {
-        expect((0, compiler_1.appendApiVersionForGraph)('https://api.thegraph.com')).toBe('https://api.thegraph.com');
-    });
-    it('do nothing for non-graph endpoint', () => {
-        expect((0, compiler_1.appendApiVersionForGraph)('https://ipfs.saihaj.dev/')).toBe('https://ipfs.saihaj.dev/');
-    });
-    it('do nothing for non-graph endpoint ending with /ipfs', () => {
-        expect((0, compiler_1.appendApiVersionForGraph)('https://ipfs.saihaj.dev/ipfs/')).toBe('https://ipfs.saihaj.dev/ipfs/');
-    });
-});