Merge remote-tracking branch 'upstream/v4.0.0' into hereje/i763/refac…

…tor/migrate-to-esm/concerto-types

.eslintignore

@@ -2,7 +2,7 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ -15,8 +15,6 @@
 coverage
 node_modules
 out
-lib/introspect/parser.js
-lib/acl/parser.js
-lib/query/parser.js
+src/introspect/parser.js
 test/data
-umd
+umd

.github/workflows/build.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - main
+      - v4.0.0 # Temporary, while we prepare for merge to main
 
 jobs:
   build:
@@ -15,8 +16,8 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 16.x
           - 18.x
+          - 20.x
         os:
           - ubuntu-latest
           - windows-latest
@@ -96,6 +97,5 @@ jobs:
       - name: build and publish
         run: |
           npm config set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
-          npm version --no-git-tag-version --yes --exact ${{ steps.timestamp.outputs.stamp }}
-          npx lerna version --no-git-tag-version --yes --exact ${{ steps.timestamp.outputs.stamp }}
-          npx lerna exec -- npm publish --access public --tag=unstable 2>&1
+          npm version --workspaces --include-workspace-root --no-git-tag-version --yes --exact ${{ steps.timestamp.outputs.stamp }}
+          npm publish --workspaces --access public --tag=unstable 2>&1

.github/workflows/publish.yml

@@ -15,10 +15,10 @@ jobs:
       - name: git checkout
         uses: actions/checkout@v2
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 20.x
 
       - run: npm ci
       - run: npm run build --if-present
@@ -31,9 +31,8 @@ jobs:
       - name: build and publish
         run: |
           npm config set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
-          npm version --no-git-tag-version --yes --exact ${{ github.event.release.tag_name }}
-          npx lerna version --no-git-tag-version --yes --exact ${{ github.event.release.tag_name }}
-          npx lerna exec -- npm publish --access public ${{ steps.tag.outputs.tag }} 2>&1
+          npm version --workspaces --include-workspace-root --no-git-tag-version --yes --exact ${{ github.event.release.tag_name }}
+          npm publish --workspaces --access public ${{ steps.tag.outputs.tag }} 2>&1
 
       - name: Create PR to increment version
         uses: peter-evans/create-pull-request@v3