Merge branch 'redhat-developer:main' into patch-1

Author: RedCMD

.github/workflows/CI.yaml

@@ -33,23 +33,27 @@ jobs:
 
       # Run install dependencies
       - name: Install dependencies
-        run: yarn
+        run: npm ci
+
+      # Install latest yaml-language-server
+      - name: Update yaml-language-server
+        run: npm i yaml-language-server@next
 
       # Build extension
       - name: Run build
-        run: yarn build
+        run: npm run build
 
       # Run tests
       - name: Run Test
         uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 #v1.0.1
         with:
-          run: yarn test
+          run: npm test
 
       # Run UI tests
       - name: Run UI Test
         uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 #v1.0.1
         with:
-          run: yarn run ui-test
+          run: npm run ui-test
           options: -screen 0 1920x1080x24
 
       #Package vsix

.github/workflows/release.yml

@@ -1,6 +1,8 @@
 name: release
 
 on:
+  schedule:
+    - cron: '0 8 * * *'
   workflow_dispatch:
     inputs:
       publishPreRelease:
@@ -29,8 +31,39 @@ on:
         default: 'true'
 
 jobs:
+
+  should-build-change:
+    runs-on: ubuntu-latest
+    outputs:
+      repo-cache-hit: ${{ steps.cache-last-commit.outputs.cache-hit }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: "redhat-developer/vscode-yaml"
+          fetch-depth: 2
+          path: vscode-yaml
+      - uses: actions/checkout@v4
+        with:
+          repository: "redhat-developer/yaml-language-server"
+          fetch-depth: 2
+          path: yaml-language-server
+      - run: |
+          pushd vscode-yaml
+          git rev-parse HEAD >> ../lastCommit
+          popd
+          pushd yaml-language-server
+          git rev-parse HEAD >> ../lastCommit
+      - name: Check New Changes
+        id: cache-last-commit
+        uses: actions/cache@v4
+        with:
+          path: lastCommit
+          key: lastCommit-${{ hashFiles('lastCommit') }}
+
   packaging-job:
     runs-on: ubuntu-latest
+    needs: should-build-change
+    if: ${{ needs.should-build-change.outputs.repo-cache-hit != 'true' || github.event_name != 'schedule' }}
     steps:
       - name: Checkout vscode-yaml
         uses: actions/checkout@v4
@@ -39,24 +72,33 @@ jobs:
         with:
           path: release
           node-version: 20
+      - name: Set version to prerelease version
+        run: |
+          node ./scripts/change-version-to-prerelease.mjs
+          echo "publishPreReleaseFlag=--pre-release" >> $GITHUB_ENV
+        if: ${{ github.event_name == 'schedule' || inputs.publishPreRelease == 'true'}}
       - name: Install dependencies
         run: |
-          npm install -g typescript "yarn" "@vscode/vsce" "ovsx"
+          npm install -g typescript "@vscode/vsce" "ovsx"
           echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
+      # Install latest yaml-language-server in the case of a prerelease
+      - name: Update yaml-language-server
+        if: ${{ github.event_name == 'schedule' || inputs.publishPreRelease == 'true'}}
+        run: npm i yaml-language-server@next
       - name: Build vscode-yaml
         uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 #v1.0.1
         with:
           run: |
-            yarn install
-            yarn run build
-            yarn run check-dependencies
+            npm ci
+            npm run build
+            npm run check-dependencies
       - name: Run Unit Tests
         uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 #v1.0.1
         with:
-          run: yarn test --silent
+          run: npm test --silent
       - name: Package
         run: |
-          vsce package -o vscode-yaml-${{ env.EXT_VERSION }}-${GITHUB_RUN_NUMBER}.vsix
+          vsce package ${{ env.publishPreReleaseFlag }} -o vscode-yaml-${{ env.EXT_VERSION }}-${GITHUB_RUN_NUMBER}.vsix
           sha256sum *.vsix > vscode-yaml-${{ env.EXT_VERSION }}-${GITHUB_RUN_NUMBER}.vsix.sha256
           ls -lash *.vsix *.sha256
       - name: Upload VSIX Artifacts
@@ -70,7 +112,7 @@ jobs:
         uses: "marvinpinto/action-automatic-releases@919008cf3f741b179569b7a6fb4d8860689ab7f0"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${{ env.EXT_VERSION }}"
+          automatic_release_tag: "${{ github.event_name != 'schedule' && inputs.publishPreRelease != 'true' && env.EXT_VERSION || null }}"
           draft: true
           files: |
             vscode-yaml-${{ env.EXT_VERSION }}-${{github.run_number}}*.vsix
@@ -88,9 +130,13 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: 20
+    - name: Set version to prerelease version
+      run: |
+        node ./scripts/change-version-to-prerelease.mjs
+      if: ${{ github.event_name == 'schedule' || inputs.publishPreRelease == 'true'}}
     - name: Install dependencies
       run: |
-        npm install -g typescript "yarn" "@vscode/vsce" "ovsx"
+        npm install -g typescript "@vscode/vsce" "ovsx"
         echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
     - name: Download VSIX Artifacts
       uses: actions/download-artifact@v4

.gitignore

@@ -6,5 +6,6 @@ dist/
 test/testFixture/.vscode
 *.vsix
 .DS_Store
-test-resources
-yarn-error.log
+test-resources/
+yarn.lock
+.yarnrc

.vscode/tasks.json

@@ -9,7 +9,7 @@
       // the command is a shell script
       "type": "shell",
       // we run the custom npm script "compile" as defined in package.json
-      "command": "yarn run compile",
+      "command": "npm run compile",
       // show the output window only if unrecognized errors occur.
       "presentation": {
         "reveal": "never"
@@ -32,7 +32,7 @@
       // the command is a shell script
       "type": "shell",
       // we run the custom npm script "compile" as defined in package.json
-      "command": "yarn test-compile",
+      "command": "npm run test-compile",
       // show the output window only if unrecognized errors occur.
       "presentation": {
         "reveal": "never"

.vscodeignore

@@ -20,6 +20,7 @@ CONTRIBUTING.md
 .vscode-test-web/**
 **/**.vsix
 **/**.tar.gz
+test-resources
 !node_modules/prettier/index.js
 !node_modules/prettier/third-party.js
 !node_modules/prettier/parser-yaml.js

.yarnrc

@@ -1,3 +1,30 @@
+### 1.19.0
+- Feat: Support formatting docker-compose.yml by default [#1071](https://github.com/redhat-developer/yaml-language-server/issues/1071)
+- Feat: Support statically registering format support [#1062](https://github.com/redhat-developer/yaml-language-server/pull/1062)
+- Feat: Support localization in the YAML language server [#1081](https://github.com/redhat-developer/yaml-language-server/issues/1081)
+- Feat: Migrated to NPM [#1097](https://github.com/redhat-developer/yaml-language-server/issues/1097)
+- Feat: Add formatting option to remove trailing comma [#1112](https://github.com/redhat-developer/vscode-yaml/issues/1112)
+- Fix: OpenAPI 3.0.0 specification is treated as invalid [#752](https://github.com/redhat-developer/yaml-language-server/issues/752)
+- Fix: YAML Language Server checks against JSON Schema Draft 7 instead of the defined one [#780](https://github.com/redhat-developer/yaml-language-server/issues/780)
+- Fix: Numbers in comments should not break schema validation [#922](https://github.com/redhat-developer/yaml-language-server/issues/922)
+- Fix: Make enum values easier to read on hover [#982](https://github.com/redhat-developer/yaml-language-server/issues/982)
+- Fix: No more quickfix for indent with tab [#1052](https://github.com/redhat-developer/yaml-language-server/issues/1052)
+- Fix: QuickFix for "flow sequence forbidden" leaves in trailing `]` [#1060](https://github.com/redhat-developer/yaml-language-server/issues/1060)
+- Fix: YAML conversion does not resolve aliases correctly [#1075](https://github.com/redhat-developer/yaml-language-server/issues/1075)
+- Fix: Fix enum values to be unique [#1028](https://github.com/redhat-developer/yaml-language-server/pull/1028)
+- Fix: Using bool values in enum and const generates a validation error for valid values [#1078](https://github.com/redhat-developer/yaml-language-server/issues/1078)
+- Fix: improve enum value descriptions for merged enum lists [#1085](https://github.com/redhat-developer/yaml-language-server/pull/1085)
+- Fix: Array of const completion [#1092](https://github.com/redhat-developer/yaml-language-server/pull/1092)
+- Fix: Error for missing anchor (unidentified alias) broken since 1.0 [#1098](https://github.com/redhat-developer/vscode-yaml/issues/1098)
+- Fix: Invalid tab indentation error [#1110](https://github.com/redhat-developer/vscode-yaml/issues/1110)
+- Fix: Validation shows false negative errors if using boolean with const [#1116](https://github.com/redhat-developer/vscode-yaml/issues/1116)
+- Fix: Broken link to JSON Schema website [#1113](https://github.com/redhat-developer/yaml-language-server/pull/1113)
+- Fix: GitHub Actions release process was broken [#1127](https://github.com/redhat-developer/yaml-language-server/pull/1127), [#1128](https://github.com/redhat-developer/yaml-language-server/issues/1128)
+- Bump: ajv version [#1067](https://github.com/redhat-developer/yaml-language-server/pull/1067)
+
+Thanks to [Trevor Dixon](https://github.com/trevordixon), [David Lechner](https://github.com/dlech), [pjsk-stripe](https://github.com/pjsk-stripe), [Lucy Dryaeva
+](https://github.com/ShadiestGoat), [Kosta](https://github.com/Kosta-Github) and [August Johansson ](https://github.com/webdevred) for your contributions.
+
 ### 1.18.0
 - Feat: Do not suggest propertyNames if doNotSuggest is true [#1045](https://github.com/redhat-developer/yaml-language-server/pull/1045)
 - Feat: Exclude not suggest properties from possible properties error [#1051](https://github.com/redhat-developer/yaml-language-server/pull/1051)

CHANGELOG.md

@@ -48,7 +48,7 @@ All contributions are welcome!
 
 3. Open the `vscode-yaml` folder in VSCode, and then add the `yaml-language-server` project to the workspace using `File -> Add Folder to Workspace...`.
 
-4. Run `yarn install` in both directories to initialize `node_modules` dependencies.
+4. Run `npm run install` in both directories to initialize `node_modules` dependencies.
 
 5. To run the language server in VSCode, click `View -> Debug`, then from the drop down menu beside the green arrow select `Launch Extension (vscode-yaml)`, click the arrow, and a new VSCode window should load with the YAML LS running.
 

CONTRIBUTING.md

@@ -3,13 +3,12 @@
 def installBuildRequirements(){
   def nodeHome = tool 'nodejs-lts'
   env.PATH="${env.PATH}:${nodeHome}/bin"
-  sh "npm install --global yarn"
   sh "npm install --global vsce"
 }
 
 def buildVscodeExtension(){
-  sh "yarn install"
-  sh "yarn run vscode:prepublish"
+  sh "npm run install"
+  sh "npm run vscode:prepublish"
 }
 
 node('rhel8'){
@@ -22,13 +21,13 @@ node('rhel8'){
   installBuildRequirements()
 
   stage 'Build vscode-yaml'
-  sh "yarn install"
-  sh "yarn run build"
-  sh "yarn run check-dependencies"
+  sh "npm run install"
+  sh "npm run build"
+  sh "npm run check-dependencies"
 
   stage 'Test vscode-yaml for staging'
   wrap([$class: 'Xvnc']) {
-    sh "yarn test --silent"
+    sh "npm test --silent"
   }
 
   stage "Package vscode-yaml"