[core-rest-pipeline] Add conditional exports

common/tools/dev-tool/src/commands/run/bundle.ts

@@ -39,6 +39,11 @@ export const commandInfo = makeCommandInfo(
       default: true,
       description: "include a polyfill for Node.js builtin modules",
     },
+    "output-cjs-ext": {
+      kind: "boolean",
+      default: false,
+      description: "use .cjs extension for bundle output. default is .js extension",
+    },
   }
 );
 
@@ -72,7 +77,7 @@ export default leafCommand(commandInfo, async (options) => {
       const bundle = await rollup.rollup(baseConfig);
 
       await bundle.write({
-        file: "dist/index.js",
+        file: `dist/index.${options["output-cjs-ext"] ? "cjs" : "js"}`,
         format: "cjs",
         sourcemap: true,
         exports: "named",

sdk/core/core-rest-pipeline/package.json

@@ -3,8 +3,16 @@
   "version": "1.9.1",
   "description": "Isomorphic client library for making HTTP requests in node.js and browser.",
   "sdk-type": "client",
-  "main": "dist/index.js",
+  "main": "dist/index.cjs",
   "module": "dist-esm/src/index.js",
+  "type": "module",
+  "export": {
+    ".": {
+      "types": "./types/src/index.js",
+      "require": "./dist/index.cjs",
+      "import": "./dist-esm/src/index.js"
+    }
+  },
   "browser": {
     "./dist-esm/src/defaultHttpClient.js": "./dist-esm/src/defaultHttpClient.browser.js",
     "./dist-esm/src/policies/decompressResponsePolicy.js": "./dist-esm/src/policies/decompressResponsePolicy.browser.js",
@@ -14,7 +22,7 @@
     "./dist-esm/src/util/userAgentPlatform.js": "./dist-esm/src/util/userAgentPlatform.browser.js"
   },
   "react-native": {
-    "./dist/index.js": "./dist-esm/src/index.js",
+    "./dist/index.cjs": "./dist-esm/src/index.js",
     "./dist-esm/src/defaultHttpClient.js": "./dist-esm/src/defaultHttpClient.native.js",
     "./dist-esm/src/util/userAgentPlatform.js": "./dist-esm/src/util/userAgentPlatform.native.js"
   },
@@ -29,9 +37,9 @@
   "scripts": {
     "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
     "build:samples": "echo Obsolete",
-    "build:test": "tsc -p . && dev-tool run bundle",
+    "build:test": "tsc -p . && dev-tool run bundle --output-cjs-ext=true",
     "build:types": "downlevel-dts types/latest/ types/3.1/",
-    "build": "npm run clean && tsc -p . && dev-tool run bundle && api-extractor run --local && npm run build:types",
+    "build": "npm run clean && tsc -p . && dev-tool run bundle --output-cjs-ext=true && api-extractor run --local && npm run build:types",
     "check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
     "clean": "rimraf dist dist-* temp types *.tgz *.log",
     "execute:samples": "echo skipped",
@@ -45,15 +53,17 @@
     "pack": "npm pack 2>&1",
     "test:browser": "npm run clean && npm run build:test && npm run unit-test:browser && npm run integration-test:browser",
     "test:node": "npm run clean && tsc -p . && npm run unit-test:node && npm run integration-test:node",
-    "test": "npm run clean && tsc -p . && npm run unit-test:node && dev-tool run bundle && npm run unit-test:browser && npm run integration-test",
-    "unit-test:browser": "karma start --single-run",
-    "unit-test:node": "mocha -r esm -r ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace  --exclude \"test/**/browser/*.spec.ts\" \"test/**/*.spec.ts\"",
+    "test": "npm run clean && tsc -p . && npm run unit-test:node && dev-tool run bundle --output-cjs-ext=true && npm run unit-test:browser && npm run integration-test",
+    "unit-test:browser": "karma start karma.conf.cjs --single-run",
+    "unit-test:node": "mocha --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace  --exclude \"test/**/browser/*.spec.ts\" \"test/**/*.spec.ts\"",
     "unit-test": "npm run unit-test:node && npm run unit-test:browser"
   },
   "files": [
     "dist/",
     "dist-esm/src/",
+    "types/3.1/src/",
     "types/3.1/core-rest-pipeline.d.ts",
+    "types/latest/src/",
     "types/latest/core-rest-pipeline.d.ts",
     "core-rest-pipeline.shims.d.ts",
     "core-rest-pipeline.shims-3_1.d.ts",
@@ -125,15 +135,19 @@
     "karma-sourcemap-loader": "^0.3.8",
     "karma": "^6.3.0",
     "mocha-junit-reporter": "^2.0.0",
-    "mocha": "^7.1.1",
+    "mocha": "^10.0.0",
     "prettier": "^2.5.1",
     "puppeteer": "^14.0.0",
     "rimraf": "^3.0.0",
     "sinon": "^9.0.2",
     "source-map-support": "^0.5.9",
-    "typescript": "~4.6.0",
+    "ts-node": "^10.0.0",
+    "typescript": "~4.7.0",
     "util": "^0.12.1"
   },
+  "mocha": {
+    "loader": "ts-node/esm"
+  },
   "//sampleConfiguration": {
     "skipFolder": true,
     "disableDocsMs": true,

sdk/core/core-rest-pipeline/src/createPipelineFromOptions.ts

@@ -1,21 +1,21 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { LogPolicyOptions, logPolicy } from "./policies/logPolicy";
-import { Pipeline, createEmptyPipeline } from "./pipeline";
-import { PipelineRetryOptions, TlsSettings } from "./interfaces";
-import { RedirectPolicyOptions, redirectPolicy } from "./policies/redirectPolicy";
-import { UserAgentPolicyOptions, userAgentPolicy } from "./policies/userAgentPolicy";
+import { LogPolicyOptions, logPolicy } from "./policies/logPolicy.js";
+import { Pipeline, createEmptyPipeline } from "./pipeline.js";
+import { PipelineRetryOptions, TlsSettings } from "./interfaces.js";
+import { RedirectPolicyOptions, redirectPolicy } from "./policies/redirectPolicy.js";
+import { UserAgentPolicyOptions, userAgentPolicy } from "./policies/userAgentPolicy.js";
 
-import { ProxySettings } from ".";
-import { decompressResponsePolicy } from "./policies/decompressResponsePolicy";
-import { defaultRetryPolicy } from "./policies/defaultRetryPolicy";
-import { formDataPolicy } from "./policies/formDataPolicy";
+import { ProxySettings } from "./interfaces.js";
+import { decompressResponsePolicy } from "./policies/decompressResponsePolicy.js";
+import { defaultRetryPolicy } from "./policies/defaultRetryPolicy.js";
+import { formDataPolicy } from "./policies/formDataPolicy.js";
 import { isNode } from "@azure/core-util";
-import { proxyPolicy } from "./policies/proxyPolicy";
-import { setClientRequestIdPolicy } from "./policies/setClientRequestIdPolicy";
-import { tlsPolicy } from "./policies/tlsPolicy";
-import { tracingPolicy } from "./policies/tracingPolicy";
+import { proxyPolicy } from "./policies/proxyPolicy.js";
+import { setClientRequestIdPolicy } from "./policies/setClientRequestIdPolicy.js";
+import { tlsPolicy } from "./policies/tlsPolicy.js";
+import { tracingPolicy } from "./policies/tracingPolicy.js";
 
 /**
  * Defines options that are used to configure the HTTP pipeline for

sdk/core/core-rest-pipeline/src/defaultHttpClient.browser.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { HttpClient } from "./interfaces";
-import { createFetchHttpClient } from "./fetchHttpClient";
+import { HttpClient } from "./interfaces.js";
+import { createFetchHttpClient } from "./fetchHttpClient.js";
 
 /**
  * Create the correct HttpClient for the current environment.

sdk/core/core-rest-pipeline/src/defaultHttpClient.native.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { HttpClient } from "./interfaces";
-import { createXhrHttpClient } from "./xhrHttpClient";
+import { HttpClient } from "./interfaces.js";
+import { createXhrHttpClient } from "./xhrHttpClient.js";
 
 /**
  * Create the correct HttpClient for the current environment.

sdk/core/core-rest-pipeline/src/defaultHttpClient.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { HttpClient } from "./interfaces";
-import { createNodeHttpClient } from "./nodeHttpClient";
+import { HttpClient } from "./interfaces.js";
+import { createNodeHttpClient } from "./nodeHttpClient.js";
 
 /**
  * Create the correct HttpClient for the current environment.

sdk/core/core-rest-pipeline/src/fetchHttpClient.ts

@@ -8,9 +8,9 @@ import {
   PipelineRequest,
   PipelineResponse,
   TransferProgressEvent,
-} from "./interfaces";
-import { RestError } from "./restError";
-import { createHttpHeaders } from "./httpHeaders";
+} from "./interfaces.js";
+import { RestError } from "./restError.js";
+import { createHttpHeaders } from "./httpHeaders.js";
 
 /**
  * Checks if the body is a NodeReadable stream which is not supported in Browsers

sdk/core/core-rest-pipeline/src/httpHeaders.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { HttpHeaders, RawHttpHeaders, RawHttpHeadersInput } from "./interfaces";
+import { HttpHeaders, RawHttpHeaders, RawHttpHeadersInput } from "./interfaces.js";
 
 interface HeaderEntry {
   name: string;

sdk/core/core-rest-pipeline/src/index.ts

@@ -20,70 +20,78 @@ export {
   SendRequest,
   TlsSettings,
   TransferProgressEvent,
-} from "./interfaces";
+} from "./interfaces.js";
 export {
   AddPolicyOptions as AddPipelineOptions,
   PipelinePhase,
   PipelinePolicy,
   Pipeline,
   createEmptyPipeline,
-} from "./pipeline";
+} from "./pipeline.js";
 export {
   createPipelineFromOptions,
   InternalPipelineOptions,
   PipelineOptions,
-} from "./createPipelineFromOptions";
-export { createDefaultHttpClient } from "./defaultHttpClient";
-export { createHttpHeaders } from "./httpHeaders";
-export { createPipelineRequest, PipelineRequestOptions } from "./pipelineRequest";
-export { RestError, RestErrorOptions, isRestError } from "./restError";
+} from "./createPipelineFromOptions.js";
+export { createDefaultHttpClient } from "./defaultHttpClient.js";
+export { createHttpHeaders } from "./httpHeaders.js";
+export { createPipelineRequest, PipelineRequestOptions } from "./pipelineRequest.js";
+export { RestError, RestErrorOptions, isRestError } from "./restError.js";
 export {
   decompressResponsePolicy,
   decompressResponsePolicyName,
-} from "./policies/decompressResponsePolicy";
+} from "./policies/decompressResponsePolicy.js";
 export {
   exponentialRetryPolicy,
   ExponentialRetryPolicyOptions,
   exponentialRetryPolicyName,
-} from "./policies/exponentialRetryPolicy";
+} from "./policies/exponentialRetryPolicy.js";
 export {
   setClientRequestIdPolicy,
   setClientRequestIdPolicyName,
-} from "./policies/setClientRequestIdPolicy";
-export { logPolicy, logPolicyName, LogPolicyOptions } from "./policies/logPolicy";
-export { proxyPolicy, proxyPolicyName, getDefaultProxySettings } from "./policies/proxyPolicy";
+} from "./policies/setClientRequestIdPolicy.js";
+export { logPolicy, logPolicyName, LogPolicyOptions } from "./policies/logPolicy.js";
+export { proxyPolicy, proxyPolicyName, getDefaultProxySettings } from "./policies/proxyPolicy.js";
 export {
   redirectPolicy,
   redirectPolicyName,
   RedirectPolicyOptions,
-} from "./policies/redirectPolicy";
+} from "./policies/redirectPolicy.js";
 export {
   systemErrorRetryPolicy,
   SystemErrorRetryPolicyOptions,
   systemErrorRetryPolicyName,
-} from "./policies/systemErrorRetryPolicy";
+} from "./policies/systemErrorRetryPolicy.js";
 export {
   throttlingRetryPolicy,
   throttlingRetryPolicyName,
   ThrottlingRetryPolicyOptions,
-} from "./policies/throttlingRetryPolicy";
-export { retryPolicy, RetryPolicyOptions } from "./policies/retryPolicy";
-export { RetryStrategy, RetryInformation, RetryModifiers } from "./retryStrategies/retryStrategy";
-export { tracingPolicy, tracingPolicyName, TracingPolicyOptions } from "./policies/tracingPolicy";
-export { defaultRetryPolicy, DefaultRetryPolicyOptions } from "./policies/defaultRetryPolicy";
+} from "./policies/throttlingRetryPolicy.js";
+export { retryPolicy, RetryPolicyOptions } from "./policies/retryPolicy.js";
+export {
+  RetryStrategy,
+  RetryInformation,
+  RetryModifiers,
+} from "./retryStrategies/retryStrategy.js";
+export {
+  tracingPolicy,
+  tracingPolicyName,
+  TracingPolicyOptions,
+} from "./policies/tracingPolicy.js";
+export { defaultRetryPolicy, DefaultRetryPolicyOptions } from "./policies/defaultRetryPolicy.js";
 export {
   userAgentPolicy,
   userAgentPolicyName,
   UserAgentPolicyOptions,
-} from "./policies/userAgentPolicy";
-export { tlsPolicy, tlsPolicyName } from "./policies/tlsPolicy";
-export { formDataPolicy, formDataPolicyName } from "./policies/formDataPolicy";
+} from "./policies/userAgentPolicy.js";
+export { tlsPolicy, tlsPolicyName } from "./policies/tlsPolicy.js";
+export { formDataPolicy, formDataPolicyName } from "./policies/formDataPolicy.js";
 export {
   bearerTokenAuthenticationPolicy,
   BearerTokenAuthenticationPolicyOptions,
   bearerTokenAuthenticationPolicyName,
   ChallengeCallbacks,
   AuthorizeRequestOptions,
   AuthorizeRequestOnChallengeOptions,
-} from "./policies/bearerTokenAuthenticationPolicy";
-export { ndJsonPolicy, ndJsonPolicyName } from "./policies/ndJsonPolicy";
+} from "./policies/bearerTokenAuthenticationPolicy.js";
+export { ndJsonPolicy, ndJsonPolicyName } from "./policies/ndJsonPolicy.js";

sdk/core/core-rest-pipeline/src/nodeHttpClient.ts

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import * as http from "http";
-import * as https from "https";
-import * as zlib from "zlib";
+import http from "http";
+import https from "https";
+import zlib from "zlib";
 import { Transform } from "stream";
 import { AbortController, AbortError } from "@azure/abort-controller";
 import {
@@ -14,11 +14,11 @@ import {
   RequestBodyType,
   TlsSettings,
   TransferProgressEvent,
-} from "./interfaces";
-import { createHttpHeaders } from "./httpHeaders";
-import { RestError } from "./restError";
+} from "./interfaces.js";
+import { createHttpHeaders } from "./httpHeaders.js";
+import { RestError } from "./restError.js";
 import { IncomingMessage } from "http";
-import { logger } from "./log";
+import { logger } from "./log.js";
 
 const DEFAULT_TLS_SETTINGS = {};