Skip to content

Commit 1fa94ff

Browse files
authored
Merge pull request #7732 from MicrosoftDocs/main637817765373233518
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 42040ba + 99619cf commit 1fa94ff

26 files changed

+190
-430
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45945,6 +45945,11 @@
4594545945
"redirect_url": "/visualstudio/ide/tutorial-windows-forms-math-quiz-customize-ui",
4594645946
"redirect_document_id": false
4594745947
},
45948+
{
45949+
"source_path": "docs/ide/quickstart-nodejs.md",
45950+
"redirect_url": "/visualstudio/javascript/tutorial-nodejs",
45951+
"redirect_document_id": false
45952+
},
4594845953
{
4594945954
"source_path": "docs/ide/how-to-target-a-version-of-the-dotnet-framework.md",
4595045955
"redirect_url": "/visualstudio/ide/visual-studio-multi-targeting-overview",

docs/deployment/includes/quickstart-prereqs-azure.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

docs/deployment/includes/quickstart-prereqs.md

Lines changed: 0 additions & 30 deletions
This file was deleted.

docs/get-started/visual-studio-ide.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ If you're ready to dive into more coding, one of the following language-specific
3737

3838
- [Use Visual Studio to create your first F# web app](../ide/quickstart-fsharp.md)
3939

40-
- [Use Visual Studio to create your first Node.js app](../ide/quickstart-nodejs.md)
41-
4240
- [Use Visual Studio to create your first C++ console app](/cpp/get-started/tutorial-console-cpp)
4341

42+
Another good place to start with coding is a tutorial:
43+
44+
- [Create a Node.js and Express app in Visual Studio](../javascript/tutorial-nodejs.md)
45+
4446
## See also
4547

4648
- Discover [more Visual Studio features](../ide/advanced-feature-overview.md).

docs/ide/index-writing-code.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@ landingContent:
7070
url: ../get-started/csharp/tutorial-console.md
7171
- text: Create a console app with Visual Basic
7272
url: ../get-started/visual-basic/tutorial-console.md
73-
- text: Create a web app with Node.js
74-
url: quickstart-nodejs.md
73+
- text: Create a Node.js and Express app
74+
url: ../javascript/tutorial-nodejs.md
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

docs/ide/quickstart-nodejs.md

Lines changed: 0 additions & 212 deletions
This file was deleted.

docs/javascript/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
items:
99
- name: First look at the Visual Studio IDE
1010
href: quickstart-ide-orientation-js.md
11-
- name: Create a Node.js project
12-
href: ../ide/quickstart-nodejs.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json
1311
- name: Create a Vue.js project
1412
href: quickstart-vuejs-with-nodejs.md
1513
- name: Create a React app

docs/javascript/compile-typescript-code-npm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For ASP.NET Core projects, it's recommended that you use the [NuGet package](../
2525

2626
The [TypeScript npm package](https://www.npmjs.com/package/typescript) adds TypeScript support. When the npm package for TypeScript 2.1 or higher is installed into your project, the corresponding version of the TypeScript language service gets loaded in the editor.
2727

28-
1. [Follow instructions](../ide/quickstart-nodejs.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json) to install the Node.js development workload and the Node.js runtime.
28+
1. [Follow instructions](./tutorial-nodejs.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json) to install the Node.js development workload and the Node.js runtime.
2929

3030
For a simple Visual Studio integration, create your project using one of the Node.js TypeScript templates, such as the Blank Node.js Web Application template. Else, use either a Node.js JavaScript template included with Visual Studio and follow instructions here. Or, use an [Open Folder](../javascript/develop-javascript-code-without-solutions-projects.md) project.
3131

@@ -113,7 +113,7 @@ The [TypeScript npm package](https://www.npmjs.com/package/typescript) adds Type
113113

114114
### Run the application
115115

116-
For instructions to run the app after you compile it, see [Create your first Node.js app](../ide/quickstart-nodejs.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json#run-the-app).
116+
For instructions to run the app after you compile it, see [Create a Node.js and Express app](./tutorial-nodejs.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json#run-the-app).
117117

118118
## Automate build tasks
119119

docs/javascript/compile-typescript-code-nuget.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ If you run into issues where Visual Studio is using a version of Node.js or a th
105105

106106
### Run the application
107107

108-
For instructions to run the app after you compile it, see [Create your first Node.js app](/visualstudio/ide/quickstart-nodejs?toc=%2Fvisualstudio%2Fjavascript%2Ftoc.json#run-the-application).
108+
For instructions to run the app after you compile it, see [Create a Node.js and Express app](./tutorial-nodejs.md?toc=%2Fvisualstudio%2Fjavascript%2Ftoc.json#run-the-app).
109109

110110
### NuGet package structure details
111111

Loading
Loading

docs/javascript/npm-package-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ These features work together and synchronize with the project system and the *pa
6161

6262
### Prerequisites
6363

64-
You need the **Node.js development** workload and the Node.js runtime installed to add npm support to your project. For detailed steps, see [Create a Node.js project](../ide/quickstart-nodejs.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json).
64+
You need the **Node.js development** workload and the Node.js runtime installed to add npm support to your project. For detailed steps, see [Create a Node.js and Express app](./tutorial-nodejs.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json).
6565

6666
> [!NOTE]
6767
> For existing Node.js projects, use the **From existing Node.js code** solution template or the [Open folder (Node.js)](../javascript/develop-javascript-code-without-solutions-projects.md) project type to enable npm in your project.

docs/javascript/publish-nodejs-app-azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ In this tutorial, you learn how to:
4545

4646
If you need to install the workload but already have Visual Studio, go to **Tools** > **Get Tools and Features...**, which opens the Visual Studio Installer. Choose the **Node.js development** workload, then choose **Modify**.
4747

48-
![Node.js workload in VS Installer](../ide/media/quickstart-nodejs-workload.png)
48+
![Node.js workload in VS Installer](./media/tutorial-nodejs-workload.png)
4949

5050
* You must have the Node.js runtime installed.
5151

0 commit comments

Comments
 (0)