diff --git a/common/tools/dev-tool/src/commands/run/index.ts b/common/tools/dev-tool/src/commands/run/index.ts index 944fc7e3b06e..f0c856869174 100644 --- a/common/tools/dev-tool/src/commands/run/index.ts +++ b/common/tools/dev-tool/src/commands/run/index.ts @@ -1,13 +1,12 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license -import { subCommand, makeCommandInfo } from "../../framework/command"; +import { makeCommandInfo, subCommand } from "../../framework/command"; export const commandInfo = makeCommandInfo("run", "run scripts such as test:node"); export default subCommand(commandInfo, { "test:node-tsx-ts": () => import("./testNodeTsxTS"), - "test:node-tsx-js": () => import("./testNodeTsxJS"), "test:node-ts-input": () => import("./testNodeTSInput"), "test:node-js-input": () => import("./testNodeJSInput"), "test:browser": () => import("./testBrowser"), diff --git a/common/tools/dev-tool/src/commands/run/testNodeJSInput.ts b/common/tools/dev-tool/src/commands/run/testNodeJSInput.ts index ad1c698e10c0..60707e05ef6e 100644 --- a/common/tools/dev-tool/src/commands/run/testNodeJSInput.ts +++ b/common/tools/dev-tool/src/commands/run/testNodeJSInput.ts @@ -2,9 +2,9 @@ // Licensed under the MIT license import { leafCommand, makeCommandInfo } from "../../framework/command"; + import concurrently from "concurrently"; import { createPrinter } from "../../util/printer"; -import { isModuleProject } from "../../util/resolveProject"; import { runTestsWithProxyTool } from "../../util/testUtils"; export const commandInfo = makeCommandInfo( @@ -17,31 +17,13 @@ export const commandInfo = makeCommandInfo( default: false, description: "whether to run with test-proxy", }, - "use-esm-workaround": { - shortName: "uew", - kind: "boolean", - default: false, - description: - "when true, uses the `esm` npm package for tests. Otherwise uses esm4mocha if needed", - }, }, ); export default leafCommand(commandInfo, async (options) => { - const isModule = await isModuleProject(); - let esmLoaderArgs = ""; - - if (isModule === false) { - if (options["use-esm-workaround"] === false) { - esmLoaderArgs = "--loader=../../../common/tools/esm4mocha.mjs"; - } else { - esmLoaderArgs = "-r ../../../common/tools/esm-workaround -r esm"; - } - } - const reporterArgs = "--reporter ../../../common/tools/mocha-multi-reporter.js --reporter-option output=test-results.xml"; - const defaultMochaArgs = `${esmLoaderArgs} -r source-map-support/register.js ${reporterArgs} --full-trace`; + const defaultMochaArgs = `-r source-map-support/register.js ${reporterArgs} --full-trace`; const updatedArgs = options["--"]?.map((opt) => opt.includes("**") && !opt.startsWith("'") && !opt.startsWith('"') ? `"${opt}"` : opt, ); @@ -49,7 +31,7 @@ export default leafCommand(commandInfo, async (options) => { ? updatedArgs.join(" ") : '--timeout 5000000 "dist-esm/test/{,!(browser)/**/}/*.spec.js"'; const command = { - command: `c8 mocha ${defaultMochaArgs} ${mochaArgs}`, + command: `c8 mocha --require tsx ${defaultMochaArgs} ${mochaArgs}`, name: "node-tests", }; diff --git a/common/tools/dev-tool/src/commands/run/testNodeTsxJS.ts b/common/tools/dev-tool/src/commands/run/testNodeTsxJS.ts deleted file mode 100644 index 34ae0de6b57e..000000000000 --- a/common/tools/dev-tool/src/commands/run/testNodeTsxJS.ts +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license - -import { leafCommand, makeCommandInfo } from "../../framework/command"; -import concurrently from "concurrently"; -import { createPrinter } from "../../util/printer"; -import { runTestsWithProxyTool } from "../../util/testUtils"; - -export const commandInfo = makeCommandInfo( - "test:node-js-input", - "runs the node tests using mocha with the default and the provided options; starts the proxy-tool in record and playback modes", - { - "no-test-proxy": { - shortName: "ntp", - kind: "boolean", - default: false, - description: "whether to run with test-proxy", - }, - }, -); - -export default leafCommand(commandInfo, async (options) => { - const reporterArgs = - "--reporter ../../../common/tools/mocha-multi-reporter.js --reporter-option output=test-results.xml"; - const defaultMochaArgs = `-r source-map-support/register.js ${reporterArgs} --full-trace`; - const updatedArgs = options["--"]?.map((opt) => - opt.includes("**") && !opt.startsWith("'") && !opt.startsWith('"') ? `"${opt}"` : opt, - ); - const mochaArgs = updatedArgs?.length - ? updatedArgs.join(" ") - : '--timeout 5000000 "dist-esm/test/{,!(browser)/**/}/*.spec.js"'; - const command = { - command: `c8 mocha --require tsx ${defaultMochaArgs} ${mochaArgs}`, - name: "node-tests", - }; - - if (!options["no-test-proxy"]) { - return runTestsWithProxyTool(command); - } - - createPrinter("test-info").info("Running tests without test-proxy"); - await concurrently([command]).result; - return true; -}); diff --git a/sdk/appconfiguration/app-configuration/package.json b/sdk/appconfiguration/app-configuration/package.json index 98b8cb8a81b2..6703c94fa2a8 100644 --- a/sdk/appconfiguration/app-configuration/package.json +++ b/sdk/appconfiguration/app-configuration/package.json @@ -53,7 +53,7 @@ "pack": "npm pack 2>&1", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "integration-test:browser": "npm run build:test && dev-tool run test:browser", - "integration-test:node": "dev-tool run test:node-tsx-js -- --timeout 180000 'dist-esm/test/**/*.spec.js'", + "integration-test:node": "dev-tool run test:node-js-input -- --timeout 180000 'dist-esm/test/**/*.spec.js'", "test:browser": "npm run clean && npm run build:test && npm run unit-test:browser", "test:node": "npm run clean && npm run build:test && npm run unit-test:node", "test": "npm run test:node && npm run test:browser", diff --git a/sdk/cognitivelanguage/ai-language-text/package.json b/sdk/cognitivelanguage/ai-language-text/package.json index 0eb94954798e..bb0f08cc7c9c 100644 --- a/sdk/cognitivelanguage/ai-language-text/package.json +++ b/sdk/cognitivelanguage/ai-language-text/package.json @@ -73,7 +73,7 @@ "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"", "generate:client": "autorest --typescript swagger/README.md", "integration-test:browser": "dev-tool run test:browser", - "integration-test:node": "dev-tool run test:node-js-input --use-esm-workaround=true -- --timeout 5000000 \"dist-esm/test/**/*.spec.js\"", + "integration-test:node": "dev-tool run test:node-js-input -- --timeout 5000000 \"dist-esm/test/**/*.spec.js\"", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]", "lint": "eslint package.json api-extractor.json src test --ext .ts", diff --git a/sdk/eventgrid/eventgrid/package.json b/sdk/eventgrid/eventgrid/package.json index d56fc80c4fe1..67f0fef1903e 100644 --- a/sdk/eventgrid/eventgrid/package.json +++ b/sdk/eventgrid/eventgrid/package.json @@ -76,7 +76,7 @@ "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"", "generate:client": "autorest --typescript ./swagger/README.md && node ./scripts/setPathToEmpty.js", "integration-test:browser": "dev-tool run test:browser", - "integration-test:node": "dev-tool run test:node-tsx-js -- --timeout 5000000 \"dist-esm/test/**/*.spec.js\"", + "integration-test:node": "dev-tool run test:node-js-input -- --timeout 5000000 \"dist-esm/test/**/*.spec.js\"", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "lint:fix": "eslint package.json api-extractor.json README.md src test --ext .ts,.javascript,.js --fix --fix-type [problem,suggestion]", "lint": "eslint package.json api-extractor.json README.md src test --ext .ts,.javascript,.js", diff --git a/sdk/eventhub/event-hubs/package.json b/sdk/eventhub/event-hubs/package.json index 9def17528196..d45f75cd7acf 100644 --- a/sdk/eventhub/event-hubs/package.json +++ b/sdk/eventhub/event-hubs/package.json @@ -52,7 +52,7 @@ "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"", "generate-certs": "node ./scripts/generateCerts.js", "integration-test:browser": "cross-env TEST_TARGET=live DISABLE_MULTI_VERSION_TESTING=true karma start --single-run", - "integration-test:node": "cross-env TEST_TARGET=live DISABLE_MULTI_VERSION_TESTING=true dev-tool run test:node-js-input --no-test-proxy=true --use-esm-workaround=true -- --timeout 600000 \"dist-esm/test/internal/*.spec.js\" \"dist-esm/test/public/*.spec.js\" \"dist-esm/test/public/**/*.spec.js\" \"dist-esm/test/internal/**/*.spec.js\"", + "integration-test:node": "cross-env TEST_TARGET=live DISABLE_MULTI_VERSION_TESTING=true dev-tool run test:node-js-input --no-test-proxy=true -- --timeout 600000 \"dist-esm/test/internal/*.spec.js\" \"dist-esm/test/public/*.spec.js\" \"dist-esm/test/public/**/*.spec.js\" \"dist-esm/test/internal/**/*.spec.js\"", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "lint:fix": "eslint package.json api-extractor.json README.md src test --ext .ts,.javascript,.js --fix --fix-type [problem,suggestion]", "lint": "eslint package.json api-extractor.json README.md src test --ext .ts,.javascript,.js", diff --git a/sdk/instrumentation/opentelemetry-instrumentation-azure-sdk/package.json b/sdk/instrumentation/opentelemetry-instrumentation-azure-sdk/package.json index 7fc7f291d676..10cc151168dc 100644 --- a/sdk/instrumentation/opentelemetry-instrumentation-azure-sdk/package.json +++ b/sdk/instrumentation/opentelemetry-instrumentation-azure-sdk/package.json @@ -30,7 +30,7 @@ "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"", "generate:client": "autorest --typescript ./swagger/README.md", "integration-test:browser": "karma start --single-run", - "integration-test:node": "dev-tool run test:node-tsx-js --no-test-proxy=true", + "integration-test:node": "dev-tool run test:node-js-input --no-test-proxy=true", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "lint:fix": "eslint package.json api-extractor.json README.md src test --ext .ts,.javascript,.js --fix --fix-type [problem,suggestion]", "lint": "eslint package.json api-extractor.json README.md src test --ext .ts,.javascript,.js", diff --git a/sdk/keyvault/keyvault-admin/package.json b/sdk/keyvault/keyvault-admin/package.json index 4a7a109cc65d..8661f0004ab5 100644 --- a/sdk/keyvault/keyvault-admin/package.json +++ b/sdk/keyvault/keyvault-admin/package.json @@ -56,8 +56,8 @@ "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"", "generate:client": "autorest --typescript swagger/README.md", "integration-test:browser": "echo skipped", - "integration-test:node": "dev-tool run test:node-js-input --use-esm-workaround=true -- --timeout 180000 --exclude \"dist-esm/**/*.browser.spec.js\" \"dist-esm/**/*.spec.js\"", - "integration-test:node:no-timeout": "dev-tool run test:node-js-input --use-esm-workaround=true -- --no-timeouts --full-trace --exclude \"dist-esm/**/*.browser.spec.js\" \"dist-esm/**/*.spec.js\"", + "integration-test:node": "dev-tool run test:node-js-input -- --timeout 180000 --exclude \"dist-esm/**/*.browser.spec.js\" \"dist-esm/**/*.spec.js\"", + "integration-test:node:no-timeout": "dev-tool run test:node-js-input -- --no-timeouts --full-trace --exclude \"dist-esm/**/*.browser.spec.js\" \"dist-esm/**/*.spec.js\"", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "lint:fix": "eslint package.json src --ext .ts --fix --fix-type [problem,suggestion]", "lint": "eslint package.json api-extractor.json src --ext .ts", diff --git a/sdk/keyvault/keyvault-certificates/package.json b/sdk/keyvault/keyvault-certificates/package.json index 8e36b53c5345..a0da17e87549 100644 --- a/sdk/keyvault/keyvault-certificates/package.json +++ b/sdk/keyvault/keyvault-certificates/package.json @@ -51,8 +51,8 @@ "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"samples-dev/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"", "generate:client": "autorest --typescript swagger/README.md", "integration-test:browser": "dev-tool run test:browser", - "integration-test:node": "dev-tool run test:node-js-input --use-esm-workaround=true -- --timeout 350000 'dist-esm/**/*.spec.js'", - "integration-test:node:no-timeout": "dev-tool run test:node-js-input --use-esm-workaround=true -- --no-timeouts 'dist-esm/**/*.spec.js'", + "integration-test:node": "dev-tool run test:node-js-input -- --timeout 350000 'dist-esm/**/*.spec.js'", + "integration-test:node:no-timeout": "dev-tool run test:node-js-input -- --no-timeouts 'dist-esm/**/*.spec.js'", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]", "lint": "eslint package.json api-extractor.json src test --ext .ts", diff --git a/sdk/keyvault/keyvault-keys/package.json b/sdk/keyvault/keyvault-keys/package.json index fa20d127f457..5b9d4c79cdbc 100644 --- a/sdk/keyvault/keyvault-keys/package.json +++ b/sdk/keyvault/keyvault-keys/package.json @@ -57,8 +57,8 @@ "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"", "generate:client": "autorest --typescript swagger/README.md", "integration-test:browser": "dev-tool run test:browser", - "integration-test:node": "dev-tool run test:node-js-input --use-esm-workaround=true -- --timeout 5000000 'dist-esm/**/*.spec.js'", - "integration-test:node:no-timeout": "dev-tool run test:node-js-input --use-esm-workaround=true -- --timeout 9999999 'dist-esm/**/*.spec.js'", + "integration-test:node": "dev-tool run test:node-js-input -- --timeout 5000000 'dist-esm/**/*.spec.js'", + "integration-test:node:no-timeout": "dev-tool run test:node-js-input -- --timeout 9999999 'dist-esm/**/*.spec.js'", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]", "lint": "eslint package.json api-extractor.json src test --ext .ts", diff --git a/sdk/keyvault/keyvault-secrets/package.json b/sdk/keyvault/keyvault-secrets/package.json index f6bfb08d3a7f..170d4198f5ba 100644 --- a/sdk/keyvault/keyvault-secrets/package.json +++ b/sdk/keyvault/keyvault-secrets/package.json @@ -52,8 +52,8 @@ "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"", "generate:client": "autorest --typescript swagger/README.md", "integration-test:browser": "dev-tool run test:browser", - "integration-test:node": "dev-tool run test:node-js-input --use-esm-workaround=true -- --timeout 350000 'dist-esm/**/*.spec.js'", - "integration-test:node:no-timeout": "dev-tool run test:node-js-input --use-esm-workaround=true -- --no-timeout 'dist-esm/**/*.spec.js'", + "integration-test:node": "dev-tool run test:node-js-input -- --timeout 350000 'dist-esm/**/*.spec.js'", + "integration-test:node:no-timeout": "dev-tool run test:node-js-input -- --no-timeout 'dist-esm/**/*.spec.js'", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]", "lint": "eslint package.json api-extractor.json src test --ext .ts", diff --git a/sdk/monitor/monitor-opentelemetry/package.json b/sdk/monitor/monitor-opentelemetry/package.json index 35fbd739f19e..7c01800a690c 100644 --- a/sdk/monitor/monitor-opentelemetry/package.json +++ b/sdk/monitor/monitor-opentelemetry/package.json @@ -26,7 +26,7 @@ "test:browser": "npm run unit-test:browser", "unit-test:browser": "echo skipped", "unit-test:node": "dev-tool run test:node-tsx-ts --no-test-proxy=true -- --timeout 1200000 \"test/internal/unit/**/*.test.ts\"", - "unit-test:node:debug": "dev-tool run test:node-tsx-js --no-test-proxy=true -- --inspect-brk --timeout 1200000 \"test/internal/unit/**/*.test.ts\"", + "unit-test:node:debug": "dev-tool run test:node-js-input --no-test-proxy=true -- --inspect-brk --timeout 1200000 \"test/internal/unit/**/*.test.ts\"", "unit-test": "npm run unit-test:node && npm run unit-test:browser", "integration-test:browser": "echo skipped", "integration-test:node": "dev-tool run test:node-ts-input --no-test-proxy=true -- \"test/internal/functional/**/*.test.ts\"", diff --git a/sdk/monitor/monitor-query/package.json b/sdk/monitor/monitor-query/package.json index 07a25550b58f..5fed2553bcf6 100644 --- a/sdk/monitor/monitor-query/package.json +++ b/sdk/monitor/monitor-query/package.json @@ -50,7 +50,7 @@ "generate:client:metrics-namespaces": "autorest --typescript swagger/metric-namespaces.md", "generate:client:metrics-definitions": "autorest --typescript swagger/metric-definitions.md", "integration-test:browser": "dev-tool run test:browser", - "integration-test:node": "dev-tool run test:node-tsx-js -- --timeout 5000000 'dist-esm/test/**/*.spec.js' 'dist-esm/test/**/**/*.spec.js'", + "integration-test:node": "dev-tool run test:node-js-input -- --timeout 5000000 'dist-esm/test/**/*.spec.js' 'dist-esm/test/**/**/*.spec.js'", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]", "lint": "eslint package.json api-extractor.json src test --format unix --ext .ts", diff --git a/sdk/schemaregistry/schema-registry-avro/package.json b/sdk/schemaregistry/schema-registry-avro/package.json index 3d3df5b55ac8..78aeb4769ba2 100644 --- a/sdk/schemaregistry/schema-registry-avro/package.json +++ b/sdk/schemaregistry/schema-registry-avro/package.json @@ -23,7 +23,7 @@ "extract-api": "tsc -p . && api-extractor run --local", "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"", "integration-test:browser": "dev-tool run test:browser", - "integration-test:node": "dev-tool run test:node-js-input --use-esm-workaround=true -- --timeout 5000000 'dist-esm/test/**/*.spec.js'", + "integration-test:node": "dev-tool run test:node-js-input -- --timeout 5000000 'dist-esm/test/**/*.spec.js'", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "lint:fix": "eslint package.json api-extractor.json README.md src test --ext .ts,.javascript,.js --fix --fix-type [problem,suggestion]", "lint": "eslint package.json api-extractor.json README.md src test --ext .ts,.javascript,.js", diff --git a/sdk/web-pubsub/web-pubsub-client-protobuf/package.json b/sdk/web-pubsub/web-pubsub-client-protobuf/package.json index 9fec3b14abf6..f9a5be63de6e 100644 --- a/sdk/web-pubsub/web-pubsub-client-protobuf/package.json +++ b/sdk/web-pubsub/web-pubsub-client-protobuf/package.json @@ -33,7 +33,7 @@ "test:node": "npm run build:test && npm run unit-test:node && npm run integration-test:node", "test": "npm run build:test && npm run unit-test && npm run integration-test", "unit-test:browser": "echo skipped", - "unit-test:node": "dev-tool run test:node-js-input --use-esm-workaround=true --no-test-proxy=true", + "unit-test:node": "dev-tool run test:node-js-input --no-test-proxy=true", "unit-test": "npm run unit-test:node && npm run unit-test:browser" }, "files": [