diff --git a/.github/workflows/nextjs.yml b/.github/workflows/nextjs.yml index 9c894a95..e35bee14 100644 --- a/.github/workflows/nextjs.yml +++ b/.github/workflows/nextjs.yml @@ -25,13 +25,15 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 - with: - version: 8 + - uses: oven-sh/setup-bun@v1 - name: Setup Node uses: actions/setup-node@v3 + - uses: actions/cache@v4 with: - cache: 'pnpm' + path: ~/.bun/install/cache + key: ${{ runner.os }}-${{ matrix.bun }}-bun-${{ hashFiles('**/bun.lockb') }} + restore-keys: | + ${{ runner.os }}-${{ matrix.bun }}-bun- - name: Setup Pages uses: actions/configure-pages@v2 with: @@ -51,14 +53,14 @@ jobs: restore-keys: | ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}- - name: Install dependencies - run: pnpm install --no-frozen-lockfile + run: bun install - name: Build with Next.js env: NEXT_PUBLIC_GAPI_OAUTH_CLIENT_ID: ${{ secrets.NEXT_PUBLIC_GAPI_OAUTH_CLIENT_ID }} NEXT_PUBLIC_BASE_PATH: /${{ github.event.repository.name }} - run: pnpm build + run: bun run build - name: Static HTML export with Next.js - run: pnpm build:pages + run: bun run build:pages - name: Upload artifact uses: actions/upload-pages-artifact@v1 with: diff --git a/README.md b/README.md index 0ffa9386..d2ec2e69 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ You can get a live preview of the current `develop` branch here: [https://slub.g First, run the development server: ```bash -pnpm i && pnpm run dev +bun i && bun run dev ``` Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. @@ -53,7 +53,7 @@ all of their props and options. It also gives an overview over the frontend comp ```bash cd app/exhibition-live -pnpm i && pnpm run storybook +bun i && bun run storybook ``` Open [http://localhost:6006](http://localhost:6006) with your browser to see the storybook. diff --git a/apps/exhibition-live/package.json b/apps/exhibition-live/package.json index 5b82921f..698a6376 100644 --- a/apps/exhibition-live/package.json +++ b/apps/exhibition-live/package.json @@ -12,7 +12,7 @@ "test:jsonSchema2Select": "NODE_OPTIONS=--experimental-vm-modules jest --watch --runTestsByPath components/utils/sparql/jsonSchema2Select.test.ts ", "test:lobidMapping": "NODE_OPTIONS=--experimental-vm-modules jest --watch --runTestsByPath components/config/lobidMappings.test.ts", "test:parseMarkdownLink": "NODE_OPTIONS=--experimental-vm-modules jest --watch --runTestsByPath components/utils/core/parseMarkdownLink.test.ts ", - "build:pages": "next build && mv ./dist ../../_site && storybook build && mv ./storybook-static ../../_site/storybook", + "build:pages": "next build && mv ./out ../../_site && storybook build && mv ./storybook-static ../../_site/storybook", "linkml:json-schema": "docker run --rm -v ${PWD}/schema:/work -w /work -ti linkml/linkml:1.4 bash -c 'gen-json-schema ./exhibition-info.yaml > ./exhibition-info.schema.json'", "linkml:ontology": "docker run --rm -v ${PWD}/schema:/work -w /work -ti linkml/linkml:1.4 bash -c 'gen-owl --no-metaclasses --no-type-objects --metadata-profile rdfs ./exhibition-info.yaml -o ./exhibition-info.owl.ttl'", "linkml:interactive": "docker run --rm -v ${PWD}/schema:/work -w /work -ti linkml/linkml:1.4", diff --git a/bun.lockb b/bun.lockb new file mode 100755 index 00000000..9ef2a86b Binary files /dev/null and b/bun.lockb differ diff --git a/flake.lock b/flake.lock index e976b7b7..d3f38181 100644 --- a/flake.lock +++ b/flake.lock @@ -17,16 +17,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676895851, - "narHash": "sha256-xdhBKw2el790G+88tZYpRWlP9VjQC9OLR5Jx84VPe08=", + "lastModified": 1708979614, + "narHash": "sha256-FWLWmYojIg6TeqxSnHkKpHu5SGnFP5um1uUjH+wRV6g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e19f25b587f15871d26442cfa1abe4418a815d7d", + "rev": "b7ee09cf5614b02d289cd86fcfa6f24d4e078c2a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/package.json b/package.json index fabc12de..eeea6c69 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint": "turbo run lint", "lint:fix": "turbo run lint:fix", "format": "prettier --write \"**/*.{ts,tsx,md}\"", - "precommit": "pnpm run lint:fix && pnpm run format" + "precommit": "bun run lint:fix && bun run format" }, "workspaces": [ "apps/*",