Skip to content

Commit

Permalink
Update dependencies (#201)
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcusLongmuir authored Sep 26, 2024
1 parent 4730cf4 commit 091a5ef
Show file tree
Hide file tree
Showing 16 changed files with 2,179 additions and 1,200 deletions.
8 changes: 4 additions & 4 deletions .github/actions/npm-install-build-and-cache/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ runs:
using: "composite"
steps:
- name: Set up nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: npm
Expand All @@ -23,11 +23,11 @@ runs:
run: echo "NX_REJECT_UNKNOWN_LOCAL_CACHE=0" >> $GITHUB_ENV

- name: Cache NPM dependencies
uses: actions/cache@v3
uses: actions/cache@v4
id: cache-npm-deps
with:
path: |
node_modules
**/node_modules
~/.cache
key: ${{ runner.os }}-npm-v3-${{ hashFiles('package-lock.json') }}

Expand All @@ -41,7 +41,7 @@ runs:
run: npm run build

- name: Upload build artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/retrieve-deps-and-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ runs:
using: "composite"
steps:
- name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-artifacts

- name: Set up nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: npm

- name: Cache NPM dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
node_modules
**/node_modules
~/.cache
key: ${{ runner.os }}-npm-v3-${{ hashFiles('package-lock.json') }}
18 changes: 9 additions & 9 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand All @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand All @@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand All @@ -67,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand All @@ -84,14 +84,14 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: |
~/.cache
key: ${{ runner.os }}

- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand All @@ -105,7 +105,7 @@ jobs:

- name: Upload End to End Test Images
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: images
path: e2e-tests/test/__image_snapshots__/
Expand All @@ -130,7 +130,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand All @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand All @@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand All @@ -67,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand All @@ -84,14 +84,14 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: |
~/.cache
key: ${{ runner.os }}

- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
persist-credentials: false
Expand All @@ -105,7 +105,7 @@ jobs:

- name: Upload End to End Test Images
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: images
path: e2e-tests/test/__image_snapshots__/
Expand Down
8 changes: 4 additions & 4 deletions e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
"wait-for-ports": "npx wait-on http://127.0.0.1:7079 -t 60000"
},
"dependencies": {
"chokidar": "3.6.0",
"express": "4.19.2",
"chokidar": "4.0.1",
"express": "4.21.0",
"express-ws": "5.0.2",
"jest-image-snapshot": "6.4.0",
"networked-dom-server": "0.18.0",
"puppeteer": "22.6.5",
"wait-on": "8.0.0",
"wait-on": "8.0.1",
"ws": "8.18.0"
},
"devDependencies": {
"@types/cors": "2.8.17",
"@types/express": "4.17.21",
"@types/express-ws": "3.0.4",
"@types/express-ws": "3.0.5",
"@types/jest-image-snapshot": "6.4.0",
"@types/puppeteer": "7.0.4"
},
Expand Down
9 changes: 7 additions & 2 deletions e2e-tests/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { Stats } from "node:fs";

import * as chokidar from "chokidar";
import express, { Request, static as expressStatic } from "express";
import enableWs from "express-ws";
Expand All @@ -13,8 +15,11 @@ const srcPath = path.resolve(dirname, "../src");

const documents: { [key: string]: { documentPath: string; document: EditableNetworkedDOM } } = {};

const watchPath = path.resolve(srcPath, "*.html");
const watcher = chokidar.watch(watchPath, { ignored: /^\./, persistent: true });
const watcher = chokidar.watch(srcPath, {
ignored: (path: string, stats: Stats) => (stats?.isFile() || false) && !path.endsWith(".html"),
depth: 0,
persistent: true,
});
watcher
.on("add", (relativeFilePath) => {
const filename = path.basename(relativeFilePath);
Expand Down
6 changes: 3 additions & 3 deletions examples/mml-web-client-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
"lint-fix": "eslint \"./**/*.{js,jsx,ts,tsx}\" --fix"
},
"dependencies": {
"chokidar": "3.6.0",
"express": "4.19.2",
"chokidar": "4.0.1",
"express": "4.21.0",
"express-ws": "5.0.2",
"networked-dom-server": "^0.18.0",
"ws": "8.18.0"
},
"devDependencies": {
"@types/cors": "2.8.17",
"@types/express": "4.17.21",
"@types/express-ws": "3.0.4"
"@types/express-ws": "3.0.5"
},
"version": "0.18.0"
}
6 changes: 3 additions & 3 deletions examples/networked-dom-web-client-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"serve": "node --enable-source-maps ./build/index.js"
},
"dependencies": {
"chokidar": "3.6.0",
"express": "4.19.2",
"chokidar": "4.0.1",
"express": "4.21.0",
"express-ws": "5.0.2",
"networked-dom-server": "^0.18.0",
"ws": "8.18.0"
},
"devDependencies": {
"@types/cors": "2.8.17",
"@types/express": "4.17.21",
"@types/express-ws": "3.0.4"
"@types/express-ws": "3.0.5"
},
"version": "0.18.0"
}
Loading

0 comments on commit 091a5ef

Please sign in to comment.