create-sitecore-jss 22.4.1-canary.2 → 22.5.0-beta.1

package/dist/common/processes/transform.js

@@ -183,10 +183,8 @@ const diffAndWriteFiles = (_a) => __awaiter(void 0, [_a], void 0, function* ({ r
 exports.diffAndWriteFiles = diffAndWriteFiles;
 const populateEjsData = (answers, destination) => {
     // pass in helper to answers object
-    // Don't expose canary build number in the generated app
-    const jssVersion = version.includes('canary')
-        ? version.replace(/(-canary\.\d+)$/, '-canary')
-        : version;
+    // Don't expose prerelease build number in the generated app
+    const jssVersion = version.replace(/(\.\d+)$/, '');
     const ejsData = Object.assign(Object.assign({}, answers), { version: jssVersion, helper: {
             isDev: (0, helpers_1.isDevEnvironment)(destination || answers.destination),
             getPascalCaseName: helpers_1.getPascalCaseName,

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

@@ -1,5 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { NativeDataFetcher, GraphQLSitemapXmlService } 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';
@@ -24,10 +24,11 @@ const sitemapApi = async (
     siteName: site.name,
   });
 
-  // if url has sitemap-{n}.xml type. The id - can be null if it's sitemap.xml request
+  // The id is present if url has sitemap-{n}.xml type.
+  // The id can be null if it's index sitemap.xml request
   const sitemapPath = await sitemapXmlService.getSitemap(id as string);
 
-  // if sitemap is match otherwise redirect to 404 page
+  // regular sitemap
   if (sitemapPath) {
     const isAbsoluteUrl = sitemapPath.match(ABSOLUTE_URL_REGEXP);
     const sitemapUrl = isAbsoluteUrl ? sitemapPath : `${config.sitecoreApiHost}${sitemapPath}`;
@@ -43,10 +44,7 @@ const sitemapApi = async (
     }
   }
 
-
-
-
-  // this approache if user go to /sitemap.xml - under it generate xml page with list of sitemaps
+  // index /sitemap.xml that includes links to all sitemaps
   const sitemaps = await sitemapXmlService.fetchSitemaps();
 
   if (!sitemaps.length) {

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

@@ -13,9 +13,10 @@ 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)
+    else if (pageState !== LayoutServicePageState.Normal || renderingType === 'component')
       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,11 +6,14 @@ 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;
@@ -18,6 +21,47 @@ 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 } =
+        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,
+        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/nextjs-xmcloud/src/pages/component-library/render.tsx

@@ -0,0 +1,51 @@
+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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-sitecore-jss",
-  "version": "22.4.1-canary.2",
+  "version": "22.5.0-beta.1",
   "description": "Sitecore JSS initializer",
   "bin": "./dist/index.js",
   "scripts": {
@@ -65,5 +65,5 @@
     "ts-node": "^10.9.1",
     "typescript": "~5.6.3"
   },
-  "gitHead": "7cec13189f26fb9287541720fd1491bfcc9c24b8"
+  "gitHead": "e080916b354c36e63f29f01fbcb87688d7f2b4cd"
 }