From 9a90c5ae9dc93eb80fa5bf391bf9a7f741ca6eda Mon Sep 17 00:00:00 2001 From: Matthew Scheffel Date: Mon, 31 Aug 2026 10:14:37 -0300 Subject: [PATCH] ci, build: use package.json for js deps --- .github/workflows/ci.yaml | 6 ++++- .github/workflows/pr-preview-build.yml | 4 ++++ .github/workflows/publish.yaml | 4 ++++ Trunk.toml | 8 ------- assets/style.scss | 10 ++++----- index.html | 4 ++-- package-lock.json | 31 ++++++++++++++++++++++++++ package.json | 9 ++++++++ 8 files changed, 60 insertions(+), 16 deletions(-) delete mode 100644 Trunk.toml create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ce6bc5c6..64e9038b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,12 @@ jobs: ~/.cargo/registry/cache/ ~/.cargo/git/db/ target/ + node_modules/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - + + - name: npm ci + run: npm ci + - name: Build run: cargo build --release diff --git a/.github/workflows/pr-preview-build.yml b/.github/workflows/pr-preview-build.yml index 73c8a363..a502f984 100644 --- a/.github/workflows/pr-preview-build.yml +++ b/.github/workflows/pr-preview-build.yml @@ -17,6 +17,10 @@ jobs: - name: Set build timestamp run: echo "BUILD_TIMESTAMP=$(date --rfc-3339=seconds --utc)" >> $GITHUB_ENV + + - name: npm ci + run: npm ci + - name: Build page env: BUILD_COMMIT: ${{ github.sha }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3f30aec3..8d1d7173 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -26,6 +26,7 @@ jobs: ~/.cargo/registry ~/.cargo/git target + node_modules/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Install trunk @@ -40,6 +41,9 @@ jobs: - name: Set build timestamp run: echo "BUILD_TIMESTAMP=$(date --rfc-3339=seconds --utc)" >> $GITHUB_ENV + - name: npm ci + run: npm ci + - name: Build page env: BUILD_COMMIT: ${{ github.sha }} diff --git a/Trunk.toml b/Trunk.toml deleted file mode 100644 index 8be07463..00000000 --- a/Trunk.toml +++ /dev/null @@ -1,8 +0,0 @@ -[[node_packages]] -name = "@patternfly/patternfly" -version = "6.4.0" - -[[node_packages]] -name = "@fortawesome/fontawesome-free" -version = "7.1.0" - diff --git a/assets/style.scss b/assets/style.scss index 892339e8..6d7eb183 100644 --- a/assets/style.scss +++ b/assets/style.scss @@ -1,11 +1,11 @@ // only required if you are using the icons-far or icons-fab feature // $fa-font-path: "webfonts"; -@import "../target/node_modules/@fortawesome/fontawesome-free/7.1.0/scss/fontawesome"; -@import "../target/node_modules/@fortawesome/fontawesome-free/7.1.0/scss/brands"; +@import "../node_modules/@fortawesome/fontawesome-free/scss/fontawesome"; +@import "../node_modules/@fortawesome/fontawesome-free/scss/brands"; // PatternFly styles -@import "../target/node_modules/@patternfly/patternfly/6.4.0/patternfly.scss"; -@import "../target/node_modules/@patternfly/patternfly/6.4.0/patternfly-addons.scss"; +@import "../node_modules/@patternfly/patternfly/patternfly.scss"; +@import "../node_modules/@patternfly/patternfly/patternfly-addons.scss"; @font-face { font-family: "Font Awesome 7 Brands"; @@ -13,4 +13,4 @@ font-weight: 400; font-display: block; src: url("./webfonts/fa-brands-400.woff2"); -} \ No newline at end of file +} diff --git a/index.html b/index.html index bcd8d3a9..8eccdd3f 100644 --- a/index.html +++ b/index.html @@ -12,12 +12,12 @@ - + - + diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..aa5a0527 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,31 @@ +{ + "name": "patternfly-yew-quickstart", + "version": "0.0.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "patternfly-yew-quickstart", + "version": "0.0.1", + "dependencies": { + "@fortawesome/fontawesome-free": "^7", + "@patternfly/patternfly": "^6" + } + }, + "node_modules/@fortawesome/fontawesome-free": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.1.0.tgz", + "integrity": "sha512-+WxNld5ZCJHvPQCr/GnzCTVREyStrAJjisUPtUxG5ngDA8TMlPnKp6dddlTpai4+1GNmltAeuk1hJEkBohwZYA==", + "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)", + "engines": { + "node": ">=6" + } + }, + "node_modules/@patternfly/patternfly": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-6.4.0.tgz", + "integrity": "sha512-4drFhg74sEc/fftark5wZevODIog17qR4pwLCdB3j5iK3Uu5oMA2SdLhsEeEQggalfnFzve/Km87MdVR0ghhvQ==", + "license": "MIT" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 00000000..259da0ef --- /dev/null +++ b/package.json @@ -0,0 +1,9 @@ +{ + "name": "patternfly-yew-quickstart", + "version": "0.0.1", + "private": true, + "dependencies": { + "@fortawesome/fontawesome-free": "^7", + "@patternfly/patternfly": "^6" + } +}