Fixing compliance issues (#1610)

* Fixing compliance issues

* Adding missing lib reference that new version shiki required

* update format and changelog

* revert vs2019 change as it will be deprecated

common/changes/@cadl-lang/html-program-viewer/compliancefix_2023-01-31-08-20.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cadl-lang/html-program-viewer",
+      "comment": "Prettier format change.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@cadl-lang/html-program-viewer"
+}

common/changes/cadl-vs/compliancefix_2023-01-31-08-20.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "cadl-vs",
+      "comment": "Explicitly adding NewtonSoft.Json 13.0.2 to address vulnerability",
+      "type": "none"
+    }
+  ],
+  "packageName": "cadl-vs"
+}

common/scripts/install-run-rush-pnpm.js

@@ -0,0 +1,28 @@
+// THIS FILE WAS GENERATED BY A TOOL. ANY MANUAL MODIFICATIONS WILL GET OVERWRITTEN WHENEVER RUSH IS UPGRADED.
+//
+// This script is intended for usage in an automated build environment where the Rush command may not have
+// been preinstalled, or may have an unpredictable version.  This script will automatically install the version of Rush
+// specified in the rush.json configuration file (if not already installed), and then pass a command-line to the
+// rush-pnpm command.
+//
+// An example usage would be:
+//
+//    node common/scripts/install-run-rush-pnpm.js pnpm-command
+//
+// For more information, see: https://rushjs.io/pages/maintainer/setup_new_repo/
+
+/******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+var __webpack_exports__ = {};
+/*!*****************************************************!*\
+  !*** ./lib-esnext/scripts/install-run-rush-pnpm.js ***!
+  \*****************************************************/
+
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See the @microsoft/rush package's LICENSE file for license information.
+require('./install-run-rush');
+//# sourceMappingURL=install-run-rush-pnpm.js.map
+module.exports = __webpack_exports__;
+/******/ })()
+;
+//# sourceMappingURL=install-run-rush-pnpm.js.map

common/scripts/install-run-rush.js

@@ -141,12 +141,22 @@ function _getRushVersion(logger) {
             'using an unexpected syntax.');
     }
 }
+function _getBin(scriptName) {
+    switch (scriptName.toLowerCase()) {
+        case 'install-run-rush-pnpm.js':
+            return 'rush-pnpm';
+        case 'install-run-rushx.js':
+            return 'rushx';
+        default:
+            return 'rush';
+    }
+}
 function _run() {
     const [nodePath /* Ex: /bin/node */, scriptPath /* /repo/common/scripts/install-run-rush.js */, ...packageBinArgs /* [build, --to, myproject] */] = process.argv;
     // Detect if this script was directly invoked, or if the install-run-rushx script was invokved to select the
     // appropriate binary inside the rush package to run
     const scriptName = path__WEBPACK_IMPORTED_MODULE_0__.basename(scriptPath);
-    const bin = scriptName.toLowerCase() === 'install-run-rushx.js' ? 'rushx' : 'rush';
+    const bin = _getBin(scriptName);
     if (!nodePath || !scriptPath) {
         throw new Error('Unexpected exception: could not detect node path or script path');
     }
@@ -173,7 +183,10 @@ function _run() {
     }
     if (!commandFound) {
         console.log(`Usage: ${scriptName} <command> [args...]`);
-        if (scriptName === 'install-run-rush.js') {
+        if (scriptName === 'install-run-rush-pnpm.js') {
+            console.log(`Example: ${scriptName} pnpm-command`);
+        }
+        else if (scriptName === 'install-run-rush.js') {
             console.log(`Example: ${scriptName} build --to myproject`);
         }
         else {

common/scripts/install-run.js

@@ -238,8 +238,8 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "RUSH_JSON_FILENAME": () => (/* binding */ RUSH_JSON_FILENAME),
-/* harmony export */   "getNpmPath": () => (/* binding */ getNpmPath),
 /* harmony export */   "findRushJsonFolder": () => (/* binding */ findRushJsonFolder),
+/* harmony export */   "getNpmPath": () => (/* binding */ getNpmPath),
 /* harmony export */   "installAndRun": () => (/* binding */ installAndRun),
 /* harmony export */   "runWithErrorAndStatusCode": () => (/* binding */ runWithErrorAndStatusCode)
 /* harmony export */ });

packages/cadl-vs/VS2019/Microsoft.Cadl.VS2019.csproj

@@ -14,7 +14,6 @@
     <!-- Use 16.latest for build tools -->
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.11.65" PrivateAssets="All" />
     <!-- Align with VS 16.0 version here: https://devblogs.microsoft.com/visualstudio/using-newtonsoft-json-in-a-visual-studio-extension/-->
-    <PackageReference Include="NewtonSoft.JSON" Version="9.0.1" ExcludeAssets="Runtime" />
   </ItemGroup>
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   <Import Project="../Microsoft.Cadl.VS.targets" />

packages/cadl-vs/VS2022/Microsoft.Cadl.VS2022.csproj

@@ -14,7 +14,7 @@
     <!-- Use latest 17.x for build tools-->
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.3.2093" PrivateAssets="All" />
     <!-- Align with VS 17.0 version here: https://devblogs.microsoft.com/visualstudio/using-newtonsoft-json-in-a-visual-studio-extension/-->
-    <PackageReference Include="NewtonSoft.JSON" Version="13.0.1" ExcludeAssets="Runtime" />
+    <PackageReference Include="NewtonSoft.JSON" Version="13.0.2" ExcludeAssets="Runtime" />
   </ItemGroup>
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   <Import Project="../Microsoft.Cadl.VS.targets" />

packages/html-program-viewer/src/ui.tsx

@@ -108,7 +108,7 @@ const omittedProps = [
   "projections",
 ] as const;
 const omittedPropsSet = new Set(omittedProps);
-type OmittedProps = typeof omittedProps[number];
+type OmittedProps = (typeof omittedProps)[number];
 type NamedTypeUIProps<T extends NamedType> = {
   type: T;
   properties: Record<Exclude<keyof T, OmittedProps>, "skip" | "ref" | "nested" | "value">;

packages/ref-doc/tsconfig.json

@@ -7,7 +7,8 @@
     "outDir": "dist",
     "rootDir": ".",
     "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo",
-    "types": ["node"]
+    "types": ["node"],
+    "lib": ["DOM"]
   },
   "include": ["src/**/*.ts", "test/**/*.ts"]
 }

rush.json

@@ -4,7 +4,7 @@
  */
 {
   "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
-  "rushVersion": "5.88.0",
+  "rushVersion": "5.90.0",
   "pnpmVersion": "6.32.9",
   "ensureConsistentVersions": true,
   /**