resolve conflicts

Author: PawelJastrzebski

.github/dependabot.yml

@@ -1,83 +1,35 @@
 version: 2
 updates:
-  - package-ecosystem: npm
-    directory: /
-    schedule:
-      interval: daily
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: daily
+      interval: weekly
+    groups:
+      ci-dependencies:
+        applies-to: version-updates
+        patterns: ["*"]
+        update-types:
+        - "minor"
+        - "patch"
   - package-ecosystem: cargo
     directory: /
     schedule:
-      interval: daily
-  # CLI
-  - package-ecosystem: cargo
-    directory: /cli/
-    schedule:
-      interval: daily
-  # CORE
-  - package-ecosystem: cargo
-    directory: /core/ast/
-    schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /core/engine/
-    schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /core/gc/
-    schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /core/icu_provider/
-    schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /core/interner/
-    schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /core/macros/
-    schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /core/parser/
-    schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /core/profiler/
-    schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /core/runtime/
-    schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /core/temporal/
-    schedule:
-      interval: daily
-  # TESTS
-  - package-ecosystem: cargo
-    directory: /tests/tester/
-    schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /tests/macros/
-    schedule:
-      interval: daily
+      interval: weekly
+    groups:
+      rust-dependencies:
+        applies-to: version-updates
+        patterns: ["*"]
+        update-types:
+        - "minor"
+        - "patch"
   - package-ecosystem: cargo
     directory: /tests/fuzz/
     schedule:
-      interval: daily
-  # FFI
-  - package-ecosystem: cargo
-    directory: /ffi/wasm/
-    schedule:
-      interval: daily
-  # TOOLS
-  - package-ecosystem: cargo
-    directory: /tools/
-    schedule:
-      interval: daily
+      interval: weekly
+    groups:
+      fuzz-dependencies:
+        applies-to: version-updates
+        patterns: ["*"]
+        update-types:
+        - "minor"
+        - "patch"

.github/workflows/main.yml

@@ -12,14 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 120
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions-rs/[email protected]
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          override: true
-          profile: minimal
+
       - name: Cache cargo
         uses: actions/cache@v4
         with:

.github/workflows/pull_request.yml

@@ -15,16 +15,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          profile: minimal
-          override: true
 
       - name: Install cargo-workspaces
-        uses: actions-rs/[email protected]
-        with:
-          crate: cargo-workspaces
+        run: cargo install cargo-workspaces
 
       - name: Release
         env:
@@ -40,45 +36,38 @@ jobs:
             --no-git-commit \
             skip
 
-  doc-publish:
-    name: Publish documentation
-    needs: publish
+  npm_publish:
+    name: Publish NPM package (wasm)
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          profile: minimal
-          override: true
+          targets: wasm32-unknown-unknown
+
       - name: Install wasm-pack
-        uses: baptiste0928/[email protected]
+        uses: jetli/[email protected]
         with:
-          crate: wasm-pack
-      - uses: actions/setup-node@v4
+          version: 'latest'
+
+      - name: Build boa_wasm
+        run: wasm-pack build --scope boa-dev ./ffi/wasm
+
+      - name: Set-up Node.js
+        uses: actions/setup-node@v4
         with:
           node-version: "20"
-      - run: npm ci
-      - name: Cache npm build
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            target
-            ffi/wasm/pkg
-            ~/.cargo/git
-            ~/.cargo/registry
-          key: ${{ runner.os }}-npm-build-target-${{ hashFiles('**/package-lock.json') }}
-      - run: wasm-pack build ./ffi/wasm
-      - run: npm run build:prod
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          publish_dir: ./dist
-          destination_dir: playground
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set-up npm config for publishing
+        run: npm config set -- '//registry.npmjs.org/:_authToken' "${{ secrets.NPM_TOKEN }}"
+
+      - name: Publish to npm
+        run: npm publish ./ffi/wasm/pkg --access=public
 
   release-binaries:
     name: Publish binaries
@@ -108,13 +97,14 @@ jobs:
           binary_name: boa.exe
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          profile: minimal
-          override: true
+
       - name: Build
         run: cargo build --target ${{ matrix.target }} --verbose --release --locked --bin boa
       - name: Upload binaries to release