Merge pull request #294 from umbraco/v1/release/rc2

1.0.0-rc.2

Author: iOvergaard

.github/workflows/azure-static-web-apps-delightful-beach-055ecb503.yml

@@ -3,13 +3,16 @@ name: Azure Static Web Apps CI/CD
 on:
   push:
     branches:
-      - storybook
+      - main
+      - 'v*/main'
+      - 'v*/dev'
   # This is how azure builds staging environments
   pull_request:
     types: [opened, synchronize, reopened, closed]
     branches:
       - main
       - 'v*/main'
+      - 'v*/dev'
 
 jobs:
   build_and_deploy_job:
@@ -34,6 +37,7 @@ jobs:
           app_build_command: 'npm run storybook:build'
           api_location: '' # Api source code path - optional
           output_location: '/storybook-static' # Built app content directory - optional
+          production_branch: 'v1/main' # Production branch
           ###### End of Repository/Build Configurations ######
 
   close_pull_request_job:

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

.storybook/main.js

@@ -3,11 +3,13 @@ const tsconfigPaths = require('vite-tsconfig-paths').default;
 module.exports = {
   stories: ['../packages/**/*.story.ts', '../stories/**/*.story.ts'],
   addons: [
-    '@storybook/addon-links',
     '@storybook/addon-essentials',
+    '@storybook/addon-links',
     '@storybook/addon-a11y',
     '../storyhelpers/storybook-readme/preset.js',
   ],
+  framework: '@storybook/web-components',
+  features: { storyStoreV7: false },
   core: { builder: '@storybook/builder-vite' },
   staticDirs: ['./images'],
 
@@ -22,16 +24,6 @@ module.exports = {
     if (configType === 'DEVELOPMENT') {
       // add plugins
       config.plugins.push(tsconfigPaths());
-
-      // pre bundle dependencies for faster startup time
-      config.optimizeDeps.include.push('@storybook/web-components');
-      config.optimizeDeps.include.push('lit-html');
-      config.optimizeDeps.include.push('lit');
-      config.optimizeDeps.include.push('lit/decorators.js');
-      config.optimizeDeps.include.push('lit/directives/style-map.js');
-      config.optimizeDeps.include.push('lit/directives/if-defined.js');
-      config.optimizeDeps.include.push('lit/directives/unsafe-html.js');
-      config.optimizeDeps.include.push('element-internals-polyfill');
     }
 
     return config;

.storybook/preview.js

@@ -5,16 +5,6 @@ import { setCustomElements } from '@storybook/web-components';
 
 import customElements from '../custom-elements.json';
 
-const sort = (a, b) => {
-  if (a[1].name === 'Overview') {
-    return 0;
-  }
-  if (b[1].name === 'Overview') {
-    return 1;
-  }
-  return a[0] > b[0];
-};
-
 export const parameters = {
   layout: 'padded',
   actions: { argTypesRegex: '^on[A-Z].*' },
@@ -29,7 +19,16 @@ export const parameters = {
   },
   options: {
     method: 'alphabetical',
-    storySort: sort,
+    storySort: (a, b) => {
+      //NOTE: This has to be an inline function for some reason
+      if (a.title === 'Overview') {
+        return 0;
+      }
+      if (b.title === 'Overview') {
+        return 1;
+      }
+      return a.title > b.title;
+    },
   },
 };