From e7b54668020ab2e313065888ca00dc557579b6bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Sep 2020 10:59:37 +0000 Subject: [PATCH 1/8] Bump http-proxy from 1.17.0 to 1.18.1 Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.17.0 to 1.18.1. - [Release notes](https://github.com/http-party/node-http-proxy/releases) - [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/http-party/node-http-proxy/compare/1.17.0...1.18.1) Signed-off-by: dependabot[bot] --- package-lock.json | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index bbaceca..2bbbd23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1025,12 +1025,6 @@ "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=", "dev": true }, - "eventemitter3": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", - "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==", - "dev": true - }, "events": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz", @@ -1821,14 +1815,22 @@ } }, "http-proxy": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { - "eventemitter3": "^3.0.0", + "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", "requires-port": "^1.0.0" + }, + "dependencies": { + "eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "dev": true + } } }, "http-server": { From c581e2f1f1ec1c7ac650f7d8af2f717ca31e39dd Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Mon, 19 Jul 2021 19:10:38 -0400 Subject: [PATCH 2/8] add gh actions ci --- .github/workflows/continuous-integration.yml | 128 +++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 .github/workflows/continuous-integration.yml diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml new file mode 100644 index 0000000..21b7b59 --- /dev/null +++ b/.github/workflows/continuous-integration.yml @@ -0,0 +1,128 @@ +name: Continuous Integration +on: + # branches pushed by collaborators + push: + branches: + - master + # pull request from non-collaborators + pull_request: {} + # nightly + schedule: + - cron: '0 0 * * *' +jobs: + build: + name: "Test: ${{ matrix.os }}, node ${{ matrix.node }}" + runs-on: ${{ matrix.os }}-latest + strategy: + fail-fast: false + matrix: + os: [ubuntu, windows] + node: + - 16 + - 14 + - 12 + - 10 + - 9 + - '8' + - '7' + - '6' + - '4' + - '0.12' + - '0.10' + steps: + # checkout code + - uses: actions/checkout@v2 + # install node + - name: Use Node.js ${{ matrix.os }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node }} + + # npm install with caching + - run: | + npm config set cache "$( node -p "process.cwd()" )/temp/npm-cache" + - name: Cache dependencies + uses: actions/cache@v2 + with: + path: temp/npm-cache + key: npm-cache-${{ matrix.os }} ${{ matrix.node }}-${{ hashFiles('package-lock.json') }} + # restore-keys: npm-cache-${{ matrix.os }} ${{ matrix.node }}- + - run: npm ci + + # # install version to test against + # - name: Use Node.js ${{ matrix.node }} + # uses: actions/setup-node@v1 + # with: + # node-version: ${{ matrix.node }} + + # Run tests + - run: npm test + + # test: + # needs: build + # name: "Test: ${{ matrix.os }}, node ${{ matrix.node }}" + # runs-on: ${{ matrix.os }}-latest + # strategy: + # fail-fast: false + # matrix: + # os: [ubuntu, windows] + # node: + # - 16 + # - 14 + # - 12 + # - 10 + # - 9 + # - '8' + # - '7' + # - '6' + # - '4' + # - '0.12' + # - '0.10' + # steps: + # # checkout code + # - uses: actions/checkout@v2 + # # install node + # - name: Use Node.js ${{ matrix.node }} + # uses: actions/setup-node@v1 + # 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 config set cache "$( node -p "process.cwd()" )/temp/npm-cache" + # - name: Cache dependencies + # uses: actions/cache@v2 + # with: + # path: temp/npm-cache + # key: npm-cache-${{ matrix.os }}-${{ hashFiles('package-lock.json') }} + # restore-keys: npm-cache-${{matrix.os }}- + # - run: npm ci --ignore-scripts + # - name: Upload npm logs + # if: ${{ failure() }} + # uses: actions/upload-artifact@v1 + # with: + # name: npm-logs + # path: temp/npm-cache/_logs + # - run: npm run build-tsc + # - name: Download package artifact + # uses: actions/download-artifact@v1 + # with: + # name: ts-node-packed.tgz + # path: tests/ + # - run: npm install typescript@${{ matrix.typescript }} --force + # - run: npm run test-cov + # - name: Upload npm logs + # if: ${{ failure() }} + # uses: actions/upload-artifact@v1 + # with: + # name: npm-logs-${{ matrix.os }}-node-${{ matrix.nodeFlag }}-typescript-${{ matrix.typescriptFlag }} + # path: temp/npm-cache/_logs + # - run: npm run coverage-report + # if: ${{ always() }} + # - name: Codecov + # if: ${{ always() }} + # uses: codecov/codecov-action@v1 + # with: + # flags: ${{ matrix.os }},node_${{ matrix.nodeFlag }},typescript_${{ matrix.typescriptFlag }} From 9ea5e6b2897b0c01402a6fd92d28e101f1b67788 Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Mon, 19 Jul 2021 19:14:20 -0400 Subject: [PATCH 3/8] try to fix tests --- test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.js b/test.js index ef7ad55..8635296 100644 --- a/test.js +++ b/test.js @@ -616,7 +616,7 @@ it('handleUncaughtExceptions is true with existing listener', function(done) { ]; fs.writeFileSync('.original.js', 'this is the original code'); - fs.writeFileSync('.generated.js.map', createSingleLineSourceMap()); + fs.writeFileSync('.generated.js.map', `${ createSingleLineSourceMap() }`); fs.writeFileSync('.generated.js', source.join('\n')); child_process.exec('node ./.generated', function(error, stdout, stderr) { From b3b71f9fce1908a59ba285edd0a8ff565be6185f Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Mon, 19 Jul 2021 19:19:55 -0400 Subject: [PATCH 4/8] fix --- test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.js b/test.js index 8635296..68e96b8 100644 --- a/test.js +++ b/test.js @@ -113,7 +113,7 @@ function compareStackTrace(sourceMap, source, expected) { function compareStdout(done, sourceMap, source, expected) { fs.writeFileSync('.original.js', 'this is the original code'); - fs.writeFileSync('.generated.js.map', sourceMap); + fs.writeFileSync('.generated.js.map', `${ sourceMap }`); fs.writeFileSync('.generated.js', source.join('\n') + '//@ sourceMappingURL=.generated.js.map'); child_process.exec('node ./.generated', function(error, stdout, stderr) { From 0fbbb8b24635e98aa38fe8912560a60ffc29d40e Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Mon, 19 Jul 2021 19:21:11 -0400 Subject: [PATCH 5/8] npm install to support old npm --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 21b7b59..2af48b7 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -47,7 +47,7 @@ jobs: path: temp/npm-cache key: npm-cache-${{ matrix.os }} ${{ matrix.node }}-${{ hashFiles('package-lock.json') }} # restore-keys: npm-cache-${{ matrix.os }} ${{ matrix.node }}- - - run: npm ci + - run: npm install # # install version to test against # - name: Use Node.js ${{ matrix.node }} From 4aa14556c62a6d2fd135c7bc29b2dc90b8d90500 Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Mon, 19 Jul 2021 19:23:15 -0400 Subject: [PATCH 6/8] fix --- test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.js b/test.js index 68e96b8..03471d6 100644 --- a/test.js +++ b/test.js @@ -86,7 +86,7 @@ function createMultiLineSourceMapWithSourcesContent() { function compareStackTrace(sourceMap, source, expected) { // Check once with a separate source map - fs.writeFileSync('.generated.js.map', sourceMap); + fs.writeFileSync('.generated.js.map', `${ sourceMap }`); fs.writeFileSync('.generated.js', 'exports.test = function() {' + source.join('\n') + '};//@ sourceMappingURL=.generated.js.map'); try { From c61afc524388950ab736cb2d175167a0bf35986a Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Mon, 19 Jul 2021 19:25:14 -0400 Subject: [PATCH 7/8] fix --- test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test.js b/test.js index 03471d6..8fb0a62 100644 --- a/test.js +++ b/test.js @@ -86,7 +86,7 @@ function createMultiLineSourceMapWithSourcesContent() { function compareStackTrace(sourceMap, source, expected) { // Check once with a separate source map - fs.writeFileSync('.generated.js.map', `${ sourceMap }`); + fs.writeFileSync('.generated.js.map', sourceMap.toString()); fs.writeFileSync('.generated.js', 'exports.test = function() {' + source.join('\n') + '};//@ sourceMappingURL=.generated.js.map'); try { @@ -113,7 +113,7 @@ function compareStackTrace(sourceMap, source, expected) { function compareStdout(done, sourceMap, source, expected) { fs.writeFileSync('.original.js', 'this is the original code'); - fs.writeFileSync('.generated.js.map', `${ sourceMap }`); + fs.writeFileSync('.generated.js.map', sourceMap.toString()); fs.writeFileSync('.generated.js', source.join('\n') + '//@ sourceMappingURL=.generated.js.map'); child_process.exec('node ./.generated', function(error, stdout, stderr) { @@ -616,7 +616,7 @@ it('handleUncaughtExceptions is true with existing listener', function(done) { ]; fs.writeFileSync('.original.js', 'this is the original code'); - fs.writeFileSync('.generated.js.map', `${ createSingleLineSourceMap() }`); + fs.writeFileSync('.generated.js.map', createSingleLineSourceMap().toString()); fs.writeFileSync('.generated.js', source.join('\n')); child_process.exec('node ./.generated', function(error, stdout, stderr) { From 98ac22f9e4113f0a3f0bef843b385e3fd6e282c0 Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Mon, 19 Jul 2021 19:31:06 -0400 Subject: [PATCH 8/8] disable node 0.10 tests --- .github/workflows/continuous-integration.yml | 77 +------------------- 1 file changed, 1 insertion(+), 76 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 2af48b7..54fd5d3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -28,7 +28,7 @@ jobs: - '6' - '4' - '0.12' - - '0.10' + # - '0.10' steps: # checkout code - uses: actions/checkout@v2 @@ -49,80 +49,5 @@ jobs: # restore-keys: npm-cache-${{ matrix.os }} ${{ matrix.node }}- - run: npm install - # # install version to test against - # - name: Use Node.js ${{ matrix.node }} - # uses: actions/setup-node@v1 - # with: - # node-version: ${{ matrix.node }} - # Run tests - run: npm test - - # test: - # needs: build - # name: "Test: ${{ matrix.os }}, node ${{ matrix.node }}" - # runs-on: ${{ matrix.os }}-latest - # strategy: - # fail-fast: false - # matrix: - # os: [ubuntu, windows] - # node: - # - 16 - # - 14 - # - 12 - # - 10 - # - 9 - # - '8' - # - '7' - # - '6' - # - '4' - # - '0.12' - # - '0.10' - # steps: - # # checkout code - # - uses: actions/checkout@v2 - # # install node - # - name: Use Node.js ${{ matrix.node }} - # uses: actions/setup-node@v1 - # 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 config set cache "$( node -p "process.cwd()" )/temp/npm-cache" - # - name: Cache dependencies - # uses: actions/cache@v2 - # with: - # path: temp/npm-cache - # key: npm-cache-${{ matrix.os }}-${{ hashFiles('package-lock.json') }} - # restore-keys: npm-cache-${{matrix.os }}- - # - run: npm ci --ignore-scripts - # - name: Upload npm logs - # if: ${{ failure() }} - # uses: actions/upload-artifact@v1 - # with: - # name: npm-logs - # path: temp/npm-cache/_logs - # - run: npm run build-tsc - # - name: Download package artifact - # uses: actions/download-artifact@v1 - # with: - # name: ts-node-packed.tgz - # path: tests/ - # - run: npm install typescript@${{ matrix.typescript }} --force - # - run: npm run test-cov - # - name: Upload npm logs - # if: ${{ failure() }} - # uses: actions/upload-artifact@v1 - # with: - # name: npm-logs-${{ matrix.os }}-node-${{ matrix.nodeFlag }}-typescript-${{ matrix.typescriptFlag }} - # path: temp/npm-cache/_logs - # - run: npm run coverage-report - # if: ${{ always() }} - # - name: Codecov - # if: ${{ always() }} - # uses: codecov/codecov-action@v1 - # with: - # flags: ${{ matrix.os }},node_${{ matrix.nodeFlag }},typescript_${{ matrix.typescriptFlag }}