Merge pull request #549 from Sitecore/develop

Merge 'develop' to 'main'
Sitecore · Jun 11, 2024 · ba3b26d · ba3b26d
2 parents c3bd3dc + b28ae74
commit ba3b26d
Show file tree

Hide file tree

Showing 40 changed files with 37,094 additions and 22,215 deletions.
diff --git a/.env b/.env
@@ -12,7 +12,7 @@ RENDERING_HOST=www.edge.localhost
 # Sitecore Docker registry and platform version.
 # The ltsc2019-based images are used by default here. Development-only 1909 images are also available.
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/
-SITECORE_VERSION=10.3
+SITECORE_VERSION=10.4
 WINDOWSSERVERCORE_VERSION=ltsc2019
 NANOSERVER_VERSION=1809
 LEGACY_NANOSERVER_VERSION=1809
@@ -28,7 +28,7 @@ SQL_SA_LOGIN=sa
 SQL_SA_PASSWORD=
 
 # Node.js version for JSS
-NODEJS_VERSION=14.17.0
+NODEJS_VERSION=20.11.0
 
 # MSBuild configuration and the target build stage for the Rendering Host image.
 BUILD_CONFIGURATION=debug

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -6,6 +6,7 @@ major-version-bump-message: '\+semver:\s?(dotnotuse)'
 minor-version-bump-message: '\+semver:\s?(breaking|major)'
 patch-version-bump-message: '\+semver:\s?(feature|minor)'
 no-bump-message: '\+semver:\s?(none|skip)'
+next-version: 1040.0.0
 branches:
   develop:
     tag: beta

diff --git a/Website/Packages.props b/Website/Packages.props
@@ -6,7 +6,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PlatformVersion>10.3.0-r*</PlatformVersion>
+    <PlatformVersion>10.4.0</PlatformVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Update="Sitecore.Kernel" Version="$(PlatformVersion)" />
@@ -19,5 +19,6 @@
     <PackageReference Update="Sitecore.Connector.CMP" Version="3.1.0" />
     <PackageReference Update="Sitecore.Services.GraphQL" Version="6.0.0" />
     <PackageReference Update="Sitecore.Services.GraphQL.EdgeSchema" Version="6.0.0" />
+    <PackageReference Update="HtmlAgilityPack" Version="1.4.9.5" />
   </ItemGroup>
 </Project>
diff --git a/Website/src/platform/Platform.csproj b/Website/src/platform/Platform.csproj
@@ -57,6 +57,10 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="HtmlAgilityPack">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
     <PackageReference Include="Sitecore.Kernel">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>

diff --git a/Website/src/rendering/.storybook/main.js b/Website/src/rendering/.storybook/main.js
@@ -1,23 +1,42 @@
 const path = require('path');
 
 module.exports = {
-  "stories": [
-    "../src/**/*.stories.mdx",
-    "../src/**/*.stories.@(js|jsx|ts|tsx)"
-  ],
-  "addons": [
-    "@storybook/addon-links",
-    "@storybook/addon-essentials",
-    "storybook-addon-breakpoints",
+  stories: ['../src/**/*.stories.@(js|jsx|ts|tsx)'],
+
+  addons: [
+    '@storybook/addon-links',
+    '@storybook/addon-essentials',
+    'storybook-addon-breakpoints',
+    '@storybook/addon-styling-webpack',
     {
-      name: "@storybook/addon-postcss",
+      name: '@storybook/addon-styling-webpack',
+
       options: {
-        postcssLoaderOptions: {
-          implementation: require("postcss"),
-        },
+        rules: [
+          {
+            test: /\.css$/,
+            sideEffects: true,
+            use: [
+              require.resolve('style-loader'),
+              {
+                loader: require.resolve('css-loader'),
+                options: {
+                  importLoaders: 1,
+                },
+              },
+              {
+                loader: require.resolve('postcss-loader'),
+                options: {
+                  implementation: require.resolve('postcss'),
+                },
+              },
+            ],
+          },
+        ],
       },
     },
   ],
+
   webpackFinal: async (config) => {
     config.module.rules.push({
       test: /\,css&/,
@@ -30,13 +49,22 @@ module.exports = {
               require('tailwindcss/nesting'),
               require('postcss-sassy-mixins'),
               require('tailwindcss'),
-              require('autoprefixer')
-            ]
-          }
-        }
+              require('autoprefixer'),
+            ],
+          },
+        },
       ],
       include: path.resolve(__dirname, '../'),
     });
-    return config
-  }
-}
+    return config;
+  },
+
+  framework: {
+    name: '@storybook/nextjs',
+    options: {},
+  },
+
+  docs: {
+    autodocs: false,
+  },
+};
diff --git a/Website/src/rendering/.storybook/preview.js b/Website/src/rendering/.storybook/preview.js
@@ -1,11 +1,14 @@
 import React from 'react';
-import { SitecoreContextReactContext, LayoutServicePageState } from '@sitecore-jss/sitecore-jss-nextjs';
-import "../src/assets/css/abstracts/mixins.css";
-import "../src/assets/css/main.css";
-import * as nextImage from 'next/image';
+import {
+  SitecoreContextReactContext,
+  LayoutServicePageState,
+} from '@sitecore-jss/sitecore-jss-nextjs';
+import '../src/assets/css/abstracts/mixins.css';
+import '../src/assets/css/main.css';
+// import * as nextImage from 'next/image';
 
 export const parameters = {
-  actions: { argTypesRegex: "^on[A-Z].*" },
+  actions: { argTypesRegex: '^on[A-Z].*' },
   controls: {
     matchers: {
       color: /(background|color)$/i,
@@ -15,21 +18,21 @@ export const parameters = {
   layout: 'fullscreen',
   breakpoints: {
     breakpointNames: {
-      'default': '0',
-      'sm': '640',
-      'md': '768',
-      'lg': '1024',
-      'xl': '1280',
+      default: '0',
+      sm: '640',
+      md: '768',
+      lg: '1024',
+      xl: '1280',
       '2xl': '1536',
     },
     debounceTimeout: 200,
   },
-}
+};
 
-Object.defineProperty(nextImage, 'default', {
-  configurable: true,
-  value: props => <img {...props} />
-});
+// Object.defineProperty(nextImage, 'default', {
+//   configurable: true,
+//   value: (props) => <img {...props} />,
+// });
 
 export const mockLayoutData = {
   sitecore: {