diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index bdd0934..1066659 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -17,11 +17,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: ["20.x"] - python-version: ["3.10"] + node-version: ["24.x"] + python-version: ["3.12"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: pnpm/action-setup@v4 with: @@ -29,7 +29,7 @@ jobs: args: [ --force ] - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} @@ -43,14 +43,14 @@ jobs: PYTHONPATH=server python server/davidia/generate_openapi.py - name: Set Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: ${{ matrix.node-version }} cache: pnpm - name: Build and publish id: build-publish - uses: bitovi/github-actions-storybook-to-github-pages@v1.0.3 + uses: bitovi/github-actions-storybook-to-github-pages@v1 with: checkout: false path: storybook/storybook-static diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml index 0c0e133..586cb43 100644 --- a/.github/workflows/npm-publish.yaml +++ b/.github/workflows/npm-publish.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - uses: pnpm/action-setup@v4 with: diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f2280dc..c0ff8fe 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,11 +16,11 @@ jobs: strategy: fail-fast: false matrix: - node-version: ["20.x"] - python-version: ["3.10"] + node-version: ["24.x"] + python-version: ["3.12"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: pnpm/action-setup@v4 with: @@ -28,7 +28,7 @@ jobs: args: [ --force ] - name: Set Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: ${{ matrix.node-version }} cache: pnpm @@ -41,7 +41,7 @@ jobs: pnpm test - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} - name: Install server dependencies @@ -63,19 +63,19 @@ jobs: pipx run build server pipx run build server/example-client --outdir server/dist - name: Upload sdist and wheel as artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: dist path: server/dist pypi: - # upload to PyPI and make a release on every tag + # Upload to PyPI and make a release on every tag if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') needs: [build] runs-on: ubuntu-latest permissions: - # this permission is mandatory for trusted publishing To PyPI + # This permission is mandatory for trusted publishing to PyPI id-token: write # This permission allows the CI to create the release environment contents: write @@ -83,8 +83,8 @@ jobs: environment: release steps: - # download sdist and wheel from dist job - - uses: actions/download-artifact@v4 - # publish to PyPI using trusted publishing + # Download sdist and wheel from dist job + - uses: actions/download-artifact@v7 + # Publish to PyPI using trusted publishing - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/client/component/package.json b/client/component/package.json index f721efb..b9f42fa 100644 --- a/client/component/package.json +++ b/client/component/package.json @@ -1,8 +1,9 @@ { "name": "@diamondlightsource/davidia", + "license": "MIT", "repository": { "type": "git", - "url": "https://github.com/DiamondLightSource/davidia.git" + "url": "git+https://github.com/DiamondLightSource/davidia.git" }, "private": false, "version": "1.0.4", @@ -17,7 +18,9 @@ "files": [ "dist" ], - "main": "src/index.ts", + "exports": { + ".": "./src/index.ts" + }, "publishConfig": { "main": "dist/index.js", "types": "dist/index.d.ts"