diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 5c27f15d8..ebeb6ff95 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1,7 +1,7 @@ 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-build-tasks': 'file:projects/codeql-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' @@ -39,6 +39,7 @@ dependencies: '@typescript-eslint/eslint-plugin': 2.23.0_2510d86781fe783b47b58303c18a0d9b '@typescript-eslint/parser': 2.23.0_eslint@6.8.0+typescript@3.8.3 ansi-colors: 4.1.1 + build-tasks: 0.0.1 chai: 4.2.0 chai-as-promised: 7.1.1_chai@4.2.0 child-process-promise: 2.2.1 @@ -1444,6 +1445,10 @@ packages: node: '>=0.2.0' resolution: integrity: sha1-skV5w77U1tOWru5tmorn9Ugqt7s= + /build-tasks/0.0.1: + dev: false + resolution: + integrity: sha1-uriieUZPproUpWCkPbYhSbgpQJg= /builtin-modules/3.1.0: dev: false engines: @@ -7818,7 +7823,7 @@ packages: commander: 2.20.3 resolution: integrity: sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw== - 'file:projects/build-tasks.tgz_glob@7.1.6': + 'file:projects/codeql-build-tasks.tgz_glob@7.1.6': dependencies: '@microsoft/node-core-library': 3.13.0 '@microsoft/rush-lib': 5.20.0 @@ -7846,29 +7851,31 @@ packages: typescript-formatter: 7.2.2_typescript@3.8.3 vinyl: 2.2.0 dev: false - id: 'file:projects/build-tasks.tgz' - name: '@rush-temp/build-tasks' + id: 'file:projects/codeql-build-tasks.tgz' + name: '@rush-temp/codeql-build-tasks' peerDependencies: glob: '*' resolution: - integrity: sha512-TIOvnjspaKY4LEBtf/hVxfiLZR/gCnvfN6o1w0WIvHDZKJFAU50aXhHnpi1ORNDEuI5XUFmyDAhKHM8kscFECQ== - tarball: 'file:projects/build-tasks.tgz' + integrity: sha512-53KAqlV2HWcFop5mhJXKqlPrOQY9gCy+E44Ob7FweRf8w/d7CIRl4UpbStWIiU9sbg4Oz2X13r4FmJN4NE5yOQ== + tarball: 'file:projects/codeql-build-tasks.tgz' version: 0.0.0 'file:projects/codeql-vscode-utils.tgz': dependencies: '@types/node': 12.12.30 '@types/vscode': 1.43.0 + build-tasks: 0.0.1 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== + integrity: sha512-SzKVkfdpwUXeyN+an3XxuLLK3q2Sph7psg6fDIl6yV9BmHufZ+F/mwwG1YXlAOR2eSdxx3KX9y+V1D9bw3M6uA== 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 + build-tasks: 0.0.1 leb: 0.3.0 reflect-metadata: 0.1.13 typescript-formatter: 7.2.2_typescript@3.8.3 @@ -7878,13 +7885,14 @@ packages: peerDependencies: typescript: '*' resolution: - integrity: sha512-ufPu8zLXf9JvPCRycWLiFTDb5rZ7bqxQZuiFjy1DAxnatEG5VJITPSXwDFVc11qpjJpaFd4hI+4QtOda7d5zww== + integrity: sha512-sXDTu0AypfZvUTh6MRs5PD6mtXxIKlnEW7ohz0I/nHPxFNmMSpejyfoTVyaSt34vLx6JG6fv6Raa+rxrfdYgJQ== tarball: 'file:projects/semmle-bqrs.tgz' version: 0.0.0 'file:projects/semmle-io-node.tgz_typescript@3.8.3': dependencies: '@types/fs-extra': 8.1.0 '@types/node': 12.12.30 + build-tasks: 0.0.1 fs-extra: 8.1.0 typescript-formatter: 7.2.2_typescript@3.8.3 dev: false @@ -7893,12 +7901,13 @@ packages: peerDependencies: typescript: '*' resolution: - integrity: sha512-jB3C3WWEI991Kr3knPKUwqqNi040WmYCubLJJG7AK1nz3V1YjmyLHIAdjqwOgDNXYKCQPC6tlaEgljbs2Q/kIQ== + integrity: sha512-bVTCpLkr+8I24vLJzGIzcN+QPM8oWZ1f0/QjipmDw1pUeBEFVc+mwEgHa833H04NRlWY0AJrcZq7mWJ1fJLTHw== tarball: 'file:projects/semmle-io-node.tgz' version: 0.0.0 'file:projects/semmle-io.tgz_typescript@3.8.3': dependencies: '@types/node': 12.12.30 + build-tasks: 0.0.1 leb: 0.3.0 typescript-formatter: 7.2.2_typescript@3.8.3 dev: false @@ -7907,7 +7916,7 @@ packages: peerDependencies: typescript: '*' resolution: - integrity: sha512-6DFvjDclWTihDToSf31Hh+wQNhLGkA37l4QajeW/w6gS4NHjSrFL1qBlS7dLUY80VC/8nQJH9foe3r6dfEfQYw== + integrity: sha512-QKqymDJLlOD6G1Rp6QZ/i+i/0MQF+/w2TAG0kcSSqWfH88YGswyc8uu0kQ4JxD1d06OEVVB7CmYQPmTbYgFUMQ== tarball: 'file:projects/semmle-io.tgz' version: 0.0.0 'file:projects/typescript-config.tgz': @@ -7946,6 +7955,7 @@ packages: '@types/xml2js': 0.4.5 '@typescript-eslint/eslint-plugin': 2.23.0_2510d86781fe783b47b58303c18a0d9b '@typescript-eslint/parser': 2.23.0_eslint@6.8.0+typescript@3.8.3 + build-tasks: 0.0.1 chai: 4.2.0 chai-as-promised: 7.1.1_chai@4.2.0 child-process-promise: 2.2.1 @@ -7995,14 +8005,14 @@ packages: dev: false name: '@rush-temp/vscode-codeql' resolution: - integrity: sha512-XpFAF++2jIMaO7si5qa5udAYQPhVWnw7h3viw5a+gMfbAmdNVeqChlgQ3/Jm9wkI7NVfEhZpIFPUFcu6kPEcrA== + integrity: sha512-QQnBR6RIszCZ5uwJ9UZtqAX4Z2Si3WYEkX/vnX2/9JllbsNuI/iCJF8jbvGff1HNdB74xjRvVrKxsz3bNdjT2g== tarball: 'file:projects/vscode-codeql.tgz' version: 0.0.0 registry: '' 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-build-tasks': 'file:./projects/codeql-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' @@ -8040,6 +8050,7 @@ specifiers: '@typescript-eslint/eslint-plugin': ~2.23.0 '@typescript-eslint/parser': ~2.23.0 ansi-colors: ^4.0.1 + build-tasks: ^0.0.1 chai: ^4.2.0 chai-as-promised: ~7.1.1 child-process-promise: ^2.2.1 diff --git a/extensions/ql-vscode/gulpfile.js/index.js b/extensions/ql-vscode/gulpfile.js/index.js index e2c5c8c2c..2577db828 100644 --- a/extensions/ql-vscode/gulpfile.js/index.js +++ b/extensions/ql-vscode/gulpfile.js/index.js @@ -9,7 +9,7 @@ const { compileTextMateGrammar, copyTestData, copyViewCss -} = require('build-tasks'); +} = require('@github/codeql-build-tasks'); const { compileView } = require('./webpack'); exports.buildWithoutPackage = gulp.parallel(compileTypeScript, compileTextMateGrammar, compileView, copyTestData, copyViewCss); diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index bd79ff2f2..91ddbba08 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -615,7 +615,7 @@ "@types/vscode": "^1.39.0", "@types/webpack": "^4.32.1", "@types/xml2js": "~0.4.4", - "build-tasks": "^0.0.1", + "@github/codeql-build-tasks": "^0.0.1", "chai": "^4.2.0", "css-loader": "~3.1.0", "glob": "^7.1.4", diff --git a/lib/semmle-bqrs/gulpfile.js/index.js b/lib/semmle-bqrs/gulpfile.js/index.js index 8d874e2d2..ef767887c 100644 --- a/lib/semmle-bqrs/gulpfile.js/index.js +++ b/lib/semmle-bqrs/gulpfile.js/index.js @@ -1,7 +1,7 @@ 'use strict'; require('ts-node').register({}); -const { compileTypeScript, watchTypeScript } = require('build-tasks'); +const { compileTypeScript, watchTypeScript } = require('@github/codeql-build-tasks'); exports.default = compileTypeScript; exports.watchTypeScript = watchTypeScript; diff --git a/lib/semmle-bqrs/package.json b/lib/semmle-bqrs/package.json index d78c5db12..08854cea6 100644 --- a/lib/semmle-bqrs/package.json +++ b/lib/semmle-bqrs/package.json @@ -25,8 +25,8 @@ }, "devDependencies": { "@types/node": "^12.0.8", - "build-tasks": "^0.0.1", + "@github/codeql-build-tasks": "^0.0.1", "typescript-config": "^0.0.1", "typescript-formatter": "^7.2.2" } -} \ No newline at end of file +} diff --git a/lib/semmle-io-node/gulpfile.js/index.js b/lib/semmle-io-node/gulpfile.js/index.js index 8d874e2d2..ef767887c 100644 --- a/lib/semmle-io-node/gulpfile.js/index.js +++ b/lib/semmle-io-node/gulpfile.js/index.js @@ -1,7 +1,7 @@ 'use strict'; require('ts-node').register({}); -const { compileTypeScript, watchTypeScript } = require('build-tasks'); +const { compileTypeScript, watchTypeScript } = require('@github/codeql-build-tasks'); exports.default = compileTypeScript; exports.watchTypeScript = watchTypeScript; diff --git a/lib/semmle-io-node/package.json b/lib/semmle-io-node/package.json index 901c0b483..ab8d91089 100644 --- a/lib/semmle-io-node/package.json +++ b/lib/semmle-io-node/package.json @@ -25,8 +25,8 @@ "devDependencies": { "@types/fs-extra": "^8.0.0", "@types/node": "^12.0.8", - "build-tasks": "^0.0.1", + "@github/codeql-build-tasks": "^0.0.1", "typescript-config": "^0.0.1", "typescript-formatter": "^7.2.2" } -} \ No newline at end of file +} diff --git a/lib/semmle-io/gulpfile.js/index.js b/lib/semmle-io/gulpfile.js/index.js index 8d874e2d2..ef767887c 100644 --- a/lib/semmle-io/gulpfile.js/index.js +++ b/lib/semmle-io/gulpfile.js/index.js @@ -1,7 +1,7 @@ 'use strict'; require('ts-node').register({}); -const { compileTypeScript, watchTypeScript } = require('build-tasks'); +const { compileTypeScript, watchTypeScript } = require('@github/codeql-build-tasks'); exports.default = compileTypeScript; exports.watchTypeScript = watchTypeScript; diff --git a/lib/semmle-io/package.json b/lib/semmle-io/package.json index 5f14bbe8d..b44231841 100644 --- a/lib/semmle-io/package.json +++ b/lib/semmle-io/package.json @@ -23,8 +23,8 @@ }, "devDependencies": { "@types/node": "^12.0.8", - "build-tasks": "^0.0.1", + "@github/codeql-build-tasks": "^0.0.1", "typescript-config": "^0.0.1", "typescript-formatter": "^7.2.2" } -} \ No newline at end of file +} diff --git a/lib/semmle-vscode-utils/gulpfile.js/index.js b/lib/semmle-vscode-utils/gulpfile.js/index.js index 8d874e2d2..ef767887c 100644 --- a/lib/semmle-vscode-utils/gulpfile.js/index.js +++ b/lib/semmle-vscode-utils/gulpfile.js/index.js @@ -1,7 +1,7 @@ 'use strict'; require('ts-node').register({}); -const { compileTypeScript, watchTypeScript } = require('build-tasks'); +const { compileTypeScript, watchTypeScript } = require('@github/codeql-build-tasks'); exports.default = compileTypeScript; exports.watchTypeScript = watchTypeScript; diff --git a/lib/semmle-vscode-utils/package.json b/lib/semmle-vscode-utils/package.json index 1fc804906..e07b6d9c4 100644 --- a/lib/semmle-vscode-utils/package.json +++ b/lib/semmle-vscode-utils/package.json @@ -9,6 +9,9 @@ "type": "git", "url": "https://github.com/github/codeql-coreql-team.git" }, + "publishConfig": { + "registry": "https://npm.pkg.github.com/" + }, "main": "./out/index", "scripts": { "build": "gulp", @@ -17,7 +20,7 @@ "devDependencies": { "@types/node": "^12.0.8", "@types/vscode": "^1.39.0", - "build-tasks": "^0.0.1", + "@github/codeql-build-tasks": "^0.0.1", "typescript": "^3.7.2", "typescript-config": "^0.0.1", "typescript-formatter": "^7.2.2" diff --git a/rush.json b/rush.json index bbae5208a..8e5147ecf 100644 --- a/rush.json +++ b/rush.json @@ -31,8 +31,9 @@ "projectFolder": "configs/typescript-config" }, { - "packageName": "build-tasks", - "projectFolder": "tools/build-tasks" + "packageName": "@github/codeql-build-tasks", + "projectFolder": "tools/build-tasks", + "versionPolicyName": "utilities" }, { "packageName": "semmle-bqrs", diff --git a/tools/build-tasks/package.json b/tools/build-tasks/package.json index 52caf7f12..5ffe53560 100644 --- a/tools/build-tasks/package.json +++ b/tools/build-tasks/package.json @@ -1,13 +1,16 @@ { - "name": "build-tasks", + "name": "@github/codeql-build-tasks", "description": "Internal Gulp tasks", "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" + }, + "publishConfig": { + "registry": "https://npm.pkg.github.com/" }, "main": "./out/index", "scripts": {