Skip to content

Commit bd2f3ac

Browse files
committed
Merge remote-tracking branch 'origin/eslint9' into eslint9_merge_fiori_custom_into_fiori_tools_plugin
* origin/eslint9: (52 commits) chore: apply latest changesets update building block svg (#3826) chore: apply latest changesets feat(create): auto generate readme on build (#3760) chore: apply latest changesets Resolve Transport Request Checks for Download Quick Fiori App Deploy (#3819) test: v4 project builder (#3682) chore: apply latest changesets fix: bump specVersion to v4.0 (#3744) chore: apply latest changesets test: Integration test for fiori MCP using promptfoo (#3705) chore: apply latest changesets fix: move message to store creds prompt, tests, changeset (#3820) chore: apply latest changesets fix: bump fallback versions (#3813) chore: apply latest changesets chore - upgrade ui5 devDeps (#3771) correct publisher to SAPOSS (#3817) chore: apply latest changesets fix: cloud system render logic, message wording, test connection logging (#3811) ...
2 parents c1477c8 + dfda8ec commit bd2f3ac

File tree

570 files changed

+28454
-18494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

570 files changed

+28454
-18494
lines changed

.github/workflows/lint.yml

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ jobs:
1313
run-linters:
1414
strategy:
1515
matrix:
16-
os: [ubuntu-latest]
17-
node-version: [20.x]
16+
os: [ubuntu-latest]
17+
node-version: [20.x]
1818
runs-on: ${{ matrix.os }}
1919

2020
steps:
2121
- name: Checkout code repository
2222
uses: actions/checkout@v4
2323
with:
24-
ref: ${{ github.event.pull_request.head.ref }}
24+
repository: ${{ github.event.pull_request.head.repo.full_name }}
25+
ref: ${{ github.event.pull_request.head.ref }}
2526
- name: Setup pnpm
2627
uses: pnpm/action-setup@v4
2728
with:
@@ -30,16 +31,16 @@ jobs:
3031
- name: Cache pnpm modules
3132
uses: actions/cache@v4
3233
env:
33-
cache-name: cache-pnpm-modules
34+
cache-name: cache-pnpm-modules
3435
with:
35-
path: ~/.pnpm-store
36-
key: ${{ matrix.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
37-
restore-keys: |
38-
${{ matrix.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-
36+
path: ~/.pnpm-store
37+
key: ${{ matrix.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
38+
restore-keys: |
39+
${{ matrix.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-
3940
- name: Use Node.js ${{ matrix.node-version }}
4041
uses: actions/setup-node@v4
4142
with:
42-
node-version: ${{ matrix.node-version }}
43+
node-version: ${{ matrix.node-version }}
4344
- name: Install pnpm modules
4445
run: pnpm install --frozen-lockfile
4546
- name: Run build
@@ -52,8 +53,18 @@ jobs:
5253
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
5354
- name: Commit lint fixes if any
5455
run: |
55-
git config --global user.name github-actions[bot]
56-
git config --global user.email github-actions[bot]@users.noreply.github.com
57-
git add pnpm-lock.yaml
58-
git commit -m "Linting auto fix commit" -a --no-verify || true
59-
git push || true
56+
git config --global user.name github-actions[bot]
57+
git config --global user.email github-actions[bot]@users.noreply.github.com
58+
git add pnpm-lock.yaml
59+
if git commit -m "Linting auto fix commit" -a --no-verify; then
60+
CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r HEAD)
61+
if ! git push; then
62+
echo "::error::Failed to push lint fixes to remote repository. The commit was created locally but could not be pushed."
63+
echo "::error::Files that could not be committed: $CHANGED_FILES"
64+
echo "Fix the eslint issues locally and push the changes."
65+
exit 1
66+
fi
67+
echo "Lint fixes committed and pushed successfully"
68+
else
69+
echo "No lint fixes needed"
70+
fi

.github/workflows/pipeline.yml

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,6 @@ jobs:
5959
- name: Validate changeset files if found
6060
if: steps.check_changeset_files.outputs.files_exists == 'true'
6161
run: pnpm changeset status
62-
- name: Package SAP Systems VSCode extension
63-
if: steps.check_changeset_files.outputs.files_exists == 'true' && matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
64-
run: |
65-
if grep -R "sap-ux-sap-systems-ext" .changeset/*.md >/dev/null 2>&1; then
66-
echo "sap-systems-ext referenced in changeset. Packaging extension..."
67-
pnpm --filter sap-ux-sap-systems-ext ide-ext:package
68-
else
69-
echo "sap-systems-ext not referenced in changeset. Skipping packaging."
70-
fi
7162
- name: Cache playwright browsers
7263
id: cache-playwright-browsers
7364
uses: actions/cache@v4
@@ -196,12 +187,17 @@ jobs:
196187
node-version: 20.x
197188
- name: Install pnpm modules
198189
run: pnpm install --frozen-lockfile
199-
- name: Replace placeholder with instrumentation key
190+
- name: Set instrumentation key in fiori-mcp-server
191+
uses: jacobtomlinson/gha-find-replace@v3
192+
with:
193+
include: packages/fiori-mcp-server/src/telemetry/index.ts
194+
find: 'ApplicationInsightsInstrumentationKeyPLACEH0LDER'
195+
replace: ${{ secrets.INSTRUMENTATION_KEY }}
196+
regex: false
197+
- name: Set instrumentation key in sap-systems-ext
200198
uses: jacobtomlinson/gha-find-replace@v3
201199
with:
202-
include: |
203-
packages/fiori-mcp-server/src/telemetry/index.ts
204-
packages/sap-systems-ext/src/utils/telemetryHelper.ts
200+
include: packages/sap-systems-ext/src/utils/telemetryHelper.ts
205201
find: 'ApplicationInsightsInstrumentationKeyPLACEH0LDER'
206202
replace: ${{ secrets.INSTRUMENTATION_KEY }}
207203
regex: false
@@ -216,17 +212,42 @@ jobs:
216212
publish: pnpm ci:publish
217213
env:
218214
GITHUB_TOKEN: ${{ secrets.ACCESS_PAT }}
219-
- name: Create GitHub Release (sap-systems-ext)
220-
if: env.SAP_SYSTEMS_EXT_CHANGED == 'true'
215+
- name: Detect extension publication
216+
if: steps.changesetPublish.outputs.published == 'true'
217+
run: |
218+
PUBLISHED=$(echo '${{ steps.changesetPublish.outputs.publishedPackages }}' | jq -r '.[].name')
219+
# Extract the first package name matching sap-ux-*-ext
220+
EXT_PKG=$(echo "$PUBLISHED" | grep -E '^sap-ux-.*-ext$' | head -n 1 || true)
221+
222+
if [ -n "$EXT_PKG" ]; then
223+
echo "EXTENSION_UPDATED=true" >> $GITHUB_ENV
224+
echo "EXT_PKG=$EXT_PKG" >> $GITHUB_ENV
225+
226+
# Strip 'sap-ux-' prefix to derive directory name
227+
EXT_DIR_NAME=$(echo "$EXT_PKG" | sed 's/^sap-ux-//')
228+
echo "EXT_DIR=packages/${EXT_DIR_NAME}" >> $GITHUB_ENV
229+
else
230+
echo "EXTENSION_UPDATED=false" >> $GITHUB_ENV
231+
fi
232+
- name: Read extension version
233+
if: env.EXTENSION_UPDATED == 'true'
234+
run: |
235+
EXT_VERSION=$(jq -r '.version' "${{ env.EXT_DIR }}/package.json")
236+
echo "EXT_VERSION=$EXT_VERSION" >> $GITHUB_ENV
237+
- name: Package VSCode extension
238+
if: env.EXTENSION_UPDATED == 'true'
239+
run: pnpm --filter ${{ env.EXT_PKG }} ide-ext:package
240+
- name: Create GitHub Release (extension)
241+
if: env.EXTENSION_UPDATED == 'true'
221242
uses: softprops/action-gh-release@v1
222243
with:
223-
tag_name: sap-systems-ext@${{ env.EXT_VERSION }}
224-
name: sap-systems-ext v${{ env.EXT_VERSION }}
225-
body: 'VSCode SAP Systems extension v${{ env.EXT_VERSION }} release.'
226-
draft: false
244+
tag_name: ${{ env.EXT_PKG }}@${{ env.EXT_VERSION }}
245+
name: ${{ env.EXT_PKG }} v${{ env.EXT_VERSION }}
246+
body: 'Extension release: ${{ env.EXT_PKG }} v${{ env.EXT_VERSION }}'
247+
draft: true
227248
prerelease: false
228249
generate_release_notes: true
229-
files: packages/sap-systems-ext/*.vsix
250+
files: ${{ env.EXT_DIR }}/*.vsix
230251
fail_on_unmatched_files: true
231252
env:
232253
GITHUB_TOKEN: ${{ secrets.ACCESS_PAT }}
@@ -240,9 +261,10 @@ jobs:
240261
echo "$(echo '${{ steps.changesetPublish.outputs.publishedPackages }}' | jq --raw-output 'map("*" + .name + "*" + " - " + "<https://www.npmjs.com/package/" + .name + "|" + .version + ">") | join("\\n")')" >> $GITHUB_ENV
241262
echo "$EOF" >> $GITHUB_ENV
242263
- name: Prepare Slack notification message (extension release only)
243-
if: steps.changesetPublish.outputs.published != 'true' && env.SAP_SYSTEMS_EXT_CHANGED == 'true'
264+
if: env.EXTENSION_UPDATED == 'true'
244265
run: |
245-
echo "EXT_RELEASE_MESSAGE=:package: VSCode SAP Systems extension v${{ env.EXT_VERSION }} released (private package)." >> $GITHUB_ENV
266+
RELEASE_URL="https://github.com/${{ github.repository }}/releases/tag/${{ env.EXT_PKG }}@${{ env.EXT_VERSION }}"
267+
echo "EXT_RELEASE_MESSAGE=:package: Extension *${{ env.EXT_PKG }}* v${{ env.EXT_VERSION }} released - <${RELEASE_URL}|View on GitHub>" >> $GITHUB_ENV
246268
- name: Send Slack notification (published packages)
247269
if: steps.changesetPublish.outputs.published == 'true'
248270
uses: slackapi/[email protected]
@@ -252,7 +274,7 @@ jobs:
252274
env:
253275
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
254276
- name: Send Slack notification (extension release)
255-
if: steps.changesetPublish.outputs.published != 'true' && env.SAP_SYSTEMS_EXT_CHANGED == 'true'
277+
if: env.EXTENSION_UPDATED == 'true'
256278
uses: slackapi/[email protected]
257279
with:
258280
payload: |

examples/fe-fpm-cli/CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# @sap-ux/fe-fpm-cli
22

3+
## 0.1.55
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [cfe9c13]
8+
- @sap-ux/fe-fpm-writer@0.39.17
9+
10+
## 0.1.54
11+
12+
### Patch Changes
13+
14+
- @sap-ux/fe-fpm-writer@0.39.16
15+
316
## 0.1.53
417

518
### Patch Changes

examples/fe-fpm-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux/fe-fpm-cli",
3-
"version": "0.1.53",
3+
"version": "0.1.55",
44
"description": "A simple CLI to prompt required information to create a building block using the fe-fpm-writer module's prompt and generate functions.",
55
"license": "Apache-2.0",
66
"private": true,

examples/odata-cli/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# @sap-ux/odata-cli
22

3+
## 0.17.20
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [cfe9c13]
8+
- @sap-ux/btp-utils@1.1.5
9+
- @sap-ux/logger@0.7.1
10+
- @sap-ux/axios-extension@1.24.2
11+
312
## 0.17.19
413

514
### Patch Changes

examples/odata-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux/odata-cli",
3-
"version": "0.17.19",
3+
"version": "0.17.20",
44
"description": "Simple example CLI uing the @sap-ux/axios-extension module to fetch metadata and annotations from an SAP system.",
55
"license": "Apache-2.0",
66
"private": true,

examples/simple-generator/CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,38 @@
11
# @sap-ux/generator-simple-fe
22

3+
## 1.1.109
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [aa2c7df]
8+
- @sap-ux/fiori-freestyle-writer@2.5.0
9+
- @sap-ux/fiori-elements-writer@2.8.0
10+
11+
## 1.1.108
12+
13+
### Patch Changes
14+
15+
- @sap-ux/fiori-elements-writer@2.7.37
16+
- @sap-ux/fiori-freestyle-writer@2.4.61
17+
18+
## 1.1.107
19+
20+
### Patch Changes
21+
22+
- Updated dependencies [cfe9c13]
23+
- @sap-ux/fiori-freestyle-writer@2.4.60
24+
- @sap-ux/fiori-elements-writer@2.7.36
25+
- @sap-ux/system-access@0.6.28
26+
- @sap-ux/btp-utils@1.1.5
27+
- @sap-ux/logger@0.7.1
28+
- @sap-ux/axios-extension@1.24.2
29+
30+
## 1.1.106
31+
32+
### Patch Changes
33+
34+
- @sap-ux/fiori-elements-writer@2.7.35
35+
336
## 1.1.105
437

538
### Patch Changes

examples/simple-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux/generator-simple-fe",
3-
"version": "1.1.105",
3+
"version": "1.1.109",
44
"description": "Simple example of a yeoman generator for Fiori elements.",
55
"license": "Apache-2.0",
66
"private": true,

examples/ui-prompting-examples/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @sap-ux-private/ui-prompting-examples
22

3+
## 0.4.7
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [afb4be5]
8+
- @sap-ux/ui-components@1.26.15
9+
- @sap-ux/ui-prompting@0.5.6
10+
11+
## 0.4.6
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [cfe9c13]
16+
- @sap-ux/ui-components@1.26.14
17+
- @sap-ux/ui-prompting@0.5.5
18+
319
## 0.4.5
420

521
### Patch Changes

examples/ui-prompting-examples/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux-private/ui-prompting-examples",
3-
"version": "0.4.5",
3+
"version": "0.4.7",
44
"description": "This project contains UI storybook stories with exampleS with prompt ui and FPM based building blocks.",
55
"license": "Apache-2.0",
66
"private": true,

0 commit comments

Comments
 (0)