From b436468ca93a87ea93182efb55e5db3b51c4bd29 Mon Sep 17 00:00:00 2001 From: Dave Bartolomeo Date: Fri, 5 Jun 2020 17:25:52 -0400 Subject: [PATCH] Rename `semmle-vscode-utils` -> `@github/codeql-vscode-utils` Also adds a version policy to support publishing as an npm package. --- common/config/rush/pnpm-lock.yaml | 40 +++++++++---------- common/config/rush/version-policies.json | 8 +++- extensions/ql-vscode/package.json | 2 +- extensions/ql-vscode/src/config.ts | 2 +- extensions/ql-vscode/src/databases-ui.ts | 2 +- extensions/ql-vscode/src/databases.ts | 2 +- extensions/ql-vscode/src/discovery.ts | 2 +- extensions/ql-vscode/src/interface.ts | 2 +- extensions/ql-vscode/src/logging.ts | 2 +- extensions/ql-vscode/src/qlpack-discovery.ts | 2 +- extensions/ql-vscode/src/qltest-discovery.ts | 2 +- .../ql-vscode/src/queryserver-client.ts | 2 +- extensions/ql-vscode/src/test-adapter.ts | 2 +- extensions/ql-vscode/src/test-ui.ts | 2 +- lib/semmle-vscode-utils/package.json | 8 ++-- rush.json | 10 ++--- 16 files changed, 47 insertions(+), 43 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 471ea9a76..5c27f15d8 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -2,10 +2,10 @@ dependencies: '@microsoft/node-core-library': 3.13.0 '@microsoft/rush-lib': 5.20.0 '@rush-temp/build-tasks': 'file:projects/build-tasks.tgz_glob@7.1.6' + '@rush-temp/codeql-vscode-utils': 'file:projects/codeql-vscode-utils.tgz' '@rush-temp/semmle-bqrs': 'file:projects/semmle-bqrs.tgz_typescript@3.8.3' '@rush-temp/semmle-io': 'file:projects/semmle-io.tgz_typescript@3.8.3' '@rush-temp/semmle-io-node': 'file:projects/semmle-io-node.tgz_typescript@3.8.3' - '@rush-temp/semmle-vscode-utils': 'file:projects/semmle-vscode-utils.tgz' '@rush-temp/typescript-config': 'file:projects/typescript-config.tgz' '@rush-temp/vscode-codeql': 'file:projects/vscode-codeql.tgz' '@types/chai': 4.2.11 @@ -7851,9 +7851,21 @@ packages: peerDependencies: glob: '*' resolution: - integrity: sha512-14DvfY6Fj3HXp2/CNJ2zNh9MA8zPw9mUcr8WqkSsYvJow7JMcIlJ//OOONwpoSWtfrk1bk6Cin7jj9H79ItHQQ== + integrity: sha512-TIOvnjspaKY4LEBtf/hVxfiLZR/gCnvfN6o1w0WIvHDZKJFAU50aXhHnpi1ORNDEuI5XUFmyDAhKHM8kscFECQ== tarball: 'file:projects/build-tasks.tgz' version: 0.0.0 + 'file:projects/codeql-vscode-utils.tgz': + dependencies: + '@types/node': 12.12.30 + '@types/vscode': 1.43.0 + typescript: 3.8.3 + typescript-formatter: 7.2.2_typescript@3.8.3 + dev: false + name: '@rush-temp/codeql-vscode-utils' + resolution: + integrity: sha512-HE4/gbxUCO8lNb5FOUMQJZwpG5YyRYkZnoJXOmW5gmfOXnakk8InSlcsD8FYEHRykTK7Kb1aEfFNzUFWt2jY9A== + tarball: 'file:projects/codeql-vscode-utils.tgz' + version: 0.0.0 'file:projects/semmle-bqrs.tgz_typescript@3.8.3': dependencies: '@types/node': 12.12.30 @@ -7866,7 +7878,7 @@ packages: peerDependencies: typescript: '*' resolution: - integrity: sha512-24GdnvMbGfQIWMfgDhift+kYJDnG7dX03NrpX4ajZ2rckteysvq2/K7XI1OXGvUuqrt3m0/+GRDHpSI9XKDJJA== + integrity: sha512-ufPu8zLXf9JvPCRycWLiFTDb5rZ7bqxQZuiFjy1DAxnatEG5VJITPSXwDFVc11qpjJpaFd4hI+4QtOda7d5zww== tarball: 'file:projects/semmle-bqrs.tgz' version: 0.0.0 'file:projects/semmle-io-node.tgz_typescript@3.8.3': @@ -7881,7 +7893,7 @@ packages: peerDependencies: typescript: '*' resolution: - integrity: sha512-Bj0ax/bASrHV7tamOuXZZdd3UOB4NBKdjdszIRaDvDRTu8RlEst+TVoUhkfy30qb2/6ePp3/juOJyyiBJN7u8Q== + integrity: sha512-jB3C3WWEI991Kr3knPKUwqqNi040WmYCubLJJG7AK1nz3V1YjmyLHIAdjqwOgDNXYKCQPC6tlaEgljbs2Q/kIQ== tarball: 'file:projects/semmle-io-node.tgz' version: 0.0.0 'file:projects/semmle-io.tgz_typescript@3.8.3': @@ -7895,26 +7907,14 @@ packages: peerDependencies: typescript: '*' resolution: - integrity: sha512-NtyviDSevxbd+hj4J66LucOzo8LU2hJ1Jh0eHw0Qu3tRZPUT8HcQlseyy29AvZR8n8eppfEZiAm/JdiHfmRPMA== + integrity: sha512-6DFvjDclWTihDToSf31Hh+wQNhLGkA37l4QajeW/w6gS4NHjSrFL1qBlS7dLUY80VC/8nQJH9foe3r6dfEfQYw== tarball: 'file:projects/semmle-io.tgz' version: 0.0.0 - 'file:projects/semmle-vscode-utils.tgz': - dependencies: - '@types/node': 12.12.30 - '@types/vscode': 1.43.0 - typescript: 3.8.3 - typescript-formatter: 7.2.2_typescript@3.8.3 - dev: false - name: '@rush-temp/semmle-vscode-utils' - resolution: - integrity: sha512-5y5r8SDoN9Fp44naC9gUe8rOexeckXg2T0h9QCJAIcEgnFqOxzRc6Rv9gbMUStFKNh+rFlvmYmgPAdg5QkfgUg== - tarball: 'file:projects/semmle-vscode-utils.tgz' - version: 0.0.0 'file:projects/typescript-config.tgz': dev: false name: '@rush-temp/typescript-config' resolution: - integrity: sha512-XuUIySaNoooIduvehnlKYaHqZJmmQoCqB1RtKhNszjCYZaSSJAnKVucViWBf5oNLKSNP7NchrD7gcoBlQ3xYvw== + integrity: sha512-kSFyvKy63jUHFVXQEzALiYfsTdn7J+Y7PcqtUVo9GndU5b5Xh3rBpVbZD1QN8+y8GfT0m/sdZZQVyH0h+On11Q== tarball: 'file:projects/typescript-config.tgz' version: 0.0.0 'file:projects/vscode-codeql.tgz': @@ -7995,7 +7995,7 @@ packages: dev: false name: '@rush-temp/vscode-codeql' resolution: - integrity: sha512-bU6tGSUD6TzMa6XDiDymvfY28xtDKp6uYPVCwiy7zdsl5NYUxph5Yua0Snoam7oytdYMa2HieTn8Lh6Hkb5P/A== + integrity: sha512-XpFAF++2jIMaO7si5qa5udAYQPhVWnw7h3viw5a+gMfbAmdNVeqChlgQ3/Jm9wkI7NVfEhZpIFPUFcu6kPEcrA== tarball: 'file:projects/vscode-codeql.tgz' version: 0.0.0 registry: '' @@ -8003,10 +8003,10 @@ specifiers: '@microsoft/node-core-library': ~3.13.0 '@microsoft/rush-lib': ~5.20.0 '@rush-temp/build-tasks': 'file:./projects/build-tasks.tgz' + '@rush-temp/codeql-vscode-utils': 'file:./projects/codeql-vscode-utils.tgz' '@rush-temp/semmle-bqrs': 'file:./projects/semmle-bqrs.tgz' '@rush-temp/semmle-io': 'file:./projects/semmle-io.tgz' '@rush-temp/semmle-io-node': 'file:./projects/semmle-io-node.tgz' - '@rush-temp/semmle-vscode-utils': 'file:./projects/semmle-vscode-utils.tgz' '@rush-temp/typescript-config': 'file:./projects/typescript-config.tgz' '@rush-temp/vscode-codeql': 'file:./projects/vscode-codeql.tgz' '@types/chai': ^4.1.7 diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 317032d62..50e0f6ebb 100644 --- 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 index 91621b8e2..bd79ff2f2 100644 --- 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 index ebe310882..3c45a97c5 100644 --- 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 index f85e5e36e..54daf6abc 100644 --- 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 index 4746f7183..6bb0bafd7 100644 --- 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 index 3f4dff595..ac24b1e6e 100644 --- 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 index 349ab451f..ae0bf6b0b 100644 --- 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 index 06d3033d1..eea9f1ad4 100644 --- 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 index ec0ef6be8..686ce0c99 100644 --- 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 index f32fcfba9..d364b9d4c 100644 --- 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 index 0c6eb442e..79c3d6a76 100644 --- 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 index 68066df6e..33d301acc 100644 --- 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 index 0743eec96..3367b6969 100644 --- 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 index 39cd5bfa6..1fc804906 100644 --- 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": {} -} \ No newline at end of file +} diff --git a/rush.json b/rush.json index 8ffd930e6..bbae5208a 100644 --- 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" } ] }