From 4af69fd1903aefa2c3c91ab989bd189cd6a88c2c Mon Sep 17 00:00:00 2001 From: Brennan Date: Thu, 17 Oct 2024 09:34:49 -0700 Subject: [PATCH] Add scope for internal npm packages (#58476) --- package-lock.json | 74 +++++++++---------- package.json | 2 +- .../CustomElements/src/js/package.json | 2 +- src/Components/Web.JS/package.json | 2 +- .../src/Interop/package.json | 2 +- .../src/Interop/package.json | 2 +- src/Middleware/Diagnostics/src/_package.json | 2 +- src/Mvc/Mvc.TagHelpers/src/_package.json | 2 +- src/Mvc/build/package-lock.json | 4 +- src/Mvc/build/package.json | 2 +- .../test/WebSites/BasicWebSite/_package.json | 2 +- .../WebSites/GenericHostWebSite/_package.json | 2 +- .../Web.ProjectTemplates/package-lock.json | 4 +- .../Web.ProjectTemplates/package.json | 2 +- .../test/Templates.Tests/package.json | 2 +- .../clients/ts/FunctionalTests/package.json | 2 +- src/SignalR/clients/ts/package.json | 2 +- 17 files changed, 55 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0cc117052468..dc63ccf881ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "aspnetcore", + "name": "@microsoft/aspnetcore", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "aspnetcore", + "name": "@microsoft/aspnetcore", "version": "1.0.0", "workspaces": [ "src/SignalR/clients/ts/signalr", @@ -3185,6 +3185,14 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@microsoft/client-ts": { + "resolved": "src/SignalR/clients/ts", + "link": true + }, + "node_modules/@microsoft/components.authentication": { + "resolved": "src/Components/WebAssembly/WebAssembly.Authentication/src/Interop", + "link": true + }, "node_modules/@microsoft/dotnet-js-interop": { "resolved": "src/JSInterop/Microsoft.JSInterop.JS/src", "link": true @@ -3193,6 +3201,26 @@ "resolved": "src/Components/dotnet-runtime-js", "link": true }, + "node_modules/@microsoft/functionaltests": { + "resolved": "src/SignalR/clients/ts/FunctionalTests", + "link": true + }, + "node_modules/@microsoft/microsoft.aspnetcore.components.web.js": { + "resolved": "src/Components/Web.JS", + "link": true + }, + "node_modules/@microsoft/microsoft.aspnetcore.projecttemplates.tests": { + "resolved": "src/ProjectTemplates/test/Templates.Tests", + "link": true + }, + "node_modules/@microsoft/microsoft.components.customelements": { + "resolved": "src/Components/CustomElements/src/js", + "link": true + }, + "node_modules/@microsoft/microsoft.msal.components.webassembly": { + "resolved": "src/Components/WebAssembly/Authentication.Msal/src/Interop", + "link": true + }, "node_modules/@microsoft/signalr": { "resolved": "src/SignalR/clients/ts/signalr", "link": true @@ -6926,10 +6954,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/client-ts": { - "resolved": "src/SignalR/clients/ts", - "link": true - }, "node_modules/cliui": { "version": "7.0.4", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/cliui/-/cliui-7.0.4.tgz", @@ -7068,10 +7092,6 @@ "dev": true, "license": "MIT" }, - "node_modules/components.authentication": { - "resolved": "src/Components/WebAssembly/WebAssembly.Authentication/src/Interop", - "link": true - }, "node_modules/compress-commons": { "version": "4.1.2", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/compress-commons/-/compress-commons-4.1.2.tgz", @@ -9578,10 +9598,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/functionaltests": { - "resolved": "src/SignalR/clients/ts/FunctionalTests", - "link": true - }, "node_modules/gauge": { "version": "4.0.4", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/gauge/-/gauge-4.0.4.tgz", @@ -14671,22 +14687,6 @@ "node": ">=8.6" } }, - "node_modules/microsoft.aspnetcore.components.web.js": { - "resolved": "src/Components/Web.JS", - "link": true - }, - "node_modules/microsoft.aspnetcore.projecttemplates.tests": { - "resolved": "src/ProjectTemplates/test/Templates.Tests", - "link": true - }, - "node_modules/microsoft.components.customelements": { - "resolved": "src/Components/CustomElements/src/js", - "link": true - }, - "node_modules/microsoft.msal.components.webassembly": { - "resolved": "src/Components/WebAssembly/Authentication.Msal/src/Interop", - "link": true - }, "node_modules/mime": { "version": "2.6.0", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/mime/-/mime-2.6.0.tgz", @@ -20451,7 +20451,7 @@ } }, "src/Components/CustomElements/src/js": { - "name": "microsoft.components.customelements" + "name": "@microsoft/microsoft.components.customelements" }, "src/Components/dotnet-runtime-js": { "name": "@microsoft/dotnet-runtime", @@ -20459,7 +20459,7 @@ "license": "MIT" }, "src/Components/Web.JS": { - "name": "microsoft.aspnetcore.components.web.js", + "name": "@microsoft/microsoft.aspnetcore.components.web.js", "version": "0.0.1", "devDependencies": { "@babel/core": "^7.23.6", @@ -20497,13 +20497,13 @@ } }, "src/Components/WebAssembly/Authentication.Msal/src/Interop": { - "name": "microsoft.msal.components.webassembly", + "name": "@microsoft/microsoft.msal.components.webassembly", "dependencies": { "@azure/msal-browser": "^2.28.3" } }, "src/Components/WebAssembly/WebAssembly.Authentication/src/Interop": { - "name": "components.authentication", + "name": "@microsoft/components.authentication", "dependencies": { "oidc-client": "^1.11.5" } @@ -20851,7 +20851,7 @@ } }, "src/ProjectTemplates/test/Templates.Tests": { - "name": "microsoft.aspnetcore.projecttemplates.tests", + "name": "@microsoft/microsoft.aspnetcore.projecttemplates.tests", "version": "0.0.1", "license": "MIT", "dependencies": { @@ -20860,7 +20860,7 @@ } }, "src/SignalR/clients/ts": { - "name": "client-ts", + "name": "@microsoft/client-ts", "version": "1.0.0", "license": "MIT", "devDependencies": { @@ -20885,7 +20885,7 @@ } }, "src/SignalR/clients/ts/FunctionalTests": { - "name": "functionaltests", + "name": "@microsoft/functionaltests", "version": "1.0.0", "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 32c7d1df34ce..48c94efe5535 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "aspnetcore", + "name": "@microsoft/aspnetcore", "version": "1.0.0", "private": true, "workspaces": [ diff --git a/src/Components/CustomElements/src/js/package.json b/src/Components/CustomElements/src/js/package.json index 1a0f6c53fbfb..952782ecdec4 100644 --- a/src/Components/CustomElements/src/js/package.json +++ b/src/Components/CustomElements/src/js/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "microsoft.components.customelements", + "name": "@microsoft/microsoft.components.customelements", "scripts": { "clean": "rimraf ./dist/Debug ./dist/Release", "prebuild": "npm run clean", diff --git a/src/Components/Web.JS/package.json b/src/Components/Web.JS/package.json index 7230603af01a..1ecbff22adba 100644 --- a/src/Components/Web.JS/package.json +++ b/src/Components/Web.JS/package.json @@ -1,5 +1,5 @@ { - "name": "microsoft.aspnetcore.components.web.js", + "name": "@microsoft/microsoft.aspnetcore.components.web.js", "private": true, "version": "0.0.1", "description": "", diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Interop/package.json b/src/Components/WebAssembly/Authentication.Msal/src/Interop/package.json index 615dbb4a39a5..9d8c0d3c75af 100644 --- a/src/Components/WebAssembly/Authentication.Msal/src/Interop/package.json +++ b/src/Components/WebAssembly/Authentication.Msal/src/Interop/package.json @@ -1,5 +1,5 @@ { - "name": "microsoft.msal.components.webassembly", + "name": "@microsoft/microsoft.msal.components.webassembly", "private": true, "scripts": { "clean": "rimraf ./dist/Debug ./dist/Release", diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/package.json b/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/package.json index 9e65eac7567f..dcef7f8ce791 100644 --- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/package.json +++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/package.json @@ -1,5 +1,5 @@ { - "name": "components.authentication", + "name": "@microsoft/components.authentication", "private": true, "scripts": { "clean": "rimraf ./dist/Debug ./dist/Release", diff --git a/src/Middleware/Diagnostics/src/_package.json b/src/Middleware/Diagnostics/src/_package.json index a89dd3241cf6..7262c61e559d 100644 --- a/src/Middleware/Diagnostics/src/_package.json +++ b/src/Middleware/Diagnostics/src/_package.json @@ -1,5 +1,5 @@ { - "name": "DiagnosticsPages", + "name": "@microsoft/DiagnosticsPages", "version": "0.0.0", "description": "", "private": true, diff --git a/src/Mvc/Mvc.TagHelpers/src/_package.json b/src/Mvc/Mvc.TagHelpers/src/_package.json index ea557bf64ef8..46d78f15d9c1 100644 --- a/src/Mvc/Mvc.TagHelpers/src/_package.json +++ b/src/Mvc/Mvc.TagHelpers/src/_package.json @@ -1,6 +1,6 @@ { "version": "1.0.0", - "name": "Microsoft.AspNetCore.Mvc.TagHelpers", + "name": "@microsoft/Microsoft.AspNetCore.Mvc.TagHelpers", "private": true, "devDependencies": { "grunt": "~0.4.5", diff --git a/src/Mvc/build/package-lock.json b/src/Mvc/build/package-lock.json index e876d6510dc8..b6a3602d452c 100644 --- a/src/Mvc/build/package-lock.json +++ b/src/Mvc/build/package-lock.json @@ -1,11 +1,11 @@ { - "name": "jquery-validation-dependency", + "name": "@microsoft/jquery-validation-dependency", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "jquery-validation-dependency", + "name": "@microsoft/jquery-validation-dependency", "version": "1.0.0", "devDependencies": { "jquery-validation": "1.20.0" diff --git a/src/Mvc/build/package.json b/src/Mvc/build/package.json index 9676c2415364..3367086617fd 100644 --- a/src/Mvc/build/package.json +++ b/src/Mvc/build/package.json @@ -1,5 +1,5 @@ { - "name": "jquery-validation-dependency", + "name": "@microsoft/jquery-validation-dependency", "version": "1.0.0", "private": true, "scripts": { diff --git a/src/Mvc/test/WebSites/BasicWebSite/_package.json b/src/Mvc/test/WebSites/BasicWebSite/_package.json index a0d2a37b7acb..f06282ec0ede 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/_package.json +++ b/src/Mvc/test/WebSites/BasicWebSite/_package.json @@ -1,6 +1,6 @@ { "version": "0.0.0", - "name": "BasicWebSite", + "name": "@microsoft/BasicWebSite", "description": "Web site demonstrating various validations.", "private": true, "devDependencies": { diff --git a/src/Mvc/test/WebSites/GenericHostWebSite/_package.json b/src/Mvc/test/WebSites/GenericHostWebSite/_package.json index 45df438fd2a0..e927a42c5226 100644 --- a/src/Mvc/test/WebSites/GenericHostWebSite/_package.json +++ b/src/Mvc/test/WebSites/GenericHostWebSite/_package.json @@ -1,6 +1,6 @@ { "version": "0.0.0", - "name": "GenericHostWebSite", + "name": "@microsoft/GenericHostWebSite", "description": "Web site demonstrating various validations.", "private": true, "devDependencies": { diff --git a/src/ProjectTemplates/Web.ProjectTemplates/package-lock.json b/src/ProjectTemplates/Web.ProjectTemplates/package-lock.json index b9aa70741733..0b6889bfd3c5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/package-lock.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/package-lock.json @@ -1,11 +1,11 @@ { - "name": "project-templates", + "name": "@microsoft/project-templates", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "project-templates", + "name": "@microsoft/project-templates", "version": "0.1.0", "dependencies": { "bootstrap": "^5.3.3", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/package.json b/src/ProjectTemplates/Web.ProjectTemplates/package.json index 17fbcf2ee59e..c2e8fe32e490 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/package.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/package.json @@ -1,5 +1,5 @@ { - "name": "project-templates", + "name": "@microsoft/project-templates", "private": true, "version": "0.1.0", "description": "Project templates dependencies", diff --git a/src/ProjectTemplates/test/Templates.Tests/package.json b/src/ProjectTemplates/test/Templates.Tests/package.json index 08ff35cbb443..465f1eec94e9 100644 --- a/src/ProjectTemplates/test/Templates.Tests/package.json +++ b/src/ProjectTemplates/test/Templates.Tests/package.json @@ -1,5 +1,5 @@ { - "name": "microsoft.aspnetcore.projecttemplates.tests", + "name": "@microsoft/microsoft.aspnetcore.projecttemplates.tests", "version": "0.0.1", "description": "Not a real package. This file exists only to declare dependencies.", "main": "index.js", diff --git a/src/SignalR/clients/ts/FunctionalTests/package.json b/src/SignalR/clients/ts/FunctionalTests/package.json index 515f26d01c9b..e830b4a64979 100644 --- a/src/SignalR/clients/ts/FunctionalTests/package.json +++ b/src/SignalR/clients/ts/FunctionalTests/package.json @@ -1,5 +1,5 @@ { - "name": "functionaltests", + "name": "@microsoft/functionaltests", "private": true, "version": "1.0.0", "description": "", diff --git a/src/SignalR/clients/ts/package.json b/src/SignalR/clients/ts/package.json index b353c6f9e48d..c88f93d1b94f 100644 --- a/src/SignalR/clients/ts/package.json +++ b/src/SignalR/clients/ts/package.json @@ -1,5 +1,5 @@ { - "name": "client-ts", + "name": "@microsoft/client-ts", "version": "1.0.0", "description": "Common dependencies used during dev time. DO NOT PUBLISH", "private": true,