Merge pull request #60 from CodinGame/update-dev-dependencies

Update dev dependencies

Author: CGNonofr

package-lock.json

@@ -141,37 +141,37 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.18.10",
+    "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.18.10",
-    "@babel/preset-env": "^7.18.10",
+    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.18.6",
     "@codingame/eslint-config": "^1.1.6",
-    "@codingame/tsconfig": "^1.1.0",
-    "@octokit/rest": "^19.0.4",
-    "@rollup/plugin-node-resolve": "^13.3.0",
-    "@rollup/plugin-replace": "^4.0.0",
-    "@rollup/plugin-typescript": "^8.3.4",
-    "@types/babel__core": "^7.1.19",
-    "@types/semver": "^7.3.12",
+    "@codingame/tsconfig": "^1.1.1",
+    "@octokit/rest": "^19.0.5",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-replace": "^5.0.2",
+    "@rollup/plugin-typescript": "^11.0.0",
+    "@types/babel__core": "^7.20.0",
+    "@types/semver": "^7.3.13",
     "@types/vscode": "~1.69.1",
-    "@typescript-eslint/eslint-plugin": "^5.33.1",
-    "@typescript-eslint/parser": "^5.33.1",
-    "eslint": "^8.22.0",
+    "@typescript-eslint/eslint-plugin": "^5.48.2",
+    "@typescript-eslint/parser": "^5.48.2",
+    "eslint": "^8.32.0",
     "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.2.4",
-    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-n": "^15.6.1",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-unused-imports": "^2.0.0",
     "js-cleanup": "^1.2.0",
-    "recast": "^0.21.2",
-    "rollup": "^2.78.1",
-    "rollup-plugin-dts": "^4.2.2",
+    "recast": "^0.22.0",
+    "rollup": "^3.10.0",
+    "rollup-plugin-dts": "^5.1.1",
     "rollup-plugin-styles": "^4.0.0",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "ts-node": "^10.9.1",
-    "typescript": "^4.7.4",
-    "zx": "^7.0.8"
+    "typescript": "^4.9.4",
+    "zx": "^7.1.1"
   },
   "dependencies": {
   },
@@ -180,6 +180,11 @@
     "vscode-textmate": "^7.0.1",
     "vscode-oniguruma": "^1.6.2"
   },
