diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3422a2..d61948e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,7 @@ # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions name: CI -permissions: - contents: write - pull-requests: write + on: push: branches: @@ -16,14 +14,10 @@ on: jobs: build: - runs-on: ubuntu-latest - strategy: matrix: - node-version: - - 20.x - - 22.x + node-version: [20, 22] steps: - uses: actions/checkout@v6 @@ -36,7 +30,7 @@ jobs: - run: npm test - run: npm run build --if-present - name: Save build - if: matrix.node-version == '20.x' + if: matrix.node-version == 20 uses: actions/upload-artifact@v6 with: name: build @@ -60,39 +54,47 @@ jobs: npm-publish-build: needs: build runs-on: ubuntu-latest + permissions: + id-token: write + contents: read steps: - uses: actions/download-artifact@v7 with: name: build - uses: actions/setup-node@v6 with: - node-version: 20.x + node-version: 20 + registry-url: 'https://registry.npmjs.org' + - name: Update npm to latest (required for OIDC) + run: npm install -g npm@latest - uses: rlespinasse/github-slug-action@v3.x - name: Append commit hash to package version run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json' - name: Disable pre- and post-publish actions run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json' - - uses: JS-DevTools/npm-publish@v4.1.4 + - name: Publish to npm if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]' - with: - token: ${{ secrets.NPM_TOKEN }} - tag: ${{ env.GITHUB_REF_SLUG }} + run: npm publish --tag ${{ env.GITHUB_REF_SLUG }} npm-publish-latest: needs: [build, npm-publish-build] runs-on: ubuntu-latest if: github.ref == 'refs/heads/main' + permissions: + id-token: write # Required for OIDC + contents: read steps: - uses: actions/download-artifact@v7 with: name: build - uses: actions/setup-node@v6 with: - node-version: 20.x + node-version: 20 + registry-url: 'https://registry.npmjs.org' + - name: Update npm to latest (required for OIDC) + run: npm install -g npm@latest - name: Disable pre- and post-publish actions run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json' - - uses: JS-DevTools/npm-publish@v4.1.4 + - name: Publish to npm if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]' - with: - token: ${{ secrets.NPM_TOKEN }} - tag: latest + run: npm publish --tag latest diff --git a/package-lock.json b/package-lock.json index a71e06e..c42a6dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -149,6 +149,7 @@ "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.28.6", "@babel/generator": "^7.28.6", @@ -1999,6 +2000,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" }, @@ -2022,6 +2024,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" } @@ -5037,6 +5040,7 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -5986,6 +5990,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -7763,6 +7768,7 @@ "integrity": "sha512-vPZZsiOKaBAIATpFE2uMI4w5IRwdv/FpQ+qZZMR4E+PeOcM4OeoEbqxRMnywdxP19TyB/3h6QBB0EWon7letSQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/types": "^8.35.0", "comment-parser": "^1.4.1", @@ -10331,6 +10337,7 @@ "integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@jest/core": "30.2.0", "@jest/types": "30.2.0", @@ -11409,6 +11416,7 @@ "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cssstyle": "^4.2.1", "data-urls": "^5.0.0", @@ -13666,6 +13674,7 @@ "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-2.3.5.tgz", "integrity": "sha512-dXW3GbHSKx3vctY3YUm7O/EVj4pNVueUgrm3GBsWjwrRkkFBu2+9Sd5zjhi/skbzhpQ9d45rO/2HGD8zi0oubw==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.28.4", "@frogcat/ttl2jsonld": "^0.0.10", @@ -13691,6 +13700,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz", "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==", "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -14260,6 +14270,7 @@ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -14772,6 +14783,7 @@ "resolved": "https://registry.npmjs.org/solid-logic/-/solid-logic-4.0.1.tgz", "integrity": "sha512-srCwjX171dUQKN9Pp12lBD4mghRrbSvLfPFmeYP3TezAd5yGleb1ojcbMeN15RVSJQHrPqZDh9TiBUXZo3knLw==", "license": "MIT", + "peer": true, "dependencies": { "@inrupt/solid-client-authn-browser": "^3.1.0", "solid-namespace": "^0.5.4" @@ -14791,6 +14803,7 @@ "resolved": "https://registry.npmjs.org/solid-ui/-/solid-ui-3.0.1.tgz", "integrity": "sha512-bmeSnNoDWjC9Vu36hf854QxXrzDt3+WvkPqMtbPn9qruYbfeJxzfTRycUhUyc1ZfILJ2OJR7bVkNOgJ6PVZr6g==", "license": "MIT", + "peer": true, "dependencies": { "@noble/curves": "^1.9.6", "@noble/hashes": "^1.8.0", @@ -15522,6 +15535,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -15780,7 +15794,8 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true, - "license": "0BSD" + "license": "0BSD", + "peer": true }, "node_modules/tsyringe": { "version": "4.10.0", @@ -16377,6 +16392,7 @@ "integrity": "sha512-Qphch25abbMNtekmEGJmeRUhLDbe+QfiWTiqpKYkpCOWY64v9eyl+KRRLmqOFA2AvKPpc9DC6+u2n76tQLBoaA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", @@ -16426,6 +16442,7 @@ "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@discoveryjs/json-ext": "^0.6.1", "@webpack-cli/configtest": "^3.0.1", diff --git a/package.json b/package.json index ccac58a..820acab 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/solidos/solid-panes.git" + "url": "git+https://github.com/SolidOS/solid-panes.git" }, "keywords": [ "solid",