@autorest/typescript 6.0.0-beta.14 → 6.0.0-beta.17

package/src/generators/samples/sampleGenerator.ts

@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import {
+  Project,
+  SourceFile
+} from "ts-morph";
+import * as fs from 'fs';
+import * as path from 'path';
+import * as hbs from "handlebars";
+import { getAutorestOptions, getSession } from "../../autorestSession";
+import { ClientDetails } from "../../models/clientDetails";
+import { SampleGroup } from "../../models/sampleDetails";
+
+/**
+ * Function that writes the code for all the operations.
+ * It will generate one file per operation group and each file contains:
+ *    - A class definition for the operation group
+ *    - Methods and overrides for each operation
+ *    - OperationSpecs for each operation
+ * @param clientDetails client details
+ * @param project project for code generation
+ */
+export function generateSamples(
+  clientDetails: ClientDetails,
+  project: Project
+): void {
+  // Toplevel operations are inlined in the client
+  const sampleGroups = clientDetails.samples;
+  const session = getSession();
+  if (!sampleGroups) {
+    session.error("No samples are found! ", []);
+  }
+  for (const sampleGroup of sampleGroups as SampleGroup[]) {
+    try {
+      const file = fs.readFileSync(path.join(__dirname, "../static/samples.ts.hbs"), {
+        encoding: "utf-8"
+      });
+
+      const sampleGroupFileContents = hbs.compile(file, { noEscape: true });
+      project.createSourceFile(`samples-dev/${sampleGroup.sampleFileName}.ts`, sampleGroupFileContents(sampleGroup), {
+        overwrite: true
+      });
+    } catch (error) {
+      session.error("An error was encountered while handling sample generation", [sampleGroup.sampleFileName]);
+      throw error;
+    }
+  }
+}
+

package/src/generators/static/apiExtractorConfig.ts

