Baptiste Augrain пре 6 дана
родитељ
комит
dc3ffab8bf
3 измењених фајлова са 18 додато и 26 уклоњено
  1. 10 14
      patches/fix-keymap.patch
  2. 6 10
      patches/fix-policies.patch
  3. 2 2
      upstream/insider.json

+ 10 - 14
patches/fix-keymap.patch

@@ -1,5 +1,5 @@
 diff --git a/.npmrc b/.npmrc
 diff --git a/.npmrc b/.npmrc
-index c58ce2e..a1f42cd 100644
+index e4a5cc2..71db628 100644
 --- a/.npmrc
 --- a/.npmrc
 +++ b/.npmrc
 +++ b/.npmrc
 @@ -5,2 +5,3 @@ runtime="electron"
 @@ -5,2 +5,3 @@ runtime="electron"
@@ -33,22 +33,18 @@ index 8fda673..967ae23 100644
 +						'@vscodium/native-keymap',
 +						'@vscodium/native-keymap',
  						'native-watchdog',
  						'native-watchdog',
 diff --git a/package-lock.json b/package-lock.json
 diff --git a/package-lock.json b/package-lock.json
-index 4d43f38..7334f04 100644
+index 2b1154b..834f597 100644
 --- a/package-lock.json
 --- a/package-lock.json
 +++ b/package-lock.json
 +++ b/package-lock.json
-@@ -9,3 +9,2 @@
-       "version": "1.107.0",
--      "hasInstallScript": true,
-       "license": "MIT",
-@@ -29,2 +28,3 @@
+@@ -29,2 +29,3 @@
          "@vscode/windows-registry": "^1.1.0",
          "@vscode/windows-registry": "^1.1.0",
 +        "@vscodium/native-keymap": "3.3.7-258424",
 +        "@vscodium/native-keymap": "3.3.7-258424",
          "@xterm/addon-clipboard": "^0.2.0-beta.119",
          "@xterm/addon-clipboard": "^0.2.0-beta.119",
-@@ -46,3 +46,2 @@
+@@ -46,3 +47,2 @@
          "native-is-elevated": "0.8.0",
          "native-is-elevated": "0.8.0",
 -        "native-keymap": "^3.3.5",
 -        "native-keymap": "^3.3.5",
          "native-watchdog": "^1.4.1",
          "native-watchdog": "^1.4.1",
