diff options
| author | bors <bors@rust-lang.org> | 2023-06-30 06:35:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-30 06:35:09 +0000 |
| commit | d597369253f290e9b3d60c8cebbf33e0949268d3 (patch) | |
| tree | b6b559859c8524c5c5896c5a75a2b36cc06b6a03 | |
| parent | 40b2a68381f6889416a7b6aebc14a98902429a09 (diff) | |
| parent | 477a75d67171ddc81ad8d6be88a1515045d83aa0 (diff) | |
| download | rust-d597369253f290e9b3d60c8cebbf33e0949268d3.tar.gz rust-d597369253f290e9b3d60c8cebbf33e0949268d3.zip | |
Auto merge of #15175 - lnicola:cross-env, r=Veykril
internal: Drop `cross-env` npm dep
| -rw-r--r-- | editors/code/package-lock.json | 19 | ||||
| -rw-r--r-- | editors/code/package.json | 3 | ||||
| -rw-r--r-- | editors/code/tests/unit/settings.test.ts | 2 |
3 files changed, 3 insertions, 21 deletions
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index 31b18a1bdd6..d99fd8f617b 100644 --- a/editors/code/package-lock.json +++ b/editors/code/package-lock.json @@ -23,7 +23,6 @@ "@typescript-eslint/parser": "^5.60.1", "@vscode/test-electron": "^2.3.3", "@vscode/vsce": "^2.19.0", - "cross-env": "^7.0.3", "esbuild": "^0.18.10", "eslint": "^8.43.0", "eslint-config-prettier": "^8.8.0", @@ -922,24 +921,6 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, - "node_modules/cross-env": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", - "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.1" - }, - "bin": { - "cross-env": "src/bin/cross-env.js", - "cross-env-shell": "src/bin/cross-env-shell.js" - }, - "engines": { - "node": ">=10.14", - "npm": ">=6", - "yarn": ">=1" - } - }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", diff --git a/editors/code/package.json b/editors/code/package.json index 581b3abb366..fe060ce698b 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -38,7 +38,7 @@ "lint": "prettier --check . && eslint -c .eslintrc.js --ext ts ./src ./tests", "fix": "prettier --write . && eslint -c .eslintrc.js --ext ts ./src ./tests --fix", "pretest": "tsc && npm run build", - "test": "cross-env TEST_VARIABLE=test node ./out/tests/runTests.js" + "test": "node ./out/tests/runTests.js" }, "dependencies": { "@hpcc-js/wasm": "^2.13.0", @@ -55,7 +55,6 @@ "@typescript-eslint/parser": "^5.60.1", "@vscode/test-electron": "^2.3.3", "@vscode/vsce": "^2.19.0", - "cross-env": "^7.0.3", "esbuild": "^0.18.10", "eslint": "^8.43.0", "eslint-config-prettier": "^8.8.0", diff --git a/editors/code/tests/unit/settings.test.ts b/editors/code/tests/unit/settings.test.ts index 224cea5a232..2cc1b670dc8 100644 --- a/editors/code/tests/unit/settings.test.ts +++ b/editors/code/tests/unit/settings.test.ts @@ -39,6 +39,7 @@ export async function getTests(ctx: Context) { }); suite.addTest("Should support external variables", async () => { + process.env["TEST_VARIABLE"] = "test"; const envJson = { USING_EXTERNAL_VAR: "${env:TEST_VARIABLE} test ${env:TEST_VARIABLE}", }; @@ -48,6 +49,7 @@ export async function getTests(ctx: Context) { const actualEnv = await substituteVariablesInEnv(envJson); assert.deepStrictEqual(actualEnv, expectedEnv); + delete process.env["TEST_VARIABLE"]; }); suite.addTest("should support VSCode variables", async () => { |