Skip to content

Commit

Permalink
Merge pull request #411 from it-at-m/beta
Browse files Browse the repository at this point in the history
Release 3.0
  • Loading branch information
FabianWilms authored Feb 5, 2025
2 parents cdd4f40 + a65c8f1 commit 476e42c
Show file tree
Hide file tree
Showing 34 changed files with 1,015 additions and 678 deletions.
2 changes: 1 addition & 1 deletion .coderabbit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ reviews:
request_changes_workflow: true
high_level_summary: true
poem: true
review_status: true
review_status: false # dont comment that auto reviews are enabled, this bloats PRs
collapse_walkthrough: false
auto_review:
enabled: false
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
contents: read
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: ${{ env.NODE_VERSION }}
cache: "npm"
Expand All @@ -28,7 +28,7 @@ jobs:
contents: read
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: ${{ env.NODE_VERSION }}
cache: "npm"
Expand All @@ -42,20 +42,20 @@ jobs:
contents: read
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: ${{ env.NODE_VERSION }}
cache: "npm"
- run: npm ci # install dependencies
- run: npm run build # build library
- run: npm run build-storybook # build docs
- name: upload library artifacts
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name: library_dist
path: ./dist
- name: upload storybook artifacts
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name: storybook_dist
path: ./storybook-static
Expand All @@ -71,7 +71,7 @@ jobs:
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/beta'
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: ${{ env.NODE_VERSION }}
cache: "npm"
Expand Down
12 changes: 0 additions & 12 deletions .releaserc.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,6 @@ module.exports = {
path: "dist/muc-patternlab-vue.es.js",
label: "JS distribution",
},
{
path: "dist/assets/temporary/muenchende-style.css",
label: "CSS distribution",
},
{
path: "dist/assets/temporary/muenchende-fontfaces.css",
label: "CSS fontface distribution",
},
{
path: "dist/assets/temporary/muc-icons.svg",
label: "SVG sprite distribution",
},
],
},
],
Expand Down
4 changes: 2 additions & 2 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import { StorybookConfig } from "@storybook/vue3-vite";
const fs = require("fs");
const path = require("path");
const mucIconsSvg = fs.readFileSync(
path.resolve(__dirname, "../public/assets/temporary/muc-icons.svg"),
path.resolve(__dirname, "../public/assets/icons/muc-icons.svg"),
"utf8"
);
const customIconsSvg = fs.readFileSync(
path.resolve(__dirname, "../public/assets/temporary/custom-icons.svg"),
path.resolve(__dirname, "../public/assets/icons/custom-icons.svg"),
"utf8"
);

Expand Down
9 changes: 9 additions & 0 deletions .storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!-- Load MDE-CSS from assets-Server -->
<link
rel="stylesheet"
href="https://assets.muenchen.de/mde/1.0.6/css/muenchende-fontfaces.css"
/>
<link
rel="stylesheet"
href="https://assets.muenchen.de/mde/1.0.6/css/muenchende-style.css"
/>
4 changes: 1 addition & 3 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import "../public/assets/temporary/muenchende-style.css";
import "../public/assets/temporary/custom-style.css";
import "../public/assets/temporary/muenchende-fontfaces.css";
import "../public/assets/css/custom-style.css";

/** @type { import('@storybook/vue3').Preview } */
const preview = {
Expand Down
14 changes: 9 additions & 5 deletions docs/GettingStarted.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,23 @@ export default defineConfig({
});
```

In your Webcomponents root you should import the MDE5-CSS and SVG-Sprite for MDE5-Icons, as well as the optional custom-icons SVG-Sprite:
In your Webcomponents root you should import the MDE5-CSS from assets.muenchen.de and SVG-Sprite for MDE5-Icons, as well as the optional custom-icons SVG-Sprite:

```html
<script
lang="ts"
setup
>
import customIconsSprite from "@muenchen/muc-patternlab-vue/assets/temporary/custom-icons.svg?raw";
import mucIconsSprite from "@muenchen/muc-patternlab-vue/assets/temporary/muc-icons.svg?raw";
import customIconsSprite from "@muenchen/muc-patternlab-vue/assets/icons/custom-icons.svg?raw";
import mucIconsSprite from "@muenchen/muc-patternlab-vue/assets/icons/muc-icons.svg?raw";
</script>

<template>
<link
href="https://assets.muenchen.de/mde/1.0.6/css/muenchende-style.css"
rel="stylesheet"
/>

<div>
<div v-html="mucIconsSprite"></div>
<div v-html="customIconsSprite"></div>
Expand All @@ -52,8 +57,7 @@ In your Webcomponents root you should import the MDE5-CSS and SVG-Sprite for MDE
</template>

<style>
@import "@muenchen/muc-patternlab-vue/assets/temporary/muenchende-style.css";
@import "@muenchen/muc-patternlab-vue/assets/temporary/custom-style.css";
@import "@muenchen/muc-patternlab-vue/assets/css/custom-style.css";
@import "@muenchen/muc-patternlab-vue/style.css";
</style>
```
Expand Down
Loading

0 comments on commit 476e42c

Please sign in to comment.