Feature/469713

packages/sitecore-jss-angular/src/layout.service.ts

@@ -9,6 +9,7 @@ import { from as fromPromise, Observable, throwError as observableThrow } from '
 import { catchError } from 'rxjs/operators';
 import { LayoutServiceError } from './layout-service-error';
 
+// TODO: these are deprecated and we should switch to using new methods
 const { fetchRouteData, fetchPlaceholderData } = dataApi;
 
 @Injectable()

packages/sitecore-jss-nextjs/src/services/graphql-sitemap-service.test.ts

@@ -3,6 +3,7 @@ import nock from 'nock';
 import { GraphQLSitemapService } from './graphql-sitemap-service';
 import rootItemQueryResult from '../testData/rootItemQueryResult.json';
 import sitemapQueryResult from '../testData/sitemapQueryResult.json';
+import sitemapServiceResult from '../testData/sitemapServiceResult';
 
 describe('GraphQLSitemapService', () => {
   const rootItemPath = '/sitecore/next/home';
@@ -59,33 +60,6 @@ describe('GraphQLSitemapService', () => {
       );
   };
 
-  const expectedSSGSitemap = [
-    {
-      params: {
-        path: [''],
-      },
-      locale: 'ua',
-    },
-    {
-      params: {
-        path: ['x1'],
-      },
-      locale: 'ua',
-    },
-    {
-      params: {
-        path: ['y1', 'y2', 'y3', 'y4'],
-      },
-      locale: 'ua',
-    },
-    {
-      params: {
-        path: ['y1', 'y2'],
-      },
-      locale: 'ua',
-    },
-  ];
-
   describe('Fetch sitemap in SSG mode', () => {
     // language param tests
 
@@ -95,7 +69,7 @@ describe('GraphQLSitemapService', () => {
 
       const service = new GraphQLSitemapService({ endpoint, apiKey });
       const sitemap = await service.fetchSSGSitemap(['ua'], rootItemPath);
-      expect(sitemap).to.deep.equal(expectedSSGSitemap);
+      expect(sitemap).to.deep.equal(sitemapServiceResult);
 
       return expect(nock.isDone()).to.be.true;
     });
@@ -239,7 +213,7 @@ describe('GraphQLSitemapService', () => {
       const service = new GraphQLSitemapService({ endpoint, apiKey, pageSize: customPageSize });
       const sitemap = await service.fetchSSGSitemap(['ua'], rootItemPath);
 
-      expect(sitemap).to.deep.equal(expectedSSGSitemap);
+      expect(sitemap).to.deep.equal(sitemapServiceResult);
       return expect(nock.isDone()).to.be.true;
     });
 
@@ -252,7 +226,7 @@ describe('GraphQLSitemapService', () => {
       const service = new GraphQLSitemapService({ endpoint, apiKey, pageSize: undefined });
       const sitemap = await service.fetchSSGSitemap(['ua'], rootItemPath);
 
-      expect(sitemap).to.deep.equal(expectedSSGSitemap);
+      expect(sitemap).to.deep.equal(sitemapServiceResult);
       return expect(nock.isDone()).to.be.true;
     });
 

packages/sitecore-jss-nextjs/src/services/graphql-sitemap-service.ts

@@ -14,36 +14,37 @@ const DEFAULTS = Object.freeze({
   pageSize: 10,
 });
 
-const query = `
-query SitePageQuery(
-  $rootItemId: String!,
-  $language: String!,
-  $pageSize: Int = 10,
-  $after: String
-) {
-  search(
-    where: {
-      AND:[
-        { name: "_path",      value: $rootItemId },
-        { name: "_language",  value: $language   },
-        { name: "_hasLayout", value: "true"      }
-      ]
-    }
-    first: $pageSize
-    after: $after
+const query = /* GraphQL */ `
+  query SitePageQuery(
+    $rootItemId: String!
+    $language: String!
+    $pageSize: Int = 10
+    $after: String
   ) {
-    total
-    pageInfo {
-      endCursor
-      hasNext
-    }
-    results {
-      url {
-        path
+    search(
+      where: {
+        AND: [
+          { name: "_path", value: $rootItemId }
+          { name: "_language", value: $language }
+          { name: "_hasLayout", value: "true" }
+        ]
+      }
+      first: $pageSize
+      after: $after
+    ) {
+      total
+      pageInfo {
+        endCursor
+        hasNext
+      }
+      results {
+        url {
+          path
+        }
       }
     }
   }
-}`;
+`;
 
 /**
  * Configuration options for @see GraphQLDictionaryService instances

packages/sitecore-jss-nextjs/src/testData/sitemapServiceResult.ts

@@ -0,0 +1,26 @@
+export default [
+  {
+    params: {
+      path: [''],
+    },
+    locale: 'ua',
+  },
+  {
+    params: {
+      path: ['x1'],
+    },
+    locale: 'ua',
+  },
+  {
+    params: {
+      path: ['y1', 'y2', 'y3', 'y4'],
+    },
+    locale: 'ua',
+  },
+  {
+    params: {
+      path: ['y1', 'y2'],
+    },
+    locale: 'ua',
+  },
+];

packages/sitecore-jss-tracking/src/trackingApi.ts

@@ -1,4 +1,4 @@
-import { HttpDataFetcher, HttpResponse, isServer } from '@sitecore-jss/sitecore-jss';
+import { HttpDataFetcher, HttpResponse, isServer, resolveUrl } from '@sitecore-jss/sitecore-jss';
 import {
   CampaignInstance,
   EventInstance,
@@ -7,6 +7,7 @@ import {
   PageViewInstance,
 } from './dataModels';
 import { TrackingRequestOptions } from './trackingRequestOptions';
+import querystring from 'querystring';
 
 class ResponseError extends Error {
   response: HttpResponse<unknown>;
@@ -31,18 +32,6 @@ function checkStatus(response: HttpResponse<unknown>) {
   throw error;
 }
 
-/**
- * note: encodeURIComponent is available via browser (window) or natively in node.js
- * if you use another js engine for server-side rendering you may not have native encodeURIComponent
- * and would then need to install a package for that functionality
- * @param {Object} params
- */
-function getQueryString(params: { [key: string]: unknown }) {
-  return Object.keys(params)
-    .map((k) => `${encodeURIComponent(k)}=${encodeURIComponent(params[k] as string)}`)
-    .join('&');
-}
-
 /**
  * Note: axios needs to use `withCredentials: true` in order for Sitecore cookies to be included in CORS requests
  * which is necessary for analytics and such
@@ -57,12 +46,9 @@ function fetchData<T>(
   data: any,
   fetcher: HttpDataFetcher<T>,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  params: { [key: string]: any } = {}
+  params: querystring.ParsedUrlQueryInput = {}
 ) {
-  const qs = getQueryString(params);
-  const fetchUrl = url.indexOf('?') !== -1 ? `${url}&${qs}` : `${url}?${qs}`;
-
-  return fetcher(fetchUrl, data)
+  return fetcher(resolveUrl(url, params), data)
     .then(checkStatus)
     .then((response) => {
       // axios auto-parses JSON responses, don't need to JSON.parse

packages/sitecore-jss-tracking/src/trackingRequestOptions.ts

@@ -1,3 +1,4 @@
+import querystring from 'querystring';
 import { HttpDataFetcher } from '@sitecore-jss/sitecore-jss';
 
 export interface TrackingRequestOptions {
@@ -13,7 +14,7 @@ export interface TrackingRequestOptions {
   /**
    * An object of key:value pairs to be stringified and used as querystring parameters.
    */
-  querystringParams?: { [key: string]: unknown };
+  querystringParams?: querystring.ParsedUrlQueryInput;
 
   /** Type of tracking request action. Default: 'event' */
   action?: string;

packages/sitecore-jss/package.json

@@ -15,10 +15,14 @@
   },
   "author": {
     "name": "Sitecore Corporation",
-    "url": "https://jss.sitecore.net"
+    "url": "https://jss.sitecore.com"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Sitecore/jss"
   },
   "license": "Apache-2.0",
-  "homepage": "https://jss.sitecore.net",
+  "homepage": "https://jss.sitecore.com",
   "bugs": {
     "url": "https://github.com/sitecore/jss/issues"
   },