Revert "[core-rest-pipeline] Add conditional exports (#22804)" (#23699)

This reverts commit 02f6ad6.


### Packages impacted by this PR
`@azure/core-rest-pipeline`

### Describe the problem that is addressed by this PR
Making core-rest-pipeline ESM with conditional exports broke notification-hubs.  Reverting the change while investigating.

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

@@ -70,12 +70,9 @@ export default leafCommand(commandInfo, async (options) => {
 
     try {
       const bundle = await rollup.rollup(baseConfig);
-      const cjsFilename = info.packageJson.main;
-      if (!cjsFilename) {
-        throw new Error("Expecting valid main entry");
-      }
+
       await bundle.write({
-        file: cjsFilename,
+        file: "dist/index.js",
         format: "cjs",
         sourcemap: true,
         exports: "named",

common/tools/eslint-plugin-azure-sdk/docs/rules/ts-package-json-main-is-cjs.md

@@ -1,6 +1,6 @@
 # ts-package-json-main-is-cjs
 
-Requires `main` in `package.json` to be point to a CommonJS or UMD module. In this case, its assumed that it points to `"dist/index.js"` or `"dist/index.cjs"`.
+Requires `main` in `package.json` to be point to a CommonJS or UMD module. In this case, its assumed that it points to `"dist/index.js"`.
 
 This rule is fixable using the `--fix` option.
 
@@ -14,14 +14,6 @@ This rule is fixable using the `--fix` option.
 }
 ```
 
-### Good
-
-```json
-{
-  "main": "dist/index.cjs"
-}
-```
-
 ### Bad
 
 ```json

common/tools/eslint-plugin-azure-sdk/src/rules/ts-package-json-main-is-cjs.ts

@@ -45,10 +45,10 @@ export = {
             const nodeValue = node.value as Literal;
             const main = nodeValue.value as string;
 
-            if (!/^(\.\/)?dist\/index\.(c)?js$/.test(main)) {
+            if (!/^(\.\/)?dist\/index\.js$/.test(main)) {
               context.report({
                 node: nodeValue,
-                message: `main is set to ${main} when it should be set to dist/index.js or dist/index.cjs`,
+                message: `main is set to ${main} when it should be set to dist/index.js`,
                 fix: (fixer: Rule.RuleFixer): Rule.Fix =>
                   fixer.replaceText(nodeValue, `"dist/index.js"`),
               });

common/tools/eslint-plugin-azure-sdk/tests/rules/ts-package-json-main-is-cjs.ts

@@ -263,16 +263,6 @@ ruleTester.run("ts-package-json-main-is-cjs", rule, {
       code: '{"main": "./dist/index.js"}',
       filename: "package.json",
     },
-    {
-      // correct format #1
-      code: '{"main": "dist/index.cjs"}',
-      filename: "package.json",
-    },
-    {
-      // correct format #2
-      code: '{"main": "./dist/index.cjs"}',
-      filename: "package.json",
-    },
     {
       // a full example package.json (taken from https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/eventhub/event-hubs/package.json with "scripts" removed for testing purposes)
       code: examplePackageGood,
@@ -310,8 +300,7 @@ ruleTester.run("ts-package-json-main-is-cjs", rule, {
       filename: "package.json",
       errors: [
         {
-          message:
-            "main is set to dist//index.js when it should be set to dist/index.js or dist/index.cjs",
+          message: "main is set to dist//index.js when it should be set to dist/index.js",
         },
       ],
       output: '{"main": "dist/index.js"}',
@@ -321,8 +310,7 @@ ruleTester.run("ts-package-json-main-is-cjs", rule, {
       filename: "package.json",
       errors: [
         {
-          message:
-            "main is set to .dist/index.js when it should be set to dist/index.js or dist/index.cjs",
+          message: "main is set to .dist/index.js when it should be set to dist/index.js",
         },
       ],
       output: '{"main": "dist/index.js"}',
@@ -332,8 +320,7 @@ ruleTester.run("ts-package-json-main-is-cjs", rule, {
       filename: "package.json",
       errors: [
         {
-          message:
-            "main is set to /dist/index.js when it should be set to dist/index.js or dist/index.cjs",
+          message: "main is set to /dist/index.js when it should be set to dist/index.js",
         },
       ],
       output: '{"main": "dist/index.js"}',
@@ -344,7 +331,7 @@ ruleTester.run("ts-package-json-main-is-cjs", rule, {
       filename: "package.json",
       errors: [
         {
-          message: "main is set to dist when it should be set to dist/index.js or dist/index.cjs",
+          message: "main is set to dist when it should be set to dist/index.js",
         },
       ],
       output: '{"main": "dist/index.js"}',
@@ -354,8 +341,7 @@ ruleTester.run("ts-package-json-main-is-cjs", rule, {
       filename: "package.json",
       errors: [
         {
-          message:
-            "main is set to index.js when it should be set to dist/index.js or dist/index.cjs",
+          message: "main is set to index.js when it should be set to dist/index.js",
         },
       ],
       output: '{"main": "dist/index.js"}',
@@ -365,8 +351,7 @@ ruleTester.run("ts-package-json-main-is-cjs", rule, {
       filename: "package.json",
       errors: [
         {
-          message:
-            "main is set to dist/src/index.js when it should be set to dist/index.js or dist/index.cjs",
+          message: "main is set to dist/src/index.js when it should be set to dist/index.js",
         },
       ],
       output: '{"main": "dist/index.js"}',
@@ -377,8 +362,7 @@ ruleTester.run("ts-package-json-main-is-cjs", rule, {
       filename: "package.json",
       errors: [
         {
-          message:
-            "main is set to index.js when it should be set to dist/index.js or dist/index.cjs",
+          message: "main is set to index.js when it should be set to dist/index.js",
         },
       ],
       output: examplePackageGood,

sdk/core/core-rest-pipeline/CHANGELOG.md

@@ -1,11 +1,9 @@
 # Release History
 
-## 1.10.0 (Unreleased)
+## 1.9.3 (Unreleased)
 
 ### Features Added
 
-- Added conditional exports for CommonJS and ESM. [#22804](https://github.com/Azure/azure-sdk-for-js/pull/22804)
-
 ### Breaking Changes
 
 ### Bugs Fixed

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

@@ -1,23 +1,10 @@
 {
   "name": "@azure/core-rest-pipeline",
-  "version": "1.10.0",
+  "version": "1.9.3",
   "description": "Isomorphic client library for making HTTP requests in node.js and browser.",
   "sdk-type": "client",
-  "main": "dist/index.cjs",
+  "main": "dist/index.js",
   "module": "dist-esm/src/index.js",
-  "type": "module",
-  "export": {
-    ".": {
-      "require": {
-        "types": "core-rest-pipeline.shims.d.ts",
-        "default": "./dist/index.cjs"
-      },
-      "import": {
-        "types": "core-rest-pipeline.shims.d.cts",
-        "default": "./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",
@@ -27,7 +14,7 @@
     "./dist-esm/src/util/userAgentPlatform.js": "./dist-esm/src/util/userAgentPlatform.browser.js"
   },
   "react-native": {
-    "./dist/index.cjs": "./dist-esm/src/index.js",
+    "./dist/index.js": "./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"
   },
@@ -36,9 +23,6 @@
     "<3.6": {
       "core-rest-pipeline.shims.d.ts": [
         "core-rest-pipeline.shims-3_1.d.ts"
-      ],
-      "core-rest-pipeline.shims.d.cts": [
-        "core-rest-pipeline.shims-3_1.d.cts"
       ]
     }
   },
@@ -62,16 +46,14 @@
     "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 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: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\"",
     "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",
@@ -143,19 +125,15 @@
     "karma-sourcemap-loader": "^0.3.8",
     "karma": "^6.3.0",
     "mocha-junit-reporter": "^2.0.0",
-    "mocha": "^10.0.0",
+    "mocha": "^7.1.1",
     "prettier": "^2.5.1",
     "puppeteer": "^14.0.0",
     "rimraf": "^3.0.0",
     "sinon": "^9.0.2",
     "source-map-support": "^0.5.9",
-    "ts-node": "^10.0.0",
-    "typescript": "~4.7.0",
+    "typescript": "~4.6.0",
     "util": "^0.12.1"
   },
-  "mocha": {
-    "loader": "ts-node/esm"
-  },
   "//sampleConfiguration": {
     "skipFolder": true,
     "disableDocsMs": true,

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

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export const SDK_VERSION: string = "1.10.0";
+export const SDK_VERSION: string = "1.9.3";
 
 export const DEFAULT_RETRY_POLICY_COUNT = 3;

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.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 { 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 { ProxySettings } from "./interfaces.js";
-import { decompressResponsePolicy } from "./policies/decompressResponsePolicy.js";
-import { defaultRetryPolicy } from "./policies/defaultRetryPolicy.js";
-import { formDataPolicy } from "./policies/formDataPolicy.js";
+import { ProxySettings } from ".";
+import { decompressResponsePolicy } from "./policies/decompressResponsePolicy";
+import { defaultRetryPolicy } from "./policies/defaultRetryPolicy";
+import { formDataPolicy } from "./policies/formDataPolicy";
 import { isNode } from "@azure/core-util";
-import { proxyPolicy } from "./policies/proxyPolicy.js";
-import { setClientRequestIdPolicy } from "./policies/setClientRequestIdPolicy.js";
-import { tlsPolicy } from "./policies/tlsPolicy.js";
-import { tracingPolicy } from "./policies/tracingPolicy.js";
+import { proxyPolicy } from "./policies/proxyPolicy";
+import { setClientRequestIdPolicy } from "./policies/setClientRequestIdPolicy";
+import { tlsPolicy } from "./policies/tlsPolicy";
+import { tracingPolicy } from "./policies/tracingPolicy";
 
 /**
  * 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.js";
-import { createFetchHttpClient } from "./fetchHttpClient.js";
+import { HttpClient } from "./interfaces";
+import { createFetchHttpClient } from "./fetchHttpClient";
 
 /**
  * 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.js";
-import { createXhrHttpClient } from "./xhrHttpClient.js";
+import { HttpClient } from "./interfaces";
+import { createXhrHttpClient } from "./xhrHttpClient";
 
 /**
  * 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.js";
-import { createNodeHttpClient } from "./nodeHttpClient.js";
+import { HttpClient } from "./interfaces";
+import { createNodeHttpClient } from "./nodeHttpClient";
 
 /**
  * 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.js";
-import { RestError } from "./restError.js";
-import { createHttpHeaders } from "./httpHeaders.js";
+} from "./interfaces";
+import { RestError } from "./restError";
+import { createHttpHeaders } from "./httpHeaders";
 
 /**
  * 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.js";
+import { HttpHeaders, RawHttpHeaders, RawHttpHeadersInput } from "./interfaces";
 
 interface HeaderEntry {
   name: string;