@@ -5,7 +5,7 @@ import { Project } from "ts-morph";
 import { getAutorestOptions } from "../../autorestSession";
 
 export function generateApiExtractorConfig(project: Project) {
-  const { generateMetadata, packageDetails, generateTest } = getAutorestOptions();
+  const { generateMetadata, packageDetails, generateTest, restLevelClient } = getAutorestOptions();
 
   if (!generateMetadata) {
     return;
@@ -14,7 +14,7 @@ export function generateApiExtractorConfig(project: Project) {
   const config = {
     $schema:
       "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-    mainEntryPointFilePath: generateTest ?`./dist-esm/src/index.d.ts` :`./dist-esm/index.d.ts` ,
+    mainEntryPointFilePath: `${restLevelClient ? "./types" : "./dist-esm"}${generateTest ? "/src" : ""}/index.d.ts`,
     docModel: {
       enabled: true
     },

package/src/generators/static/esLintConfigGenerator.ts

@@ -0,0 +1,24 @@
+import { Project } from "ts-morph";
+import { getAutorestOptions } from "../../autorestSession";
+
+const esLintConfig = {
+  plugins: ["@azure/azure-sdk"],
+  extends: ["plugin:@azure/azure-sdk/azure-sdk-base"],
+  rules: {
+    "@azure/azure-sdk/ts-modules-only-named": "warn",
+    "@azure/azure-sdk/ts-apiextractor-json-types": "warn",
+    "@azure/azure-sdk/ts-package-json-types": "warn",
+    "@azure/azure-sdk/ts-package-json-engine-is-present": "warn",
+    "tsdoc/syntax": "warn"
+  }
+}
+
+export function generateEsLintConfig(project: Project) {
+  const { generateMetadata } = getAutorestOptions();
+  if (!generateMetadata) {
+    return;
+  }
+  project.createSourceFile(".eslintrc.json", JSON.stringify(esLintConfig), {
+    overwrite: true
+  });
+}

package/src/generators/static/{README.md.hbs → hlcREADME.md.hbs}

@@ -24,6 +24,8 @@ This package contains an isomorphic SDK (runs both in Node.js and in browsers) f
 - [LTS versions of Node.js](https://nodejs.org/about/releases/)
 - Latest versions of Safari, Chrome, Edge and Firefox.
 
+See our [support policy](https://github.com/Azure/azure-sdk-for-js/blob/main/SUPPORT.md) for more details.
+
 {{#if azure}}
 ### Prerequisites
 
@@ -64,17 +66,38 @@ For more information about how to create an Azure AD Application check out [this
 ```javascript
 const { {{ clientClassName }} } = require("{{ clientPackageName }}");
 const { DefaultAzureCredential } = require("@azure/identity");
+// For client-side applications running in the browser, use InteractiveBrowserCredential instead of DefaultAzureCredential. See https://aka.ms/azsdk/js/identity/examples for more details.
+
 const subscriptionId = "00000000-0000-0000-0000-000000000000";
 const client = new {{ clientClassName }}(new DefaultAzureCredential(), subscriptionId);
+
+// For client-side applications running in the browser, use this code instead:
+// const credential = new InteractiveBrowserCredential({
+//   tenantId: "<YOUR_TENANT_ID>",
+//   clientId: "<YOUR_CLIENT_ID>"
+// });
+// const client = new {{ clientClassName }}(credential, subscriptionId);
 ```
 {{else}}
 ```javascript
 const { {{ clientClassName }} } = require("{{ clientPackageName }}");
 const { DefaultAzureCredential } = require("@azure/identity");
+// For client-side applications running in the browser, use InteractiveBrowserCredential instead of DefaultAzureCredential. See https://aka.ms/azsdk/js/identity/examples for more details.
+
 const client = new {{ clientClassName }}("<endpoint>", new DefaultAzureCredential());
+// For client-side applications running in the browser, use this code instead:
+// const credential = new InteractiveBrowserCredential({
+//   tenantId: "<YOUR_TENANT_ID>",
+//   clientId: "<YOUR_CLIENT_ID>"
+// });
+// const client = new {{ clientClassName }}("<endpoint>", credential);
 ```
 {{/if}}
 {{/if}}{{/if}}
+
+### JavaScript Bundle
+To use this client library in the browser, first you need to use a bundler. For details on how to do this, please refer to our [bundling documentation](https://aka.ms/AzureSDKBundling).
+
 ## Key concepts
 
 ### {{ clientClassName }}

package/src/generators/static/karma.conf.js.hbs

@@ -0,0 +1,141 @@
+// https://github.com/karma-runner/karma-chrome-launcher
+process.env.CHROME_BIN = require("puppeteer").executablePath();
+require("dotenv").config();
+const {
+  jsonRecordingFilterFunction,
+  isPlaybackMode,
+  isSoftRecordMode,
+  isRecordMode,
+} = require("@azure-tools/test-recorder");
+
+module.exports = function (config) {
+  config.set({
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: "./",
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ["source-map-support", "mocha"],
+
+    plugins: [
+      "karma-mocha",
+      "karma-mocha-reporter",
+      "karma-chrome-launcher",
+      "karma-edge-launcher",
+      "karma-firefox-launcher",
+      "karma-ie-launcher",
+      "karma-env-preprocessor",
+      "karma-coverage",
+      "karma-sourcemap-loader",
+      "karma-junit-reporter",
+      "karma-json-to-file-reporter",
+      "karma-source-map-support",
+      "karma-json-preprocessor",
+    ],
+
+    // list of files / patterns to load in the browser
+    files: [
+      "dist-test/index.browser.js",
+      { pattern: "dist-test/index.browser.js.map", type: "html", included: false, served: true },
+    ].concat(isPlaybackMode() || isSoftRecordMode() ? ["recordings/browsers/**/*.json"] : []),
+
+    // list of files / patterns to exclude
+    exclude: [],
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+      "**/*.js": ["sourcemap", "env"],
+      "recordings/browsers/**/*.json": ["json"],
+      // IMPORTANT: COMMENT following line if you want to debug in your browsers!!
+      // Preprocess source file to calculate code coverage, however this will make source file unreadable
+      // "dist-test/index.js": ["coverage"]
+    },
+
+    envPreprocessor: [
+      "TEST_MODE",
+      "ENDPOINT",
+      "AZURE_CLIENT_SECRET",
+      "AZURE_CLIENT_ID",
+      "AZURE_TENANT_ID",
+      "SUBSCRIPTION_ID",
+    ],
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ["mocha", "coverage", "junit", "json-to-file"],
+
+    coverageReporter: {
+      // specify a common output directory
+      dir: "coverage-browser/",
+      reporters: [
+        { type: "json", subdir: ".", file: "coverage.json" },
+        { type: "lcovonly", subdir: ".", file: "lcov.info" },
+        { type: "html", subdir: "html" },
+        { type: "cobertura", subdir: ".", file: "cobertura-coverage.xml" },
+      ],
+    },
+
+    junitReporter: {
+      outputDir: "", // results will be saved as $outputDir/$browserName.xml
+      outputFile: "test-results.browser.xml", // if included, results will be saved as $outputDir/$browserName/$outputFile
+      suite: "", // suite will become the package name attribute in xml testsuite element
+      useBrowserName: false, // add browser name to report and classes names
+      nameFormatter: undefined, // function (browser, result) to customize the name attribute in xml testcase element
+      classNameFormatter: undefined, // function (browser, result) to customize the classname attribute in xml testcase element
+      properties: {}, // key value pair of properties to add to the <properties> section of the report
+    },
+
+    jsonToFileReporter: {
+      filter: jsonRecordingFilterFunction,
+      outputPath: ".",
+    },
+
+    // web server port
+    port: 9876,
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: false,
+
+    // --no-sandbox allows our tests to run in Linux without having to change the system.
+    // --disable-web-security allows us to authenticate from the browser without having to write tests using interactive auth, which would be far more complex.
+    browsers: ["ChromeHeadlessNoSandbox"],
+    customLaunchers: {
+      ChromeHeadlessNoSandbox: {
+        base: "ChromeHeadless",
+        flags: ["--no-sandbox", "--disable-web-security"],
+      },
+    },
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: false,
+
+    // Concurrency level
+    // how many browser should be started simultaneous
+    concurrency: 1,
+
+    browserNoActivityTimeout: 60000000,
+    browserDisconnectTimeout: 10000,
+    browserDisconnectTolerance: 3,
+    browserConsoleLogOptions: {
+      terminal: !isRecordMode(),
+    },
+
+    client: {
+      mocha: {
+        // change Karma's debug.html to the mocha web reporter
+        reporter: "html",
+        timeout: "600000",
+      },
+    },
+  });
+};

package/src/generators/static/karmaConfigFileGenerator.ts

@@ -0,0 +1,20 @@
+import { Project } from "ts-morph";
+import * as path from 'path';
+import * as fs from 'fs';
+import * as hbs from "handlebars";
+import { getAutorestOptions } from "../../autorestSession";
+
+export function generateKarmaConfigFile(project: Project) {
+  const { generateTest, restLevelClient } = getAutorestOptions();
+  if (!generateTest || !restLevelClient) {
+    return;
+  }
+  const metadata = {}
+  const file = fs.readFileSync(path.join(__dirname, "karma.conf.js.hbs"), {
+    encoding: "utf-8"
+  });
+  const karmaConfigFileContents = hbs.compile(file, { noEscape: true });
+  project.createSourceFile("karma.conf.js", karmaConfigFileContents(metadata), {
+    overwrite: true
+  });
+}

package/src/generators/static/packageFileGenerator.ts

@@ -7,6 +7,7 @@ import { PackageDetails } from "../../models/packageDetails";
 import { getAutorestOptions, getSession } from "../../autorestSession";
 import { hasPagingOperations } from "../../utils/extractPaginationDetails";
 import { hasPollingOperations } from "../../restLevelClient/helpers/hasPollingOperations";
+import { NameType, normalizeName } from "../../utils/nameUtils";
 
 export function generatePackageJson(
   project: Project,
@@ -48,52 +49,87 @@ export function generatePackageJson(
  * or High Level Client
  */
 function restLevelPackage(packageDetails: PackageDetails) {
-  const { azureArm } = getAutorestOptions();
+  const { azureArm, generateTest, azureOutputDirectory, azureSdkForJs } = getAutorestOptions();
   const { model } = getSession();
   const hasPaging = hasPagingOperations(model);
   const hasLRO = hasPollingOperations(model);
-  return {
+  const packageInfo: Record<string, any> = {
     name: `${packageDetails.name}`,
     "sdk-type": `${azureArm ? "mgmt" : "client"}`,
+    author: "Microsoft Corporation",
     version: `${packageDetails.version}`,
     description: `${packageDetails.description}`,
-    main: "dist-esm/index.js",
+    keywords: [
+      "node",
+      "azure",
+      "cloud",
+      "typescript",
+      "browser",
+      "isomorphic"
+    ],
+    license: "MIT",
+    main: "dist/index.js",
+    module: generateTest? "./dist-esm/src/index.js" : "./dist-esm/index.js",
     types: `./types/${packageDetails.nameWithoutScope}.d.ts`,
+    homepage: `https://github.com/Azure/azure-sdk-for-js/tree/main/${azureOutputDirectory}/README.md`,
+    repository: "github:Azure/azure-sdk-for-js",
+    bugs: {
+      url: "https://github.com/Azure/azure-sdk-for-js/issues"
+    },
+    "files": [
+      "dist/",
+      generateTest? "dist-esm/src/" : "dist-esm/",
+      `types/${packageDetails.nameWithoutScope}.d.ts`,
+      "README.md",
+      "LICENSE",
+      "review/*",
+    ],
+    "//metadata": {
+      "constantPaths": [
+        {
+          "path": "swagger/README.md",
+          "prefix": "package-version"
+        }
+      ]
+    },
+    engines: {
+      node: ">=12.0.0"
+    },
     scripts: {
-      test: 'echo "Error: no test specified" && exit 1',
-      build: "npm run clean && tsc --build && npm run extract-api",
-      "extract-api": "mkdirp ./review && api-extractor run --local",
-      pack: "npm pack 2>&1",
-      lint: "echo skipped",
-      audit: "echo skipped",
-      clean: "echo skipped",
-      "build:node": "echo skipped",
-      "build:browser": "echo skipped",
-      "build:test": "echo skipped",
+      audit: "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
+      "build:browser": "echo skipped.",
+      "build:node": "echo skipped.",
       "build:samples": "echo skipped.",
-      "check-format": "echo skipped",
+      "build:test": "echo skipped.",
+      "build:debug": "echo skipped.",
+      "check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
+      clean: "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
       "execute:samples": "echo skipped",
-      format: "echo skipped",
-      "test:node": "echo skipped",
+      "extract-api": "rimraf review && mkdirp ./review && api-extractor run --local",
+      "format": "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
+      "generate:client": "autorest --typescript swagger/README.md && npm run format",
+      "integration-test:browser": "echo skipped",
+      "integration-test:node": "echo skipped",
+      "integration-test": "echo skipped",
+      "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",
+      pack: "npm pack 2>&1",
       "test:browser": "echo skipped",
+      "test:node": "echo skipped",
+      test: 'echo "Error: no test specified" && exit 1',
       "unit-test": "echo skipped",
       "unit-test:node": "echo skipped",
       "unit-test:browser": "echo skipped",
-      "integration-test:browser": "echo skipped",
-      "integration-test:node": "echo skipped",
-      "integration-test": "echo skipped",
-      docs: "echo skipped"
-    },
-    keywords: [],
-    author: "",
-    license: "ISC",
-    engines: {
-      node: ">=12.0.0"
+      docs: "typedoc --excludePrivate --excludeExternals  --out ./dist/docs ./src"
     },
+    "sideEffects": false,
+    "autoPublish": false,
     dependencies: {
-      "@azure-rest/core-client": "1.0.0-beta.7",
       "@azure/core-auth": "^1.3.0",
+      "@azure-rest/core-client": "1.0.0-beta.8",
       "@azure/core-rest-pipeline": "^1.3.0",
+      "@azure/logger": "^1.0.0",
+      tslib: "^2.2.0",
       ...(hasPaging && {
         "@azure/core-paging": "^1.2.0"
       }),
@@ -102,18 +138,90 @@ function restLevelPackage(packageDetails: PackageDetails) {
       })
     },
     devDependencies: {
-      autorest: "latest",
       "@microsoft/api-extractor": "^7.18.11",
-      "@types/node": "^14.14.22",
+      autorest: "latest",
+      "@types/node": "^12.0.0",
       dotenv: "^8.2.0",
-      prettier: "^2.2.1",
-      "ts-node": "^9.1.1",
-      typescript: "~4.2.4",
-      mkdirp: "^1.0.4"
-    },
-    sideEffects: false,
-    autoPublish: true
+      eslint: "^7.15.0",
+      mkdirp: "^1.0.4",
+      prettier: "2.2.1",
+      rimraf: "^3.0.0",
+      "source-map-support": "^0.5.9",
+      "typedoc": "0.15.2",
+      "typescript": "~4.2.0"
+    }
   };
+
+  if (azureSdkForJs) {
+    packageInfo.scripts["build"] = "npm run clean && tsc -p . && dev-tool run bundle && mkdirp ./review && api-extractor run --local";
+    packageInfo.scripts["build:debug"] = "tsc -p . && dev-tool run bundle && api-extractor run --local";
+    packageInfo.scripts["build:browser"] = "tsc -p . && dev-tool run bundle";
+    packageInfo.scripts["build:node"] = "tsc -p . && dev-tool run bundle";
+    packageInfo.devDependencies["@azure/dev-tool"] = "^1.0.0"
+    packageInfo.devDependencies["@azure/eslint-plugin-azure-sdk"] = "^3.0.0"
+  } else {
+    packageInfo.scripts["build"] = "npm run clean && tsc && rollup -c 2>&1 && npm run minify && mkdirp ./review && npm run extract-api";
+    packageInfo.scripts["minify"] = `uglifyjs -c -m --comments --source-map "content='./dist/index.js.map'" -o ./dist/index.min.js ./dist/index.js`;
+    packageInfo.devDependencies["@rollup/plugin-commonjs"] = "^21.0.1";
+    packageInfo.devDependencies["@rollup/plugin-json"] = "^4.1.0";
+    packageInfo.devDependencies["@rollup/plugin-multi-entry"] = "^4.1.0";
+    packageInfo.devDependencies["@rollup/plugin-node-resolve"] = "^13.1.3";
+    packageInfo.devDependencies["rollup"] = "^2.66.1";
+    packageInfo.devDependencies["rollup-plugin-sourcemaps"] = "^0.6.3";
+    packageInfo.devDependencies["uglify-js"] = "^3.4.9";
+  }
+
+  if (generateTest) {
+    packageInfo.module = `./dist-esm/src/index.js`;
+    packageInfo.devDependencies["@azure/identity"] = "^2.0.1";
+    packageInfo.devDependencies["@azure-tools/test-recorder"] = "^1.0.0";
+    packageInfo.devDependencies["mocha"] = "^7.1.1";
+    packageInfo.devDependencies["mocha-junit-reporter"] = "^1.18.0";
+    packageInfo.devDependencies["cross-env"] = "^7.0.2";
+    packageInfo.devDependencies["chai"] = "^4.2.0";
+    packageInfo.devDependencies["cross-env"] = "^7.0.2";
+    packageInfo.devDependencies["karma-chrome-launcher"] = "^3.0.0";
+    packageInfo.devDependencies["karma-coverage"] = "^2.0.0";
+    packageInfo.devDependencies["karma-edge-launcher"] = "^0.4.2";
+    packageInfo.devDependencies["karma-env-preprocessor"] = "^0.1.1";
+    packageInfo.devDependencies["karma-firefox-launcher"] = "^1.1.0";
+    packageInfo.devDependencies["karma-ie-launcher"] = "^1.0.0";
+    packageInfo.devDependencies["karma-json-preprocessor"] = "^0.3.3";
+    packageInfo.devDependencies["karma-json-to-file-reporter"] = "^1.0.1";
+    packageInfo.devDependencies["karma-junit-reporter"] = "^2.0.1";
+    packageInfo.devDependencies["karma-mocha-reporter"] = "^2.2.5";
+    packageInfo.devDependencies["karma-mocha"] = "^2.0.1";
+    packageInfo.devDependencies["karma-source-map-support"] = "~1.4.0";
+    packageInfo.devDependencies["karma-sourcemap-loader"] = "^0.3.8";
+    packageInfo.devDependencies["karma"] = "^6.2.0";
+    packageInfo.devDependencies["nyc"] = "^14.0.0";
+    packageInfo.devDependencies["source-map-support"] = "^0.5.9";
+
+    packageInfo.scripts["test"] = "npm run clean && npm run build:test && npm run unit-test";
+    packageInfo.scripts["test:node"] = "npm run clean && npm run build:test && npm run unit-test:node";
+    packageInfo.scripts["test:browser"] = "tsc -p . && cross-env ONLY_BROWSER=true rollup -c 2>&1";
+    packageInfo.scripts["unit-test"] = "npm run unit-test:node && npm run unit-test:browser";
+    packageInfo.scripts["unit-test:node"] = "mocha -r esm --require ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace \"test/{,!(browser)/**/}*.spec.ts\"";
+    packageInfo.scripts["unit-test:browser"] = "karma start --single-run";
+    packageInfo.scripts["integration-test"] = "npm run integration-test:node && npm run integration-test:browser";
+    packageInfo.scripts["integration-test:node"] = "nyc mocha -r esm --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 5000000 --full-trace \"dist-esm/test/{,!(browser)/**/}*.spec.js\"";
+
+    if (azureSdkForJs) {
+      packageInfo.scripts["build:test"] = "tsc -p . && dev-tool run bundle";
+      packageInfo.scripts["integration-test:browser"] = "dev-tool run test:browser";
+    } else {
+      packageInfo.scripts["build:test"] = "tsc -p . && rollup -c 2>&1";
+      packageInfo.scripts["integration-test:browser"] = "karma start --single-run";
+
+    }
+
+    packageInfo["browser"] = {
+      "./dist-esm/test/public/utils/env.js":
+        "./dist-esm/test/public/utils/env.browser.js"
+    };
+  }
+
+  return packageInfo;
 }
 
 /**
@@ -132,12 +240,20 @@ function regularAutorestPackage(
     azureArm,
     addCredentials,
     azureOutputDirectory,
-    generateTest
+    generateTest,
+    generateSample,
+    coreHttpCompatMode
   } = getAutorestOptions();
   const { model } = getSession();
   const hasLro = hasPollingOperations(model);
   const hasAsyncIterators =
     !disablePagingAsyncIterators && clientDetails.options.hasPaging;
+  const clientPackageName = packageDetails.name;
+  let apiRefUrlQueryParameter: string = "";
+  if (packageDetails.version.includes("beta")) {
+    apiRefUrlQueryParameter = "?view=azure-node-preview";
+  }
+  const description = packageDetails.description;
 
   const packageInfo: Record<string, any> = {
     name: packageDetails.name,
@@ -157,6 +273,8 @@ function regularAutorestPackage(
       ...(!useCoreV2 && { "@azure/core-http": "^2.0.0" }),
       ...(useCoreV2 && { "@azure/core-client": "^1.0.0" }),
       ...(useCoreV2 && addCredentials && { "@azure/core-auth": "^1.3.0" }),
+      ...(useCoreV2 &&
+        coreHttpCompatMode && { "@azure/core-http-compat": "^1.0.0" }),
       ...(useCoreV2 && {
         "@azure/core-rest-pipeline": "^1.1.0"
       }),
@@ -164,7 +282,6 @@ function regularAutorestPackage(
         "@azure/core-tracing": "1.0.0-preview.13",
         "@opentelemetry/api": "^0.10.2"
       }),
-
       tslib: "^2.2.0"
     },
     keywords: ["node", "azure", "typescript", "browser", "isomorphic"],
@@ -174,15 +291,16 @@ function regularAutorestPackage(
     types: `./types/${packageDetails.nameWithoutScope}.d.ts`,
     devDependencies: {
       "@microsoft/api-extractor": "^7.18.11",
-      "@rollup/plugin-commonjs": "11.0.2",
-      "@rollup/plugin-json": "^4.0.0",
-      "@rollup/plugin-multi-entry": "^3.0.0",
-      "@rollup/plugin-node-resolve": "^8.0.0",
+      "@rollup/plugin-commonjs": "^21.0.1",
+      "@rollup/plugin-json": "^4.1.0",
+      "@rollup/plugin-multi-entry": "^4.1.0",
+      "@rollup/plugin-node-resolve": "^13.1.3",
       mkdirp: "^1.0.4",
-      rollup: "^1.16.3",
-      "rollup-plugin-sourcemaps": "^0.4.2",
+      rollup: "^2.66.1",
+      "rollup-plugin-sourcemaps": "^0.6.3",
       typescript: "~4.2.0",
-      "uglify-js": "^3.4.9"
+      "uglify-js": "^3.4.9",
+      rimraf: "^3.0.0"
     },
     // TODO: Calculate the SDK path for the package
     homepage: `https://github.com/Azure/azure-sdk-for-js/tree/main/${azureOutputDirectory}`,
@@ -220,7 +338,8 @@ function regularAutorestPackage(
       "extract-api": "api-extractor run --local",
       lint: "echo skipped",
       audit: "echo skipped",
-      clean: "echo skipped",
+      clean:
+        "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
       "build:node": "echo skipped",
       "build:browser": "echo skipped",
       "build:test": "echo skipped",
@@ -240,11 +359,19 @@ function regularAutorestPackage(
       docs: "echo skipped"
     },
     sideEffects: false,
+    "//metadata": {
+      constantPaths: [
+        {
+          path: `src/${normalizeName(clientDetails.name, NameType.File)}.ts`,
+          prefix: "packageDetails"
+        }
+      ]
+    },
     autoPublish: true
   };
   if (generateTest) {
     packageInfo.module = `./dist-esm/src/index.js`;
-    packageInfo.devDependencies["@azure/identity"] = "2.0.0-beta.6";
+    packageInfo.devDependencies["@azure/identity"] = "^2.0.1";
     packageInfo.devDependencies["@azure-tools/test-recorder"] = "^1.0.0";
     packageInfo.devDependencies["mocha"] = "^7.1.1";
     packageInfo.devDependencies["cross-env"] = "^7.0.2";
@@ -256,7 +383,19 @@ function regularAutorestPackage(
     packageInfo.scripts["integration-test"] =
       "npm run integration-test:node && npm run integration-test:browser";
     packageInfo.scripts["integration-test:node"] =
-      "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts";
+      "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts --reporter ../../../common/tools/mocha-multi-reporter.js";
+  }
+  if (
+    generateSample &&
+    clientDetails.samples &&
+    clientDetails.samples.length > 0
+  ) {
+    packageInfo["//sampleConfiguration"] = {
+      productName: description,
+      productSlugs: ["azure"],
+      disableDocsMs: true,
+      apiRefLink: `https://docs.microsoft.com/javascript/api/${clientPackageName}${apiRefUrlQueryParameter}`
+    };
   }
   return packageInfo;
 }