Merge pull request #247 from atom-ide-community/upstream_master

Author: aminya

package-lock.json

@@ -135,7 +135,7 @@
     "open-on-github": "https://www.atom.io/api/packages/open-on-github/versions/1.3.2/tarball",
     "package-generator": "https://www.atom.io/api/packages/package-generator/versions/1.3.0/tarball",
     "pathwatcher": "8.1.0",
-    "postcss": "8.1.2",
+    "postcss": "8.1.3",
     "postcss-selector-parser": "6.0.4",
     "prebuild-install": "5.3.5",
     "property-accessors": "^1.1.3",
@@ -147,20 +147,20 @@
     "semver": "7.3.2",
     "service-hub": "^0.7.4",
     "settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.261.6/tarball",
-    "sinon": "9.2.0",
+    "sinon": "9.2.1",
     "snippets": "https://www.atom.io/api/packages/snippets/versions/1.5.1/tarball",
     "solarized-dark-syntax": "file:packages/solarized-dark-syntax",
     "solarized-light-syntax": "file:packages/solarized-light-syntax",
-    "spell-check": "https://www.atom.io/api/packages/spell-check/versions/0.76.1/tarball",
+    "spell-check": "https://www.atom.io/api/packages/spell-check/versions/0.76.2/tarball",
     "status-bar": "https://www.atom.io/api/packages/status-bar/versions/1.8.17/tarball",
     "styleguide": "https://www.atom.io/api/packages/styleguide/versions/0.49.12/tarball",
     "symbols-view": "https://www.atom.io/api/packages/symbols-view/versions/0.118.4/tarball",
     "tabs": "https://www.atom.io/api/packages/tabs/versions/0.110.0/tarball",
-    "temp": "^0.9.0",
+    "temp": "0.9.2",
     "text-buffer": "13.17.3",
     "timecop": "https://www.atom.io/api/packages/timecop/versions/0.36.2/tarball",
     "tree-sitter": "0.17.1",
-    "tree-view": "https://www.atom.io/api/packages/tree-view/versions/0.228.1/tarball",
+    "tree-view": "https://www.atom.io/api/packages/tree-view/versions/0.228.2/tarball",
     "typescript-simple": "8.0.6",
     "update-package-dependencies": "file:./packages/update-package-dependencies",
     "vscode-ripgrep": "1.9.0",
@@ -219,13 +219,13 @@
     "package-generator": "1.3.0",
     "settings-view": "0.261.6",
     "snippets": "1.5.1",
-    "spell-check": "0.76.1",
+    "spell-check": "0.76.2",
     "status-bar": "1.8.17",
     "styleguide": "0.49.12",
     "symbols-view": "0.118.4",
     "tabs": "0.110.0",
     "timecop": "0.36.2",
-    "tree-view": "0.228.1",
+    "tree-view": "0.228.2",
     "update-package-dependencies": "file:./packages/update-package-dependencies",
     "welcome": "file:./packages/welcome",
     "whitespace": "0.37.7",

package.json

@@ -17,12 +17,7 @@ steps:
       }
 
       # Bootstrap
-      if (($env:AGENT_OS  -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) {
-        node 'script\vsts\windows-run.js' 'script\bootstrap.cmd'
-      }
-      else {
-        script/bootstrap
-      }
+      script/bootstrap
     displayName: Bootstrap build environment
     env:
       GITHUB_TOKEN: $(GITHUB_TOKEN)

script/vsts/platforms/templates/bootstrap.yml

@@ -29,11 +29,7 @@ steps:
 
       # Build
       $esc = '--%'
-      if (($env:AGENT_OS  -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) {
-        node 'script\vsts\windows-run.js' 'script\build.cmd' --no-bootstrap --compress-artifacts $esc $CodeSign $CreateWindowsInstallaer
-      } else {
-        script/build --no-bootstrap --compress-artifacts $esc $env:LinuxArgs $CodeSign $CreateWindowsInstallaer
-      }
+      script/build --no-bootstrap --compress-artifacts $esc $env:LinuxArgs $CodeSign $CreateWindowsInstallaer
     displayName: Build Atom
     env:
       GITHUB_TOKEN: $(GITHUB_TOKEN)

script/vsts/platforms/templates/build.yml

@@ -20,9 +20,19 @@ steps:
     condition: eq(variables['Agent.OS'], 'Linux')
 
   # Common
+  - pwsh: |
+      if ($env:BUILD_ARCH -eq "x86") {
+        echo "##vso[task.setvariable variable=IsWinX86]true"
+      }
+    displayName: Set "IsWinX86" based on "BUILD_ARCH"
+    # Convert "BUILD_ARCH" to a boolean ("IsWinX86") for the following NodeTool task.
+    # Templates evaluate too early for the matrix variable "BUILD_ARCH" to be available in ${{ template expressions }}.
+    # Scripts are interpreted at runtime, so "BUILD_ARCH" will be available to this script, and we can set "IsWinX86".
+
   - task: NodeTool@0
     inputs:
       versionSpec: 12.16.3
+      force32bit: $(IsWinX86)
     displayName: Install Node.js 12.16.3
 
   - script: npm install --global npm@6.14.8

script/vsts/platforms/templates/preparation.yml

@@ -10,8 +10,6 @@ steps:
       if ($env:AGENT_OS -eq "Darwin") {
         osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver
         caffeinate -s script/test # Run with caffeinate to prevent screen saver
-      } elseif (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) {
-        node 'script\vsts\windows-run.js' 'script\test.cmd'
       } else {
         script/test
       }
@@ -28,12 +26,7 @@ steps:
     condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
 
   # Test results
-  - pwsh: |
-      if (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) {
-        node 'script\vsts\windows-run.js' 'script\postprocess-junit-results.cmd' --search-folder "$env:TEST_JUNIT_XML_ROOT" --test-results-files "**/*.xml"
-      } else {
-        script/postprocess-junit-results --search-folder "$env:TEST_JUNIT_XML_ROOT" --test-results-files "**/*.xml"
-      }
+  - pwsh: script/postprocess-junit-results --search-folder "$env:TEST_JUNIT_XML_ROOT" --test-results-files "**/*.xml"
     env:
       TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit
     displayName: Post-process test results

script/vsts/platforms/templates/test.yml

@@ -108,8 +108,6 @@ jobs:
             $env:FileID=""
           }
           echo "##vso[task.setvariable variable=FileID]$env:FileID" # Azure syntax
-        env:
-          BUILD_ARCH: $(BUILD_ARCH)
         displayName: Set FileID based on the arch
 
       - template: templates/download-unzip.yml

script/vsts/platforms/windows.yml

@@ -0,0 +1,10 @@
+describe('"atom" protocol URL', () =>
+  it('sends the file relative in the package as response', function() {
+    let called = false;
+    const request = new XMLHttpRequest();
+    request.addEventListener('load', () => (called = true));
+    request.open('GET', 'atom://async/package.json', true);
+    request.send();
+
+    waitsFor('request to be done', () => called === true);
+  }));