Skip to content

Commit

Permalink
Merge pull request #2165 from smeup/dev-to-mas
Browse files Browse the repository at this point in the history
10.0.1
  • Loading branch information
pasere-smeup authored Nov 6, 2024
2 parents 4cdc3a3 + 3744747 commit 0723a4f
Show file tree
Hide file tree
Showing 148 changed files with 5,614 additions and 660 deletions.
284 changes: 142 additions & 142 deletions .github/workflows/continuum.yaml
Original file line number Diff line number Diff line change
@@ -1,149 +1,149 @@
name: continuum

on:
push:
branches:
- develop
push:
branches:
- develop

env:
VERSION: 10.0.0-SNAPSHOT
AWS_REGION: eu-south-1
VERSION: 11.0.0-SNAPSHOT
AWS_REGION: eu-south-1

jobs:
ketchup-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "18.16.0"
cache: "yarn"

- name: Install dependencies
run: yarn install --immutable

- name: Run Ketchup build
run: npm run k:build

- 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
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
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
# Prepare GitHub Pages Showcase deployment
- name: Setup GitHub Pages
uses: actions/configure-pages@v5
- name: Upload GitHub Pages artifact
uses: actions/upload-pages-artifact@v3
with:
path: "./packages/ketchup-showcase/dist"

# Showcase Deployment Job
showcase-release:
needs: ketchup-release
runs-on: ubuntu-latest
# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
permissions:
pages: write # to deploy to Pages
id-token: write # to verify the deployment originates from an appropriate source

# Deploy to the github-pages environment
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4

build:
runs-on: ubuntu-latest
needs: ketchup-release
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
run: yarn install --no-immutable

- name: Update Ketchup Version with Timestamp
run: |
cd packages/ketchup
VERSION=$(node -p "require('./package.json').version")
TIMESTAMP=$(date +%Y%m%d%H%M%S)
NEW_VERSION="${VERSION}-${TIMESTAMP}"
echo "New version: $NEW_VERSION"
sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
- name: Update Ketchup React Version with Timestamp
run: |
cd packages/ketchup-react
VERSION=$(node -p "require('./package.json').version")
TIMESTAMP=$(date +%Y%m%d%H%M%S)
NEW_VERSION="${VERSION}-${TIMESTAMP}"
echo "New version: $NEW_VERSION"
sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
- name: Run Ketchup build
run: npm run k:build

- name: Publish Ketchup
run: |
cd packages/ketchup
npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Publish Ketchup React
run: |
cd packages/ketchup-react
npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

trigger-webup-continuum:
needs: build
runs-on: ubuntu-latest
steps:
- run: |
curl -L \
-X POST \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${{ secrets.ROBBY_SMEUP_PAT }}" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/smeup/webup-project/actions/workflows/continuum.yaml/dispatches \
-d '{"ref": "develop"}'
trigger-webupjs-develop:
needs: build
runs-on: ubuntu-latest
steps:
- run: |
curl -L \
-X POST \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${{ secrets.ROBBY_SMEUP_PAT }}" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/smeup/webup.js/actions/workflows/develop-release.yaml/dispatches \
-d '{"ref": "develop"}'
ketchup-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '18.16.0'
cache: 'yarn'

- name: Install dependencies
run: yarn install --immutable

- name: Run Ketchup build
run: npm run k:build

- 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
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
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
# Prepare GitHub Pages Showcase deployment
- name: Setup GitHub Pages
uses: actions/configure-pages@v5
- name: Upload GitHub Pages artifact
uses: actions/upload-pages-artifact@v3
with:
path: './packages/ketchup-showcase/dist'

# Showcase Deployment Job
showcase-release:
needs: ketchup-release
runs-on: ubuntu-latest
# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
permissions:
pages: write # to deploy to Pages
id-token: write # to verify the deployment originates from an appropriate source

# Deploy to the github-pages environment
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4

build:
runs-on: ubuntu-latest
needs: ketchup-release
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
run: yarn install --no-immutable

- name: Update Ketchup Version with Timestamp
run: |
cd packages/ketchup
VERSION=$(node -p "require('./package.json').version")
TIMESTAMP=$(date +%Y%m%d%H%M%S)
NEW_VERSION="${VERSION}-${TIMESTAMP}"
echo "New version: $NEW_VERSION"
sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
- name: Update Ketchup React Version with Timestamp
run: |
cd packages/ketchup-react
VERSION=$(node -p "require('./package.json').version")
TIMESTAMP=$(date +%Y%m%d%H%M%S)
NEW_VERSION="${VERSION}-${TIMESTAMP}"
echo "New version: $NEW_VERSION"
sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
- name: Run Ketchup build
run: npm run k:build

