Skip to content

Commit

Permalink
Merge branch 'main' into DX-frontends
Browse files Browse the repository at this point in the history
  • Loading branch information
bojanrajh authored Dec 7, 2023
2 parents 4461d28 + 7e4ba1f commit 22191b9
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 31 deletions.
20 changes: 1 addition & 19 deletions .vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,23 +184,8 @@ export default withMermaid(defineConfigWithTheme<ThemeConfig>({
srcExclude: [
// git sources
"**/_source/**",
// table of contents
"docs/SUMMARY.md",
// template
"docs/resources/references/adr/YYYY-MM-DD-template.md",
// {% api
"docs/v6.3/guides/plugins/apps/app-base-guide.md",
"docs/v6.3/resources/references/app-reference/payment-reference.md",
// Missed semicolon
'docs/v6.3/guides/plugins/plugins/plugin-fundamentals/add-custom-commands.md',
// path() is not a function in twig codeblock
'docs/v6.3/products/extensions/b2b-suite/guides/storefront/ajax-panel.md',
// {% block
'docs/v6.3/guides/plugins/plugins/administration/customizing-components.md',
// unknown
'docs/v6.3/guides/plugins/plugins/content/cms/add-cms-block.md',
'docs/v6.3/guides/plugins/plugins/framework/data-handling/add-data-translations.md',
'docs/v6.3/guides/plugins/themes/add-css-js-to-theme.md',
// snippets
'docs/snippets/**',
],
Expand Down Expand Up @@ -317,9 +302,6 @@ export default withMermaid(defineConfigWithTheme<ThemeConfig>({
]
],

// tmp?
ignoreDeadLinks: true,

themeConfig: {
...navigation, // add sidebar and nav config

Expand Down Expand Up @@ -462,7 +444,7 @@ export default withMermaid(defineConfigWithTheme<ThemeConfig>({
}),
],
worker: {
plugins: [
plugins: () => [
topLevelAwait()
]
},
Expand Down
3 changes: 3 additions & 0 deletions .vitepress/navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ const navigation = buildSidebarNav('./src/', [
'/', // always have root sidebar
'/resources/meteor-icon-kit/',
'/release-notes/',
], [
'/docs/assets/',
'/docs/snippets/',
]);

navigation.sidebar['/frontends/'] = (await import("../src/frontends/_source/apps/docs/.vitepress/sidebar")).sidebar;
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@shopware-ag/meteor-icon-kit": "^5.2.0",
"cross-env": "^7.0.3",
"terser": "^5.25.0",
"vitepress": "1.0.0-rc.25",
"vitepress": "1.0.0-rc.31",
"vitepress-shopware-docs": "1.1.0",
"vue": "^3.3.10"
},
Expand All @@ -38,8 +38,8 @@
"@mdit-vue/shared": "^1.0.0",
"@mermaid-js/mermaid-mindmap": "^9.3.0",
"@originjs/vite-plugin-require-context": "^1.0.9",
"@playwright/test": "1.39.0",
"@shopware-docs/cli": "1.1.0-alpha.5",
"@playwright/test": "1.40.1",
"@shopware-docs/cli": "1.1.0",
"@shopware-docs/storybook": "1.1.0",
"@shopware-docs/typer": "1.1.0",
"@shopware-docs/vitepress": "1.1.0",
Expand All @@ -61,15 +61,15 @@
"@types/uuid": "^9.0.7",
"@vitejs/plugin-vue": "^4.5.1",
"@vitest/coverage-c8": "^0.33.0",
"@vitest/ui": "^0.34.7",
"@vue/test-utils": "^2.4.3",
"@vueuse/shared": "^10.7.0",
"algoliasearch": "^4.20.0",
"chromatic": "^7.6.0",
"execa": "^8.0.1",
"find-in-files": "^0.5.0",
"fs-extra": "^11.2.0",
"fuse.js": "^6.6.2",
"@vitest/ui": "^1.0.1",
"chromatic": "^10.0.0",
"fuse.js": "^7.0.0",
"get-port": "^7.0.0",
"instantsearch.css": "^8.1.0",
"instantsearch.js": "^4.61.0",
Expand Down Expand Up @@ -102,12 +102,12 @@
"typescript": "^5.3.3",
"uuid": "^9.0.1",
"vinyl": "^3.0.0",
"vite-plugin-inspect": "^0.7.42",
"vite-plugin-inspect": "^0.8.1",
"vite-plugin-live-reload": "^3.0.3",
"vite-plugin-top-level-await": "^1.3.1",
"vite-plugin-wasm": "^3.2.2",
"vitepress-plugin-mermaid": "^2.0.16",
"vitest": "^0.34.6",
"vitest": "^1.0.1",
"vue-instantsearch": "^4.13.0"
},
"pnpm": {
Expand All @@ -126,5 +126,5 @@
"engines": {
"node": ">=20.0.0"
},
"packageManager": "pnpm@8.9.2"
"packageManager": "pnpm@8.11.0"
}
8 changes: 7 additions & 1 deletion src/components/SwagChangelogWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,13 @@ const intro = new DOMParser().parseFromString(content, "text/html").querySelecto

<style lang="scss">
.SwagChangelogWrapper {
@apply bg-[var(--sw-c-gray-50)];
&.SwagChangelogWrapper {
@apply bg-[var(--sw-c-gray-50)];
.dark & {
@apply bg-[var(--sw-c-gray-dark-700)];
}
}
&_grid {
@apply grid;
@media (min-width: 960px) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/SwagSlackCommunity.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<img src="/components/slack-logo.png" />
<p class="SwagSlackCommunity_intro">Join the Shopware Slack Community and connect with more than <span class="font-black">8,000</span> Developers!</p>
<p>We've got an incredible community waiting for you! Join our Shopware Slack workspace, where developers from
around the world came together to share knowledge, insights, and experiences.</p>
around the world come together to share knowledge, insights, and experiences.</p>
<a href="https://shopwarecommunity.slack.com/" target="_blank" class="btn --primary mt-4">Join the community channel</a>
</div>
</div>
Expand Down Expand Up @@ -35,4 +35,4 @@
</style>

<script>
</script>
</script>

0 comments on commit 22191b9

Please sign in to comment.