ci: deployment fixes

.github/workflows/release-package.yml

@@ -33,6 +33,8 @@ jobs:
       - run: |
           pnpm install
           pnpm run build
+        env:
+          ASSET_URL: https://mortenolsen.pro/bob
       - uses: actions/upload-artifact@v3
         with:
           name: lib
@@ -42,6 +44,12 @@ jobs:
             packages/*/package.json
             package.json
             README.md
+      - uses: actions/upload-artifact@v3
+        with:
+          name: web
+          retention-days: 5
+          path: |
+            packages/playground/dist
   update-release-draft:
     if: github.ref == 'refs/heads/main'
     needs: build
@@ -62,21 +70,18 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build, update-release-draft]
     permissions:
-      contents: write
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2
         with:
-          fetch-depth: 0
+          artifact_name: web
-      - uses: actions/download-artifact@v3
+
-        with:
-          name: lib
-          path: ./
-      - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@4.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          branch: gh-pages
-          folder: packages/playground/dist
   release-npm:
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
@@ -104,6 +109,6 @@ jobs:
           git config user.name "Github Actions Bot"
           git config user.email "<>"
           pnpm version $(git describe --tag --abbrev=0)
-          pnpm publish -r
+          pnpm publish -r --publish-branch main --access public
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

packages/algorithm/package.json

@@ -18,8 +18,9 @@
   "files": [
     "dist/**/*"
   ],
+  "private": false,
   "main": "./dist/cjs/index.js",
-  "name": "bob-the-algorithm",
+  "name": "@bob-the-algorithm/core",
   "scripts": {
     "build": "tsc --build configs/tsconfig.libs.json"
   },

packages/configs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@bob-the-algorithm/config",
-  "private": true,
+  "private": false,
   "version": "0.0.1"
 }

packages/playground/package.json

@@ -10,13 +10,14 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "bob-the-algorithm": "workspace:^",
+    "@bob-the-algorithm/core": "workspace:^",
     "date-fns": "^2.30.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@mdx-js/rollup": "^2.3.0",
+    "@types/node": "^20.5.9",
     "@types/react": "^18.2.15",
     "@types/react-dom": "^18.2.7",
     "@typescript-eslint/eslint-plugin": "^6.0.0",

packages/playground/src/pages/hello/script.ts

@@ -1,4 +1,4 @@
-import { calulation, plugins } from 'bob-the-algorithm';
+import { calulation, plugins } from '@bob-the-algorithm/core';
 import { createWorker } from '../../features/runner/worker';
 import { convertResult } from '../../utils/graph';
 

packages/playground/src/presenters/graph/plan.tsx

@@ -1,4 +1,4 @@
-import { GraphNode } from 'bob-the-algorithm';
+import { GraphNode } from '@bob-the-algorithm/core';
 import { useMemo } from 'react';
 import { ConvertedResult } from '../../utils/graph';
 import { format } from 'date-fns';

packages/playground/src/utils/graph.ts

@@ -1,4 +1,4 @@
-import { CalulationResult } from 'bob-the-algorithm';
+import { CalulationResult } from '@bob-the-algorithm/core';
 
 function msToHMS(ms: number) {
   // 1- Convert to seconds:

packages/playground/vite.config.ts

@@ -2,7 +2,10 @@ import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react-swc';
 import mdx from '@mdx-js/rollup';
 
+const ASSET_URL = process.env.ASSET_URL || '';
+
 // https://vitejs.dev/config/
 export default defineConfig({
+  base: `${ASSET_URL}/dist/`,
   plugins: [mdx(), react()],
 });

pnpm-lock.yaml

@@ -30,7 +30,7 @@ importers:
 
   packages/playground:
     dependencies:
-      bob-the-algorithm:
+      '@bob-the-algorithm/core':
         specifier: workspace:^
         version: link:../algorithm
       date-fns:
@@ -46,6 +46,9 @@ importers:
       '@mdx-js/rollup':
         specifier: ^2.3.0
         version: 2.3.0(rollup@3.28.1)
+      '@types/node':
+        specifier: ^20.5.9
+        version: 20.5.9
       '@types/react':
         specifier: ^18.2.15
         version: 18.2.15
@@ -78,7 +81,7 @@ importers:
         version: 5.2.2
       vite:
         specifier: ^4.4.5
-        version: 4.4.5
+        version: 4.4.5(@types/node@20.5.9)
 
 packages:
 
@@ -1028,6 +1031,10 @@ packages:
     resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
     dev: true
 
+  /@types/node@20.5.9:
+    resolution: {integrity: sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==}
+    dev: true
+
   /@types/offscreencanvas@2019.7.1:
     resolution: {integrity: sha512-+HSrJgjBW77ALieQdMJvXhRZUIRN1597L+BKvsyeiIlHHERnqjcuOLyodK3auJ3Y3zRezNKtKAhuQWYJfEgFHQ==}
     dev: true
@@ -1375,7 +1382,7 @@ packages:
       vite: ^4
     dependencies:
       '@swc/core': 1.3.82
-      vite: 4.4.5
+      vite: 4.4.5(@types/node@20.5.9)
     transitivePeerDependencies:
       - '@swc/helpers'
     dev: true
@@ -4422,7 +4429,7 @@ packages:
       vfile-message: 3.1.4
     dev: true
 
-  /vite@4.4.5:
+  /vite@4.4.5(@types/node@20.5.9):
     resolution: {integrity: sha512-4m5kEtAWHYr0O1Fu7rZp64CfO1PsRGZlD3TAB32UmQlpd7qg15VF7ROqGN5CyqN7HFuwr7ICNM2+fDWRqFEKaA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -4450,6 +4457,7 @@ packages:
       terser:
         optional: true
     dependencies:
+      '@types/node': 20.5.9
       esbuild: 0.18.20
       postcss: 8.4.29
       rollup: 3.28.1