chore: create workflows merge from master to develop and check commits

.dockerignore

@@ -18,7 +18,8 @@ deploy
 # Output
 out
 **/dist
-apps/storybook/.out
+apps/mirinae-storybook/.out
+apps/web-storybook/.out
 packages/mirinae/css
 packages/mirinae/types
 
@@ -55,4 +56,4 @@ VERSION
 .idea
 *.swp
 *.bak
-**/.DS_Store
+**/.DS_Store

.github/workflows/dispatch_master_to_develop.yaml

@@ -0,0 +1,65 @@
+name: "[Dispatch] Master To Develop"
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'enter version(x.y.z)'
+        required: true
+        default: '2.0.0'
+
+env:
+  VERSION: ${{ github.event.inputs.version }}
+  SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+  REF_BRANCH: "master"
+
+jobs:
+  merge_to_develop:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{env.REF_BRANCH}}
+          fetch-depth: 0
+          fetch-tags: false
+          submodules: true
+          token: ${{ secrets.PAT_TOKEN }}
+
+      - name: Fetch develop branch
+        run: |
+          git checkout -b develop origin/develop
+
+      - name: Configure git
+        run: |
+          git log -n 10 --oneline
+          git branch
+          git config --global user.email "${{ vars.GIT_EMAIL }}"
+          git config --global user.name "${{ vars.GIT_USERNAME }}"
+
+      - name: Import GPG key
+        id: import-gpg
+        uses: crazy-max/ghaction-import-gpg@v6.2.0
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
+      - name: Merge master into develop
+        run: |
+          git merge --no-ff master -m "chore: merge master into develop after ${{ env.VERSION }} version tagging"
+
+      - name: Push changes to develop using GitHub push action
+        uses: ad-m/github-push-action@v0.6.0
+        with:
+          branch: develop
+          github_token: ${{ secrets.PAT_TOKEN }}
+
+      - name: Notice when job fails
+        if: failure()
+        uses: 8398a7/action-slack@v3.15.0
+        with:
+          status: ${{job.status}}
+          fields: repo,workflow,job
+          author_name: Github Action Slack

.github/workflows/dispatch_release.yaml

@@ -20,10 +20,29 @@ env:
   ARCH: ${{ github.event.inputs.container_arch }}
   VERSION: ${{ github.event.inputs.version }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+  REF_BRANCH: "master"
 
 jobs:
+  check-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check branch with regex
+        run: |
+          if [[ ! "${{ github.ref }}" =~ ^refs/heads/(${{env.REF_BRANCH}}.*|.*${{env.REF_BRANCH}})$ ]]; then
+            echo `::error::Branch should always be run from '${{env.REF_BRANCH}}', Running branch: ${github.ref_name}`.
+            exit 1
+          fi
+      - name: Notice when job fails
+        if: failure()
+        uses: 8398a7/action-slack@v3.15.0
+        with:
+          status: ${{job.status}}
+          fields: repo,workflow,job
+          author_name: Github Action Slack
+
   mirinae:
     runs-on: ubuntu-latest
+    needs: check-branch
     steps:
       - name: Invoke mirinae release workflow
         id: mirinae
@@ -63,6 +82,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+          ref: ${{ env.REF_BRANCH }}
           token: ${{ secrets.PAT_TOKEN }}
 
       - name: Setup Node.js
@@ -91,7 +111,7 @@ jobs:
 
       - name: Import GPG key
         id: import-gpg
-        uses: crazy-max/ghaction-import-gpg@v6.2.0  
+        uses: crazy-max/ghaction-import-gpg@v6.2.0
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -129,6 +149,21 @@ jobs:
           github_token: ${{ secrets.PAT_TOKEN }}
           branch: ${{ github.ref }}
 
+      - name: Trigger dispatch_master_to_develop.yaml workflow
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.PAT_TOKEN }}
+          script: |
+            github.rest.actions.createWorkflowDispatch({
+               owner: "${{ github.repository_owner }}",
+               repo: "${{ github.event.repository.name }}",
+               workflow_id: "dispatch_master_to_develop.yaml",
+               inputs: {
+                 version: "${{ github.event.inputs.version }}",
+               },
+               ref: "${{env.REF_BRANCH}}",
+             });
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 

.github/workflows/pull_request_check_revert_candidate_commits.yaml

@@ -0,0 +1,52 @@
+name: "[Pull Request] Check Revert Candidate Commits"
+
+on:
+  pull_request:
+    branches: [master]
+
+jobs:
+  check-commits:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Find feat(backend) commits
+        id: check-commits
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          COMMITS=$(gh api repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/commits \
+            --jq '.[] | select(.commit.message | test("^feat\\(backend")) | .sha + " " + .commit.message')
+
+          if [ -z "$COMMITS" ]; then
+            echo "No matching commits found"
+            echo "found=false" >> $GITHUB_OUTPUT
+          else
+            echo "Found matching commits"
+            echo "found=true" >> $GITHUB_OUTPUT
+            COMMITS="${COMMITS//$'\n'/'%0A'}"
+            echo "commits=$COMMITS" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Comment feat(backend) commits
+        if: steps.check-commits.outputs.found == 'true'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const prNumber = context.payload.pull_request.number;
+            const commits = `${{ steps.check-commits.outputs.commits }}`.replace(/%0A/g, '\n');
+            await github.rest.issues.createComment({
+              ...context.repo,
+              issue_number: prNumber,
+              body: `⚠️ The following commits require review:\n\n${commits}`
+            });
+
+      - name: Comment no feat(backend) commits
+        if: steps.check-commits.outputs.found == 'false'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            await github.rest.issues.createComment({
+              ...context.repo,
+              issue_number: context.payload.pull_request.number,
+              body: `✅ There are no commits in this PR that require review.`
+            });
+

