Merge remote-tracking branch 'origin/master' into ab/fix-1130

TypeStrong · Oct 31, 2020 · 518d8fa · 518d8fa
2 parents 71271c9 + a0f7aa1
commit 518d8fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -107,16 +107,19 @@ jobs:
             nodeFlag: 15
             typescript: latest
             typescriptFlag: latest
+            downgradeNpm: true
           - flavor: 12
             node: 15
             nodeFlag: 15
             typescript: 2.7
             typescriptFlag: 2_7
+            downgradeNpm: true
           - flavor: 13
             node: 15
             nodeFlag: 15
             typescript: next
             typescriptFlag: next
+            downgradeNpm: true
     steps:
       # checkout code
       - uses: actions/checkout@v2
@@ -126,6 +129,9 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       # lint, build, test
+        # Downgrade from npm 7 to 6 because 7 still seems buggy to me
+      - if: ${{ matrix.downgradeNpm }}
+        run: npm install -g npm@6
       - run: npm install
       - run: npm run build-nopack
       - name: Download package artifact

diff --git a/src/index.spec.ts b/src/index.spec.ts
@@ -926,7 +926,7 @@ describe('ts-node', function () {
         }, function (err, stdout, stderr) {
           expect(err).to.not.equal(null)
           // expect error from node's default resolver
-          expect(stderr).to.match(/Error \[ERR_UNSUPPORTED_ESM_URL_SCHEME\]:.*\n *at defaultResolve/)
+          expect(stderr).to.match(/Error \[ERR_UNSUPPORTED_ESM_URL_SCHEME\]:.*(?:\n.*){0,1}\n *at defaultResolve/)
           return done()
         })
       })