Implement NLS without AMD loader (microsoft#214588)

aaronchucarroll · Jul 10, 2024 · f3e65f0 · f3e65f0
1 parent e197710
commit f3e65f0
Show file tree

Hide file tree

Showing 54 changed files with 1,490 additions and 1,499 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1015,10 +1015,6 @@
 							"vs/base/common/*"
 						]
 					},
-					{
-						"target": "src/vs/workbench/{workbench.desktop.main.nls.js,workbench.web.main.nls.js}",
-						"restrictions": []
-					},
 					{
 						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts,nls.build.ts,nls.mock.ts}",
 						"restrictions": []

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -40,8 +40,6 @@
 		"**/Cargo.lock": true,
 		"src/vs/workbench/workbench.web.main.css": true,
 		"src/vs/workbench/workbench.desktop.main.css": true,
-		"src/vs/workbench/workbench.desktop.main.nls.js": true,
-		"src/vs/workbench/workbench.web.main.nls.js": true,
 		"build/**/*.js": true,
 		"out/**": true,
 		"out-build/**": true,

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
@@ -216,104 +216,105 @@ extends:
                 parameters:
                   VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
 
-      - stage: CompileCLI
-        dependsOn: []
-        jobs:
-          - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
-            - job: CLILinuxX64
-              pool:
-                name: 1es-ubuntu-20.04-x64
-                os: linux
-              steps:
-                - template: build/azure-pipelines/linux/cli-build-linux.yml@self
-                  parameters:
-                    VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_LINUX: ${{ parameters.VSCODE_BUILD_LINUX }}
-
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), or(eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true))) }}:
-            - job: CLILinuxGnuARM
-              pool:
-                name: 1es-ubuntu-20.04-x64
-                os: linux
-              steps:
-                - template: build/azure-pipelines/linux/cli-build-linux.yml@self
-                  parameters:
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_LINUX_ARMHF: ${{ parameters.VSCODE_BUILD_LINUX_ARMHF }}
-                    VSCODE_BUILD_LINUX_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ARM64 }}
-
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
-            - job: CLIAlpineX64
-              pool:
-                name: 1es-ubuntu-20.04-x64
-                os: linux
-              steps:
-                - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
-                  parameters:
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_ALPINE: ${{ parameters.VSCODE_BUILD_ALPINE }}
-
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}:
-            - job: CLIAlpineARM64
-              pool:
-                name: 1es-mariner-2.0-arm64
-                os: linux
-                hostArchitecture: arm64
-              container: ubuntu-2004-arm64
-              steps:
-                - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
-                  parameters:
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_ALPINE_ARM64 }}
-
-          - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
-            - job: CLIMacOSX64
-              pool:
-                name: Azure Pipelines
-                image: macOS-13
-                os: macOS
-              steps:
-                - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
-                  parameters:
-                    VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_MACOS: ${{ parameters.VSCODE_BUILD_MACOS }}
-
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
-            - job: CLIMacOSARM64
-              pool:
-                name: Azure Pipelines
-                image: macOS-13
-                os: macOS
-              steps:
-                - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
-                  parameters:
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_MACOS_ARM64: ${{ parameters.VSCODE_BUILD_MACOS_ARM64 }}
-
-          - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}:
-            - job: CLIWindowsX64
-              pool:
-                name: 1es-windows-2019-x64
-                os: windows
-              steps:
-                - template: build/azure-pipelines/win32/cli-build-win32.yml@self
-                  parameters:
-                    VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_WIN32: ${{ parameters.VSCODE_BUILD_WIN32 }}
-
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
-            - job: CLIWindowsARM64
-              pool:
-                name: 1es-windows-2019-x64
-                os: windows
-              steps:
-                - template: build/azure-pipelines/win32/cli-build-win32.yml@self
-                  parameters:
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }}
+      - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+        - stage: CompileCLI
+          dependsOn: []
+          jobs:
+            - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
+              - job: CLILinuxX64
+                pool:
+                  name: 1es-ubuntu-20.04-x64
+                  os: linux
+                steps:
+                  - template: build/azure-pipelines/linux/cli-build-linux.yml@self
+                    parameters:
+                      VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_LINUX: ${{ parameters.VSCODE_BUILD_LINUX }}
+
+            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), or(eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true))) }}:
+              - job: CLILinuxGnuARM
+                pool:
+                  name: 1es-ubuntu-20.04-x64
+                  os: linux
+                steps:
+                  - template: build/azure-pipelines/linux/cli-build-linux.yml@self
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_LINUX_ARMHF: ${{ parameters.VSCODE_BUILD_LINUX_ARMHF }}
+                      VSCODE_BUILD_LINUX_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ARM64 }}
+
+            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
+              - job: CLIAlpineX64
+                pool:
+                  name: 1es-ubuntu-20.04-x64
+                  os: linux
+                steps:
+                  - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ALPINE: ${{ parameters.VSCODE_BUILD_ALPINE }}
+
+            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}:
+              - job: CLIAlpineARM64
+                pool:
+                  name: 1es-mariner-2.0-arm64
+                  os: linux
+                  hostArchitecture: arm64
+                container: ubuntu-2004-arm64
+                steps:
+                  - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_ALPINE_ARM64 }}
+
+            - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
+              - job: CLIMacOSX64
+                pool:
+                  name: Azure Pipelines
+                  image: macOS-13
+                  os: macOS
+                steps:
+                  - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
+                    parameters:
+                      VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_MACOS: ${{ parameters.VSCODE_BUILD_MACOS }}
+
+            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
+              - job: CLIMacOSARM64
+                pool:
+                  name: Azure Pipelines
+                  image: macOS-13
+                  os: macOS
+                steps:
+                  - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_MACOS_ARM64: ${{ parameters.VSCODE_BUILD_MACOS_ARM64 }}
+
+            - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}:
+              - job: CLIWindowsX64
+                pool:
+                  name: 1es-windows-2019-x64
+                  os: windows
+                steps:
+                  - template: build/azure-pipelines/win32/cli-build-win32.yml@self
+                    parameters:
+                      VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_WIN32: ${{ parameters.VSCODE_BUILD_WIN32 }}
+
+            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+              - job: CLIWindowsARM64
+                pool:
+                  name: 1es-windows-2019-x64
+                  os: windows
+                steps:
+                  - template: build/azure-pipelines/win32/cli-build-win32.yml@self
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }}
 
       - stage: CustomSDL
         dependsOn: []
@@ -331,7 +332,8 @@ extends:
         - stage: Windows
           dependsOn:
             - Compile
-            - CompileCLI
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+              - CompileCLI
           pool:
             name: 1es-windows-2019-x64
             os: windows
@@ -422,7 +424,8 @@ extends:
         - stage: Linux
           dependsOn:
             - Compile
-            - CompileCLI
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+              - CompileCLI
           pool:
             name: 1es-ubuntu-20.04-x64
             os: linux
@@ -580,7 +583,8 @@ extends:
         - stage: Alpine
           dependsOn:
             - Compile
-            - CompileCLI
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+              - CompileCLI
           pool:
             name: 1es-ubuntu-20.04-x64
             os: linux
@@ -606,7 +610,8 @@ extends:
         - stage: macOS
           dependsOn:
             - Compile
-            - CompileCLI
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+              - CompileCLI
           pool:
             name: Azure Pipelines
             image: macOS-13

diff --git a/build/azure-pipelines/upload-nlsmetadata.js b/build/azure-pipelines/upload-nlsmetadata.js