Merge branch 'master' into asset-validation-error-per-asset-6.x

Author: godismyjudge95

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
           tag_name: ${{ steps.changelog.outputs.version }}
           release_name: ${{ steps.changelog.outputs.version }}
           body: ${{ steps.changelog.outputs.text }}
-          prerelease: true
+          prerelease: false
 
       - name: Upload dist zip to release
         uses: actions/[email protected]

.github/workflows/tests.yml

@@ -38,7 +38,7 @@ jobs:
         with:
           files: |
             config
-            resources/lang
+            lang
             resources/users
             resources/views
             routes

.storybook/main.ts

@@ -1,4 +1,5 @@
 import type { StorybookConfig } from '@storybook/vue3-vite';
+import { resolve } from 'path';
 
 const config: StorybookConfig = {
     stories: [
@@ -16,6 +17,15 @@ const config: StorybookConfig = {
             docgen: 'vue-component-meta'
         }
     },
+    async viteFinal(config) {
+        if (config.resolve) {
+            config.resolve.alias = {
+                ...config.resolve.alias,
+                '@api': resolve(process.cwd(), 'resources/js/api.js'),
+            };
+        }
+        return config;
+    },
 };
 
 export default config;

.storybook/manager-head.html

@@ -1,3 +1,10 @@
+<link rel="icon" type="image/x-icon" href="favicon.ico">
+<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
+<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
+<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
+
 <link rel="preconnect" href="https://fonts.googleapis.com">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link href="https://fonts.googleapis.com/css2?family=Lexend:wght@400;500;600;700&family=Source+Code+Pro:wght@400;500&display=swap" rel="stylesheet">
+
+<link rel="stylesheet" href="manager-head.css">

.storybook/manager.ts

@@ -6,9 +6,12 @@ const theme = create({
   base: 'light',
   brandTitle: 'Statamic UI Components',
   brandUrl: 'https://statamic.dev',
-  brandImage: '/logo.png',
+  brandImage: '/logo.svg',
   fontBase: '"Lexend", sans-serif',
-  fontCode: '"Source Code Pro", monospace'
+  fontCode: '"Source Code Pro", monospace',
+
+   appBorderColor: 'hsl(287deg 80% 90%)',
+   textColor: '#181a1b',
 });
 
 addons.setConfig({

.storybook/preview-head.html

@@ -1,6 +1,11 @@
+<link rel="icon" type="image/x-icon" href="favicon.ico">
+<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
+<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
+<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
+
 <link rel="preconnect" href="https://use.typekit.net" crossorigin>
 <link rel="preconnect" href="https://p.typekit.net" crossorigin>
-<link rel="stylesheet" href="https://use.typekit.net/wyy0pka.css"/>
+<link rel="stylesheet" href="https://use.typekit.net/wyy0pka.css">
 
 <link rel="preconnect" href="https://fonts.googleapis.com">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>

.storybook/preview.ts

@@ -1,14 +1,19 @@
-import type { Preview } from '@storybook/vue3-vite';
-import { setup } from '@storybook/vue3';
-import { create as createTheme } from 'storybook/theming';
-import { router } from '@inertiajs/vue3';
-import { action } from 'storybook/actions';
+import type {Preview} from '@storybook/vue3-vite';
+import {setup} from '@storybook/vue3';
+import {create as createTheme} from 'storybook/theming';
+import {router} from '@inertiajs/vue3';
+import {action} from 'storybook/actions';
 import './storybook.css';
 import './theme.css';
-import { translate } from '@/translations/translator';
+import {translate} from '@/translations/translator';
 import registerUiComponents from '@/bootstrap/ui';
 import DateFormatter from '@/components/DateFormatter';
 import cleanCodeSnippet from './clean-code-snippet';
+import PortalVue from 'portal-vue';
+import FullscreenHeader from '@/components/publish/FullscreenHeader.vue';
+import Portal from '@/components/portals/Portal.vue';
+import PortalTargets from '@/components/portals/PortalTargets.vue';
+import {keys, portals, slug, stacks} from '@api';
 
 // Intercept Inertia navigation and log to Actions tab.
 router.on('before', (event) => {
@@ -18,8 +23,50 @@ router.on('before', (event) => {
 
 setup(async (app) => {
   window.__ = translate;
+
+  window.Statamic = {
+      $config: {
+          get(key) {
+              const config = {
+                  linkToDocs: true,
+                  paginationSize: 50,
+                  paginationSizeOptions: [10, 25, 50, 100, 500],
+                  sites: [{
+                      handle: 'default',
+                      lang: 'en',
+                  }],
+                  selectedSite: 'default',
+              };
+
+              return config[key] ?? null;
+          }
+      },
+      $commandPalette: {
+          add(command) {
+              //
+          }
+      },
+      $progress: {
+          loading(name, loading) {
+              //
+          }
+      }
+  };
+
   app.config.globalProperties.__ = translate;
   app.config.globalProperties.$date = new DateFormatter;
+  app.config.globalProperties.cp_url = (url) => url;
+  app.config.globalProperties.$portals = portals;
+  app.config.globalProperties.$stacks = stacks;
+  app.config.globalProperties.$slug = slug;
+  app.config.globalProperties.$keys = keys;
+
+  app.use(PortalVue, { portalName: 'v-portal' });
+
+  app.component('portal', Portal);
+  app.component('PortalTargets', PortalTargets);
+  app.component('publish-field-fullscreen-header', FullscreenHeader);
+
   await registerUiComponents(app);
 });
 
@@ -37,6 +84,7 @@ const preview: Preview = {
                 base: 'light',
                 fontBase: '"Lexend", sans-serif',
                 fontCode: '"Source Code Pro", monospace',
+                textColor: '#181a1b',
             }),
             source: {
                 transform: (code: string) => cleanCodeSnippet(code),
@@ -50,11 +98,11 @@ const preview: Preview = {
         options: {
             storySort: {
                 order: [
-                    // 'Getting Started',
-                    // 'Installation',
-                    '*',
-                    'Components'
+                    'Overview',
+                    'Components',
+                    '*'
                 ],
+                method: 'alphabetical',
             },
         },
     },
@@ -87,7 +135,10 @@ const preview: Preview = {
                 }
             }
 
-            return story();
+            return {
+                components: { PortalTargets },
+                template: '<div><story /><PortalTargets /></div>',
+            };
         },
     ],
 };