@graphprotocol/graph-cli 0.41.0-alpha-20230220204254-d199c93 → 0.41.0-alpha-20230221140937-bb75c97

package/CHANGELOG.md

@@ -1,13 +1,9 @@
 # @graphprotocol/graph-cli
 
-## 0.41.0-alpha-20230220204254-d199c93
+## 0.41.0-alpha-20230221140937-bb75c97
 
 ### Minor Changes
 
-- [#1076](https://github.com/graphprotocol/graph-tooling/pull/1076)
-  [`d199c93`](https://github.com/graphprotocol/graph-tooling/commit/d199c9332b169db95cbf36b1fc05517a4c98ec97)
-  Thanks [@saihaj](https://github.com/saihaj)! - add `base-testnet` to studio
-
 - [#1055](https://github.com/graphprotocol/graph-tooling/pull/1055)
   [`044cd92`](https://github.com/graphprotocol/graph-tooling/commit/044cd92d0ceb9628c7f7fbe3627a09b867710247)
   Thanks [@enisdenjo](https://github.com/enisdenjo)! - Migrate to Oclif
@@ -17,18 +13,9 @@
 - [#1055](https://github.com/graphprotocol/graph-tooling/pull/1055)
   [`044cd92`](https://github.com/graphprotocol/graph-tooling/commit/044cd92d0ceb9628c7f7fbe3627a09b867710247)
   Thanks [@enisdenjo](https://github.com/enisdenjo)! - dependencies updates:
-
   - Added dependency [`@oclif/core@2.0.7` ↗︎](https://www.npmjs.com/package/@oclif/core/v/2.0.7) (to
     `dependencies`)
 
-- [#1074](https://github.com/graphprotocol/graph-tooling/pull/1074)
-  [`e84d1e8`](https://github.com/graphprotocol/graph-tooling/commit/e84d1e873d9b2a8967c5fe2a85fce48b2caeb75f)
-  Thanks [@saihaj](https://github.com/saihaj)! - update GH issues link for error message
-
-- [#1071](https://github.com/graphprotocol/graph-tooling/pull/1071)
-  [`17d0888`](https://github.com/graphprotocol/graph-tooling/commit/17d08884fbc30a78089403e13139622b4145e9ff)
-  Thanks [@saihaj](https://github.com/saihaj)! - global files are not needed when using substreams
-
 ## 0.40.0
 
 ### Minor Changes

package/dist/command-helpers/studio.js

@@ -18,7 +18,6 @@ exports.allowedStudioNetworks = [
     'near-testnet',
     'theta-testnet-001',
     'osmo-test-4',
-    'base-testnet',
 ];
 const validateStudioNetwork = ({ studio, product, network, }) => {
     const isStudio = studio || product === 'subgraph-studio';

package/dist/commands/deploy.js

@@ -48,7 +48,13 @@ const headersFlag = core_1.Flags.custom({
 });
 class DeployCommand extends core_1.Command {
     async run() {
-        const { args: { 'subgraph-name': subgraphName, 'subgraph-manifest': manifest }, flags: { product, studio, 'deploy-key': deployKeyFlag, 'access-token': accessToken, 'version-label': versionLabelFlag, ipfs, headers, node: nodeFlag, 'output-dir': outputDir, 'skip-migrations': skipMigrations, watch, 'debug-fork': debugFork, network, 'network-file': networkFile, }, } = await this.parse(DeployCommand);
+        const { args: { 'subgraph-name': subgraphName, 'subgraph-manifest': manifest }, flags: { product: productFlag, studio, 'deploy-key': deployKeyFlag, 'access-token': accessToken, 'version-label': versionLabelFlag, ipfs, headers, node: nodeFlag, 'output-dir': outputDir, 'skip-migrations': skipMigrations, watch, 'debug-fork': debugFork, network, 'network-file': networkFile, }, } = await this.parse(DeployCommand);
+        const product = studio
+            ? 'subgraph-studio'
+            : productFlag ||
+                (await core_1.ux.prompt('Which product to deploy for?', {
+                    required: true,
+                }));
         try {
             const dataSourcesAndTemplates = await DataSourcesExtractor.fromFilePath(manifest);
             for (const { network } of dataSourcesAndTemplates) {
@@ -61,10 +67,7 @@ class DeployCommand extends core_1.Command {
         const { node } = (0, node_1.chooseNodeUrl)({
             product,
             studio,
-            node: nodeFlag ||
-                (await core_1.ux.prompt('Which product to deploy for?', {
-                    required: true,
-                })),
+            node: nodeFlag,
         });
         if (!node) {
             // shouldn't happen, but we do the check to satisfy TS

package/dist/compiler/asc.js

@@ -30,7 +30,7 @@ const createExitHandler = (inputFile) => () => {
 Suggestion: try to comment the whole file and uncomment it little by little while re-running the graph-cli until you isolate the line where the problem happens.
 Also, please contact us so we can make the CLI better by handling errors like this. You can reach out in any of these links:
 - Discord channel: https://discord.gg/eM8CA6WA9r
-- Github issues: https://github.com/graphprotocol/graph-tooling/issues/new/choose`);
+- Github issues: https://github.com/graphprotocol/graph-cli/issues`);
 };
 const setupExitHandler = (exitHandler) => process.addListener('exit', exitHandler);
 const removeExitHandler = (exitHandler) => process.removeListener('exit', exitHandler);

package/dist/compiler/index.js

@@ -48,31 +48,34 @@ class Compiler {
         this.sourceDir = path_1.default.dirname(options.subgraphManifest);
         this.blockIpfsMethods = options.blockIpfsMethods;
         this.libsDirs = [];
-        this.protocol = this.options.protocol;
-        this.ABI = this.protocol.getABI();
-        if (options.protocol.name === 'substreams') {
-            return;
-        }
-        for (let dir = path_1.default.resolve(this.sourceDir); 
-        // Terminate after the root dir or when we have found node_modules
-        dir !== undefined; 
-        // Continue with the parent directory, terminate after the root dir
-        dir = path_1.default.dirname(dir) === dir ? undefined : path_1.default.dirname(dir)) {
-            if (fs_extra_1.default.existsSync(path_1.default.join(dir, 'node_modules'))) {
-                this.libsDirs.push(path_1.default.join(dir, 'node_modules'));
+        if (options.protocol.name !== 'substreams') {
+            for (let dir = path_1.default.resolve(this.sourceDir); 
+            // Terminate after the root dir or when we have found node_modules
+            dir !== undefined; 
+            // Continue with the parent directory, terminate after the root dir
+            dir = path_1.default.dirname(dir) === dir ? undefined : path_1.default.dirname(dir)) {
+                if (fs_extra_1.default.existsSync(path_1.default.join(dir, 'node_modules'))) {
+                    this.libsDirs.push(path_1.default.join(dir, 'node_modules'));
+                }
             }
+            if (this.libsDirs.length === 0) {
+                throw Error(`could not locate \`node_modules\` in parent directories of subgraph manifest`);
+            }
+            const globalsFile = path_1.default.join('@graphprotocol', 'graph-ts', 'global', 'global.ts');
+            const globalsLib = this.libsDirs.find(item => {
+                return fs_extra_1.default.existsSync(path_1.default.join(item, globalsFile));
+            });
+            if (!globalsLib) {
+                throw Error('Could not locate `@graphprotocol/graph-ts` package in parent directories of subgraph manifest.');
+            }
+            this.globalsFile = path_1.default.join(globalsLib, globalsFile);
         }
-        if (this.libsDirs.length === 0) {
-            throw Error(`could not locate \`node_modules\` in parent directories of subgraph manifest`);
-        }
-        const globalsFile = path_1.default.join('@graphprotocol', 'graph-ts', 'global', 'global.ts');
-        const globalsLib = this.libsDirs.find(item => {
-            return fs_extra_1.default.existsSync(path_1.default.join(item, globalsFile));
-        });
-        if (!globalsLib) {
-            throw Error('Could not locate `@graphprotocol/graph-ts` package in parent directories of subgraph manifest.');
+        // @ts-expect-error assigned or not, we dont care
+        if (!this.globalsFile) {
+            throw new Error('Globals file is missing.');
         }
-        this.globalsFile = path_1.default.join(globalsLib, globalsFile);
+        this.protocol = this.options.protocol;
+        this.ABI = this.protocol.getABI();
         process.on('uncaughtException', e => {
             toolbox.print.error(`UNCAUGHT EXCEPTION: ${e}`);
         });
@@ -230,9 +233,6 @@ class Compiler {
             // Create output directory
             fs_extra_1.default.mkdirsSync(path_1.default.dirname(outFile));
             const libs = this.libsDirs.join(',');
-            if (!this.globalsFile) {
-                throw Error('Could not locate `@graphprotocol/graph-ts` package in parent directories of subgraph manifest.');
-            }
             const global = path_1.default.relative(baseDir, this.globalsFile);
             asc.compile({
                 inputFile,
@@ -271,9 +271,6 @@ class Compiler {
             // Create output directory
             fs_extra_1.default.mkdirsSync(path_1.default.dirname(outFile));
             const libs = this.libsDirs.join(',');
-            if (!this.globalsFile) {
-                throw Error('Could not locate `@graphprotocol/graph-ts` package in parent directories of subgraph manifest.');
-            }
             const global = path_1.default.relative(baseDir, this.globalsFile);
             asc.compile({
                 inputFile,

package/dist/protocols/index.js

@@ -118,7 +118,6 @@ class Protocol {
                 'optimism-kovan',
                 'aurora',
                 'aurora-testnet',
-                'base-testnet',
             ],
             near: ['near-mainnet', 'near-testnet'],
             cosmos: [

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.41.0-alpha-20230220204254-d199c93",
+  "version": "0.41.0-alpha-20230221140937-bb75c97",
   "commands": {
     "add": {
       "id": "add",
@@ -569,7 +569,6 @@
             "optimism-kovan",
             "aurora",
             "aurora-testnet",
-            "base-testnet",
             "near-mainnet",
             "near-testnet",
             "cosmoshub-4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.41.0-alpha-20230220204254-d199c93",
+  "version": "0.41.0-alpha-20230221140937-bb75c97",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {