Rename semmle-vscode-utils -> @github/codeql-vscode-utils

Dave Bartolomeo · Dave Bartolomeo · commit b436468ca93a · 2020-06-05T17:25:52.000-04:00
Also adds a version policy to support publishing as an npm package.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -2,5 +2,9 @@
  * This is configuration file is used for advanced publishing configurations with Rush.
  * For full documentation, please see https://rushjs.io/pages/configs/version_policies_json/
  */
-
-[]
+[
+  {
+    "definitionName": "individualVersion",
+    "policyName": "utilities"
+  }
+]
diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json
@@ -582,7 +582,7 @@
     "react-dom": "^16.8.6",
     "semmle-bqrs": "^0.0.1",
     "semmle-io-node": "^0.0.1",
-    "semmle-vscode-utils": "^0.0.1",
+    "@github/codeql-vscode-utils": "^0.0.1",
     "tmp": "^0.1.0",
     "tree-kill": "~1.2.2",
     "unzipper": "~0.10.5",
diff --git a/extensions/ql-vscode/src/config.ts b/extensions/ql-vscode/src/config.ts
@@ -1,4 +1,4 @@
-import { DisposableObject } from 'semmle-vscode-utils';
+import { DisposableObject } from '@github/codeql-vscode-utils';
 import { workspace, Event, EventEmitter, ConfigurationChangeEvent, ConfigurationTarget } from 'vscode';
 import { DistributionManager } from './distribution';
 import { logger } from './logging';
diff --git a/extensions/ql-vscode/src/databases-ui.ts b/extensions/ql-vscode/src/databases-ui.ts
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { DisposableObject } from 'semmle-vscode-utils';
+import { DisposableObject } from '@github/codeql-vscode-utils';
 import { commands, Event, EventEmitter, ExtensionContext, ProviderResult, TreeDataProvider, TreeItem, Uri, window, env } from 'vscode';
 import * as cli from './cli';
 import { DatabaseItem, DatabaseManager, getUpgradesDirectories } from './databases';
diff --git a/extensions/ql-vscode/src/databases.ts b/extensions/ql-vscode/src/databases.ts
@@ -6,7 +6,7 @@ import * as cli from './cli';
 import { ExtensionContext } from 'vscode';
 import { showAndLogErrorMessage, showAndLogWarningMessage, showAndLogInformationMessage } from './helpers';
 import { zipArchiveScheme, encodeSourceArchiveUri, decodeSourceArchiveUri } from './archive-filesystem-provider';
-import { DisposableObject } from 'semmle-vscode-utils';
+import { DisposableObject } from '@github/codeql-vscode-utils';
 import { QueryServerConfig } from './config';
 import { Logger, logger } from './logging';
 
