From c7930ca55d072608625ba76c13b5f9baaf9a2136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= Date: Fri, 10 Feb 2023 16:37:50 +0100 Subject: [PATCH] Revert "bump @vscode/policy-watcher (#174063)" (#174072) This reverts commit 47e3135bda580086759543c729a18181dec42760. Revert "move to @vscode/policy-watcher (#173950)" This reverts commit a1e73c96a47d9139eb3965a00a1f682a74ec7bcd. --- .eslintrc.json | 2 +- build/.moduleignore | 14 ++++++------ package.json | 2 +- .../policy/node/nativePolicyService.ts | 2 +- yarn.lock | 22 +++++++++---------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index cbb6b4f0dfcad..3b8d12542e55d 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -225,7 +225,6 @@ "@parcel/watcher", "@vscode/sqlite3", "@vscode/vscode-languagedetection", - "@vscode/policy-watcher", "@vscode/ripgrep", "@vscode/iconv-lite-umd", "assert", @@ -255,6 +254,7 @@ "url", "util", "v8-inspect-profiler", + "vscode-policy-watcher", "vscode-proxy-agent", "vscode-regexpp", "vscode-textmate", diff --git a/build/.moduleignore b/build/.moduleignore index 7b57188f137dc..e2b045acc34f4 100644 --- a/build/.moduleignore +++ b/build/.moduleignore @@ -113,13 +113,13 @@ vscode-encrypt/binding.gyp vscode-encrypt/README.md !vscode-encrypt/build/Release/vscode-encrypt-native.node -@vscode/policy-watcher/build/** -@vscode/policy-watcher/.husky/** -@vscode/policy-watcher/src/** -@vscode/policy-watcher/binding.gyp -@vscode/policy-watcher/README.md -@vscode/policy-watcher/index.d.ts -!@vscode/policy-watcher/build/Release/vscode-policy-watcher.node +vscode-policy-watcher/build/** +vscode-policy-watcher/.husky/** +vscode-policy-watcher/src/** +vscode-policy-watcher/binding.gyp +vscode-policy-watcher/README.md +vscode-policy-watcher/index.d.ts +!vscode-policy-watcher/build/Release/vscode-policy-watcher.node vscode-windows-ca-certs/**/* !vscode-windows-ca-certs/package.json diff --git a/package.json b/package.json index 89ddb34e8bb13..fe31b7407ccc4 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,6 @@ "@microsoft/1ds-post-js": "^3.2.2", "@parcel/watcher": "2.1.0", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/policy-watcher": "^1.1.3", "@vscode/ripgrep": "^1.14.2", "@vscode/sqlite3": "5.1.2-vscode", "@vscode/sudo-prompt": "9.3.1", @@ -84,6 +83,7 @@ "tas-client-umd": "0.1.6", "v8-inspect-profiler": "^0.1.0", "vscode-oniguruma": "1.7.0", + "vscode-policy-watcher": "^1.1.1", "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "8.0.0", diff --git a/src/vs/platform/policy/node/nativePolicyService.ts b/src/vs/platform/policy/node/nativePolicyService.ts index eae3bf8dfac3a..7b78806548fd7 100644 --- a/src/vs/platform/policy/node/nativePolicyService.ts +++ b/src/vs/platform/policy/node/nativePolicyService.ts @@ -6,7 +6,7 @@ import { AbstractPolicyService, IPolicyService, PolicyDefinition } from 'vs/platform/policy/common/policy'; import { IStringDictionary } from 'vs/base/common/collections'; import { Throttler } from 'vs/base/common/async'; -import { createWatcher, PolicyUpdate, Watcher } from '@vscode/policy-watcher'; +import { createWatcher, PolicyUpdate, Watcher } from 'vscode-policy-watcher'; import { MutableDisposable } from 'vs/base/common/lifecycle'; import { ILogService } from 'vs/platform/log/common/log'; diff --git a/yarn.lock b/yarn.lock index d60c3a808caf3..8c969cc0c72c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1233,14 +1233,6 @@ xml2js "^0.4.23" yargs "^17.5.1" -"@vscode/policy-watcher@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@vscode/policy-watcher/-/policy-watcher-1.1.3.tgz#d001756f0d5503eb39aa8b805cb50d8669a6359c" - integrity sha512-8oA2DeGEFiTF7U1rleiz0rkZ6SUDRQwuwKTc7oPlGTnO3UTf0li3eWpDAN7fMtzW4QACxx4pfYp1qJEo4ctUHg== - dependencies: - bindings "^1.5.0" - node-addon-api "*" - "@vscode/ripgrep@^1.14.2": version "1.14.2" resolved "https://registry.yarnpkg.com/@vscode/ripgrep/-/ripgrep-1.14.2.tgz#47c0eec2b64f53d8f7e1b5ffd22a62e229191c34" @@ -7690,9 +7682,9 @@ node-abi@^3.3.0: semver "^7.3.5" node-addon-api@*: - version "5.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762" - integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA== + version "5.0.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501" + integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA== node-addon-api@^3.0.2: version "3.1.0" @@ -11305,6 +11297,14 @@ vscode-oniguruma@1.7.0: resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b" integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA== +vscode-policy-watcher@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/vscode-policy-watcher/-/vscode-policy-watcher-1.1.1.tgz#3646d17de9f82c741437fd6d687fd0c414ea513d" + integrity sha512-ZwJKg8gpIQ3UO8gdTqBvbXJBOBUStWPArjQJuqGIz8TimgMy+4H7tScVjvlxmzb/sS6rErn3wGMn8gRH824nnw== + dependencies: + bindings "^1.5.0" + node-addon-api "*" + vscode-proxy-agent@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/vscode-proxy-agent/-/vscode-proxy-agent-0.12.0.tgz#0775f464b9519b0c903da4dcf50851e1453f4e48"