Merge remote-tracking branch 'upstream/master' into categorization-to-functional

Author: sdirix

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.1/containers/javascript-node/.devcontainer/base.Dockerfile
 
-# [Choice] Node.js version: 16
-ARG VARIANT="16"
+# [Choice] Node.js version: 18
+ARG VARIANT="18"
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:1-${VARIANT}
 
 # Install chromium and point the CHROME_BIN environment variable to it

.devcontainer/devcontainer.json

@@ -4,9 +4,9 @@
   "name": "Node.js",
   "build": {
     "dockerfile": "Dockerfile",
-    // Update 'VARIANT' to pick a Node version: 16
+    // Update 'VARIANT' to pick a Node version: 18
     "args": {
-      "VARIANT": "16"
+      "VARIANT": "18"
     }
   },
   // Set *default* container specific settings.json values on container create.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -36,13 +36,6 @@ body:
     attributes:
       label: Screenshots
       description: If applicable, add screenshots to help explain your problem.
-  - type: input
-    validations:
-      required: true
-    attributes:
-      label: In which browser are you experiencing the issue?
-      placeholder: Google Chrome 91.0.4472.114
-      description: Provide the full name and don't forget to add the version!
   - type: input
     validations:
       required: true
@@ -57,8 +50,7 @@ body:
         - Core
         - React
         - Angular
-        - Vue 3
-        - Vue 2
+        - Vue
         - Other (please specify in the Additional context field)
   - type: dropdown
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -39,8 +39,7 @@ body:
         - Core
         - React
         - Angular
-        - Vue 3
-        - Vue 2
+        - Vue
         - Other (please specify in the Additional context field)
   - type: dropdown
     attributes:

.github/workflows/ci.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - uses: pnpm/[email protected]
         name: Install pnpm

.github/workflows/publish.yaml

@@ -0,0 +1,91 @@
+name: "Publish"
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        type: "string"
+        description: "version (e.g. 3.4.0-alpha.0)"
+        required: true
+      skip_publish:
+        type: "boolean"
+        description: "mark in case only the version update shall be executed, skipping the release to npm"
+        required: true
+      skip_push:
+        type: "boolean"
+        description: "mark in case the version update shall not be pushed back to the repository"
+        required: true
+      stable_release:
+        type: "boolean"
+        description: "mark in case this is a full stable release (flag is ignored in case publish is skipped)"
+        required: true
+
+jobs:
+  publish:
+    permissions:
+      contents: "write"
+      id-token: "write"
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "actions/checkout@v4"
+        with:
+          token: "${{ secrets.JSONFORMS_PUBLISH_PAT }}"
+
+      - name: "Configure Git Credentials"
+        run: |
+          git config user.name "jsonforms-publish[bot]"
+          git config user.email "[email protected]"
+
+      - name: "Setup node"
+        uses: "actions/setup-node@v3"
+        with:
+          node-version: "18"
+          registry-url: "https://registry.npmjs.org"
+
+      - uses: "pnpm/[email protected]"
+        name: "Install pnpm"
+        id: "pnpm-install"
+        with:
+          version: "8"
+          run_install: false
+
+      - name: "Install Packages"
+        run: "pnpm i --frozen-lockfile"
+
+      - name: "Build"
+        run: "pnpm run build"
+
+      - name: "Test"
+        run: "pnpm run test"
+
+      - name: "Versioning"
+        run: "pnpm exec lerna version ${{ github.event.inputs.next_version }} --no-push --force-publish --yes"
+
+      - name: "Adjust PeerDependencies"
+        run: |
+          cd packages/angular && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}"
+          cd ../angular-material && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/angular="${{ github.event.inputs.next_version }}"
+          cd ../examples && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}"
+          cd ../material-renderers && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/react="${{ github.event.inputs.next_version }}"
+          cd ../react && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}"
+          cd ../vanilla-renderers && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/react="${{ github.event.inputs.next_version }}"
+          cd ../vue && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}"
+          cd ../vue-vanilla && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/vue="${{ github.event.inputs.next_version }}"
+
+      - name: "Tag and Commit"
+        run: |
+          git add -A && git commit --amend --no-edit
+          git tag v${{ github.event.inputs.next_version }} -f
+
+      - name: "Publish to npm"
+        if: "github.event.inputs.skip_publish == 'false'"
+        run: "pnpm publish --recursive ${{  github.event.inputs.stable_release == 'true' && ' ' || '--tag next' }}"
+        env:
+          NODE_AUTH_TOKEN: "${{ secrets.NPM_TOKEN }}"
+          NPM_CONFIG_PROVENANCE: "true"
+
+      - name: "push"
+        if: "github.event.inputs.skip_push == 'false'"
+        run: |
+          git push
+          git push origin v${{ github.event.inputs.next_version }}

.github/workflows/release.yaml

@@ -13,4 +13,6 @@ stats.html
 !.vscode/settings.json
 
 .coveralls.yml
-packages/examples-react/build
+packages/examples-react/build
+
+**/.angular/cache

.gitignore

@@ -1 +1 @@
-v16.20.1
+v18.19.0

.nvmrc

@@ -49,5 +49,10 @@
     "**/node_modules": true,
     "**/lib": true
   },
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "[javascript][javascriptreact][typescript][typescriptreact][vue]": {
+    "editor.codeActionsOnSave": {
+      "source.fixAll.eslint": "explicit"
+    }
+  }
 }