From 0912463ea8c8769aede2a04ed307b742138427d6 Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Thu, 20 Apr 2023 00:50:43 -0400 Subject: [PATCH 1/5] Small cleanups. - Ensure a param is a boolean for clearer debugging. - Formatting. --- lib/expand.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/expand.js b/lib/expand.js index 2695a415..559079e9 100644 --- a/lib/expand.js +++ b/lib/expand.js @@ -634,7 +634,7 @@ async function _expandObject({ } return v; }), - {propertyIsArray: options.isFrame}); + {propertyIsArray: !!options.isFrame}); continue; } @@ -775,8 +775,7 @@ async function _expandObject({ expandedValue = await api.expand({ activeCtx, - activeProperty: - '@reverse', + activeProperty: '@reverse', element: value, options }); @@ -881,7 +880,7 @@ async function _expandObject({ }); } else { // recurse into @list or @set - const isList = (expandedProperty === '@list'); + const isList = expandedProperty === '@list'; if(isList || expandedProperty === '@set') { let nextActiveProperty = activeProperty; if(isList && expandedActiveProperty === '@graph') { From b9b0758bc53fab6493d39a728457efa136cfbcb3 Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Thu, 27 Apr 2023 18:31:45 -0400 Subject: [PATCH 2/5] Update GitHub actions versions. --- .github/workflows/main.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e533b87c..689056b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,9 +10,9 @@ jobs: matrix: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - run: npm install @@ -25,9 +25,9 @@ jobs: matrix: node-version: [14.x, 16.x, 18.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - name: Install @@ -44,9 +44,9 @@ jobs: node-version: [16.x] bundler: [webpack, browserify] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - name: Install @@ -64,9 +64,9 @@ jobs: matrix: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - run: npm install @@ -80,9 +80,9 @@ jobs: matrix: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - name: Install From 5d803fbffa02ec94d2b0267850a09be65f133327 Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Thu, 27 Apr 2023 18:32:31 -0400 Subject: [PATCH 3/5] Test on Node.js 20.x. --- .github/workflows/main.yml | 2 +- CHANGELOG.md | 1 + package.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 689056b9..15981680 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - node-version: [14.x, 16.x, 18.x] + node-version: [14.x, 16.x, 18.x, 20.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 54d23fe0..4e66ae78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and identifiers. - Skip test with 'U' escapes. Will enable when [rdf-canonize][] dependency is updated. +- Test on Node.js 20.x. ## 8.1.1 - 2023-02-25 diff --git a/package.json b/package.json index acad97e8..a2d0cea9 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "lib/**/*.js" ], "dependencies": { - "@digitalbazaar/http-client": "^3.2.0", + "@digitalbazaar/http-client": "^3.4.1", "canonicalize": "^1.0.1", "lru-cache": "^6.0.0", "rdf-canonize": "^3.0.0" From 5788ea875090fa826e84c92a9708b541595acd4c Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Thu, 27 Apr 2023 18:33:10 -0400 Subject: [PATCH 4/5] Use Node.js 18.x for GitHub actions. --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 15981680..c16c8e3e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} @@ -41,7 +41,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - node-version: [16.x] + node-version: [18.x] bundler: [webpack, browserify] steps: - uses: actions/checkout@v3 @@ -62,7 +62,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} @@ -78,7 +78,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} From 20e2016948a909cc1667a0356a75b7112740a9e5 Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Fri, 28 Apr 2023 20:28:05 -0400 Subject: [PATCH 5/5] Use Node.js 16.x for webpack related actions. - Node.js 18.x needs a newer webpack and related tools. Will return to 18.x when the tooling is updated. --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c16c8e3e..08332857 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - node-version: [18.x] + node-version: [16.x] bundler: [webpack, browserify] steps: - uses: actions/checkout@v3 @@ -62,7 +62,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - node-version: [18.x] + node-version: [16.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }}