From 17559e15d04b49f8a8b19f4075c69f9148b285a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Paku=C5=82a?= Date: Tue, 4 Jul 2023 14:16:31 +0200 Subject: [PATCH 01/28] Vue.js info on README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 148355d7c5..a732480e27 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ and * Angular (Components & Templates, in TypeScript and HTML files) * React (JSX, TSX, embedded HTML) * ESLint (for JavaScript and TypeScript) +* Vue.js Supported features for edition are From 97bfb44d8e97b3cbedf1ee5709629723537b4092 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 09:52:21 +0000 Subject: [PATCH 02/28] Bump @vue/language-server in /org.eclipse.wildwebdeveloper Bumps [@vue/language-server](https://github.com/vuejs/language-tools/tree/HEAD/packages/vue-language-server) from 1.8.3 to 1.8.4. - [Release notes](https://github.com/vuejs/language-tools/releases) - [Changelog](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/language-tools/commits/v1.8.4/packages/vue-language-server) --- updated-dependencies: - dependency-name: "@vue/language-server" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- org.eclipse.wildwebdeveloper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json index bcd334adb6..0f233b7c61 100644 --- a/org.eclipse.wildwebdeveloper/package.json +++ b/org.eclipse.wildwebdeveloper/package.json @@ -15,6 +15,6 @@ "debugger-for-chrome": "file:target/debugger-for-chrome-4.13.0.tgz", "eslint-server": "file:target/eslint-server-2.4.1.tgz", "node-debug2": "file:target/node-debug2-1.43.0.tgz", - "@vue/language-server" : "1.8.3" + "@vue/language-server" : "1.8.4" } } From 4ec978909c717da0ec38c16b99d961d2eaf2a16f Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Wed, 5 Jul 2023 12:08:36 +0200 Subject: [PATCH 03/28] [nobug] Bump version towards 1.2.1 --- org.eclipse.wildwebdeveloper.feature/feature.xml | 2 +- org.eclipse.wildwebdeveloper.feature/pom.xml | 2 +- org.eclipse.wildwebdeveloper/META-INF/MANIFEST.MF | 2 +- org.eclipse.wildwebdeveloper/pom.xml | 2 +- repository/epp.product | 2 +- repository/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/org.eclipse.wildwebdeveloper.feature/feature.xml b/org.eclipse.wildwebdeveloper.feature/feature.xml index 3b97acaa63..109bc00c6f 100644 --- a/org.eclipse.wildwebdeveloper.feature/feature.xml +++ b/org.eclipse.wildwebdeveloper.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.wildwebdeveloper.feature/pom.xml b/org.eclipse.wildwebdeveloper.feature/pom.xml index 46a2c86f33..27ce82b5f1 100644 --- a/org.eclipse.wildwebdeveloper.feature/pom.xml +++ b/org.eclipse.wildwebdeveloper.feature/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-feature - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT diff --git a/org.eclipse.wildwebdeveloper/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper/META-INF/MANIFEST.MF index b0074235e7..c9dfd7fb32 100644 --- a/org.eclipse.wildwebdeveloper/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.wildwebdeveloper;singleton:=true Automatic-Module-Name: org.eclipse.wildwebdeveloper -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.1.qualifier Bundle-Activator: org.eclipse.wildwebdeveloper.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/org.eclipse.wildwebdeveloper/pom.xml b/org.eclipse.wildwebdeveloper/pom.xml index ec103e3d70..9bd88bdc5d 100644 --- a/org.eclipse.wildwebdeveloper/pom.xml +++ b/org.eclipse.wildwebdeveloper/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-plugin - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT diff --git a/repository/epp.product b/repository/epp.product index fb105cfd2c..ae7b78085a 100644 --- a/repository/epp.product +++ b/repository/epp.product @@ -3,7 +3,7 @@ + version="1.2.1.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true"> diff --git a/repository/pom.xml b/repository/pom.xml index 478a70a4f4..b873929513 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-repository - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT From 24fe596697ccca56bc1293110285566ce023c640 Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Thu, 6 Jul 2023 14:54:21 +0200 Subject: [PATCH 04/28] [build] Use Dash License Tool v.1.0.3-SNAPSHOT --- .github/workflows/licensecheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/licensecheck.yml b/.github/workflows/licensecheck.yml index b03cbee6bf..d63e747cbf 100644 --- a/.github/workflows/licensecheck.yml +++ b/.github/workflows/licensecheck.yml @@ -69,7 +69,7 @@ jobs: run: mvn -DskipTests -pl target-platform,org.eclipse.wildwebdeveloper.embedder.node,org.eclipse.wildwebdeveloper package - name: Get Dash license tool run: | - mvn -U dependency:get -Dartifact=org.eclipse.dash:org.eclipse.dash.licenses:0.0.1-SNAPSHOT + mvn -U dependency:get -Dartifact=org.eclipse.dash:org.eclipse.dash.licenses:1.0.3-SNAPSHOT mkdir -p target/dash # Make directory for dash-license review summary - name: Set request review parameters if: github.event_name == 'issue_comment' From af1a5a9656c97c06685fc30969fb72407eaebb84 Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Thu, 6 Jul 2023 18:30:56 +0200 Subject: [PATCH 05/28] fixup! [build] Use Dash License Tool v.1.0.3-SNAPSHOT --- .github/workflows/licensecheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/licensecheck.yml b/.github/workflows/licensecheck.yml index d63e747cbf..adc50e25b4 100644 --- a/.github/workflows/licensecheck.yml +++ b/.github/workflows/licensecheck.yml @@ -86,7 +86,7 @@ jobs: projectId="tools.wildwebdeveloper" gitlabAPIToken="${{ secrets.GITLAB_API_TOKEN }}" - dashLicenseToolJar=$(ls ~/.m2/repository/org/eclipse/dash/org.eclipse.dash.licenses/0.0.1-SNAPSHOT/org.eclipse.dash.licenses-*.jar | tail -n 1) + dashLicenseToolJar=$(ls ~/.m2/repository/org/eclipse/dash/org.eclipse.dash.licenses/1.0.3-SNAPSHOT/org.eclipse.dash.licenses-*.jar | tail -n 1) npmArgs=" --no-bin-links --ignore-scripts" dashArgs="-excludeSources local -summary $savePWD/target/dash/npm-review-summary" exitStatus=0 From 823d5b65bbd422712655c275d15f37b2204fc756 Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Tue, 11 Jul 2023 15:27:25 +0200 Subject: [PATCH 06/28] [build] Use Tycho v.4.0.0 Release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a54e85b6e..7dad8dfebd 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 3.6.3 - 4.0.0-SNAPSHOT + 4.0.0 scm:git:https://github.com/eclipse/wildwebdeveloper.git error UTF-8 From 2af13b7d2c50ff984f5c133b12008080047898ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 15:17:00 +0000 Subject: [PATCH 07/28] Bump @typescript-eslint/eslint-plugin Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.62.0 to 6.0.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.0.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../testProjects/eslint/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper.tests/testProjects/eslint/package.json b/org.eclipse.wildwebdeveloper.tests/testProjects/eslint/package.json index c6e1eb969b..34190d6a9f 100644 --- a/org.eclipse.wildwebdeveloper.tests/testProjects/eslint/package.json +++ b/org.eclipse.wildwebdeveloper.tests/testProjects/eslint/package.json @@ -9,7 +9,7 @@ "author": "Andrew Obuchowicz", "license": "ISC", "devDependencies": { - "@typescript-eslint/eslint-plugin": "^5.60.0", + "@typescript-eslint/eslint-plugin": "^6.0.0", "@typescript-eslint/parser": "^5.60.0", "eslint": "^8.24.0", "typescript": "5.1.6" From 1560058de5913e2e1389922a989cd1afa757fa89 Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Tue, 11 Jul 2023 18:18:29 +0200 Subject: [PATCH 08/28] [test] Bump @typescript-eslint/parser to v.^6.0.0 --- .../testProjects/eslint/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper.tests/testProjects/eslint/package.json b/org.eclipse.wildwebdeveloper.tests/testProjects/eslint/package.json index 34190d6a9f..b7d916992d 100644 --- a/org.eclipse.wildwebdeveloper.tests/testProjects/eslint/package.json +++ b/org.eclipse.wildwebdeveloper.tests/testProjects/eslint/package.json @@ -10,7 +10,7 @@ "license": "ISC", "devDependencies": { "@typescript-eslint/eslint-plugin": "^6.0.0", - "@typescript-eslint/parser": "^5.60.0", + "@typescript-eslint/parser": "^6.0.0", "eslint": "^8.24.0", "typescript": "5.1.6" } From 8bfb690e0da148917e892786bc7515f0a5ae8e72 Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Tue, 11 Jul 2023 18:28:19 +0200 Subject: [PATCH 09/28] [nobug] Bump tests version towards 1.2.1 --- org.eclipse.wildwebdeveloper.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.wildwebdeveloper.tests/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.wildwebdeveloper.tests/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper.tests/META-INF/MANIFEST.MF index 8b298d6359..e266c325a4 100644 --- a/org.eclipse.wildwebdeveloper.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests for WildWebDeveloper Bundle-SymbolicName: org.eclipse.wildwebdeveloper.tests;singleton:=true -Bundle-Version: 1.0.7.qualifier +Bundle-Version: 1.0.8.qualifier Bundle-Vendor: Eclipse Wild Web Developer Automatic-Module-Name: org.eclipse.wildwebdeveloper.tests Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.wildwebdeveloper.tests/pom.xml b/org.eclipse.wildwebdeveloper.tests/pom.xml index 4937d90eff..ffb83269b0 100644 --- a/org.eclipse.wildwebdeveloper.tests/pom.xml +++ b/org.eclipse.wildwebdeveloper.tests/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-test-plugin - 1.0.7-SNAPSHOT + 1.0.8-SNAPSHOT From 8067d02b28ca73a3ecc0e7eeab9590ebf964b9fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:45:24 +0000 Subject: [PATCH 10/28] Bump vscode-languageserver-types in /org.eclipse.wildwebdeveloper Bumps [vscode-languageserver-types](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/types) from 3.17.4-next.0 to 3.17.4-next.1. - [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/types/3.17.4-next.1/types) --- updated-dependencies: - dependency-name: vscode-languageserver-types dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- org.eclipse.wildwebdeveloper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json index 0f233b7c61..f7346bf7bd 100644 --- a/org.eclipse.wildwebdeveloper/package.json +++ b/org.eclipse.wildwebdeveloper/package.json @@ -8,7 +8,7 @@ "typescript-plugin-css-modules": "5.0.1", "yaml-language-server": "1.13.0", "vscode-languageserver-protocol": "3.17.4-next.1", - "vscode-languageserver-types": "3.17.4-next.0", + "vscode-languageserver-types": "3.17.4-next.1", "vscode-css-languageserver": "file:target/vscode-css-languageserver-1.0.0.tgz", "vscode-html-languageserver": "file:target/vscode-html-languageserver-1.0.0.tgz", "vscode-json-languageserver": "file:target/vscode-json-languageserver-1.3.4.tgz", From c82bf71cc3ed2aea64272c1400248af2690311c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 15:48:20 +0000 Subject: [PATCH 11/28] Bump vscode-languageserver-protocol in /org.eclipse.wildwebdeveloper Bumps [vscode-languageserver-protocol](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/protocol) from 3.17.4-next.1 to 3.17.4-next.2. - [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/protocol/3.17.4-next.2/protocol) --- updated-dependencies: - dependency-name: vscode-languageserver-protocol dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- org.eclipse.wildwebdeveloper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json index f7346bf7bd..b543f2d292 100644 --- a/org.eclipse.wildwebdeveloper/package.json +++ b/org.eclipse.wildwebdeveloper/package.json @@ -7,7 +7,7 @@ "typescript-lit-html-plugin": "0.9.0", "typescript-plugin-css-modules": "5.0.1", "yaml-language-server": "1.13.0", - "vscode-languageserver-protocol": "3.17.4-next.1", + "vscode-languageserver-protocol": "3.17.4-next.2", "vscode-languageserver-types": "3.17.4-next.1", "vscode-css-languageserver": "file:target/vscode-css-languageserver-1.0.0.tgz", "vscode-html-languageserver": "file:target/vscode-html-languageserver-1.0.0.tgz", From 0614aaf9bdc29525ef974023e818f439d3ecf477 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 18:16:48 +0000 Subject: [PATCH 12/28] Bump @vue/language-server in /org.eclipse.wildwebdeveloper Bumps [@vue/language-server](https://github.com/vuejs/language-tools/tree/HEAD/packages/vue-language-server) from 1.8.4 to 1.8.5. - [Release notes](https://github.com/vuejs/language-tools/releases) - [Changelog](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/language-tools/commits/v1.8.5/packages/vue-language-server) --- updated-dependencies: - dependency-name: "@vue/language-server" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- org.eclipse.wildwebdeveloper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json index b543f2d292..3fb49a5fc1 100644 --- a/org.eclipse.wildwebdeveloper/package.json +++ b/org.eclipse.wildwebdeveloper/package.json @@ -15,6 +15,6 @@ "debugger-for-chrome": "file:target/debugger-for-chrome-4.13.0.tgz", "eslint-server": "file:target/eslint-server-2.4.1.tgz", "node-debug2": "file:target/node-debug2-1.43.0.tgz", - "@vue/language-server" : "1.8.4" + "@vue/language-server" : "1.8.5" } } From dda4212b042e2e1912a927f8e29b9604011762ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jul 2023 04:49:43 +0000 Subject: [PATCH 13/28] Bump @angular/language-server in /org.eclipse.wildwebdeveloper Bumps [@angular/language-server](https://github.com/angular/vscode-ng-language-service) from 16.0.0 to 16.1.4. - [Release notes](https://github.com/angular/vscode-ng-language-service/releases) - [Changelog](https://github.com/angular/vscode-ng-language-service/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/vscode-ng-language-service/compare/v16.0.0...v16.1.4) --- updated-dependencies: - dependency-name: "@angular/language-server" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- org.eclipse.wildwebdeveloper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json index 3fb49a5fc1..b9de5e78b3 100644 --- a/org.eclipse.wildwebdeveloper/package.json +++ b/org.eclipse.wildwebdeveloper/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@angular/language-server": "16.0.0", + "@angular/language-server": "16.1.4", "firefox-debugadapter": "2.9.8", "typescript": "5.1.6", "typescript-language-server": "3.3.2", From 3dd0582aede90692f8973b66216f9d8a7aa0d7eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 14:41:21 +0000 Subject: [PATCH 14/28] Bump yaml-language-server in /org.eclipse.wildwebdeveloper Bumps [yaml-language-server](https://github.com/redhat-developer/yaml-language-server) from 1.13.0 to 1.14.0. - [Changelog](https://github.com/redhat-developer/yaml-language-server/blob/main/CHANGELOG.md) - [Commits](https://github.com/redhat-developer/yaml-language-server/compare/1.13.0...1.14.0) --- updated-dependencies: - dependency-name: yaml-language-server dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- org.eclipse.wildwebdeveloper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json index b9de5e78b3..962ba576ac 100644 --- a/org.eclipse.wildwebdeveloper/package.json +++ b/org.eclipse.wildwebdeveloper/package.json @@ -6,7 +6,7 @@ "typescript-language-server": "3.3.2", "typescript-lit-html-plugin": "0.9.0", "typescript-plugin-css-modules": "5.0.1", - "yaml-language-server": "1.13.0", + "yaml-language-server": "1.14.0", "vscode-languageserver-protocol": "3.17.4-next.2", "vscode-languageserver-types": "3.17.4-next.1", "vscode-css-languageserver": "file:target/vscode-css-languageserver-1.0.0.tgz", From 0d4b92fea84f76490cd80ceac0a4cbc2b3e56026 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 11:02:04 +0000 Subject: [PATCH 15/28] Bump @vue/language-server in /org.eclipse.wildwebdeveloper Bumps [@vue/language-server](https://github.com/vuejs/language-tools/tree/HEAD/packages/vue-language-server) from 1.8.5 to 1.8.6. - [Release notes](https://github.com/vuejs/language-tools/releases) - [Changelog](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/language-tools/commits/v1.8.6/packages/vue-language-server) --- updated-dependencies: - dependency-name: "@vue/language-server" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- org.eclipse.wildwebdeveloper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json index 962ba576ac..dcbd5f673e 100644 --- a/org.eclipse.wildwebdeveloper/package.json +++ b/org.eclipse.wildwebdeveloper/package.json @@ -15,6 +15,6 @@ "debugger-for-chrome": "file:target/debugger-for-chrome-4.13.0.tgz", "eslint-server": "file:target/eslint-server-2.4.1.tgz", "node-debug2": "file:target/node-debug2-1.43.0.tgz", - "@vue/language-server" : "1.8.5" + "@vue/language-server" : "1.8.6" } } From c7f4be9bf6cb91530bb96dee7dd1a6edcace6a36 Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Wed, 19 Jul 2023 18:01:38 +0200 Subject: [PATCH 16/28] Update Embedded Node.js Runtime to v.18.17.0 LTS Changelog: https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V18.md#18.17.0 --- .../feature.xml | 2 +- org.eclipse.wildwebdeveloper.embedder.node.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../nodejs-info.properties | 6 +++--- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../nodejs-info.properties | 6 +++--- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../nodejs-info.properties | 6 +++--- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../nodejs-info.properties | 6 +++--- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../nodejs-info.properties | 6 +++--- .../pom.xml | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/org.eclipse.wildwebdeveloper.embedder.node.feature/feature.xml b/org.eclipse.wildwebdeveloper.embedder.node.feature/feature.xml index 8d4c0da066..f2e93554e2 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.feature/feature.xml +++ b/org.eclipse.wildwebdeveloper.embedder.node.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.wildwebdeveloper.embedder.node.feature/pom.xml b/org.eclipse.wildwebdeveloper.embedder.node.feature/pom.xml index 03599c4995..bd9e47e2c9 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.feature/pom.xml +++ b/org.eclipse.wildwebdeveloper.embedder.node.feature/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-feature - 1.0.5-SNAPSHOT + 1.0.6-SNAPSHOT diff --git a/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/META-INF/MANIFEST.MF index 1ca36f18b1..9c90d65e51 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Node.js for Linux AArch64 Bundle-SymbolicName: org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64 -Bundle-Version: 1.0.5.qualifier +Bundle-Version: 1.0.6.qualifier Bundle-Vendor: Eclipse Wild Web Developer Fragment-Host: org.eclipse.wildwebdeveloper.embedder.node;bundle-version="1.0.0" Automatic-Module-Name: org.eclipse.wildwebdeveloper.embedder.node.linux diff --git a/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/nodejs-info.properties b/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/nodejs-info.properties index 0c80d8137f..78c6dd3e91 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/nodejs-info.properties +++ b/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/nodejs-info.properties @@ -1,3 +1,3 @@ -archiveURL=https://nodejs.org/download/release/v18.16.1/node-v18.16.1-linux-arm64.tar.gz -archiveFile=resources/node-v18.16.1-linux-arm64.tar.gz -nodePath=node-v18.16.1-linux-arm64/bin/node +archiveURL=https://nodejs.org/download/release/v18.17.0/node-v18.17.0-linux-arm64.tar.gz +archiveFile=resources/node-v18.17.0-linux-arm64.tar.gz +nodePath=node-v18.17.0-linux-arm64/bin/node diff --git a/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/pom.xml b/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/pom.xml index 41452f4b06..578fcba26f 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/pom.xml +++ b/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-plugin - 1.0.5-SNAPSHOT + 1.0.6-SNAPSHOT diff --git a/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/META-INF/MANIFEST.MF index d8624adff0..91c294736a 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Node.js for Linux x64 Bundle-SymbolicName: org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64 -Bundle-Version: 1.0.5.qualifier +Bundle-Version: 1.0.6.qualifier Bundle-Vendor: Eclipse Wild Web Developer Fragment-Host: org.eclipse.wildwebdeveloper.embedder.node;bundle-version="1.0.0" Automatic-Module-Name: org.eclipse.wildwebdeveloper.embedder.node.linux diff --git a/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/nodejs-info.properties b/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/nodejs-info.properties index f1b61ca43c..8121c12d24 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/nodejs-info.properties +++ b/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/nodejs-info.properties @@ -1,3 +1,3 @@ -archiveURL=https://nodejs.org/download/release/v18.16.1/node-v18.16.1-linux-x64.tar.gz -archiveFile=resources/node-v18.16.1-linux-x64.tar.gz -nodePath=node-v18.16.1-linux-x64/bin/node +archiveURL=https://nodejs.org/download/release/v18.17.0/node-v18.17.0-linux-x64.tar.gz +archiveFile=resources/node-v18.17.0-linux-x64.tar.gz +nodePath=node-v18.17.0-linux-x64/bin/node diff --git a/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/pom.xml b/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/pom.xml index b2a6272913..952ad3aba7 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/pom.xml +++ b/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-plugin - 1.0.5-SNAPSHOT + 1.0.6-SNAPSHOT diff --git a/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/META-INF/MANIFEST.MF index c1aca4941b..5b244c9cbc 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Node.js for MacOS AArch64 Bundle-SymbolicName: org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64 -Bundle-Version: 1.0.5.qualifier +Bundle-Version: 1.0.6.qualifier Bundle-Vendor: Eclipse Wild Web Developer Fragment-Host: org.eclipse.wildwebdeveloper.embedder.node;bundle-version="1.0.0" Automatic-Module-Name: org.eclipse.wildwebdeveloper.embedder.node.macos diff --git a/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/nodejs-info.properties b/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/nodejs-info.properties index 7802697a4b..b29df26df8 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/nodejs-info.properties +++ b/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/nodejs-info.properties @@ -1,3 +1,3 @@ -archiveURL=https://nodejs.org/download/release/v18.16.1/node-v18.16.1-darwin-arm64.tar.gz -archiveFile=resources/node-v18.16.1-darwin-arm64.tar.gz -nodePath=node-v18.16.1-darwin-arm64/bin/node +archiveURL=https://nodejs.org/download/release/v18.17.0/node-v18.17.0-darwin-arm64.tar.gz +archiveFile=resources/node-v18.17.0-darwin-arm64.tar.gz +nodePath=node-v18.17.0-darwin-arm64/bin/node diff --git a/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/pom.xml b/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/pom.xml index bd60dabb2f..ce17a4da4f 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/pom.xml +++ b/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-plugin - 1.0.5-SNAPSHOT + 1.0.6-SNAPSHOT diff --git a/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/META-INF/MANIFEST.MF index 285755b9d9..a61932b100 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Node.js for MacOS x64 Bundle-SymbolicName: org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64 -Bundle-Version: 1.0.5.qualifier +Bundle-Version: 1.0.6.qualifier Bundle-Vendor: Eclipse Wild Web Developer Fragment-Host: org.eclipse.wildwebdeveloper.embedder.node;bundle-version="1.0.0" Automatic-Module-Name: org.eclipse.wildwebdeveloper.embedder.node.macos diff --git a/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/nodejs-info.properties b/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/nodejs-info.properties index 96cb5575ea..bedee81ff5 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/nodejs-info.properties +++ b/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/nodejs-info.properties @@ -1,3 +1,3 @@ -archiveURL=https://nodejs.org/download/release/v18.16.1/node-v18.16.1-darwin-x64.tar.gz -archiveFile=resources/node-v18.16.1-darwin-x64.tar.gz -nodePath=node-v18.16.1-darwin-x64/bin/node +archiveURL=https://nodejs.org/download/release/v18.17.0/node-v18.17.0-darwin-x64.tar.gz +archiveFile=resources/node-v18.17.0-darwin-x64.tar.gz +nodePath=node-v18.17.0-darwin-x64/bin/node diff --git a/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/pom.xml b/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/pom.xml index a3cac9c81c..2b2f280c38 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/pom.xml +++ b/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-plugin - 1.0.5-SNAPSHOT + 1.0.6-SNAPSHOT diff --git a/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/META-INF/MANIFEST.MF index b6c688f09d..90d6925a4b 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Node.js for Windows x86_64 Bundle-SymbolicName: org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64 -Bundle-Version: 1.0.5.qualifier +Bundle-Version: 1.0.6.qualifier Bundle-Vendor: Eclipse Wild Web Developer Fragment-Host: org.eclipse.wildwebdeveloper.embedder.node;bundle-version="1.0.0" Automatic-Module-Name: org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64 diff --git a/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/nodejs-info.properties b/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/nodejs-info.properties index a83b56a412..1f8c81f54b 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/nodejs-info.properties +++ b/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/nodejs-info.properties @@ -1,3 +1,3 @@ -archiveURL=https://nodejs.org/download/release/v18.16.1/node-v18.16.1-win-x64.zip -archiveFile = resources/node-v18.16.1-win-x64.zip -nodePath = node-v18.16.1-win-x64/node.exe +archiveURL=https://nodejs.org/download/release/v18.17.0/node-v18.17.0-win-x64.zip +archiveFile = resources/node-v18.17.0-win-x64.zip +nodePath = node-v18.17.0-win-x64/node.exe diff --git a/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/pom.xml b/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/pom.xml index c414b6b1f3..f40c11f1b6 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/pom.xml +++ b/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-plugin - 1.0.5-SNAPSHOT + 1.0.6-SNAPSHOT From 4998f935382c703a7776f37053993eae19848942 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 11:46:09 +0000 Subject: [PATCH 17/28] Bump @vue/language-server in /org.eclipse.wildwebdeveloper Bumps [@vue/language-server](https://github.com/vuejs/language-tools/tree/HEAD/packages/vue-language-server) from 1.8.6 to 1.8.8. - [Release notes](https://github.com/vuejs/language-tools/releases) - [Changelog](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/language-tools/commits/v1.8.8/packages/vue-language-server) --- updated-dependencies: - dependency-name: "@vue/language-server" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- org.eclipse.wildwebdeveloper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json index dcbd5f673e..02e4cb1eac 100644 --- a/org.eclipse.wildwebdeveloper/package.json +++ b/org.eclipse.wildwebdeveloper/package.json @@ -15,6 +15,6 @@ "debugger-for-chrome": "file:target/debugger-for-chrome-4.13.0.tgz", "eslint-server": "file:target/eslint-server-2.4.1.tgz", "node-debug2": "file:target/node-debug2-1.43.0.tgz", - "@vue/language-server" : "1.8.6" + "@vue/language-server" : "1.8.8" } } From 9772380e19c2bb832a80b10ed6465785af1521aa Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Wed, 9 Aug 2023 15:14:02 +0200 Subject: [PATCH 18/28] [build] Use Dash License Tool v.1.0.2 --- .github/workflows/licensecheck.yml | 4 ++-- pom.xml | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/licensecheck.yml b/.github/workflows/licensecheck.yml index adc50e25b4..85de1cf6cc 100644 --- a/.github/workflows/licensecheck.yml +++ b/.github/workflows/licensecheck.yml @@ -69,7 +69,7 @@ jobs: run: mvn -DskipTests -pl target-platform,org.eclipse.wildwebdeveloper.embedder.node,org.eclipse.wildwebdeveloper package - name: Get Dash license tool run: | - mvn -U dependency:get -Dartifact=org.eclipse.dash:org.eclipse.dash.licenses:1.0.3-SNAPSHOT + mvn -U dependency:get -Dartifact=org.eclipse.dash:org.eclipse.dash.licenses:1.0.2 -DremoteRepositories="https://repo.eclipse.org/content/repositories/dash-licenses" mkdir -p target/dash # Make directory for dash-license review summary - name: Set request review parameters if: github.event_name == 'issue_comment' @@ -86,7 +86,7 @@ jobs: projectId="tools.wildwebdeveloper" gitlabAPIToken="${{ secrets.GITLAB_API_TOKEN }}" - dashLicenseToolJar=$(ls ~/.m2/repository/org/eclipse/dash/org.eclipse.dash.licenses/1.0.3-SNAPSHOT/org.eclipse.dash.licenses-*.jar | tail -n 1) + dashLicenseToolJar=$(ls ~/.m2/repository/org/eclipse/dash/org.eclipse.dash.licenses/1.0.2/org.eclipse.dash.licenses-*.jar | tail -n 1) npmArgs=" --no-bin-links --ignore-scripts" dashArgs="-excludeSources local -summary $savePWD/target/dash/npm-review-summary" exitStatus=0 diff --git a/pom.xml b/pom.xml index 7dad8dfebd..7c27918cb7 100644 --- a/pom.xml +++ b/pom.xml @@ -274,10 +274,13 @@ dash-licenses-snapshots - https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/ + https://repo.eclipse.org/content/repositories/dash-licenses/ true + + true + tycho-snapshots From 059856787a76a157fd08677aa40bc50f18b86f36 Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Wed, 9 Aug 2023 14:44:38 +0200 Subject: [PATCH 19/28] State for "Verbose output" is not stored in the configurations for "Chrome Debug" #1291 --- .../debug/chrome/RunChromeDebugTab.java | 16 +++++++++++++++- .../debug/firefox/RunFirefoxDebugTab.java | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/chrome/RunChromeDebugTab.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/chrome/RunChromeDebugTab.java index e749fd12e0..93f5ee9570 100644 --- a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/chrome/RunChromeDebugTab.java +++ b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/chrome/RunChromeDebugTab.java @@ -12,11 +12,14 @@ *******************************************************************************/ package org.eclipse.wildwebdeveloper.debug.chrome; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.wildwebdeveloper.Activator; import org.eclipse.wildwebdeveloper.debug.AbstractRunHTMLDebugTab; public class RunChromeDebugTab extends AbstractRunHTMLDebugTab { @@ -36,7 +39,18 @@ public void createControl(Composite parent) { updateLaunchConfigurationDialog(); })); } - + + @Override + public void initializeFrom(ILaunchConfiguration configuration) { + super.initializeFrom(configuration); + try { + boolean verboseConsoleOutputValue = configuration.getAttribute(ChromeRunDAPDebugDelegate.VERBOSE, false); + verboseConsoleOutput.setSelection(verboseConsoleOutputValue); + } catch (CoreException ex) { + Activator.getDefault().getLog().log(ex.getStatus()); + } + } + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { super.performApply(configuration); diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/firefox/RunFirefoxDebugTab.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/firefox/RunFirefoxDebugTab.java index 5a508098c7..8f6904ed72 100644 --- a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/firefox/RunFirefoxDebugTab.java +++ b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/firefox/RunFirefoxDebugTab.java @@ -12,11 +12,14 @@ *******************************************************************************/ package org.eclipse.wildwebdeveloper.debug.firefox; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.wildwebdeveloper.Activator; import org.eclipse.wildwebdeveloper.debug.AbstractRunHTMLDebugTab; import org.eclipse.wildwebdeveloper.debug.Messages; @@ -37,7 +40,18 @@ public void createControl(Composite parent) { updateLaunchConfigurationDialog(); })); } - + + @Override + public void initializeFrom(ILaunchConfiguration configuration) { + super.initializeFrom(configuration); + try { + boolean reloadOnChangeValue = configuration.getAttribute(FirefoxRunDABDebugDelegate.RELOAD_ON_CHANGE, false); + reloadOnChange.setSelection(reloadOnChangeValue); + } catch (CoreException ex) { + Activator.getDefault().getLog().log(ex.getStatus()); + } + } + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { super.performApply(configuration); From a65a30bb44b782839d3b51bad83baec71dd91494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Paku=C5=82a?= Date: Wed, 9 Aug 2023 14:19:14 +0200 Subject: [PATCH 20/28] Fix #1290 - No grammar provided for --- org.eclipse.wildwebdeveloper/plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper/plugin.xml b/org.eclipse.wildwebdeveloper/plugin.xml index 5d8b32a240..9de3bb2e4c 100644 --- a/org.eclipse.wildwebdeveloper/plugin.xml +++ b/org.eclipse.wildwebdeveloper/plugin.xml @@ -764,7 +764,7 @@ + scopeName="vue.sfc.style.variable.injection"> From ea3c78d4dab9a8a576317e37d2d5090e1c72ff4d Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Wed, 9 Aug 2023 17:51:20 +0200 Subject: [PATCH 21/28] Use LemMinX 0.27.0 LemMinX 0.27.0 is not API-compatible with 0.26 so extensions may not work properly. --- org.eclipse.wildwebdeveloper.xml.feature/feature.xml | 2 +- org.eclipse.wildwebdeveloper.xml.feature/pom.xml | 2 +- org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF | 2 +- org.eclipse.wildwebdeveloper.xml/pom.xml | 4 ++-- repository/epp.product | 2 +- repository/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.eclipse.wildwebdeveloper.xml.feature/feature.xml b/org.eclipse.wildwebdeveloper.xml.feature/feature.xml index 94bcc1ac3b..ab93d0b3ef 100644 --- a/org.eclipse.wildwebdeveloper.xml.feature/feature.xml +++ b/org.eclipse.wildwebdeveloper.xml.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.wildwebdeveloper.xml.feature/pom.xml b/org.eclipse.wildwebdeveloper.xml.feature/pom.xml index ac3d883407..064cd76031 100644 --- a/org.eclipse.wildwebdeveloper.xml.feature/pom.xml +++ b/org.eclipse.wildwebdeveloper.xml.feature/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-feature - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT diff --git a/org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF index 6881d7bbbc..82f2261092 100644 --- a/org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wildwebdeveloper.xml;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.wildwebdeveloper.xml diff --git a/org.eclipse.wildwebdeveloper.xml/pom.xml b/org.eclipse.wildwebdeveloper.xml/pom.xml index 45f5d5764d..e2954c07f5 100644 --- a/org.eclipse.wildwebdeveloper.xml/pom.xml +++ b/org.eclipse.wildwebdeveloper.xml/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-plugin - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT @@ -40,7 +40,7 @@ org.eclipse.lemminx org.eclipse.lemminx - 0.26.1 + 0.27.0 uber diff --git a/repository/epp.product b/repository/epp.product index ae7b78085a..fb5cee3b16 100644 --- a/repository/epp.product +++ b/repository/epp.product @@ -3,7 +3,7 @@ + version="1.3.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true"> diff --git a/repository/pom.xml b/repository/pom.xml index b873929513..de34a66929 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-repository - 1.2.1-SNAPSHOT + 1.3.0-SNAPSHOT From b5ca0a4e967d8c8931fe130d95b3b5af46b20f00 Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Wed, 9 Aug 2023 19:12:27 +0200 Subject: [PATCH 22/28] Disable download external resources by default #1289 Fixes: #1289 --- .../xml/internal/ui/preferences/XMLPreferenceInitializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceInitializer.java b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceInitializer.java index f6f919df05..fecc5cd887 100644 --- a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceInitializer.java +++ b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceInitializer.java @@ -74,7 +74,7 @@ public void initializeDefaultPreferences() { STORE.setDefault(XML_PREFERENCES_COMPLETION_AUTO_CLOSE_TAGS, true); // Server settings - STORE.setDefault(XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES.preferenceId, true); + STORE.setDefault(XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES.preferenceId, false); STORE.setDefault(XML_PREFERENCES_CATAGLOGS.preferenceId, ""); STORE.setDefault(XML_PREFERENCES_CODELENS_ENABLED.preferenceId, true); STORE.setDefault(XML_PREFERENCES_FOLDING_INCLUDE_CLOSING_TAG_IN_FOLD.preferenceId, true); From eb59710ba6e74ccb8e966cce8bcd7fe90ccba5ff Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Wed, 9 Aug 2023 20:14:55 +0200 Subject: [PATCH 23/28] Update Embedded Node.js Runtime to v.18.17.1 LTS Changelog: https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V18.md#18.17.1 --- .../nodejs-info.properties | 6 +++--- .../nodejs-info.properties | 6 +++--- .../nodejs-info.properties | 6 +++--- .../nodejs-info.properties | 6 +++--- .../nodejs-info.properties | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/nodejs-info.properties b/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/nodejs-info.properties index 78c6dd3e91..2df270eeb3 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/nodejs-info.properties +++ b/org.eclipse.wildwebdeveloper.embedder.node.linux.aarch64/nodejs-info.properties @@ -1,3 +1,3 @@ -archiveURL=https://nodejs.org/download/release/v18.17.0/node-v18.17.0-linux-arm64.tar.gz -archiveFile=resources/node-v18.17.0-linux-arm64.tar.gz -nodePath=node-v18.17.0-linux-arm64/bin/node +archiveURL=https://nodejs.org/download/release/v18.17.1/node-v18.17.1-linux-arm64.tar.gz +archiveFile=resources/node-v18.17.1-linux-arm64.tar.gz +nodePath=node-v18.17.1-linux-arm64/bin/node diff --git a/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/nodejs-info.properties b/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/nodejs-info.properties index 8121c12d24..8a481800ea 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/nodejs-info.properties +++ b/org.eclipse.wildwebdeveloper.embedder.node.linux.x86_64/nodejs-info.properties @@ -1,3 +1,3 @@ -archiveURL=https://nodejs.org/download/release/v18.17.0/node-v18.17.0-linux-x64.tar.gz -archiveFile=resources/node-v18.17.0-linux-x64.tar.gz -nodePath=node-v18.17.0-linux-x64/bin/node +archiveURL=https://nodejs.org/download/release/v18.17.1/node-v18.17.1-linux-x64.tar.gz +archiveFile=resources/node-v18.17.1-linux-x64.tar.gz +nodePath=node-v18.17.1-linux-x64/bin/node diff --git a/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/nodejs-info.properties b/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/nodejs-info.properties index b29df26df8..37dbadf03e 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/nodejs-info.properties +++ b/org.eclipse.wildwebdeveloper.embedder.node.macos.aarch64/nodejs-info.properties @@ -1,3 +1,3 @@ -archiveURL=https://nodejs.org/download/release/v18.17.0/node-v18.17.0-darwin-arm64.tar.gz -archiveFile=resources/node-v18.17.0-darwin-arm64.tar.gz -nodePath=node-v18.17.0-darwin-arm64/bin/node +archiveURL=https://nodejs.org/download/release/v18.17.1/node-v18.17.1-darwin-arm64.tar.gz +archiveFile=resources/node-v18.17.1-darwin-arm64.tar.gz +nodePath=node-v18.17.1-darwin-arm64/bin/node diff --git a/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/nodejs-info.properties b/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/nodejs-info.properties index bedee81ff5..d96cf79c0b 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/nodejs-info.properties +++ b/org.eclipse.wildwebdeveloper.embedder.node.macos.x86_64/nodejs-info.properties @@ -1,3 +1,3 @@ -archiveURL=https://nodejs.org/download/release/v18.17.0/node-v18.17.0-darwin-x64.tar.gz -archiveFile=resources/node-v18.17.0-darwin-x64.tar.gz -nodePath=node-v18.17.0-darwin-x64/bin/node +archiveURL=https://nodejs.org/download/release/v18.17.1/node-v18.17.1-darwin-x64.tar.gz +archiveFile=resources/node-v18.17.1-darwin-x64.tar.gz +nodePath=node-v18.17.1-darwin-x64/bin/node diff --git a/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/nodejs-info.properties b/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/nodejs-info.properties index 1f8c81f54b..db7ef8e78d 100644 --- a/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/nodejs-info.properties +++ b/org.eclipse.wildwebdeveloper.embedder.node.win32.x86_64/nodejs-info.properties @@ -1,3 +1,3 @@ -archiveURL=https://nodejs.org/download/release/v18.17.0/node-v18.17.0-win-x64.zip -archiveFile = resources/node-v18.17.0-win-x64.zip -nodePath = node-v18.17.0-win-x64/node.exe +archiveURL=https://nodejs.org/download/release/v18.17.1/node-v18.17.1-win-x64.zip +archiveFile = resources/node-v18.17.1-win-x64.zip +nodePath = node-v18.17.1-win-x64/node.exe From dfd64bcc11cd538bf6f00c482ad7b6585b29008f Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Thu, 10 Aug 2023 07:20:50 +0200 Subject: [PATCH 24/28] Add alignWithFirstAttr option to xml.format.splitAttributes See: https://github.com/eclipse/lemminx/pull/1560 --- .../wildwebdeveloper/xml/internal/ui/Messages.java | 3 +++ .../wildwebdeveloper/xml/internal/ui/messages.properties | 7 +++++-- .../ui/preferences/XMLFormattingPreferencePage.java | 9 +++++++-- .../ui/preferences/XMLPreferenceInitializer.java | 2 +- .../ui/preferences/XMLPreferenceServerConstants.java | 2 +- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/Messages.java b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/Messages.java index 1eda74278a..0de8c94119 100644 --- a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/Messages.java +++ b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/Messages.java @@ -38,6 +38,9 @@ public class Messages extends NLS { public static String XMLFormattingPreferencePage_format_emptyElements_expand; public static String XMLFormattingPreferencePage_format_spaceBeforeEmptyCloseTag; public static String XMLFormattingPreferencePage_format_splitAttributes; + public static String XMLFormattingPreferencePage_format_splitAttribute_spreserve; + public static String XMLFormattingPreferencePage_format_splitAttributes_splitNewLine; + public static String XMLFormattingPreferencePage_format_splitAttributes_alignWithFirstAttr; public static String XMLFormattingPreferencePage_format_splitAttributesIndentSize; public static String XMLFormattingPreferencePage_format_preserveAttributeLineBreaks; public static String XMLFormattingPreferencePage_format_closingBracketNewLine; diff --git a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/messages.properties b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/messages.properties index da1509cef2..ac18ae22b4 100644 --- a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/messages.properties +++ b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/messages.properties @@ -31,6 +31,9 @@ XMLFormattingPreferencePage_format_emptyElements_collapse=Collapse XMLFormattingPreferencePage_format_emptyElements_expand=Expand XMLFormattingPreferencePage_format_spaceBeforeEmptyCloseTag=Insert space before end of self closing &tag XMLFormattingPreferencePage_format_splitAttributes=&Split multiple attributes each onto a new line +XMLFormattingPreferencePage_format_splitAttribute_spreserve=preserve +XMLFormattingPreferencePage_format_splitAttributes_splitNewLine=splitNewLine +XMLFormattingPreferencePage_format_splitAttributes_alignWithFirstAttr=alignWithFirstAttr XMLFormattingPreferencePage_format_splitAttributesIndentSize=Indentation &level for attributes XMLFormattingPreferencePage_format_closingBracketNewLine=Place closing &brackets on new lines XMLFormattingPreferencePage_format_preserveAttributeLineBreaks=&Preserve line breaks around attributes @@ -40,8 +43,8 @@ XMLFormattingPreferencePage_format_xsiSchemaLocationSplit_onPair=On pair XMLFormattingPreferencePage_format_xsiSchemaLocationSplit_none=None XMLFormattingPreferencePage_format_maxLineWidth=Max line width XMLFormattingPreferencePage_format_grammarAwareFormatting=Use Schema/DTD grammar information while formatting -XMLFormattingPreferencePage_format_preservedNewlines=Preserve new lines that separate tags. The value represents the maximum number of new lines per section. A value of 0 removes all new lines. -XMLFormattingPreferencePage_format_joinContentLines=Normalize the whitespace of content inside an element. Newlines and excess whitespace are removed +XMLFormattingPreferencePage_format_preservedNewlines=Preserve new lines that separate tags. The value represents the maximum number\t\nof new lines per section. A value of 0 removes all new lines. +XMLFormattingPreferencePage_format_joinContentLines=Normalize the whitespace of content inside an element. Newlines and \t\nwhitespace are removed XMLFormattingPreferencePage_format_insertFinalNewline=Insert a final newline at the end of the document XMLFormattingPreferencePage_format_trimFinalNewlines=Trim final newlines at the end of the document XMLFormattingPreferencePage_format_trimTrailingWhitespace=Trim trailing whitespace diff --git a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLFormattingPreferencePage.java b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLFormattingPreferencePage.java index 7623333a9c..e6e15ff323 100644 --- a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLFormattingPreferencePage.java +++ b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLFormattingPreferencePage.java @@ -70,8 +70,13 @@ public void createFieldEditors() { Messages.XMLFormattingPreferencePage_format_spaceBeforeEmptyCloseTag, getFieldEditorParent())); // Settings for attributes - addField(new BooleanFieldEditor(XML_PREFERENCES_FORMAT_SPLIT_ATTRIBUTES.preferenceId, - Messages.XMLFormattingPreferencePage_format_splitAttributes, getFieldEditorParent())); + addField(new ComboFieldEditor(XML_PREFERENCES_FORMAT_SPLIT_ATTRIBUTES.preferenceId, + Messages.XMLFormattingPreferencePage_format_splitAttributes, + new String[][] { + { Messages.XMLFormattingPreferencePage_format_splitAttribute_spreserve, "preserve" }, + { Messages.XMLFormattingPreferencePage_format_splitAttributes_splitNewLine, "splitNewLine" }, + { Messages.XMLFormattingPreferencePage_format_splitAttributes_alignWithFirstAttr, "alignWithFirstAttr" } + }, getFieldEditorParent())); addField(new IntegerFieldEditor(XML_PREFERENCES_FORMAT_SPLIT_ATTRIBUTES_INDENT_SIZE.preferenceId, Messages.XMLFormattingPreferencePage_format_splitAttributesIndentSize, getFieldEditorParent())); addField(new BooleanFieldEditor(XML_PREFERENCES_FORMAT_CLOSING_BRACKET_NEW_LINE.preferenceId, diff --git a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceInitializer.java b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceInitializer.java index fecc5cd887..80d6dc8f56 100644 --- a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceInitializer.java +++ b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceInitializer.java @@ -91,7 +91,7 @@ public void initializeDefaultPreferences() { STORE.setDefault(XML_PREFERENCES_FORMAT_EMPTY_ELEMENTS.preferenceId, "ignore"); STORE.setDefault(XML_PREFERENCES_FORMAT_SPACE_BEFORE_EMPTY_CLOSE_TAG.preferenceId, true); - STORE.setDefault(XML_PREFERENCES_FORMAT_SPLIT_ATTRIBUTES.preferenceId, false); + STORE.setDefault(XML_PREFERENCES_FORMAT_SPLIT_ATTRIBUTES.preferenceId, "preserve"); STORE.setDefault(XML_PREFERENCES_FORMAT_SPLIT_ATTRIBUTES_INDENT_SIZE.preferenceId, 2); STORE.setDefault(XML_PREFERENCES_FORMAT_PRESERVE_ATTRIBUTE_LINE_BREAKS.preferenceId, true); STORE.setDefault(XML_PREFERENCES_FORMAT_CLOSING_BRACKET_NEW_LINE.preferenceId, false); diff --git a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceServerConstants.java b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceServerConstants.java index 6100e7f956..965fe07d0c 100644 --- a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceServerConstants.java +++ b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceServerConstants.java @@ -209,7 +209,7 @@ public static void storePreferencesToLemminxOptions(IPreferenceStore store, Map< setAsInt(XML_PREFERENCES_FORMAT_PRESERVED_NEW_LINES, store, xmlOpts); setAsString(XML_PREFERENCES_FORMAT_EMPTY_ELEMENTS, store, xmlOpts); setAsBoolean(XML_PREFERENCES_FORMAT_SPACE_BEFORE_EMPTY_CLOSE_TAG, store, xmlOpts); - setAsBoolean(XML_PREFERENCES_FORMAT_SPLIT_ATTRIBUTES, store, xmlOpts); + setAsString(XML_PREFERENCES_FORMAT_SPLIT_ATTRIBUTES, store, xmlOpts); setAsInt(XML_PREFERENCES_FORMAT_SPLIT_ATTRIBUTES_INDENT_SIZE, store, xmlOpts); setAsBoolean(XML_PREFERENCES_FORMAT_PRESERVE_ATTRIBUTE_LINE_BREAKS, store, xmlOpts); setAsBoolean(XML_PREFERENCES_FORMAT_CLOSING_BRACKET_NEW_LINE, store, xmlOpts); From afa563707a354112243f1c573fd47afaf941c2a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 12:40:19 +0000 Subject: [PATCH 25/28] Bump @angular/language-server in /org.eclipse.wildwebdeveloper Bumps [@angular/language-server](https://github.com/angular/vscode-ng-language-service) from 16.1.4 to 16.1.8. - [Release notes](https://github.com/angular/vscode-ng-language-service/releases) - [Changelog](https://github.com/angular/vscode-ng-language-service/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/vscode-ng-language-service/compare/v16.1.4...v16.1.8) --- updated-dependencies: - dependency-name: "@angular/language-server" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- org.eclipse.wildwebdeveloper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json index 02e4cb1eac..ea963395ea 100644 --- a/org.eclipse.wildwebdeveloper/package.json +++ b/org.eclipse.wildwebdeveloper/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@angular/language-server": "16.1.4", + "@angular/language-server": "16.1.8", "firefox-debugadapter": "2.9.8", "typescript": "5.1.6", "typescript-language-server": "3.3.2", From 4e536d580bc6093b25ad917609b3ac58a531a6dc Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Thu, 10 Aug 2023 18:14:34 +0200 Subject: [PATCH 26/28] Fix Lemminx LS reported configuration setting errors ``` Aug 10, 2023 6:57:30 AM org.eclipse.lemminx.settings.FaultTolerantTypeAdapterFactory$1 read WARNING: Encountered an invalid setting. Using the default value. Please check your settings for outdated or invalid settings. java.lang.IllegalStateException: Expected STRING but was BOOLEAN at path $.validation.schema.enabled Aug 10, 2023 6:57:30 AM org.eclipse.lemminx.settings.FaultTolerantTypeAdapterFactory$1 read WARNING: Encountered an invalid setting. Using the default value. Please check your settings for outdated or invalid settings. java.lang.IllegalStateException: Expected STRING but was BOOLEAN at path $.validation.namespaces.enabled ``` --- .../internal/ui/preferences/XMLPreferenceServerConstants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceServerConstants.java b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceServerConstants.java index 965fe07d0c..dc3815d1ea 100644 --- a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceServerConstants.java +++ b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceServerConstants.java @@ -220,8 +220,8 @@ public static void storePreferencesToLemminxOptions(IPreferenceStore store, Map< // Validation settings setAsBoolean(XML_PREFERENCES_VALIDATION_ENABLED, store, xmlOpts); - setAsBoolean(XML_PREFERENCES_VALIDATION_NAMESPACES_ENABLED, store, xmlOpts); - setAsBoolean(XML_PREFERENCES_VALIDATION_SCHEMA_ENABLED, store, xmlOpts); + setAsString(XML_PREFERENCES_VALIDATION_NAMESPACES_ENABLED, store, xmlOpts); + setAsString(XML_PREFERENCES_VALIDATION_SCHEMA_ENABLED, store, xmlOpts); setAsBoolean(XML_PREFERENCES_VALIDATION_DISALLOW_DOCTYPE_DECL, store, xmlOpts); setAsBoolean(XML_PREFERENCES_VALIDATION_RESOLVE_EXTERNAL_ENTITIES, store, xmlOpts); setAsString(XML_PREFERENCES_VALIDATION_NO_GRAMMAR, store, xmlOpts); From db538f81d1a1af70a64b9e69f860b956cacee474 Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Thu, 10 Aug 2023 19:03:58 +0200 Subject: [PATCH 27/28] Unnecessary error message is printed to the header of the debug configurations wizard for "Chrome Debug" if URL is selected #1295 Fixes: #1295 --- .../debug/AbstractRunHTMLDebugTab.java | 66 ++++++++++++------- .../wildwebdeveloper/debug/Messages.java | 3 +- .../debug/messages.properties | 3 +- 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/AbstractRunHTMLDebugTab.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/AbstractRunHTMLDebugTab.java index f0d487713c..bbecb8767c 100644 --- a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/AbstractRunHTMLDebugTab.java +++ b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/AbstractRunHTMLDebugTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Red Hat Inc. and others. + * Copyright (c) 2018, 2023 Red Hat Inc. and others. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -17,6 +17,9 @@ import static org.eclipse.wildwebdeveloper.debug.SelectionUtils.pathOrEmpty; import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.text.MessageFormat; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -82,7 +85,9 @@ public void createControl(Composite parent) { .getFieldDecoration(FieldDecorationRegistry.DEC_ERROR); decoration.setImage(fieldDecoration.getImage()); this.programPathText.addModifyListener(event -> { + setDirty(true); validateProgramPath(); + updateLaunchConfigurationDialog(); }); filePath = new Button(resComposite, SWT.PUSH); filePath.setText(Messages.AbstractRunHTMLDebugTab_browse); @@ -115,6 +120,7 @@ public void createControl(Composite parent) { urlText.setLayoutData(urlTextGD); urlText.addModifyListener(e -> { setDirty(true); + validateProgramPath(); updateLaunchConfigurationDialog(); }); @@ -153,33 +159,43 @@ public void createControl(Composite parent) { private void validateProgramPath() { setDirty(true); - File file; - try { - file = new File(VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(programPathText.getText())); - if (!file.isFile()) { - String errorMessage = Messages.RunProgramTab_error_unknownFile; - setErrorMessage(errorMessage); - decoration.setDescriptionText(errorMessage); - decoration.show(); - } else if (!shortcut.canLaunch(file)) { - String errorMessage = "Not a html file"; //$NON-NLS-1$ - setErrorMessage(errorMessage); - decoration.setDescriptionText(errorMessage); - decoration.show(); - } else if (!file.canRead()) { - String errorMessage = Messages.RunProgramTab_error_nonReadableFile; - setErrorMessage(errorMessage); - decoration.setDescriptionText(errorMessage); - decoration.show(); - } else { - setErrorMessage(null); - decoration.hide(); + String errorMessage = null; + if (fileRadio.getSelection()) { + try { + if (programPathText.getText().length() > 0) { + File file = new File(VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(programPathText.getText())); + if (!file.isFile()) { + errorMessage = Messages.RunProgramTab_error_unknownFile; + } else if (!shortcut.canLaunch(file)) { + errorMessage = "Not a html file"; //$NON-NLS-1$ + } else if (!file.canRead()) { + errorMessage = Messages.RunProgramTab_error_nonReadableFile; + } + } + } catch (CoreException ex) { + errorMessage = ex.getMessage(); } - } catch (CoreException ex) { - setErrorMessage(ex.getMessage()); - decoration.setDescriptionText(ex.getMessage()); + } else if (urlRadio.getSelection()) { + if (urlText.getText().length() > 0) { + try { + new URL(urlText.getText()); + } catch (MalformedURLException ex) { + errorMessage = MessageFormat.format( + Messages.RunProgramTab_error_malformedUR, + ex.getMessage()); + } + } + } + + if (errorMessage != null) { + setErrorMessage(errorMessage); + decoration.setDescriptionText(errorMessage); decoration.show(); + } else { + setErrorMessage(null); + decoration.hide(); } + updateLaunchConfigurationDialog(); } diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/Messages.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/Messages.java index 05f876ac49..055f5ace45 100644 --- a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/Messages.java +++ b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Red Hat Inc. and others. + * Copyright (c) 2019, 2023 Red Hat Inc. and others. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -28,6 +28,7 @@ public class Messages extends NLS { public static String RunProgramTab_error_nonReadableFile; public static String RunProgramTab_error_notJSFile; public static String RunProgramTab_error_unknownFile; + public static String RunProgramTab_error_malformedUR; public static String RunProgramTab_program; public static String RunProgramTab_title; public static String RunProgramTab_workingDirectory; diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/messages.properties b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/messages.properties index 08d609de2d..644289dc93 100644 --- a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/messages.properties +++ b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/messages.properties @@ -1,5 +1,5 @@ ################################################################ -# Copyright (c) 2019 Red Hat Inc. and others. +# Copyright (c) 2019, 2023 Red Hat Inc. and others. # # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 @@ -22,6 +22,7 @@ RunProgramTab_argument=Arguments RunProgramTab_error_nonReadableFile=Not allowed to read file. RunProgramTab_error_notJSFile=File is not a JS file. RunProgramTab_error_unknownFile=Given path doesn't reference a file. +RunProgramTab_error_malformedUR=Malformed URL: ''{0}''. RunProgramTab_program=Program RunProgramTab_title=\u25B6\uFE0F Program RunProgramTab_workingDirectory=Working directory From b1c9b4b8f9eb8295e604a789e34b00e1b59b5a47 Mon Sep 17 00:00:00 2001 From: Victor Rubezhny Date: Thu, 10 Aug 2023 22:55:38 +0200 Subject: [PATCH 28/28] Release notes for 1.3.0 --- RELEASE_NOTES.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 98368ad60a..91113c0192 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -2,6 +2,28 @@ This page describes the noteworthy improvements provided by each release of Eclipse Wild Web Developer. +## 1.3.0 + +* 📅 Release Date: August 11th, 2023 +* All changes: https://github.com/eclipse/wildwebdeveloper/compare/1.2.0...1.3.0 + +#### Editing improvements + +* Bugfix for Run Chrome/Firefox Debug launch configurations to save edited values +* Bugfix for Run Debug HTML launch configurations validation for edited values +* Bugfix for "No grammar provided for " error +* Bugfix for "Disable download external resources by default" +* Bugfix for XML LS (Lemminx) configuration preferences using wrong/not supported values + +#### Dependencies update + +* Use the latest Vue.js LS to v.1.8.8 +* Use the latest Angular LS to v.16.1.4 +* Use the latest YAML Language Server v.1.14.0 +* Use LemMinX v.0.27.0 ⚠️ Your lemminx extensions registered to Wild Web Developer may be incompatible if they were built against an older version of LemMinX ⚠️ +* Embed latest Node.js to v.18.17.1 LTS with the latest Security Fixes +* Other dependency updates + ## 1.2.0 * 📅 Release Date: June 30th, 2023