From d8d394ce4003121f766fbda30c806c2f36843391 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Tue, 29 Mar 2022 14:09:01 -0700 Subject: [PATCH] Use new version of gulp-replace --- .../ql-vscode/gulpfile.ts/appInsights.ts | 3 +- .../ql-vscode/gulpfile.ts/tsconfig.json | 3 +- extensions/ql-vscode/package-lock.json | 114 ++++++++++-------- extensions/ql-vscode/package.json | 8 +- 4 files changed, 70 insertions(+), 58 deletions(-) diff --git a/extensions/ql-vscode/gulpfile.ts/appInsights.ts b/extensions/ql-vscode/gulpfile.ts/appInsights.ts index 4fc9acd45..e2ba2c713 100644 --- a/extensions/ql-vscode/gulpfile.ts/appInsights.ts +++ b/extensions/ql-vscode/gulpfile.ts/appInsights.ts @@ -1,5 +1,6 @@ import * as gulp from 'gulp'; -import * as replace from 'gulp-replace'; +// eslint-disable-next-line @typescript-eslint/no-var-requires +const replace = require('gulp-replace'); /** Inject the application insights key into the telemetry file */ export function injectAppInsightsKey() { diff --git a/extensions/ql-vscode/gulpfile.ts/tsconfig.json b/extensions/ql-vscode/gulpfile.ts/tsconfig.json index 86e6fa31c..482a6b127 100644 --- a/extensions/ql-vscode/gulpfile.ts/tsconfig.json +++ b/extensions/ql-vscode/gulpfile.ts/tsconfig.json @@ -16,7 +16,8 @@ "noImplicitReturns": true, "experimentalDecorators": true, "noUnusedLocals": true, - "noUnusedParameters": true + "noUnusedParameters": true, + "esModuleInterop": true }, "include": ["*.ts"] } diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 430811d6d..7cf3ed049 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -53,7 +53,7 @@ "@types/glob": "^7.1.1", "@types/google-protobuf": "^3.2.7", "@types/gulp": "^4.0.9", - "@types/gulp-replace": "1.1.0", + "@types/gulp-replace": "^1.1.0", "@types/gulp-sourcemaps": "0.0.32", "@types/js-yaml": "^3.12.5", "@types/jszip": "~3.1.6", @@ -88,7 +88,7 @@ "eslint-plugin-react": "~7.19.0", "glob": "^7.1.4", "gulp": "^4.0.2", - "gulp-replace": "^1.0.0", + "gulp-replace": "^1.1.3", "gulp-sourcemaps": "^2.6.5", "gulp-typescript": "^5.0.1", "husky": "~4.2.5", @@ -114,8 +114,8 @@ "webpack-cli": "^4.6.0" }, "engines": { - "node": "^14.17.1", - "npm": "^7.20.6", + "node": ">=14.17.1", + "npm": ">=7.20.6", "vscode": "^1.59.0" } }, @@ -2969,6 +2969,9 @@ "dev": true, "engines": { "node": ">=0.8" + }, + "funding": { + "url": "https://bevry.me/fund" } }, "node_modules/bindings": { @@ -4801,15 +4804,6 @@ "object.defaults": "^1.1.0" } }, - "node_modules/editions": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz", - "integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, "node_modules/editorconfig": { "version": "0.15.3", "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", @@ -6352,19 +6346,27 @@ } }, "node_modules/gulp-replace": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.0.0.tgz", - "integrity": "sha512-lgdmrFSI1SdhNMXZQbrC75MOl1UjYWlOWNbNRnz+F/KHmgxt3l6XstBoAYIdadwETFyG/6i+vWUSCawdC3pqOw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz", + "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==", "dev": true, "dependencies": { - "istextorbinary": "2.2.1", - "readable-stream": "^2.0.1", - "replacestream": "^4.0.0" + "@types/node": "^14.14.41", + "@types/vinyl": "^2.0.4", + "istextorbinary": "^3.0.0", + "replacestream": "^4.0.3", + "yargs-parser": ">=5.0.0-security.0" }, "engines": { - "node": ">=0.10" + "node": ">=10" } }, + "node_modules/gulp-replace/node_modules/@types/node": { + "version": "14.18.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz", + "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==", + "dev": true + }, "node_modules/gulp-sourcemaps": { "version": "2.6.5", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz", @@ -7361,17 +7363,19 @@ } }, "node_modules/istextorbinary": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.2.1.tgz", - "integrity": "sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz", + "integrity": "sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==", "dev": true, "dependencies": { - "binaryextensions": "2", - "editions": "^1.3.3", - "textextensions": "2" + "binaryextensions": "^2.2.0", + "textextensions": "^3.2.0" }, "engines": { - "node": ">=0.12" + "node": ">=8" + }, + "funding": { + "url": "https://bevry.me/fund" } }, "node_modules/jest-worker": { @@ -11600,12 +11604,15 @@ "dev": true }, "node_modules/textextensions": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz", - "integrity": "sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz", + "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==", "dev": true, "engines": { - "node": ">=0.8" + "node": ">=8" + }, + "funding": { + "url": "https://bevry.me/fund" } }, "node_modules/through": { @@ -17357,12 +17364,6 @@ "object.defaults": "^1.1.0" } }, - "editions": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz", - "integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==", - "dev": true - }, "editorconfig": { "version": "0.15.3", "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", @@ -18666,14 +18667,24 @@ } }, "gulp-replace": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.0.0.tgz", - "integrity": "sha512-lgdmrFSI1SdhNMXZQbrC75MOl1UjYWlOWNbNRnz+F/KHmgxt3l6XstBoAYIdadwETFyG/6i+vWUSCawdC3pqOw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz", + "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==", "dev": true, "requires": { - "istextorbinary": "2.2.1", - "readable-stream": "^2.0.1", - "replacestream": "^4.0.0" + "@types/node": "^14.14.41", + "@types/vinyl": "^2.0.4", + "istextorbinary": "^3.0.0", + "replacestream": "^4.0.3", + "yargs-parser": ">=5.0.0-security.0" + }, + "dependencies": { + "@types/node": { + "version": "14.18.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz", + "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==", + "dev": true + } } }, "gulp-sourcemaps": { @@ -19432,14 +19443,13 @@ "dev": true }, "istextorbinary": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.2.1.tgz", - "integrity": "sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz", + "integrity": "sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==", "dev": true, "requires": { - "binaryextensions": "2", - "editions": "^1.3.3", - "textextensions": "2" + "binaryextensions": "^2.2.0", + "textextensions": "^3.2.0" } }, "jest-worker": { @@ -22806,9 +22816,9 @@ "dev": true }, "textextensions": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz", - "integrity": "sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz", + "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==", "dev": true }, "through": { diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 82110f4b1..b30bab46c 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -14,8 +14,8 @@ }, "engines": { "vscode": "^1.59.0", - "node": "^14.17.1", - "npm": "^7.20.6" + "node": ">=14.17.1", + "npm": ">=7.20.6" }, "categories": [ "Programming Languages" @@ -1126,7 +1126,7 @@ "@types/glob": "^7.1.1", "@types/google-protobuf": "^3.2.7", "@types/gulp": "^4.0.9", - "@types/gulp-replace": "1.1.0", + "@types/gulp-replace": "^1.1.0", "@types/gulp-sourcemaps": "0.0.32", "@types/js-yaml": "^3.12.5", "@types/jszip": "~3.1.6", @@ -1161,7 +1161,7 @@ "eslint-plugin-react": "~7.19.0", "glob": "^7.1.4", "gulp": "^4.0.2", - "gulp-replace": "^1.0.0", + "gulp-replace": "^1.1.3", "gulp-sourcemaps": "^2.6.5", "gulp-typescript": "^5.0.1", "husky": "~4.2.5",