From c949f1b968955b5fcc0a1e4f78fec50c07232bd4 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Mon, 2 Dec 2024 16:13:37 +0100 Subject: [PATCH] fix(workflow): Corrected Docker image references and package scope in YAML workflows for compatibility. --- .gitea/workflows/default_nottags.yaml | 6 +-- .gitea/workflows/default_tags.yaml | 12 +++--- .gitignore | 1 - changelog.md | 7 ++++ html/index.html | 7 +--- package.json | 8 ++-- readme.md | 58 +++++++++++++++------------ test/plugins.ts | 6 +-- test/test.ts | 2 +- ts/00_commitinfo_data.ts | 2 +- ts/classes.pdfservice.ts | 8 ++-- ts/helpers.ts | 2 +- ts/paths.ts | 5 ++- ts/plugins.ts | 15 ++----- ts_web/00_commitinfo_data.ts | 2 +- ts_web/pages/index.ts | 2 + ts_web/pages/page1.ts | 17 ++++++++ ts_web/pages/page2.ts | 18 +++++++++ tsconfig.json | 10 ++++- 19 files changed, 114 insertions(+), 74 deletions(-) create mode 100644 ts_web/pages/index.ts create mode 100644 ts_web/pages/page1.ts create mode 100644 ts_web/pages/page2.ts diff --git a/.gitea/workflows/default_nottags.yaml b/.gitea/workflows/default_nottags.yaml index 9f4e743..2d7e72a 100644 --- a/.gitea/workflows/default_nottags.yaml +++ b/.gitea/workflows/default_nottags.yaml @@ -6,8 +6,8 @@ on: - '**' env: - IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci - NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git + IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci + NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@/${{gitea.repository}}.git NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}} NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}} NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}} @@ -26,7 +26,7 @@ jobs: - name: Install pnpm and npmci run: | pnpm install -g pnpm - pnpm install -g @shipzone/npmci + pnpm install -g @ship.zone/npmci - name: Run npm prepare run: npmci npm prepare diff --git a/.gitea/workflows/default_tags.yaml b/.gitea/workflows/default_tags.yaml index e27ad69..6e8064b 100644 --- a/.gitea/workflows/default_tags.yaml +++ b/.gitea/workflows/default_tags.yaml @@ -6,8 +6,8 @@ on: - '*' env: - IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci - NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git + IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci + NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@/${{gitea.repository}}.git NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}} NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}} NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}} @@ -26,7 +26,7 @@ jobs: - name: Prepare run: | pnpm install -g pnpm - pnpm install -g @shipzone/npmci + pnpm install -g @ship.zone/npmci npmci npm prepare - name: Audit production dependencies @@ -54,7 +54,7 @@ jobs: - name: Prepare run: | pnpm install -g pnpm - pnpm install -g @shipzone/npmci + pnpm install -g @ship.zone/npmci npmci npm prepare - name: Test stable @@ -82,7 +82,7 @@ jobs: - name: Prepare run: | pnpm install -g pnpm - pnpm install -g @shipzone/npmci + pnpm install -g @ship.zone/npmci npmci npm prepare - name: Release @@ -104,7 +104,7 @@ jobs: - name: Prepare run: | pnpm install -g pnpm - pnpm install -g @shipzone/npmci + pnpm install -g @ship.zone/npmci npmci npm prepare - name: Code quality diff --git a/.gitignore b/.gitignore index ef13c79..352c177 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ # artifacts coverage/ public/ -pages/ # installs node_modules/ diff --git a/changelog.md b/changelog.md index 129e298..fb7a39f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Changelog +## 2024-12-02 - 1.5.2 - fix(workflow) +Corrected Docker image references and package scope in YAML workflows for compatibility. + +- Updated Docker image reference from GitLab to code.foss.global for npmci UI workflows. +- Fixed npm package scope for `@shipzone/npmci` in YAML workflows. +- Minor formatting corrections for better code readability. + ## 2024-12-02 - 1.5.1 - fix(package) Fix duplicate node export in package.json diff --git a/html/index.html b/html/index.html index 5d13c30..6fc15c9 100644 --- a/html/index.html +++ b/html/index.html @@ -1,6 +1,3 @@ - - - @@ -11,8 +8,8 @@ - - + + + +`; diff --git a/ts_web/pages/page2.ts b/ts_web/pages/page2.ts new file mode 100644 index 0000000..70c8630 --- /dev/null +++ b/ts_web/pages/page2.ts @@ -0,0 +1,18 @@ +import { html } from "@design.estate/dees-element"; + +export const page2 = () => html` + +
+ + +
+`; diff --git a/tsconfig.json b/tsconfig.json index dfe5a55..012a01b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,9 +6,15 @@ "module": "NodeNext", "moduleResolution": "NodeNext", "esModuleInterop": true, - "verbatimModuleSyntax": true + "verbatimModuleSyntax": true, + "baseUrl": ".", + "paths": { + "undefined": [ + "./ts_web/index.js" + ] + } }, "exclude": [ "dist_*/**/*.d.ts" ] -} +} \ No newline at end of file