diff --git a/extensions/ql-vscode/src/discovery.ts b/extensions/ql-vscode/src/discovery.ts
@@ -1,4 +1,4 @@
-import { DisposableObject } from 'semmle-vscode-utils';
+import { DisposableObject } from '@github/codeql-vscode-utils';
 
 /**
  * Base class for "discovery" operations, which scan the file system to find specific kinds of
diff --git a/extensions/ql-vscode/src/interface.ts b/extensions/ql-vscode/src/interface.ts
@@ -2,7 +2,7 @@ import * as crypto from 'crypto';
 import * as path from 'path';
 import * as Sarif from 'sarif';
 import { FivePartLocation, LocationStyle, LocationValue, ResolvableLocationValue, tryGetResolvableLocation, WholeFileLocation } from 'semmle-bqrs';
-import { DisposableObject } from 'semmle-vscode-utils';
+import { DisposableObject } from '@github/codeql-vscode-utils';
 import * as vscode from 'vscode';
 import { Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, languages, Location, Range, Uri, window as Window, workspace } from 'vscode';
 import * as cli from './cli';
diff --git a/extensions/ql-vscode/src/logging.ts b/extensions/ql-vscode/src/logging.ts
@@ -1,5 +1,5 @@
 import { window as Window, OutputChannel, Progress, Disposable } from 'vscode';
-import { DisposableObject } from 'semmle-vscode-utils';
+import { DisposableObject } from '@github/codeql-vscode-utils';
 import * as fs from 'fs-extra';
 import * as path from 'path';
 
diff --git a/extensions/ql-vscode/src/qlpack-discovery.ts b/extensions/ql-vscode/src/qlpack-discovery.ts
@@ -1,5 +1,5 @@
 import { EventEmitter, Event, Uri, WorkspaceFolder, RelativePattern } from 'vscode';
-import { MultiFileSystemWatcher } from 'semmle-vscode-utils';
+import { MultiFileSystemWatcher } from '@github/codeql-vscode-utils';
 import { CodeQLCliServer, QlpacksInfo } from './cli';
 import { Discovery } from './discovery';
 
diff --git a/extensions/ql-vscode/src/qltest-discovery.ts b/extensions/ql-vscode/src/qltest-discovery.ts
@@ -2,7 +2,7 @@ import * as path from 'path';
 import { QLPackDiscovery } from './qlpack-discovery';
 import { Discovery } from './discovery';
 import { EventEmitter, Event, Uri, RelativePattern } from 'vscode';
-import { MultiFileSystemWatcher } from 'semmle-vscode-utils';
+import { MultiFileSystemWatcher } from '@github/codeql-vscode-utils';
 import { CodeQLCliServer } from './cli';
 
 /**
diff --git a/extensions/ql-vscode/src/queryserver-client.ts b/extensions/ql-vscode/src/queryserver-client.ts
@@ -2,7 +2,7 @@ import * as cp from 'child_process';
 import * as path from 'path';
 // Import from the specific module within `semmle-vscode-utils`, rather than via `index.ts`, because
 // we avoid taking an accidental runtime dependency on `vscode` this way.
-import { DisposableObject } from 'semmle-vscode-utils/out/disposable-object';
+import { DisposableObject } from '@github/codeql-vscode-utils/out/disposable-object';
 import { Disposable } from 'vscode';
 import { CancellationToken, createMessageConnection, MessageConnection, RequestType } from 'vscode-jsonrpc';
 import * as cli from './cli';
diff --git a/extensions/ql-vscode/src/test-adapter.ts b/extensions/ql-vscode/src/test-adapter.ts
@@ -15,7 +15,7 @@ import {
 import { TestAdapterRegistrar } from 'vscode-test-adapter-util';
 import { QLTestFile, QLTestNode, QLTestDirectory, QLTestDiscovery } from './qltest-discovery';
 import { Event, EventEmitter, CancellationTokenSource, CancellationToken } from 'vscode';
-import { DisposableObject } from 'semmle-vscode-utils';
+import { DisposableObject } from '@github/codeql-vscode-utils';
 import { QLPackDiscovery } from './qlpack-discovery';
 import { CodeQLCliServer } from './cli';
 import { getOnDiskWorkspaceFolders } from './helpers';
diff --git a/extensions/ql-vscode/src/test-ui.ts b/extensions/ql-vscode/src/test-ui.ts
@@ -2,7 +2,7 @@ import * as fs from 'fs-extra';
 import * as path from 'path';
 import { Uri, TextDocumentShowOptions, commands, window } from 'vscode';
 import { TestTreeNode } from './test-tree-node';
-import { DisposableObject, UIService } from 'semmle-vscode-utils';
+import { DisposableObject, UIService } from '@github/codeql-vscode-utils';
 import { TestHub, TestController, TestAdapter, TestRunStartedEvent, TestRunFinishedEvent, TestEvent, TestSuiteEvent } from 'vscode-test-adapter-api';
 import { QLTestAdapter, getExpectedFile, getActualFile } from './test-adapter';
 import { logger } from './logging';
diff --git a/lib/semmle-vscode-utils/package.json b/lib/semmle-vscode-utils/package.json
@@ -1,13 +1,13 @@
 {
-  "name": "semmle-vscode-utils",
+  "name": "@github/codeql-vscode-utils",
   "description": "Shared utilities for writing Visual Studio Code extensions",
   "author": "GitHub",
-  "private": true,
+  "private": false,
   "version": "0.0.1",
   "publisher": "GitHub",
   "repository": {
     "type": "git",
-    "url": "https://github.com/github/vscode-codeql"
+    "url": "https://github.com/github/codeql-coreql-team.git"
   },
   "main": "./out/index",
   "scripts": {
@@ -23,4 +23,4 @@
     "typescript-formatter": "^7.2.2"
   },
   "dependencies": {}
-}
+}
diff --git a/rush.json b/rush.json
@@ -16,7 +16,7 @@
   "projectFolderMaxDepth": 2,
   "gitPolicy": {},
   "repository": {
-    "url": "https://github.com/github/vscode-codeql"
+    "url": "https://github.com/github/vscode-codeql.git"
   },
   "eventHooks": {
     "preRushInstall": [],
@@ -47,13 +47,13 @@
       "projectFolder": "lib/semmle-io-node"
     },
     {
-      "packageName": "semmle-vscode-utils",
-      "projectFolder": "lib/semmle-vscode-utils"
+      "packageName": "@github/codeql-vscode-utils",
+      "projectFolder": "lib/semmle-vscode-utils",
+      "versionPolicyName": "utilities"
     },
     {
       "packageName": "vscode-codeql",
-      "projectFolder": "extensions/ql-vscode",
-      "shouldPublish": true
+      "projectFolder": "extensions/ql-vscode"
     }
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { DisposableObject } from 'semmle-vscode-utils';`
	`1`	`+import { DisposableObject } from '@github/codeql-vscode-utils';`
`2`	`2`	`import { workspace, Event, EventEmitter, ConfigurationChangeEvent, ConfigurationTarget } from 'vscode';`
`3`	`3`	`import { DistributionManager } from './distribution';`
`4`	`4`	`import { logger } from './logging';`