+  "overrides": {
+    "rollup-plugin-styles": {
+      "rollup": "3.10.0"
+    }
+  },
   "volta": {
     "node": "16.15.0",
     "npm": "8.11.0"

package.json

@@ -8,10 +8,15 @@ import cleanup from 'js-cleanup'
 import ts from 'typescript'
 import replace from '@rollup/plugin-replace'
 import styles from 'rollup-plugin-styles'
+import * as tslib from 'tslib'
+import * as babylonParser from 'recast/parsers/babylon.js'
 import * as fs from 'fs'
 import * as path from 'path'
 import * as vm from 'vm'
-import pkg from '../package.json'
+import { fileURLToPath } from 'url'
+import pkg from '../package.json' assert { type: 'json' }
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 const PURE_ANNO = '#__PURE__'
 const PURE_FUNCTIONS = new Set([
@@ -216,7 +221,7 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
         transform (code, id) {
           if (id.startsWith(VSCODE_DIR)) {
             const ast = recast.parse(code, {
-              parser: require('recast/parsers/babylon')
+              parser: babylonParser
             })
             let transformed: boolean = false
             function addComment (node: recast.types.namedTypes.NewExpression | recast.types.namedTypes.CallExpression) {
@@ -330,7 +335,7 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
       name: 'improve-treeshaking',
       transform (code) {
         const ast = recast.parse(code, {
-          parser: require('recast/parsers/babylon')
+          parser: babylonParser
         })
         let transformed: boolean = false
         function addComment (node: recast.types.namedTypes.NewExpression | recast.types.namedTypes.CallExpression) {
@@ -472,7 +477,7 @@ function customRequire<T extends Record<string, unknown>> (_path: string, rootPa
     vm.runInNewContext(transformedCode, {
       require: (_path: string) => {
         if (_path === 'tslib') {
-          return require('tslib')
+          return tslib
         }
         if (_path.endsWith('.css') || _path.includes('!')) {
           return null

rollup/rollup.config.ts

@@ -1,6 +1,9 @@
 import * as rollup from 'rollup'
 import dts from 'rollup-plugin-dts'
 import * as path from 'path'
+import { fileURLToPath } from 'url'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 const VSCODE_DIR = path.join(__dirname, '../vscode')
 

rollup/rollup.types.config.ts

@@ -26,7 +26,7 @@ rm -rf vs/code
 rm -rf vs/server
 
 echo "Building vscode..."
-tsc --declaration --importHelpers --module es2020 --preserveConstEnums --outDir "$output_directory/vs"
+npx tsc --declaration --importHelpers --module es2020 --preserveConstEnums --outDir "$output_directory/vs"
 # Copy files that are already built
 find ./vs \( -name '*.js' -o -name '*.d.ts' -o -name '*.css' \) -exec rsync -R \{\} "$output_directory/" \;
 

scripts/install-vscode

@@ -11,41 +11,6 @@ index e3f41e0d416..14885bf3197 100644
 
  	public static validateOptions(options: IEditorOptions): ValidatedEditorOptions {
  		const result = new ValidatedEditorOptions();
-diff --git a/src/vs/workbench/contrib/mergeEditor/browser/utils.ts b/src/vs/workbench/contrib/mergeEditor/browser/utils.ts
-index 7e92f970387..51e2439a52b 100644
---- a/src/vs/workbench/contrib/mergeEditor/browser/utils.ts
-+++ b/src/vs/workbench/contrib/mergeEditor/browser/utils.ts
-@@ -151,7 +151,7 @@ export function deepMerge<T extends {}>(source1: T, source2: Partial<T>): T {
- 	for (const key in source2) {
- 		const source2Value = source2[key];
- 		if (typeof result[key] === 'object' && source2Value && typeof source2Value === 'object') {
--			result[key] = deepMerge<any>(result[key], source2Value);
-+			result[key] = deepMerge<any>(result[key], source2Value!);
- 		} else {
- 			result[key] = source2Value as any;
- 		}
-diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
-index a82ae60c449..143a208b867 100644
---- a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
-+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
-@@ -246,7 +246,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
- 
- 				// this is a copy of what the merged environment collection is on the remote side
- 				const env = await this._resolveEnvironment(backend, variableResolver, shellLaunchConfig);
--				const shouldPersist = ((this._configurationService.getValue(TaskSettingId.Reconnection) && shellLaunchConfig.reconnectionOwner) || !shellLaunchConfig.isFeatureTerminal) && this._configHelper.config.enablePersistentSessions && !shellLaunchConfig.isTransient;
-+				const shouldPersist = ((this._configurationService.getValue<boolean>(TaskSettingId.Reconnection) && shellLaunchConfig.reconnectionOwner !== undefined) || !shellLaunchConfig.isFeatureTerminal) && this._configHelper.config.enablePersistentSessions && !shellLaunchConfig.isTransient;
- 				if (shellLaunchConfig.attachPersistentProcess) {
- 					const result = await backend.attachToProcess(shellLaunchConfig.attachPersistentProcess.id);
- 					if (result) {
-@@ -460,7 +460,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
- 			windowsEnableConpty: this._configHelper.config.windowsEnableConpty && !isScreenReaderModeEnabled,
- 			environmentVariableCollections: this._extEnvironmentVariableCollection ? serializeEnvironmentVariableCollections(this._extEnvironmentVariableCollection.collections) : undefined
- 		};
--		const shouldPersist = ((this._configurationService.getValue(TaskSettingId.Reconnection) && shellLaunchConfig.reconnectionOwner) || !shellLaunchConfig.isFeatureTerminal) && this._configHelper.config.enablePersistentSessions && !shellLaunchConfig.isTransient;
-+		const shouldPersist = ((this._configurationService.getValue<boolean>(TaskSettingId.Reconnection) && shellLaunchConfig.reconnectionOwner !== undefined) || !shellLaunchConfig.isFeatureTerminal) && this._configHelper.config.enablePersistentSessions && !shellLaunchConfig.isTransient;
- 		return await backend.createProcess(shellLaunchConfig, initialCwd, cols, rows, this._configHelper.config.unicodeVersion, env, options, shouldPersist);
- 	}
- 
 diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
 index a1245856684..55bb8224f51 100644
 --- a/src/vs/workbench/services/configuration/browser/configurationService.ts

scripts/vscode.patch

@@ -5,7 +5,7 @@
 		"experimentalDecorators": true,
 		"resolveJsonModule": true,
 		"target": "es2020",
-		"module": "es2020",
+		"module": "esnext",
 		"lib": [
 			"es2021",
 			"DOM"