Merge pull request #2108 from smeup/dev-to-mas

10.0.0

.github/workflows/develop-release.yml

@@ -0,0 +1,22 @@
+# Trigger jenkins workflow to build webup on 172.16.2.103 using ketchup.zip from branch staging
+
+name: ketchup-outsourcing-release
+
+on:
+  push:
+    branches:
+      - staging
+
+jobs:
+  run-cicd:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Trigger jenkins workflow
+        uses: fjogeleit/http-request-action@v1
+        with:
+          url: 'https://webuptest.smeup.com/jenkins/job/WebupKetchupOutsourcingPipeline/build?token=${{ secrets.JENKINS_WEBHOOK_TOKEN }}'
+          method: 'GET'
+          username: ${{ secrets.JENKINS_WEBHOOK_USERNAME }}
+          password: ${{ secrets.JENKINS_WEBHOOK_PASSWORD }}

.github/workflows/staging.yaml

@@ -6,6 +6,7 @@ on:
       - staging
 
 env:
+  VERSION: TEST-SNAPSHOT
   AWS_REGION: eu-south-1
 
 jobs:
@@ -28,6 +29,12 @@ jobs:
 
     - name: Run Ketchup Showcase build
       run: npm run ksc:build
+
+    - name: Zip artifacts
+      run: |
+        cd packages/ketchup/dist
+        zip -qr /tmp/ketchup.zip *
+        zip -qr /tmp/ketchup-components.zip ketchup/*
     
     - name: Setup AWS
       uses: aws-actions/configure-aws-credentials@v4
@@ -37,4 +44,9 @@ jobs:
         aws-region: ${{ env.AWS_REGION }}
 
     - name: Upload artifacts to AWS S3
+      run: |
+        aws s3 cp /tmp/ketchup.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ env.VERSION }}/zip/ketchup.zip
+        aws s3 cp /tmp/ketchup-components.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ env.VERSION }}/zip/ketchup-components.zip
+
+    - name: Upload showcase to AWS S3
       run: aws s3 sync packages/ketchup-showcase/dist/ s3://smeup-ketchup/staging/ --delete

.gitignore

@@ -5,3 +5,5 @@ packages/ketchup/src/assets/debug.js
 target/
 .yarn/cache
 .yarn/install-state.gz
+.package-lock.json
+.vscode/settings.json

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": "explicit"
@@ -25,5 +26,8 @@
     },
     "[jsonc]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
+    },
+    "[scss]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
 }

README.md

@@ -54,7 +54,8 @@ Ketchup repository is a monorepo multi-package repository managed with [Lerna](h
 
 ## Showcase
 
-Go to [Ketchup Showcase](http://ketchup.smeup.com) to see our components live.<p align="right">(<a href="#top">back to top</a>)</p>
+
+Go to [Ketchup Showcase](https://smeup.github.io/ketchup/) to see our components live.<p align="right">(<a href="#top">back to top</a>)</p>
 
 ## Getting started
 

packages/ketchup-react/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sme.up/ketchup-react",
-    "version": "9.6.10",
+    "version": "10.0.0",
     "module": "dist/index.js",
     "typings": "dist/index.d.ts",
     "keywords": [
@@ -20,7 +20,7 @@
     "description": "Ketchup React Components library by smeup",
     "license": "Apache-2.0",
     "dependencies": {
-        "@sme.up/ketchup": "^9.6.10",
+        "@sme.up/ketchup": "^10.0.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
     },

packages/ketchup-react/src/index.ts

@@ -9,6 +9,7 @@ import { defineCustomElements } from '@sme.up/ketchup/dist/loader';
 
 defineCustomElements();
 export const KupAccordion = /*@__PURE__*/createReactComponent<JSX.KupAccordion, HTMLKupAccordionElement>('kup-accordion');
+export const KupActivityTimeline = /*@__PURE__*/createReactComponent<JSX.KupActivityTimeline, HTMLKupActivityTimelineElement>('kup-activity-timeline');
 export const KupAutocomplete = /*@__PURE__*/createReactComponent<JSX.KupAutocomplete, HTMLKupAutocompleteElement>('kup-autocomplete');
 export const KupBadge = /*@__PURE__*/createReactComponent<JSX.KupBadge, HTMLKupBadgeElement>('kup-badge');
 export const KupBox = /*@__PURE__*/createReactComponent<JSX.KupBox, HTMLKupBoxElement>('kup-box');
@@ -73,4 +74,6 @@ export const KupTextField = /*@__PURE__*/createReactComponent<JSX.KupTextField,
 export const KupTimePicker = /*@__PURE__*/createReactComponent<JSX.KupTimePicker, HTMLKupTimePickerElement>('kup-time-picker');
 export const KupTooltip = /*@__PURE__*/createReactComponent<JSX.KupTooltip, HTMLKupTooltipElement>('kup-tooltip');
 export const KupTree = /*@__PURE__*/createReactComponent<JSX.KupTree, HTMLKupTreeElement>('kup-tree');
+export const KupTypography = /*@__PURE__*/createReactComponent<JSX.KupTypography, HTMLKupTypographyElement>('kup-typography');
+export const KupTypographyList = /*@__PURE__*/createReactComponent<JSX.KupTypographyList, HTMLKupTypographyListElement>('kup-typography-list');
 export const KupVerticalScroll = /*@__PURE__*/createReactComponent<JSX.KupVerticalScroll, HTMLKupVerticalScrollElement>('kup-vertical-scroll');

packages/ketchup-showcase/package.json

@@ -19,7 +19,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@sme.up/ketchup": "^9.6.10",
+    "@sme.up/ketchup": "^10.0.0",
     "core-js": "^3.30.2",
     "vue": "^2.6.14",
     "vue-router": "^3.5.1"