-@@ -3300,2 +3299,9 @@
+@@ -3300,2 +3300,9 @@
      },
      },
 +    "node_modules/@vscodium/native-keymap": {
 +    "node_modules/@vscodium/native-keymap": {
 +      "version": "3.3.7-258424",
 +      "version": "3.3.7-258424",
@@ -58,7 +54,7 @@ index 4d43f38..7334f04 100644
 +      "license": "MIT"
 +      "license": "MIT"
 +    },
 +    },
      "node_modules/@webassemblyjs/ast": {
      "node_modules/@webassemblyjs/ast": {
-@@ -12662,5 +12668,6 @@
+@@ -12662,5 +12669,6 @@
      "node_modules/napi-build-utils": {
      "node_modules/napi-build-utils": {
 -      "version": "1.0.2",
 -      "version": "1.0.2",
 -      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
 -      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
@@ -68,7 +64,7 @@ index 4d43f38..7334f04 100644
 +      "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
 +      "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
 +      "license": "MIT"
 +      "license": "MIT"
      },
      },
-@@ -12673,9 +12680,2 @@
+@@ -12673,9 +12681,2 @@
      },
      },
 -    "node_modules/native-keymap": {
 -    "node_modules/native-keymap": {
 -      "version": "3.3.7",
 -      "version": "3.3.7",
@@ -78,7 +74,7 @@ index 4d43f38..7334f04 100644
 -      "license": "MIT"
 -      "license": "MIT"
 -    },
 -    },
      "node_modules/native-watchdog": {
      "node_modules/native-watchdog": {
-@@ -14180,5 +14180,6 @@
+@@ -14180,5 +14181,6 @@
      "node_modules/prebuild-install": {
      "node_modules/prebuild-install": {
 -      "version": "7.1.2",
 -      "version": "7.1.2",
 -      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
 -      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
@@ -88,13 +84,13 @@ index 4d43f38..7334f04 100644
 +      "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
 +      "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
 +      "license": "MIT",
 +      "license": "MIT",
        "dependencies": {
        "dependencies": {
-@@ -14189,3 +14190,3 @@
+@@ -14189,3 +14191,3 @@
          "mkdirp-classic": "^0.5.3",
          "mkdirp-classic": "^0.5.3",
 -        "napi-build-utils": "^1.0.1",
 -        "napi-build-utils": "^1.0.1",
 +        "napi-build-utils": "^2.0.0",
 +        "napi-build-utils": "^2.0.0",
          "node-abi": "^3.3.0",
          "node-abi": "^3.3.0",
 diff --git a/package.json b/package.json
 diff --git a/package.json b/package.json
-index 18b9a35..afa9c72 100644
+index 9ef8381..a3f77c0 100644
 --- a/package.json
 --- a/package.json
 +++ b/package.json
 +++ b/package.json
 @@ -108,3 +108,3 @@
 @@ -108,3 +108,3 @@

+ 6 - 10
patches/fix-policies.patch

@@ -31,22 +31,18 @@ index 967ae23..16580ab 100644
 +						'@vscodium/policy-watcher',
 +						'@vscodium/policy-watcher',
  						'@vscode/proxy-agent',
  						'@vscode/proxy-agent',
 diff --git a/package-lock.json b/package-lock.json
 diff --git a/package-lock.json b/package-lock.json
-index 7334f04..2453188 100644
+index 834f597..95a1aea 100644
 --- a/package-lock.json
 --- a/package-lock.json
 +++ b/package-lock.json
 +++ b/package-lock.json
-@@ -9,2 +9,3 @@
-       "version": "1.107.0",
-+      "hasInstallScript": true,
-       "license": "MIT",
-@@ -17,3 +18,2 @@
+@@ -18,3 +18,2 @@
          "@vscode/iconv-lite-umd": "0.7.1",
          "@vscode/iconv-lite-umd": "0.7.1",
 -        "@vscode/policy-watcher": "^1.3.2",
 -        "@vscode/policy-watcher": "^1.3.2",
          "@vscode/proxy-agent": "^0.36.0",
          "@vscode/proxy-agent": "^0.36.0",
-@@ -29,2 +29,3 @@
+@@ -30,2 +29,3 @@
          "@vscodium/native-keymap": "3.3.7-258424",
          "@vscodium/native-keymap": "3.3.7-258424",
 +        "@vscodium/policy-watcher": "^1.3.2-252465",
 +        "@vscodium/policy-watcher": "^1.3.2-252465",
          "@xterm/addon-clipboard": "^0.2.0-beta.119",
          "@xterm/addon-clipboard": "^0.2.0-beta.119",
-@@ -2971,22 +2972,2 @@
+@@ -2972,22 +2972,2 @@
      },
      },
 -    "node_modules/@vscode/policy-watcher": {
 -    "node_modules/@vscode/policy-watcher": {
 -      "version": "1.3.5",
 -      "version": "1.3.5",
@@ -69,7 +65,7 @@ index 7334f04..2453188 100644
 -      }
 -      }
 -    },
 -    },
      "node_modules/@vscode/proxy-agent": {
      "node_modules/@vscode/proxy-agent": {
-@@ -3306,2 +3287,22 @@
+@@ -3307,2 +3287,22 @@
      },
      },
 +    "node_modules/@vscodium/policy-watcher": {
 +    "node_modules/@vscodium/policy-watcher": {
 +      "version": "1.3.2-252465",
 +      "version": "1.3.2-252465",
@@ -93,7 +89,7 @@ index 7334f04..2453188 100644
 +    },
 +    },
      "node_modules/@webassemblyjs/ast": {
      "node_modules/@webassemblyjs/ast": {
 diff --git a/package.json b/package.json
 diff --git a/package.json b/package.json
-index afa9c72..6599a7c 100644
+index a3f77c0..e1d6178 100644
 --- a/package.json
 --- a/package.json
 +++ b/package.json
 +++ b/package.json
 @@ -80,3 +80,3 @@
 @@ -80,3 +80,3 @@

+ 2 - 2
upstream/insider.json

@@ -1,4 +1,4 @@
 {
 {
-  "tag": "1.107.0",
-  "commit": "a44beb9c392505cf7897ad5a20c5b83d26537fd1"
+  "tag": "1.107.1",
+  "commit": "994fd12f8d3a5aa16f17d42c041e5809167e845a"
 }
 }