Remove the ee-ts dependency.

azure-pipelines/signing.yml

@@ -117,7 +117,7 @@ jobs:
     - task: ComponentGovernanceComponentDetection@0
       displayName: Detect Components
       inputs:
-        ignoreDirectories: ce/common/temp
+        sourceScanPath: "$(Build.BinariesDirectory)/ce"
     # Inject the NOTICE file. This must run after component detection.
     - task: msospo.ospo-extension.8d7f9abb-6896-461d-9e25-4f74ed65ddb2.notice@0
       displayName: Generate NOTICE File

ce/assets/package.json

@@ -15,7 +15,7 @@
   "scripts": {
     "postinstall": "node ./create-links create",
     "uninstall": "node ./create-links remove",
-    "prepack": "npx rimraf ./common/temp/node_modules/.pnpm/typescript* ./common/temp/node_modules/.pnpm/translate-strings*  ./common/temp/node_modules/.pnpm/ts-morph*  ./common/temp/node_modules/.pnpm/@types* && node ./prepare-deploy.js"
+    "prepack": "node ./prepare-deploy.js"
   },
   "repository": {
     "type": "git",

ce/ce/artifacts/activation.ts

@@ -125,11 +125,13 @@ export class Activation {
   addDefine(name: string, value: string) {
     const v = findCaseInsensitiveOnWindows(this.#defines, name);
 
-    if (v && v !== value) {
+    if (v === undefined) {
+      this.#defines.set(name, value);
+    } else if (v !== value) {
       // conflict. todo: what do we want to do?
       this.#session.channels.warning(i`Duplicate define ${name} during activation. New value will replace old.`);
+      this.#defines.set(name, value);
     }
-    this.#defines.set(name, value);
   }
 
   get defines() {
@@ -144,10 +146,12 @@ export class Activation {
   /** a collection of tool locations from artifacts */
   addTool(name: string, value: string) {
     const t = findCaseInsensitiveOnWindows(this.#tools, name);
-    if (t && t !== value) {
-      this.#session.channels.error(i`Duplicate tool declared ${name} during activation.  New value will replace old.`);
+    if (t === undefined) {
+      this.#tools.set(name, value);
+    } else if (t !== value) {
+      this.#session.channels.warning(i`Duplicate tool declared ${name} during activation.  New value will replace old.`);
+      this.#tools.set(name, value);
     }
-    this.#tools.set(name, value);
   }
 
   get tools() {
@@ -166,10 +170,12 @@ export class Activation {
   /** Aliases are tools that get exposed to the user as shell aliases */
   addAlias(name: string, value: string) {
     const a = findCaseInsensitiveOnWindows(this.#aliases, name);
-    if (a && a !== value) {
-      this.#session.channels.error(i`Duplicate alias declared ${name} during activation.  New value will replace old.`);
+    if (a === undefined) {
+      this.#aliases.set(name, value);
+    } else if (a !== value) {
+      this.#session.channels.warning(i`Duplicate alias declared ${name} during activation.  New value will replace old.`);
+      this.#aliases.set(name, value);
     }
-    this.#aliases.set(name, value);
   }
 
   async getAlias(name: string, refcheck = new Set<string>()): Promise<string | undefined> {
@@ -196,10 +202,12 @@ export class Activation {
     location = typeof location === 'string' ? location : location.fsPath;
 
     const l = this.#locations.get(name);
-    if (l !== location) {
-      this.#session.channels.error(i`Duplicate location declared ${name} during activation. New value will replace old.`);
+    if (l === undefined) {
+      this.#locations.set(name, location);
+    } else if (l !== location) {
+      this.#session.channels.warning(i`Duplicate location declared ${name} during activation. New value will replace old.`);
+      this.#locations.set(name, location);
     }
-    this.#locations.set(name, location);
   }
 
   get locations() {
@@ -276,7 +284,7 @@ export class Activation {
       return;
     }
     let v = this.#properties.get(name);
-    if (!v) {
+    if (v === undefined) {
       v = new Set<string>();
       this.#properties.set(name, v);
     }

ce/ce/fs/filesystem.ts

@@ -3,7 +3,7 @@
 
 /* eslint-disable @typescript-eslint/ban-types */
 
-import { EventEmitter } from 'ee-ts';
+import { EventEmitter } from 'node:events';
 import { Readable, Writable } from 'stream';
 import { Session } from '../session';
 import { Uri } from '../util/uri';
@@ -196,7 +196,7 @@ async function* asyncIterableOverHandle(start: number, end: number, handle: Read
   }
 }
 
-export abstract class FileSystem extends EventEmitter<FileSystemEvents> {
+export abstract class FileSystem extends EventEmitter {
 
   protected baseUri?: Uri;
 

ce/ce/package.json

@@ -55,7 +55,6 @@
   "dependencies": {
     "@snyk/nuget-semver": "1.3.0",
     "vscode-uri": "3.0.3",
-    "ee-ts": "2.0.0-rc.6",
     "yaml": "2.0.0-10",
     "semver": "7.3.5",
     "tar-stream": "~2.3.0",

ce/ce/util/channels.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { EventEmitter } from 'ee-ts';
+import { EventEmitter } from 'node:events';
 import { Session } from '../session';
 
 /** Event defintions for channel events */
@@ -40,7 +40,7 @@ export class Stopwatch {
  *
  * Warning, Error, Message, Debug
  */
-export class Channels extends EventEmitter<ChannelEvents> {
+export class Channels extends EventEmitter {
   /** @internal */
   readonly stopwatch: Stopwatch;