From 8e82080832957a707a03a37bfefb1b02110b7f03 Mon Sep 17 00:00:00 2001 From: Brennan Date: Thu, 17 Oct 2024 09:34:49 -0700 Subject: [PATCH 1/4] Add scope for internal npm packages (#58476) --- src/Components/Web.JS/package.json | 2 +- src/Middleware/Diagnostics/src/_package.json | 2 +- src/Mvc/Mvc.TagHelpers/src/_package.json | 2 +- src/Mvc/test/WebSites/BasicWebSite/_package.json | 2 +- src/Mvc/test/WebSites/GenericHostWebSite/_package.json | 2 +- src/ProjectTemplates/test/Templates.Tests/package.json | 2 +- src/SignalR/clients/ts/FunctionalTests/package.json | 2 +- src/SignalR/clients/ts/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Components/Web.JS/package.json b/src/Components/Web.JS/package.json index 0536a46be9df..1137c7475778 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/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/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/test/Templates.Tests/package.json b/src/ProjectTemplates/test/Templates.Tests/package.json index cf27e5755093..88881e57546b 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 04b637b1b368..15fa79dbdaf9 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 e2c4327c207d..560aeff4d44d 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": "0.0.0", "description": "Provides a root to run npm scripts from. DO NOT PUBLISH", "private": true, From c68b287a96da1957909a6448fd4a0636581a46dc Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 18 Oct 2024 15:08:57 -0700 Subject: [PATCH 2/4] update --- src/SignalR/clients/ts/common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SignalR/clients/ts/common/package.json b/src/SignalR/clients/ts/common/package.json index 65a622972020..e14e4717c731 100644 --- a/src/SignalR/clients/ts/common/package.json +++ b/src/SignalR/clients/ts/common/package.json @@ -1,5 +1,5 @@ { - "name": "common", + "name": "@microsoft/common", "version": "1.0.0", "description": "Common dependencies used during dev time. DO NOT PUBLISH", "private": true, From a508c1532a3827bf102afaea11c8d22a86da7481 Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 18 Oct 2024 15:15:05 -0700 Subject: [PATCH 3/4] update --- src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts | 2 +- src/SignalR/clients/ts/FunctionalTests/webpack.config.js | 2 +- src/SignalR/clients/ts/webpack.config.base.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts index 6f0f49d3e1ee..92036c9f65a1 100644 --- a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts @@ -209,7 +209,7 @@ function runJest(httpsUrl: string, httpUrl: string) { return 0; } - const jestPath = path.resolve(__dirname, "..", "..", "common", "node_modules", "jest", "bin", "jest.js"); + const jestPath = path.resolve(__dirname, "..", "..", "@microsoft/common", "node_modules", "jest", "bin", "jest.js"); const configPath = path.resolve(__dirname, "..", "func.jest.config.js"); console.log("Starting Node tests using Jest."); diff --git a/src/SignalR/clients/ts/FunctionalTests/webpack.config.js b/src/SignalR/clients/ts/FunctionalTests/webpack.config.js index 28830064f8bc..22761311337f 100644 --- a/src/SignalR/clients/ts/FunctionalTests/webpack.config.js +++ b/src/SignalR/clients/ts/FunctionalTests/webpack.config.js @@ -25,7 +25,7 @@ module.exports = { }, resolveLoader: { // Special resolution rules for loaders (which are in the 'common' directory) - modules: [ path.resolve(__dirname, "..", "common", "node_modules") ], + modules: [ path.resolve(__dirname, "..", "@microsoft/common", "node_modules") ], }, resolve: { extensions: [".ts", ".js"] diff --git a/src/SignalR/clients/ts/webpack.config.base.js b/src/SignalR/clients/ts/webpack.config.base.js index 0bf3a9d0ee1b..5b4be67dfad3 100644 --- a/src/SignalR/clients/ts/webpack.config.base.js +++ b/src/SignalR/clients/ts/webpack.config.base.js @@ -20,7 +20,7 @@ module.exports = function (modulePath, browserBaseName, options) { target: options.target, resolveLoader: { // Special resolution rules for loaders (which are in the 'common' directory) - modules: [ path.resolve(__dirname, "common", "node_modules") ], + modules: [ path.resolve(__dirname, "@microsoft/common", "node_modules") ], }, module: { rules: [ From 09a7b3c396e921ecedbd46ec4d19a9f9d2345d42 Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 18 Oct 2024 15:30:38 -0700 Subject: [PATCH 4/4] whoops --- src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts | 2 +- src/SignalR/clients/ts/FunctionalTests/webpack.config.js | 2 +- src/SignalR/clients/ts/webpack.config.base.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts index 92036c9f65a1..6f0f49d3e1ee 100644 --- a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts @@ -209,7 +209,7 @@ function runJest(httpsUrl: string, httpUrl: string) { return 0; } - const jestPath = path.resolve(__dirname, "..", "..", "@microsoft/common", "node_modules", "jest", "bin", "jest.js"); + const jestPath = path.resolve(__dirname, "..", "..", "common", "node_modules", "jest", "bin", "jest.js"); const configPath = path.resolve(__dirname, "..", "func.jest.config.js"); console.log("Starting Node tests using Jest."); diff --git a/src/SignalR/clients/ts/FunctionalTests/webpack.config.js b/src/SignalR/clients/ts/FunctionalTests/webpack.config.js index 22761311337f..28830064f8bc 100644 --- a/src/SignalR/clients/ts/FunctionalTests/webpack.config.js +++ b/src/SignalR/clients/ts/FunctionalTests/webpack.config.js @@ -25,7 +25,7 @@ module.exports = { }, resolveLoader: { // Special resolution rules for loaders (which are in the 'common' directory) - modules: [ path.resolve(__dirname, "..", "@microsoft/common", "node_modules") ], + modules: [ path.resolve(__dirname, "..", "common", "node_modules") ], }, resolve: { extensions: [".ts", ".js"] diff --git a/src/SignalR/clients/ts/webpack.config.base.js b/src/SignalR/clients/ts/webpack.config.base.js index 5b4be67dfad3..0bf3a9d0ee1b 100644 --- a/src/SignalR/clients/ts/webpack.config.base.js +++ b/src/SignalR/clients/ts/webpack.config.base.js @@ -20,7 +20,7 @@ module.exports = function (modulePath, browserBaseName, options) { target: options.target, resolveLoader: { // Special resolution rules for loaders (which are in the 'common' directory) - modules: [ path.resolve(__dirname, "@microsoft/common", "node_modules") ], + modules: [ path.resolve(__dirname, "common", "node_modules") ], }, module: { rules: [