@graphprotocol/graph-cli 0.41.0-alpha-20230220202916-954959f → 0.41.0

package/CHANGELOG.md

@@ -1,9 +1,13 @@
 # @graphprotocol/graph-cli
 
-## 0.41.0-alpha-20230220202916-954959f
+## 0.41.0
 
 ### Minor Changes
 
+- [#1076](https://github.com/graphprotocol/graph-tooling/pull/1076)
+  [`c18a663`](https://github.com/graphprotocol/graph-tooling/commit/c18a66349e18c21636d83a19388df1580848aa64)
+  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
@@ -21,6 +25,10 @@
   [`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/compiler/index.js

@@ -48,34 +48,31 @@ class Compiler {
         this.sourceDir = path_1.default.dirname(options.subgraphManifest);
         this.blockIpfsMethods = options.blockIpfsMethods;
         this.libsDirs = [];
-        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.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'));
             }
-            this.globalsFile = path_1.default.join(globalsLib, globalsFile);
         }
-        // @ts-expect-error assigned or not, we dont care
-        if (!this.globalsFile) {
-            throw new Error('Globals file is missing.');
+        if (this.libsDirs.length === 0) {
+            throw Error(`could not locate \`node_modules\` in parent directories of subgraph manifest`);
         }
-        this.protocol = this.options.protocol;
-        this.ABI = this.protocol.getABI();
+        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);
         process.on('uncaughtException', e => {
             toolbox.print.error(`UNCAUGHT EXCEPTION: ${e}`);
         });
@@ -233,6 +230,9 @@ 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,6 +271,9 @@ 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/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.41.0-alpha-20230220202916-954959f",
+  "version": "0.41.0",
   "commands": {
     "add": {
       "id": "add",

package/package.json

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