Merge branch 'master' into always_restore_cache

Author: aminya

script/vsts/nightly-release.yml

@@ -1,15 +1,15 @@
 jobs:
   - job: GetReleaseVersion
     pool:
-      vmImage: 'windows-latest'
+      vmImage: 'ubuntu-latest'
     steps:
       # This has to be done separately because VSTS inexplicably
-      # exits the script block after `npm install` completes.
+      # exits the script block after `npm ci` completes.
       - script: |
-          cd script\vsts
-          npm install
-        displayName: npm install
-      - script: node script\vsts\get-release-version.js --nightly
+          cd script/vsts
+          npm ci
+        displayName: npm ci
+      - script: node script/vsts/get-release-version.js --nightly
         name: Version
         env:
           REPO_OWNER: $(REPO_OWNER)
@@ -23,7 +23,7 @@ jobs:
 
   - job: Release
     pool:
-      vmImage: vs2017-win2016
+      vmImage: 'ubuntu-latest'
 
     dependsOn:
       - GetReleaseVersion
@@ -38,11 +38,11 @@ jobs:
       - template: platforms/templates/preparation.yml
 
        #This has to be done separately because VSTS inexplicably
-       #exits the script block after `npm install` completes.
+       #exits the script block after `npm ci` completes.
       - script: |
-          cd script\vsts
-          npm install
-        displayName: npm install
+          cd script/vsts
+          npm ci
+        displayName: npm ci
 
       - task: DownloadBuildArtifacts@0
         inputs:
@@ -51,7 +51,7 @@ jobs:
         displayName: Download Release Artifacts
 
       - script: |
-          node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom"
+          node $(Build.SourcesDirectory)/script/vsts/upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom"
         env:
           GITHUB_TOKEN: $(GITHUB_TOKEN)
           ATOM_RELEASE_VERSION: $(ReleaseVersion)
@@ -77,8 +77,8 @@ jobs:
 
       - script: |
           cd script/lib
-          npm install
-        displayName: npm install
+          npm ci
+        displayName: npm ci
       - script: |
           cd script/lib/update-dependency
           node index.js

script/vsts/pull-requests.yml

@@ -3,15 +3,15 @@ trigger: none # No CI builds, only PR builds
 jobs:
   - job: GetReleaseVersion
     pool:
-      vmImage: 'windows-latest'
+      vmImage: 'ubuntu-latest'
     steps:
       # This has to be done separately because VSTS inexplicably
-      # exits the script block after `npm install` completes.
+      # exits the script block after `npm ci` completes.
       - script: |
-          cd script\vsts
-          npm install
-        displayName: npm install
-      - script: node script\vsts\get-release-version.js
+          cd script/vsts
+          npm ci
+        displayName: npm ci
+      - script: node script/vsts/get-release-version.js
         name: Version
         env:
           REPO_OWNER: $(REPO_OWNER)

script/vsts/release-branch-build.yml

@@ -7,15 +7,15 @@ pr: none # no PR triggers
 jobs:
   - job: GetReleaseVersion
     pool:
-      vmImage: 'windows-latest'
+      vmImage: 'ubuntu-latest'
     steps:
       # This has to be done separately because VSTS inexplicably
-      # exits the script block after `npm install` completes.
+      # exits the script block after `npm ci` completes.
       - script: |
-          cd script\vsts
-          npm install
-        displayName: npm install
-      - script: node script\vsts\get-release-version.js
+          cd script/vsts
+          npm ci
+        displayName: npm ci
+      - script: node script/vsts/get-release-version.js
         name: Version
         env:
           REPO_OWNER: $(REPO_OWNER)
@@ -28,7 +28,7 @@ jobs:
 
   - job: UploadArtifacts
     pool:
-      vmImage: vs2017-win2016
+      vmImage: 'ubuntu-latest'
 
     dependsOn:
       - GetReleaseVersion
@@ -42,16 +42,14 @@ jobs:
       IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
     steps:
-      - template: platforms/templates/preparation.yml
-
       # This has to be done separately because VSTS inexplicably
-      # exits the script block after `npm install` completes.
+      # exits the script block after `npm ci` completes.
       - script: |
-          cd script\vsts
-          npm install
+          cd script/vsts
+          npm ci
         env:
           GITHUB_TOKEN: $(GITHUB_TOKEN)
-        displayName: npm install
+        displayName: npm ci
 
       - task: DownloadBuildArtifacts@0
         inputs:
@@ -60,7 +58,7 @@ jobs:
         displayName: Download Release Artifacts
 
       - script: |
-          node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom-staging"
+          node $(Build.SourcesDirectory)/script/vsts/upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom-staging"
         env:
           GITHUB_TOKEN: $(GITHUB_TOKEN)
           ATOM_RELEASE_VERSION: $(ReleaseVersion)
@@ -75,7 +73,7 @@ jobs:
         condition: and(succeeded(), eq(variables['Atom.AutoDraftRelease'], 'true'), eq(variables['IsReleaseBranch'], 'true'))
 
       - script: |
-          node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --assets-path "$(System.ArtifactsDirectory)" --s3-path "vsts-artifacts/$(Build.BuildId)/"
+          node $(Build.SourcesDirectory)/script/vsts/upload-artifacts.js --assets-path "$(System.ArtifactsDirectory)" --s3-path "vsts-artifacts/$(Build.BuildId)/"
         env:
           ATOM_RELEASE_VERSION: $(ReleaseVersion)
           ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)

src/package.js

@@ -881,8 +881,9 @@ module.exports = class Package {
   requireMainModule() {
     if (this.bundledPackage && this.packageManager.packagesCache[this.name]) {
       if (this.packageManager.packagesCache[this.name].main) {
-        this.mainModule = require(this.packageManager.packagesCache[this.name]
-          .main);
+        this.mainModule = this._require(
+          this.packageManager.packagesCache[this.name].main
+        );
         return this.mainModule;
       }
     } else if (this.mainModuleRequired) {
@@ -904,7 +905,7 @@ module.exports = class Package {
 
         const previousViewProviderCount = this.viewRegistry.getViewProviderCount();
         const previousDeserializerCount = this.deserializerManager.getDeserializerCount();
-        this.mainModule = require(mainModulePath);
+        this.mainModule = this._require(mainModulePath);
         if (
           this.viewRegistry.getViewProviderCount() ===
             previousViewProviderCount &&
@@ -921,6 +922,27 @@ module.exports = class Package {
     }
   }
 
+  // a require function with both ES5 and ES6 default export support
+  _require(path) {
+    const modul = require(path);
+    if (modul === null || modul === undefined) {
+      // if null do not bother
+      return modul;
+    } else {
+      if (
+        modul.__esModule === true &&
+        typeof modul.default === 'object' &&
+        typeof modul.default.activate === 'function'
+      ) {
+        // __esModule flag is true and the activate function exists inside it, which means
+        // an object containing the main functions (e.g. activate, etc) is default exported
+        return modul.default;
+      } else {
+        return modul;
+      }
+    }
+  }
+
   getMainModulePath() {
     if (this.resolvedMainModulePath) return this.mainModulePath;
     this.resolvedMainModulePath = true;