apps/storybook/.storybook/CloudforetTheme.js → apps/mirinae-storybook/.storybook/CloudforetTheme.js

@@ -1,6 +1,4 @@
-import { create } from '@storybook/theming/create';
-
-export default create({
+export default {
     base: 'light',
     colorPrimary: '#6638B6',
     colorSecondary: 'rgba(102, 56, 182, 0.9)',
@@ -29,4 +27,4 @@ export default create({
     brandTitle: 'Mirinae Design System',
     brandUrl: 'https://github.com/cloudforet-io/mirinae',
     brandImage: './images/SpaceONE_logoTypeA.svg',
-});
+};

apps/mirinae-storybook/.storybook/main.ts

@@ -0,0 +1,13 @@
+import type { StorybookConfig } from "@storybook/vue-vite";
+import { mainConfig } from "storybook-config-custom";
+
+/** @type { import('@storybook/vue-vite').StorybookConfig } */
+const config: StorybookConfig = {
+  ...mainConfig,
+  stories: [
+    '../../../packages/mirinae/src/**/*.mdx',
+    '../../../packages/mirinae/src/**/*.stories.@(js|jsx|ts|tsx)',
+  ],
+};
+
+export default config;

apps/mirinae-storybook/.storybook/manager.js

@@ -0,0 +1,9 @@
+
+import CloudforetThemeVar from './CloudforetTheme';
+import { setConfig } from 'storybook-config-custom';
+
+// window.STORYBOOK_GA_ID = 'UA-159327743-4';
+
+setConfig({
+  theme: CloudforetThemeVar,
+})

apps/storybook/.storybook/preview.js → apps/mirinae-storybook/.storybook/preview.js

@@ -12,10 +12,12 @@ import VueRouter from 'vue-router';
 import SvgIcon from 'vue-svgicon';
 import webFontLoader from 'webfontloader';
 
-import screens from '@/styles/screens.cjs';
-import { fontUrls, webFonts } from '@/styles/web-fonts.cjs';
+import screens from 'mirinae-foundation/screens.cjs';
 
-import SpaceOneTheme from './CloudforetTheme';
+import { fontUrls, webFonts } from 'mirinae-foundation/web-fonts.cjs';
+
+import CloudforetTheme from './CloudforetTheme';
+import { createTheme } from 'storybook-config-custom';
 
 Vue.use(VueRouter);
 Vue.use(VueI18n);
@@ -63,7 +65,7 @@ const preview = {
             }
             return null;
         },
-        theme: SpaceOneTheme,
+        theme: createTheme(CloudforetTheme),
     },
     viewport: {
         viewports,

apps/mirinae-storybook/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "mirinae-storybook",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "dev": "storybook dev -p 6006",
+    "build": "storybook build"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "eslint-config-custom": "*",
+    "mirinae-foundation": "*",
+    "postcss-config-custom": "*",
+    "storybook-config-custom": "*",
+    "tsconfig": "*"
+  }
+}

apps/storybook/tailwind.config.js → apps/mirinae-storybook/tailwind.config.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const tailwindConfig = require('../../packages/mirinae/tailwind.config.cjs');
+const tailwindConfig = require('postcss-config-custom/tailwind.config.cjs');
 
 module.exports = {
     content: [

apps/storybook/vite.config.js → apps/mirinae-storybook/vite.config.js

@@ -1,8 +1,11 @@
-import { defineConfig } from 'vite';
-import vue from '@vitejs/plugin-vue2';
-import commonjs from '@rollup/plugin-commonjs';
+/* eslint-disable import/no-extraneous-dependencies */
 import path from 'path';
 
+import commonjs from '@rollup/plugin-commonjs';
+import vue from '@vitejs/plugin-vue2';
+import { defineConfig } from 'vite';
+
+
 export default defineConfig({
     plugins: [vue()],
     resolve: {
@@ -12,9 +15,9 @@ export default defineConfig({
         },
     },
     optimizeDeps: {
-        include: ['@/styles/colors.cjs', '@/styles/web-fonts.cjs', '@/styles/screens.cjs', '@/styles/variables.cjs', '@/styles/font-size.cjs', '@/index'],
+        include: ['mirinae-foundation/web-fonts.cjs', 'mirinae-foundation/screens.cjs', '@/styles/colors.cjs'],
     },
     rollupInputOptions: {
-        plugins: [commonjs()]
-    }
-});
+        plugins: [commonjs()],
+    },
+});

apps/unified-storybook/.eslintrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+    root: false,
+    extends: ['custom'],
+    ignorePatterns: ['**/node_modules/**'],
+};

apps/unified-storybook/.gitignore

@@ -0,0 +1,3 @@
+# Transpiled code
+.out
+storybook-static

apps/unified-storybook/.storybook/CloudforetTheme.js

@@ -0,0 +1,30 @@
+export default {
+    base: 'light',
+    colorPrimary: '#6638B6',
+    colorSecondary: 'rgba(102, 56, 182, 0.9)',
+
+    // UI
+    appBg: 'white',
+    appContentBg: 'white',
+    appBorderColor: 'silver',
+    appBorderRadius: 4,
+
+    // Text colors
+    textColor: 'black',
+    textInverseColor: 'rgba(255,255,255,0.9)',
+
+    // Toolbar default and active colors
+    barTextColor: 'silver',
+    barSelectedColor: '#6638B6',
+    barBg: 'white',
+
+    // Form colors
+    inputBg: 'white',
+    inputBorder: 'silver',
+    inputTextColor: 'black',
+    inputBorderRadius: 4,
+
+    brandTitle: 'Cloudforet Design System',
+    brandUrl: 'https://github.com/cloudforet-io/console',
+    brandImage: './images/SpaceONE_logoTypeA.svg',
+};