ensure resolving graph.json respects base path configuration (#1180)

ProjectEvergreen · Nov 7, 2023 · ce0c14f · ce0c14f
1 parent 26938f3
commit ce0c14f
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 2 deletions.
diff --git a/packages/cli/src/plugins/resource/plugin-standard-json.js b/packages/cli/src/plugins/resource/plugin-standard-json.js
@@ -17,8 +17,9 @@ class StandardJsonResource extends ResourceInterface {
 
   async shouldServe(url) {
     const { protocol, pathname } = url;
+    const { basePath } = this.compilation.config;
     const isJson = pathname.split('.').pop() === this.extensions[0];
-    const isGraphJson = pathname === '/graph.json';
+    const isGraphJson = pathname === `${basePath}/graph.json`;
     const isWorkspaceFile = protocol === 'file:' && await checkResourceExists(url);
 
     return isJson && (isWorkspaceFile || isGraphJson);
@@ -27,7 +28,8 @@ class StandardJsonResource extends ResourceInterface {
   async serve(url) {
     const { pathname } = url;
     const { scratchDir } = this.compilation.context;
-    const finalUrl = pathname.startsWith('/graph.json')
+    const { basePath } = this.compilation.config;
+    const finalUrl = pathname === `${basePath}/graph.json`
       ? new URL('./graph.json', scratchDir)
       : url;
     const contents = await fs.readFile(finalUrl, 'utf-8');

diff --git a/packages/cli/test/cases/develop.config.base-path/develop.config.base-path.spec.js b/packages/cli/test/cases/develop.config.base-path/develop.config.base-path.spec.js
@@ -287,6 +287,31 @@ describe('Develop Greenwood With: ', function() {
         expect(cards.length).to.be.greaterThan(0);
       });
     });
+
+    describe('Fetching graph.json client side', function() {
+      let response;
+      let graph;
+
+      before(async function() {
+        response = await fetch(`${hostname}:${port}${basePath}/graph.json`);
+        graph = await response.clone().json();
+      });
+
+      it('should return the correct content type', function(done) {
+        expect(response.headers.get('content-type')).to.contain('application/json');
+        done();
+      });
+
+      it('should return a 200', function(done) {
+        expect(response.status).to.equal(200);
+        done();
+      });
+
+      it('should have the expected length for all content', function(done) {
+        expect(graph.length).to.equal(3);
+        done();
+      });
+    });
   });
 
   after(function() {

diff --git a/packages/cli/test/cases/develop.default/develop.default.spec.js b/packages/cli/test/cases/develop.default/develop.default.spec.js
@@ -1552,6 +1552,31 @@ describe('Develop Greenwood With: ', function() {
         done();
       });
     });
+
+    describe('Fetching graph.json client side', function() {
+      let response;
+      let graph;
+
+      before(async function() {
+        response = await fetch(`${hostname}:${port}/graph.json`);
+        graph = await response.clone().json();
+      });
+
+      it('should return the correct content type', function(done) {
+        expect(response.headers.get('content-type')).to.contain('application/json');
+        done();
+      });
+
+      it('should return a 200', function(done) {
+        expect(response.status).to.equal(200);
+        done();
+      });
+
+      it('should have the expected length for all content', function(done) {
+        expect(graph.length).to.equal(2);
+        done();
+      });
+    });
   });
 
   after(function() {

diff --git a/packages/cli/test/cases/serve.config.base-path/serve.config.base-path.spec.js b/packages/cli/test/cases/serve.config.base-path/serve.config.base-path.spec.js
@@ -437,6 +437,31 @@ describe('Serve Greenwood With: ', function() {
         expect(cards.length).to.be.greaterThan(0);
       });
     });
+
+    describe('Fetching graph.json client side', function() {
+      let response;
+      let graph;
+
+      before(async function() {
+        response = await fetch(`${hostname}${basePath}/graph.json`);
+        graph = await response.clone().json();
+      });
+
+      it('should return the correct content type', function(done) {
+        expect(response.headers.get('content-type')).to.contain('application/json');
+        done();
+      });
+
+      it('should return a 200', function(done) {
+        expect(response.status).to.equal(200);
+        done();
+      });
+
+      it('should have the expected length for all content', function(done) {
+        expect(graph.length).to.equal(4);
+        done();
+      });
+    });
   });
 
   after(function() {

diff --git a/packages/cli/test/cases/serve.default/serve.default.spec.js b/packages/cli/test/cases/serve.default/serve.default.spec.js
@@ -456,6 +456,30 @@ describe('Serve Greenwood With: ', function() {
       });
     });
 
+    describe('Fetching graph.json client side', function() {
+      let response;
+      let graph;
+
+      before(async function() {
+        response = await fetch(`${hostname}/graph.json`);
+        graph = await response.clone().json();
+      });
+
+      it('should return the correct content type', function(done) {
+        expect(response.headers.get('content-type')).to.contain('application/json');
+        done();
+      });
+
+      it('should return a 200', function(done) {
+        expect(response.status).to.equal(200);
+        done();
+      });
+
+      it('should have the expected length for all content', function(done) {
+        expect(graph.length).to.equal(2);
+        done();
+      });
+    });
   });
 
   after(function() {