- name: Publish Ketchup
run: |
cd packages/ketchup
npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Publish Ketchup React
run: |
cd packages/ketchup-react
npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

trigger-webup-continuum:
needs: build
runs-on: ubuntu-latest
steps:
- run: |
curl -L \
-X POST \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${{ secrets.ROBBY_SMEUP_PAT }}" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/smeup/webup-project/actions/workflows/continuum.yaml/dispatches \
-d '{"ref": "develop"}'
trigger-webupjs-develop:
needs: build
runs-on: ubuntu-latest
steps:
- run: |
curl -L \
-X POST \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${{ secrets.ROBBY_SMEUP_PAT }}" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/smeup/webup.js/actions/workflows/develop-release.yaml/dispatches \
-d '{"ref": "develop"}'
4 changes: 2 additions & 2 deletions packages/ketchup-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sme.up/ketchup-react",
"version": "10.0.0",
"version": "10.0.1",
"module": "dist/index.js",
"typings": "dist/index.d.ts",
"keywords": [
Expand All @@ -20,7 +20,7 @@
"description": "Ketchup React Components library by smeup",
"license": "Apache-2.0",
"dependencies": {
"@sme.up/ketchup": "^10.0.0",
"@sme.up/ketchup": "^10.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/ketchup-react/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const KupGauge = /*@__PURE__*/createReactComponent<JSX.KupGauge, HTMLKupG
export const KupGrid = /*@__PURE__*/createReactComponent<JSX.KupGrid, HTMLKupGridElement>('kup-grid');
export const KupGridRenderer = /*@__PURE__*/createReactComponent<JSX.KupGridRenderer, HTMLKupGridRendererElement>('kup-grid-renderer');
export const KupHorizontalScroll = /*@__PURE__*/createReactComponent<JSX.KupHorizontalScroll, HTMLKupHorizontalScrollElement>('kup-horizontal-scroll');
export const KupHtm = /*@__PURE__*/createReactComponent<JSX.KupHtm, HTMLKupHtmElement>('kup-htm');
export const KupIframe = /*@__PURE__*/createReactComponent<JSX.KupIframe, HTMLKupIframeElement>('kup-iframe');
export const KupImage = /*@__PURE__*/createReactComponent<JSX.KupImage, HTMLKupImageElement>('kup-image');
export const KupImageList = /*@__PURE__*/createReactComponent<JSX.KupImageList, HTMLKupImageListElement>('kup-image-list');
Expand Down Expand Up @@ -72,6 +73,7 @@ export const KupTaskListHeader = /*@__PURE__*/createReactComponent<JSX.KupTaskLi
export const KupTaskListTable = /*@__PURE__*/createReactComponent<JSX.KupTaskListTable, HTMLKupTaskListTableElement>('kup-task-list-table');
export const KupTextField = /*@__PURE__*/createReactComponent<JSX.KupTextField, HTMLKupTextFieldElement>('kup-text-field');
export const KupTimePicker = /*@__PURE__*/createReactComponent<JSX.KupTimePicker, HTMLKupTimePickerElement>('kup-time-picker');
export const KupToolbar = /*@__PURE__*/createReactComponent<JSX.KupToolbar, HTMLKupToolbarElement>('kup-toolbar');
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');
Expand Down
2 changes: 1 addition & 1 deletion packages/ketchup-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@sme.up/ketchup": "^10.0.0",
"@sme.up/ketchup": "^10.0.1",
"core-js": "^3.30.2",
"vue": "^2.6.14",
"vue-router": "^3.5.1"
Expand Down
24 changes: 22 additions & 2 deletions packages/ketchup-showcase/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
@kup-tree-nodeselected="treeClick"
></kup-tree
><div class="version"
><a href="https://github.com/smeup/ketchup/releases/tag/v10.0.0"
>v10.0.0</a
><a href="https://github.com/smeup/ketchup/releases/tag/v10.0.1"
>v10.0.1</a
></div
></div
>
Expand Down Expand Up @@ -425,6 +425,16 @@ export default {
value: 'Planner',
visible: true,
},
{
cells: {
ROUTE: {
value: 'toolbar',
},
},
icon: 'app',
value: 'Toolbar',
visible: true,
},
{
cells: {
ROUTE: {
Expand Down Expand Up @@ -594,6 +604,16 @@ export default {
value: 'Grid',
visible: true,
},
{
cells: {
ROUTE: {
value: 'htm',
},
},
icon: 'HTM',
value: 'HTM',
visible: true,
},
{
cells: {
ROUTE: {
Expand Down
Loading

0 comments on commit 0723a4f

Please sign in to comment.