create-sitecore-jss 22.4.0-canary.9 → 22.5.0-canary.1

package/dist/templates/angular-sxp/src/app/jss-data-fetcher.service.ts

@@ -4,12 +4,10 @@ import { HttpResponse } from '@sitecore-jss/sitecore-jss-angular';
 import { Observable, lastValueFrom } from 'rxjs';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class JssDataFetcherService {
-  constructor(
-    private readonly httpClient: HttpClient,
-  ) {
+  constructor(private readonly httpClient: HttpClient) {
     this.fetch = this.fetch.bind(this);
   }
 
@@ -28,9 +26,9 @@ export class JssDataFetcherService {
 
     return lastValueFrom(result)
       .then((responseData) => ({
-          data: responseData as T,
-          status: 200,
-          statusText: 'OK'
+        data: responseData as T,
+        status: 200,
+        statusText: 'OK',
       }))
       .catch((error: HttpErrorResponse) => {
         if (error instanceof Error) {
@@ -40,7 +38,7 @@ export class JssDataFetcherService {
         return {
           data: error.error as T,
           status: error.status,
-          statusText: error.statusText
+          statusText: error.statusText,
         };
       });
   }

package/dist/templates/nextjs/src/pages/[[...path]].tsx

@@ -62,7 +62,7 @@ export const getStaticPaths: GetStaticPaths = async (context) => {
   let paths: StaticPath[] = [];
   let fallback: boolean | 'blocking' = 'blocking';
 
-  if (process.env.NODE_ENV !== 'development' && !process.env.DISABLE_SSG_FETCH) {
+  if (process.env.NODE_ENV !== 'development' && process.env.DISABLE_SSG_FETCH?.toLowerCase() !== 'true') {
     try {
       // Note: Next.js runs export in production mode
       paths = await sitemapFetcher.fetch(context);

package/dist/templates/nextjs-styleguide-tracking/src/lib/data-fetcher.ts

@@ -1,15 +1,15 @@
-import { AxiosDataFetcher, AxiosResponse } from '@sitecore-jss/sitecore-jss-nextjs';
+import { NativeDataFetcher, NativeDataFetcherResponse } from '@sitecore-jss/sitecore-jss-nextjs';
 
 /**
- * Implements a data fetcher using Axios - replace with your favorite
+ * Implements a data fetcher using NativeDataFetcher - replace with your favorite
  * SSR-capable HTTP or fetch library if you like. See HttpDataFetcher<T> type
  * in sitecore-jss library for implementation details/notes.
  * @param {string} url The URL to request; may include query string
- * @param {unknown} data Optional data to POST with the request.
+ * @param {RequestInit} data Optional data to POST with the request.
  */
 export function dataFetcher<ResponseType>(
   url: string,
-  data?: unknown
-): Promise<AxiosResponse<ResponseType>> {
-  return new AxiosDataFetcher().fetch<ResponseType>(url, data);
+  data?: RequestInit
+): Promise<NativeDataFetcherResponse<ResponseType>> {
+  return new NativeDataFetcher().fetch<ResponseType>(url, data);
 }

package/dist/templates/nextjs-sxa/src/pages/404.tsx

@@ -40,7 +40,7 @@ export const getStaticProps: GetStaticProps = async (context) => {
   });
   let resultErrorPages: ErrorPages | null = null;
 
-  if (!process.env.DISABLE_SSG_FETCH) {
+  if (process.env.DISABLE_SSG_FETCH?.toLowerCase() !== 'true') {
     try {
       resultErrorPages = await errorPagesService.fetchErrorPages();
     } catch (error) {

package/dist/templates/nextjs-sxa/src/pages/500.tsx

@@ -56,7 +56,7 @@ export const getStaticProps: GetStaticProps = async (context) => {
   });
   let resultErrorPages: ErrorPages | null = null;
 
-  if (!process.env.DISABLE_SSG_FETCH) {
+  if (process.env.DISABLE_SSG_FETCH?.toLowerCase() !== 'true') {
     try {
       resultErrorPages = await errorPagesService.fetchErrorPages();
     } catch (error) {

package/dist/templates/nextjs-sxa/src/pages/api/sitemap.ts

@@ -1,5 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { AxiosDataFetcher, GraphQLSitemapXmlService, AxiosResponse } from '@sitecore-jss/sitecore-jss-nextjs';
+import { NativeDataFetcher, GraphQLSitemapXmlService } from '@sitecore-jss/sitecore-jss-nextjs'
 import { siteResolver } from 'lib/site-resolver';
 import config from 'temp/config';
 import clientFactory from 'lib/graphql-client-factory';
@@ -33,28 +33,39 @@ const sitemapApi = async (
     const sitemapUrl = isAbsoluteUrl ? sitemapPath : `${config.sitecoreApiHost}${sitemapPath}`;
     res.setHeader('Content-Type', 'text/xml;charset=utf-8');
 
-    // need to prepare stream from sitemap url
-    return new AxiosDataFetcher()
-      .get(sitemapUrl, {
-        responseType: 'stream',
-      })
-      .then((response: AxiosResponse) => {
-        response.data.pipe(res);
-      })
-      .catch(() => res.redirect('/404'));
+    try {
+      const fetcher = new NativeDataFetcher();
+      const response = await fetcher.fetch(sitemapUrl);
+
+      const reader = (response?.data as ReadableStream<Uint8Array>).getReader();
+      if (reader) {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          if (value) res.write(value);
+        }
+      }
+      res.end();
+    } catch (error) {
+      return res.redirect('/404');
+    }
+    return;
   }
 
+
+
+
   // this approache if user go to /sitemap.xml - under it generate xml page with list of sitemaps
   const sitemaps = await sitemapXmlService.fetchSitemaps();
 
   if (!sitemaps.length) {
     return res.redirect('/404');
   }
-  
+
   const reqtHost = req.headers.host;
   const reqProtocol = req.headers['x-forwarded-proto'] || 'https';
   const SitemapLinks = sitemaps
-    .map((item) => {
+    .map((item: string) => {
       const parseUrl = item.split('/');
       const lastSegment = parseUrl[parseUrl.length - 1];
 

package/dist/templates/nextjs-xmcloud/src/Bootstrap.tsx

@@ -13,10 +13,9 @@ const Bootstrap = (props: SitecorePageProps): JSX.Element | null => {
   // Browser ClientSDK init allows for page view events to be tracked
   useEffect(() => {
     const pageState = props.layoutData?.sitecore?.context.pageState;
-    const renderingType = props.layoutData?.sitecore?.context.renderingType;
     if (process.env.NODE_ENV === 'development')
       console.debug('Browser Events SDK is not initialized in development environment');
-    else if (pageState !== LayoutServicePageState.Normal || renderingType === 'component')
+    else if (pageState !== LayoutServicePageState.Normal)
       console.debug('Browser Events SDK is not initialized in edit and preview modes');
     else {
       CloudSDK({

package/dist/templates/nextjs-xmcloud/src/lib/page-props-factory/plugins/preview-mode.ts

@@ -6,14 +6,11 @@ import {
 } from '@sitecore-jss/sitecore-jss-nextjs';
 import {
   editingDataService,
-  isComponentLibraryPreviewData,
   isEditingMetadataPreviewData,
 } from '@sitecore-jss/sitecore-jss-nextjs/editing';
 import { SitecorePageProps } from 'lib/page-props';
 import { graphQLEditingService } from 'lib/graphql-editing-service';
 import { Plugin } from '..';
-import { RestComponentLayoutService } from '@sitecore-jss/sitecore-jss-nextjs';
-import config from 'temp/config';
 
 class PreviewModePlugin implements Plugin {
   order = 1;
@@ -21,48 +18,6 @@ class PreviewModePlugin implements Plugin {
   async exec(props: SitecorePageProps, context: GetServerSidePropsContext | GetStaticPropsContext) {
     if (!context.preview) return props;
 
-    if (isComponentLibraryPreviewData(context.previewData)) {
-      const { itemId, componentUid, site, language, renderingId, dataSourceId, version, variant } =
-        context.previewData;
-
-      const componentService = new RestComponentLayoutService({
-        apiHost: config.sitecoreApiHost,
-        apiKey: config.sitecoreApiKey,
-        siteName: site,
-        configurationName: config.layoutServiceConfigurationName,
-      });
-
-      const componentData = await componentService.fetchComponentData({
-        siteName: site,
-        itemId,
-        language,
-        componentUid,
-        renderingId,
-        dataSourceId,
-        variant,
-        version,
-      });
-
-      // we can reuse editing service, fortunately
-      const dictionaryData = await graphQLEditingService.fetchDictionaryData({
-        siteName: site,
-        language,
-      });
-
-      if (!componentData) {
-        throw new Error(
-          `Unable to fetch editing data for preview ${JSON.stringify(context.previewData)}`
-        );
-      }
-
-      props.locale = context.previewData.language;
-      props.layoutData = componentData;
-      props.headLinks = [];
-      props.dictionary = dictionaryData;
-
-      return props;
-    }
-
     // If we're in Pages preview (editing) Metadata Edit Mode, prefetch the editing data
     if (isEditingMetadataPreviewData(context.previewData)) {
       const { site, itemId, language, version, variantIds, layoutKind } = context.previewData;

package/dist/templates/react/package.json

@@ -29,7 +29,6 @@
   "dependencies": {
     "@apollo/client": "^3.7.1",
     "@sitecore-jss/sitecore-jss-react": "~<%- version %>",
-    "axios": "^1.2.0",
     "bootstrap": "^5.2.3",
     "cross-fetch": "^3.1.5",
     "fast-deep-equal": "^3.1.3",

package/dist/templates/react/server/server.js

@@ -3,7 +3,6 @@ import React from 'react';
 import { StaticRouter } from 'react-router-dom/server';
 import { renderToStringWithData } from '@apollo/client/react/ssr';
 import Helmet from 'react-helmet';
-import axios from 'axios';
 import http from 'http';
 import https from 'https';
 import GraphQLClientFactory from '../src/lib/GraphQLClientFactory';
@@ -31,9 +30,6 @@ function assertReplace(string, value, replacement) {
 
 // Setup Http/Https agents for keep-alive. Used in headless-proxy
 export const setUpDefaultAgents = (httpAgent, httpsAgent) => {
-  axios.defaults.httpAgent = httpAgent;
-  axios.defaults.httpsAgent = httpsAgent;
-
   http.globalAgent = httpAgent;
   https.globalAgent = httpsAgent;
 };

package/dist/templates/react/src/dataFetcher.js

@@ -1,19 +1,22 @@
-import axios from 'axios';
+import { NativeDataFetcher } from '@sitecore-jss/sitecore-jss-react';
 
 /**
- * Implements a data fetcher using Axios - replace with your favorite
+ * Implements a data fetcher using NativeDataFetcher - replace with your favorite
  * SSR-capable HTTP or fetch library if you like. See HttpDataFetcher<T> type
  * in sitecore-jss library for implementation details/notes.
  * @param {string} url The URL to request; may include query string
  * @param {any} data Optional data to POST with the request.
  */
-export function dataFetcher(url, data) {
-  return axios({
-    url,
+export async function dataFetcher(url, data) {
+  const fetcher = new NativeDataFetcher({ credentials: 'include' });
+
+  const response = await fetcher.fetch(url, {
     method: data ? 'POST' : 'GET',
-    data,
-    // 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
-    withCredentials: true,
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: data ? JSON.stringify(data) : undefined,
   });
+
+  return response.data;
 }

package/dist/templates/vue/package.json

@@ -49,7 +49,6 @@
     "@vue/apollo-composable": "4.0.0-beta.2",
     "@vue/apollo-option": "^4.0.0",
     "@vue/apollo-ssr": "^4.0.0",
-    "axios": "^1.2.3",
     "bootstrap": "^5.2.3",
     "cross-fetch": "~3.1.5",
     "graphql": "^16.6.0",

package/dist/templates/vue/server/server.js

@@ -1,7 +1,6 @@
 import { renderToString } from '@vue/server-renderer';
 import serializeJavascript from 'serialize-javascript';
 import { renderMetaToString } from 'vue-meta/ssr';
-import axios from 'axios';
 import http from 'http';
 import https from 'https';
 import i18ninit from '../src/i18n';
@@ -29,9 +28,6 @@ function assertReplace(string, value, replacement) {
 
 // Setup Http/Https agents for keep-alive. Used in headless-proxy
 export const setUpDefaultAgents = (httpAgent, httpsAgent) => {
-  axios.defaults.httpAgent = httpAgent;
-  axios.defaults.httpsAgent = httpsAgent;
-
   http.globalAgent = httpAgent;
   https.globalAgent = httpsAgent;
 };

package/dist/templates/vue/src/dataFetcher.js

@@ -1,19 +1,21 @@
-import axios from 'axios';
+import { NativeDataFetcher } from '@sitecore-jss/sitecore-jss-vue';
 
 /**
- * Implements a data fetcher using Axios - replace with your favorite
- * SSR-capable HTTP or fetch library if you like. See HttpDataFetcher<T> type
- * in sitecore-jss library for implementation details/notes.
+ * Implements a data fetcher using NativeDataFetcher - replace with your favorite
+ * SSR-capable HTTP or fetch library if you like.
  * @param {string} url The URL to request; may include query string
  * @param {any} data Optional data to POST with the request.
  */
-export function dataFetcher(url, data) {
-  return axios({
-    url,
+export async function dataFetcher(url, data) {
+  const fetcher = new NativeDataFetcher({ credentials: 'include' });
+
+  const response = await fetcher.fetch(url, {
     method: data ? 'POST' : 'GET',
-    data,
-    // 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
-    withCredentials: true,
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: data ? JSON.stringify(data) : undefined,
   });
+
+  return response.data;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-sitecore-jss",
-  "version": "22.4.0-canary.9",
+  "version": "22.5.0-canary.1",
   "description": "Sitecore JSS initializer",
   "bin": "./dist/index.js",
   "scripts": {
@@ -65,5 +65,5 @@
     "ts-node": "^10.9.1",
     "typescript": "~5.6.3"
   },
-  "gitHead": "5d94e2017b872ca4c798162ff0392da0628ce69d"
+  "gitHead": "90e6a507ac1be88357673c85ab5d4caa3089b147"
 }

package/dist/templates/nextjs-xmcloud/src/pages/component-library/render.tsx

@@ -1,51 +0,0 @@
-import { GetServerSideProps } from 'next';
-import Head from 'next/head';
-import {
-  ComponentLibraryLayout,
-  ComponentPropsContext,
-  SitecoreContext,
-} from '@sitecore-jss/sitecore-jss-nextjs';
-import { SitecorePageProps } from 'lib/page-props';
-import { sitecorePagePropsFactory } from 'lib/page-props-factory';
-import NotFound from 'src/NotFound';
-import { componentBuilder } from 'temp/componentBuilder';
-import config from 'temp/config';
-
-const FEAASRender = ({
-  notFound,
-  componentProps,
-  layoutData,
-  headLinks,
-}: SitecorePageProps): JSX.Element => {
-  if (notFound) {
-    return <NotFound />;
-  }
-  return (
-    <ComponentPropsContext value={componentProps}>
-      <SitecoreContext
-        componentFactory={componentBuilder.getComponentFactory()}
-        layoutData={layoutData}
-      >
-        <Head>
-          <title>Sitecore Component Library</title>
-          <link rel="icon" href={`${config.publicUrl}/favicon.ico`} />
-          {headLinks.map((headLink) => (
-            <link rel={headLink.rel} key={headLink.href} href={headLink.href} />
-          ))}
-        </Head>
-        <ComponentLibraryLayout {...layoutData} />
-      </SitecoreContext>
-    </ComponentPropsContext>
-  );
-};
-
-export const getServerSideProps: GetServerSideProps = async (context) => {
-  const props = await sitecorePagePropsFactory.create(context);
-  return {
-    props,
-    // not found when page not requested through editing render api or notFound set in page-props
-    notFound: props.notFound || !context.preview,
-  };
-};
-
-export default FEAASRender;