diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index e54ba7421f..a5941f68d5 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -23,14 +23,47 @@ jobs: analyze-ref-input: strategy: matrix: - version: - - stable-20210308 - - stable-20210319 - - stable-20210809 - - cached - - latest - - nightly-latest - os: [ubuntu-latest, macos-latest, windows-2019] + include: + - os: ubuntu-latest + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: windows-2019 + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: windows-2019 + version: stable-20210319 + - os: ubuntu-latest + version: stable-20210809 + - os: macos-latest + version: stable-20210809 + - os: windows-2019 + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: windows-2019 + version: cached + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: windows-2019 + version: latest + - os: windows-2022 + version: latest + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest + - os: windows-2019 + version: nightly-latest + - os: windows-2022 + version: nightly-latest name: "Analyze: 'ref' and 'sha' from inputs" runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__debug-artifacts.yml b/.github/workflows/__debug-artifacts.yml index 063b7cc0ac..03d8e0130f 100644 --- a/.github/workflows/__debug-artifacts.yml +++ b/.github/workflows/__debug-artifacts.yml @@ -23,14 +23,31 @@ jobs: debug-artifacts: strategy: matrix: - version: - - stable-20210308 - - stable-20210319 - - stable-20210809 - - cached - - latest - - nightly-latest - os: [ubuntu-latest, macos-latest] + include: + - os: ubuntu-latest + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: ubuntu-latest + version: stable-20210809 + - os: macos-latest + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest name: Debug artifact upload runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index dd916d5684..65dd886ddc 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -23,8 +23,9 @@ jobs: extractor-ram-threads: strategy: matrix: - version: [latest] - os: [ubuntu-latest] + include: + - os: ubuntu-latest + version: latest name: Extractor ram and threads options test runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index f84249b23d..46d1a2f301 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -23,14 +23,47 @@ jobs: go-custom-queries: strategy: matrix: - version: - - stable-20210308 - - stable-20210319 - - stable-20210809 - - cached - - latest - - nightly-latest - os: [ubuntu-latest, macos-latest, windows-2019] + include: + - os: ubuntu-latest + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: windows-2019 + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: windows-2019 + version: stable-20210319 + - os: ubuntu-latest + version: stable-20210809 + - os: macos-latest + version: stable-20210809 + - os: windows-2019 + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: windows-2019 + version: cached + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: windows-2019 + version: latest + - os: windows-2022 + version: latest + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest + - os: windows-2019 + version: nightly-latest + - os: windows-2022 + version: nightly-latest name: 'Go: Custom queries' runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__go-custom-tracing-autobuild.yml b/.github/workflows/__go-custom-tracing-autobuild.yml index 427cbe5bf1..66fd994b96 100644 --- a/.github/workflows/__go-custom-tracing-autobuild.yml +++ b/.github/workflows/__go-custom-tracing-autobuild.yml @@ -23,14 +23,31 @@ jobs: go-custom-tracing-autobuild: strategy: matrix: - version: - - stable-20210308 - - stable-20210319 - - stable-20210809 - - cached - - latest - - nightly-latest - os: [ubuntu-latest, macos-latest] + include: + - os: ubuntu-latest + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: ubuntu-latest + version: stable-20210809 + - os: macos-latest + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest name: 'Go: Autobuild custom tracing' runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__go-custom-tracing.yml b/.github/workflows/__go-custom-tracing.yml index 6f6b57fe41..940040c749 100644 --- a/.github/workflows/__go-custom-tracing.yml +++ b/.github/workflows/__go-custom-tracing.yml @@ -23,14 +23,47 @@ jobs: go-custom-tracing: strategy: matrix: - version: - - stable-20210308 - - stable-20210319 - - stable-20210809 - - cached - - latest - - nightly-latest - os: [ubuntu-latest, macos-latest, windows-2019] + include: + - os: ubuntu-latest + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: windows-2019 + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: windows-2019 + version: stable-20210319 + - os: ubuntu-latest + version: stable-20210809 + - os: macos-latest + version: stable-20210809 + - os: windows-2019 + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: windows-2019 + version: cached + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: windows-2019 + version: latest + - os: windows-2022 + version: latest + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest + - os: windows-2019 + version: nightly-latest + - os: windows-2022 + version: nightly-latest name: 'Go: Custom tracing' runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 44260b80bc..c8e544c6f9 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -23,8 +23,13 @@ jobs: javascript-source-root: strategy: matrix: - version: [latest, cached, nightly-latest] # This feature is not compatible with old CLIs - os: [ubuntu-latest] + include: + - os: ubuntu-latest + version: latest + - os: ubuntu-latest + version: cached + - os: ubuntu-latest + version: nightly-latest name: Custom source root runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index be7295123b..6e93758a21 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -23,14 +23,31 @@ jobs: multi-language-autodetect: strategy: matrix: - version: - - stable-20210308 - - stable-20210319 - - stable-20210809 - - cached - - latest - - nightly-latest - os: [ubuntu-latest, macos-latest] + include: + - os: ubuntu-latest + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: ubuntu-latest + version: stable-20210809 + - os: macos-latest + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest name: Multi-language repository runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index 824a0041b7..cf93974bb9 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -23,8 +23,11 @@ jobs: packaging-config-inputs-js: strategy: matrix: - version: [nightly-20210831] # This CLI version is known to work with package used in this test - os: [ubuntu-latest, macos-latest] + include: + - os: ubuntu-latest + version: nightly-20210831 + - os: macos-latest + version: nightly-20210831 name: 'Packaging: Config and input' runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 0a2ece98aa..cd4fb2f56f 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -23,8 +23,11 @@ jobs: packaging-config-js: strategy: matrix: - version: [nightly-20210831] # This CLI version is known to work with package used in this test - os: [ubuntu-latest, macos-latest] + include: + - os: ubuntu-latest + version: nightly-20210831 + - os: macos-latest + version: nightly-20210831 name: 'Packaging: Config file' runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index 686d6f32f9..47878ca93f 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -23,8 +23,11 @@ jobs: packaging-inputs-js: strategy: matrix: - version: [nightly-20210831] # This CLI version is known to work with package used in this test - os: [ubuntu-latest, macos-latest] + include: + - os: ubuntu-latest + version: nightly-20210831 + - os: macos-latest + version: nightly-20210831 name: 'Packaging: Action input' runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index 8b972b000c..fb01ff0dcf 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -23,14 +23,47 @@ jobs: remote-config: strategy: matrix: - version: - - stable-20210308 - - stable-20210319 - - stable-20210809 - - cached - - latest - - nightly-latest - os: [ubuntu-latest, macos-latest, windows-2019] + include: + - os: ubuntu-latest + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: windows-2019 + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: windows-2019 + version: stable-20210319 + - os: ubuntu-latest + version: stable-20210809 + - os: macos-latest + version: stable-20210809 + - os: windows-2019 + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: windows-2019 + version: cached + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: windows-2019 + version: latest + - os: windows-2022 + version: latest + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest + - os: windows-2019 + version: nightly-latest + - os: windows-2022 + version: nightly-latest name: Remote config file runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index 8d36e4c226..2df8aee56d 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -23,14 +23,19 @@ jobs: rubocop-multi-language: strategy: matrix: - version: - - stable-20210308 - - stable-20210319 - - stable-20210809 - - cached - - latest - - nightly-latest - os: [ubuntu-latest] + include: + - os: ubuntu-latest + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: ubuntu-latest + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: ubuntu-latest + version: latest + - os: ubuntu-latest + version: nightly-latest name: RuboCop multi-language runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index dc9d411167..381e805450 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -23,8 +23,11 @@ jobs: split-workflow: strategy: matrix: - version: [nightly-20210831] # This CLI version is known to work with package used in this test - os: [ubuntu-latest, macos-latest] + include: + - os: ubuntu-latest + version: nightly-20210831 + - os: macos-latest + version: nightly-20210831 name: Split workflow runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index c2e067cd55..46cf62f61e 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -23,8 +23,9 @@ jobs: test-local-codeql: strategy: matrix: - version: [nightly-latest] - os: [ubuntu-latest] + include: + - os: ubuntu-latest + version: nightly-latest name: Local CodeQL bundle runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 582104acd0..e0a491e3cf 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -23,8 +23,9 @@ jobs: test-proxy: strategy: matrix: - version: [latest] - os: [ubuntu-latest] + include: + - os: ubuntu-latest + version: latest name: Proxy test runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__test-ruby.yml b/.github/workflows/__test-ruby.yml index 03979f1300..7cb4b9a866 100644 --- a/.github/workflows/__test-ruby.yml +++ b/.github/workflows/__test-ruby.yml @@ -23,8 +23,19 @@ jobs: test-ruby: strategy: matrix: - version: [latest, cached, nightly-latest] - os: [ubuntu-latest, macos-latest] + include: + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest name: Ruby analysis runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index 0eaaf57217..ba8320632b 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -23,14 +23,19 @@ jobs: unset-environment: strategy: matrix: - version: - - stable-20210308 - - stable-20210319 - - stable-20210809 - - cached - - latest - - nightly-latest - os: [ubuntu-latest] + include: + - os: ubuntu-latest + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: ubuntu-latest + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: ubuntu-latest + version: latest + - os: ubuntu-latest + version: nightly-latest name: Test unsetting environment variables runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 6cbdc1b6de..264a551e64 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -23,14 +23,47 @@ jobs: upload-ref-sha-input: strategy: matrix: - version: - - stable-20210308 - - stable-20210319 - - stable-20210809 - - cached - - latest - - nightly-latest - os: [ubuntu-latest, macos-latest, windows-2019] + include: + - os: ubuntu-latest + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: windows-2019 + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: windows-2019 + version: stable-20210319 + - os: ubuntu-latest + version: stable-20210809 + - os: macos-latest + version: stable-20210809 + - os: windows-2019 + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: windows-2019 + version: cached + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: windows-2019 + version: latest + - os: windows-2022 + version: latest + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest + - os: windows-2019 + version: nightly-latest + - os: windows-2022 + version: nightly-latest name: "Upload-sarif: 'ref' and 'sha' from inputs" runs-on: ${{ matrix.os }} steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 84ee35abce..23fb0a5566 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CodeQL Action and CodeQL Runner Changelog +## 1.1.4 - 07 Mar 2022 + +- Update default CodeQL bundle version to 2.8.2. [#950](https://github.com/github/codeql-action/pull/950) +- Fix a bug where old results can be uploaded if the languages in a repository change when using a non-ephemeral self-hosted runner. [#955](https://github.com/github/codeql-action/pull/955) + ## 1.1.3 - 23 Feb 2022 - Fix bug where the CLR traces can continue tracing even after tracing should be stopped. [#938](https://github.com/github/codeql-action/pull/938) diff --git a/README.md b/README.md index 6f0d86b247..4ea98552d7 100644 --- a/README.md +++ b/README.md @@ -146,4 +146,4 @@ The very first time code scanning is run and if it is on a pull request, you wil After code scanning has analyzed the code in a pull request, it needs to compare the analysis of the topic branch (the merge commit of the branch you used to create the pull request) with the analysis of the base branch (the branch into which you want to merge the pull request). This allows code scanning to compute which alerts are newly introduced by the pull request, which alerts were already present in the base branch, and whether any existing alerts are fixed by the changes in the pull request. Initially, if you use a pull request to add code scanning to a repository, the base branch has not yet been analyzed, so it's not possible to compute these details. In this case, when you click through from the results check on the pull request you will see the "Missing analysis for base commit SHA-HASH" message. -For more information and other causes of this message, see [Reasons for the "missing analysis" message](https://docs.github.com/en/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository#reasons-for-the-missing-analysis-message) +For more information and other causes of this message, see [Reasons for the "Analysis not found" message](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository#reasons-for-the-analysis-not-found-message) diff --git a/lib/actions-util.js b/lib/actions-util.js index 2102ab64a7..8e88e1070d 100644 --- a/lib/actions-util.js +++ b/lib/actions-util.js @@ -21,6 +21,7 @@ var __importStar = (this && this.__importStar) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); exports.sanitizeArifactName = exports.isAnalyzingDefaultBranch = exports.getRelativeScriptPath = exports.isRunningLocalAction = exports.sendStatusReport = exports.createStatusReportBase = exports.getActionsStatus = exports.getRef = exports.computeAutomationID = exports.getAutomationID = exports.getAnalysisKey = exports.getWorkflowRunID = exports.getWorkflow = exports.formatWorkflowCause = exports.formatWorkflowErrors = exports.validateWorkflow = exports.getWorkflowErrors = exports.WorkflowErrors = exports.patternIsSuperset = exports.determineMergeBaseCommitOid = exports.getCommitOid = exports.getToolCacheDirectory = exports.getTemporaryDirectory = exports.getOptionalInput = exports.getRequiredInput = void 0; const fs = __importStar(require("fs")); +const os = __importStar(require("os")); const path = __importStar(require("path")); const core = __importStar(require("@actions/core")); const toolrunner = __importStar(require("@actions/exec/lib/toolrunner")); @@ -498,6 +499,8 @@ async function createStatusReportBase(actionName, status, actionStartedAt, cause workflowStartedAt = actionStartedAt.toISOString(); core.exportVariable(sharedEnv.CODEQL_WORKFLOW_STARTED_AT, workflowStartedAt); } + const runnerOs = (0, util_1.getRequiredEnvParam)("RUNNER_OS"); + const runnerArch = (0, util_1.getRequiredEnvParam)("RUNNER_ARCH"); // If running locally then the GITHUB_ACTION_REF cannot be trusted as it may be for the previous action // See https://github.com/actions/runner/issues/803 const actionRef = isRunningLocalAction() @@ -516,6 +519,8 @@ async function createStatusReportBase(actionName, status, actionStartedAt, cause started_at: workflowStartedAt, action_started_at: actionStartedAt.toISOString(), status, + runner_os: runnerOs, + runner_arch: runnerArch, }; // Add optional parameters if (cause) { @@ -534,6 +539,9 @@ async function createStatusReportBase(actionName, status, actionStartedAt, cause if (matrix) { statusReport.matrix_vars = matrix; } + if (runnerOs === "Windows" || runnerOs === "macOS") { + statusReport.runner_os_release = os.release(); + } return statusReport; } exports.createStatusReportBase = createStatusReportBase; diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map index e74d66f57c..6170adf24b 100644 --- a/lib/actions-util.js.map +++ b/lib/actions-util.js.map @@ -1 +1 @@ -{"version":3,"file":"actions-util.js","sourceRoot":"","sources":["../src/actions-util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAE7B,oDAAsC;AACtC,yEAA2D;AAC3D,kEAAoD;AACpD,8CAAgC;AAEhC,kDAAoC;AACpC,gEAAkD;AAClD,iCAKgB;AAEhB;;;GAGG;AAEH;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AACjD,CAAC;AAFD,4CAEC;AAED;;;;;;GAMG;AACI,MAAM,gBAAgB,GAAG,UAAU,IAAY;IACpD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9C,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B;AAEF,SAAgB,qBAAqB;IACnC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAChD,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAA,0BAAmB,EAAC,aAAa,CAAC,CAAC;AACzC,CAAC;AALD,sDAKC;AAED,SAAgB,qBAAqB;IACnC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACtD,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,CAAC;AAC/C,CAAC;AALD,sDAKC;AAED;;GAEG;AACI,MAAM,YAAY,GAAG,KAAK,WAAW,GAAG,GAAG,MAAM;IACtD,mEAAmE;IACnE,8EAA8E;IAC9E,6EAA6E;IAC7E,4EAA4E;IAC5E,2DAA2D;IAC3D,wEAAwE;IACxE,gCAAgC;IAChC,IAAI;QACF,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,MAAM,IAAI,UAAU,CAAC,UAAU,CAC7B,MAAM,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAChC,CAAC,WAAW,EAAE,GAAG,CAAC,EAClB;YACE,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE;gBACT,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACf,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC/B,CAAC;gBACD,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;aACF;SACF,CACF,CAAC,IAAI,EAAE,CAAC;QACT,OAAO,SAAS,CAAC,IAAI,EAAE,CAAC;KACzB;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,IAAI,CACP,6FAA6F,CAAC,EAAE,CACjG,CAAC;QACF,IAAI,CAAC,IAAI,CAAE,CAAW,CAAC,KAAK,IAAI,UAAU,CAAC,CAAC;QAC5C,OAAO,IAAA,wBAAgB,EAAC,KAAK,CAAC,IAAI,IAAA,0BAAmB,EAAC,YAAY,CAAC,CAAC;KACrE;AACH,CAAC,CAAC;AAjCW,QAAA,YAAY,gBAiCvB;AAEF;;;GAGG;AACI,MAAM,2BAA2B,GAAG,KAAK;IAG9C,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,cAAc,EAAE;QACpD,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,QAAQ,GAAG,IAAA,0BAAmB,EAAC,YAAY,CAAC,CAAC;IAEnD,IAAI;QACF,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,OAAO,GAAG,EAAE,CAAC;QAEjB,MAAM,IAAI,UAAU,CAAC,UAAU,CAC7B,MAAM,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAChC,CAAC,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,CAAC,EACxC;YACE,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE;gBACT,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBAChB,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,SAAS,KAAK,EAAE,EAAE;wBAClD,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;qBAC/B;yBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;wBACrC,IAAI,OAAO,KAAK,EAAE,EAAE;4BAClB,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;yBAC7B;6BAAM,IAAI,OAAO,KAAK,EAAE,EAAE;4BACzB,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;yBAC7B;qBACF;gBACH,CAAC;gBACD,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;aACF;SACF,CACF,CAAC,IAAI,EAAE,CAAC;QAET,gGAAgG;QAChG,IACE,SAAS,KAAK,QAAQ;YACtB,OAAO,CAAC,MAAM,KAAK,EAAE;YACrB,OAAO,CAAC,MAAM,KAAK,EAAE,EACrB;YACA,OAAO,OAAO,CAAC;SAChB;QACD,OAAO,SAAS,CAAC;KAClB;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,IAAI,CACP,sFAAsF,CAAC,EAAE,CAC1F,CAAC;QACF,IAAI,CAAC,IAAI,CAAE,CAAW,CAAC,KAAK,IAAI,UAAU,CAAC,CAAC;QAC5C,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AAtDW,QAAA,2BAA2B,+BAsDtC;AA8BF,SAAS,QAAQ,CAAC,CAAU;IAC1B,OAAO,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,CAAC;AAC7C,CAAC;AAED,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC;AAE7C,SAAS,YAAY,CAAC,MAAM;IAC1B,OAAO,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC,oCAAoC;AAC5F,CAAC;AAED,SAAS,eAAe,CAAC,KAAK;IAC5B,OAAO,IAAI,MAAM,CACf,IAAI,KAAK;SACN,QAAQ,EAAE;SACV,KAAK,CAAC,YAAY,CAAC;SACnB,MAAM,CAAC,UAAU,GAAG,EAAE,GAAG;QACxB,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACjB;aAAM,IAAI,GAAG,KAAK,GAAG,EAAE;YACtB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACpB;aAAM,IAAI,GAAG,EAAE;YACd,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;SAC7B;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC;SACL,IAAI,CAAC,EAAE,CAAC,GAAG,CACf,CAAC;AACJ,CAAC;AAED,yEAAyE;AACzE,oEAAoE;AACpE,SAAgB,iBAAiB,CAAC,QAAgB,EAAE,QAAgB;IAClE,OAAO,eAAe,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAClD,CAAC;AAFD,8CAEC;AAED,SAAS,eAAe,CAAC,QAAmC;IAC1D,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAChC,OAAO,CAAC,QAAQ,CAAC,CAAC;KACnB;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAC3B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC;SACb;QACD,OAAO,QAAQ,CAAC;KACjB;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAMD,SAAS,aAAa,CAAI,MAAS;IACjC,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACzD,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QACzC,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAiC,CAAC,CAAC;AACxC,CAAC;AAED,sCAAsC;AACtC,oDAAoD;AACvC,QAAA,cAAc,GAAG,aAAa,CAAC;IAC1C,kBAAkB,EAAE,gKAAgK;IACpL,eAAe,EAAE,sHAAsH;IACvI,cAAc,EAAE,4FAA4F;IAC5G,oBAAoB,EAAE,mGAAmG;IACzH,iBAAiB,EAAE,8IAA8I;CAClK,CAAC,CAAC;AAEH,SAAgB,iBAAiB,CAAC,GAAa;;IAC7C,MAAM,MAAM,GAAiB,EAAE,CAAC;IAEhC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;IAEvC,IAAI,OAAO,EAAE;QACX,MAAM,GAAG,GAAG,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,0CAAG,OAAO,CAAC,CAAC;QAEjC,MAAM,KAAK,GAAG,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAC;QAEzB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,qDAAqD;gBACrD,2DAA2D;gBAC3D,4DAA4D;gBAC5D,uDAAuD;gBACvD,iCAAiC;gBACjC,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,MAAK,qBAAqB,EAAE;oBACvC,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,iBAAiB,CAAC,CAAC;oBAC9C,MAAM;iBACP;aACF;SACF;KACF;IAED,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,IAAI,GAAG,CAAC,EAAE,KAAK,SAAS,EAAE;QACxB,6BAA6B;KAC9B;SAAM,IAAI,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,EAAE;QACrC,IAAI,GAAG,CAAC,EAAE,KAAK,cAAc,EAAE;YAC7B,WAAW,GAAG,IAAI,CAAC;SACpB;KACF;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QAChC,MAAM,OAAO,GAAG,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,cAAc,GAAG,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACvD,IAAI,cAAc,IAAI,CAAC,OAAO,EAAE;YAC9B,WAAW,GAAG,IAAI,CAAC;SACpB;KACF;SAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QAC3B,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACrE,MAAM,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CACzD,GAAG,CAAC,EAAE,EACN,cAAc,CACf,CAAC;QAEF,IAAI,CAAC,OAAO,IAAI,cAAc,EAAE;YAC9B,WAAW,GAAG,IAAI,CAAC;SACpB;QACD,IAAI,OAAO,IAAI,cAAc,EAAE;YAC7B,MAAM,KAAK,GAAG,MAAA,GAAG,CAAC,EAAE,CAAC,IAAI,0CAAE,KAAK,CAAC;YACjC,yFAAyF;YACzF,kCAAkC;YAClC,oFAAoF;YACpF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5C,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,cAAc,CAAC,CAAC;aAC5C;YACD,MAAM,WAAW,GAAG,MAAA,GAAG,CAAC,EAAE,CAAC,IAAI,0CAAG,cAAc,CAAC,CAAC;YAClD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxD,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,oBAAoB,CAAC,CAAC;aAClD;SACF;QAED,2DAA2D;QAC3D,uDAAuD;QACvD,uEAAuE;QACvE,IAAI,GAAG,CAAC,EAAE,CAAC,YAAY,KAAK,SAAS,EAAE;YACrC,MAAM,IAAI,GAAG,eAAe,CAAC,MAAA,GAAG,CAAC,EAAE,CAAC,IAAI,0CAAE,QAAQ,CAAC,CAAC;YAEpD,IAAI,IAAI,KAAK,IAAI,EAAE;gBACjB,MAAM,YAAY,GAAG,eAAe,CAAC,MAAA,GAAG,CAAC,EAAE,CAAC,YAAY,0CAAE,QAAQ,CAAC,CAAC;gBAEpE,IAAI,YAAY,KAAK,IAAI,EAAE;oBACzB,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CACpC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAC1D,CAAC;oBACF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzB,kEAAkE;wBAClE,2CAA2C;wBAC3C,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,kBAAkB,CAAC,CAAC;qBAChD;iBACF;qBAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,gDAAgD;oBAChD,4DAA4D;oBAC5D,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,kBAAkB,CAAC,CAAC;iBAChD;aACF;SACF;KACF;IAED,IAAI,WAAW,EAAE;QACf,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,eAAe,CAAC,CAAC;KAC7C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA/FD,8CA+FC;AAEM,KAAK,UAAU,gBAAgB;IACpC,IAAI,QAAkB,CAAC;IACvB,IAAI;QACF,QAAQ,GAAG,MAAM,WAAW,EAAE,CAAC;KAChC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,gCAAgC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;KACpD;IACD,IAAI,cAA4B,CAAC;IACjC,IAAI;QACF,cAAc,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;KAC9C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,sCAAsC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1D;IAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7B,IAAI,OAAe,CAAC;QACpB,IAAI;YACF,OAAO,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;SAChD;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,yCAAyC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7D;QACD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KACvB;IAED,OAAO,mBAAmB,CAAC,cAAc,CAAC,CAAC;AAC7C,CAAC;AAzBD,4CAyBC;AAED,SAAgB,oBAAoB,CAAC,MAAoB;IACvD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC;IAErE,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE1D,OAAO,GAAG,MAAM,CAAC,MAAM,IAAI,UAAU,iCAAiC,UAAU,EAAE,CAAC;AACrF,CAAC;AAND,oDAMC;AAED,SAAgB,mBAAmB,CAAC,MAAoB;IACtD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7C,CAAC;AALD,kDAKC;AAEM,KAAK,UAAU,WAAW;IAC/B,MAAM,YAAY,GAAG,MAAM,eAAe,EAAE,CAAC;IAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,IAAA,0BAAmB,EAAC,kBAAkB,CAAC,EACvC,YAAY,CACb,CAAC;IAEF,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;AAC3D,CAAC;AARD,kCAQC;AAED;;GAEG;AACH,KAAK,UAAU,eAAe;IAC5B,MAAM,QAAQ,GAAG,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1B,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,MAAM,GAAG,MAAM,CAAC,IAAA,0BAAmB,EAAC,eAAe,CAAC,CAAC,CAAC;IAE5D,MAAM,SAAS,GAAG,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC5C,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,OAAO,CAC1C,8CAA8C,EAC9C;QACE,KAAK;QACL,IAAI;QACJ,MAAM;KACP,CACF,CAAC;IACF,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC;IAEnD,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,WAAW,EAAE,CAAC,CAAC;IAEvE,OAAO,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB;IAC9B,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAA,0BAAmB,EAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC;IACzE,IAAI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;KACxE;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAND,4CAMC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,cAAc;IAClC,MAAM,iBAAiB,GAAG,4BAA4B,CAAC;IAEvD,IAAI,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACjD,IAAI,WAAW,KAAK,SAAS,EAAE;QAC7B,OAAO,WAAW,CAAC;KACpB;IAED,MAAM,YAAY,GAAG,MAAM,eAAe,EAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAA,0BAAmB,EAAC,YAAY,CAAC,CAAC;IAElD,WAAW,GAAG,GAAG,YAAY,IAAI,OAAO,EAAE,CAAC;IAC3C,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IACpD,OAAO,WAAW,CAAC;AACrB,CAAC;AAdD,wCAcC;AAEM,KAAK,UAAU,eAAe;IACnC,MAAM,YAAY,GAAG,MAAM,cAAc,EAAE,CAAC;IAC5C,MAAM,WAAW,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAE/C,OAAO,mBAAmB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AACxD,CAAC;AALD,0CAKC;AAED,SAAgB,mBAAmB,CACjC,YAAoB,EACpB,WAA+B;IAE/B,IAAI,YAAY,GAAG,GAAG,YAAY,GAAG,CAAC;IAEtC,uDAAuD;IACvD,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,MAAM,EAAE;QACvD,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5D,IAAI,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;gBAChC,YAAY,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;aAC5C;iBAAM;gBACL,qDAAqD;gBACrD,6CAA6C;gBAC7C,YAAY,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;aACjC;SACF;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AArBD,kDAqBC;AAED;;GAEG;AACI,KAAK,UAAU,MAAM;IAC1B,0DAA0D;IAC1D,6DAA6D;IAC7D,MAAM,QAAQ,GAAG,IAAA,wBAAgB,EAAC,KAAK,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAA,wBAAgB,EAAC,KAAK,CAAC,CAAC;IAEzC,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAC;IAC/B,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAC;IAC/B,2DAA2D;IAC3D,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,EAAE;QACjE,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;KACH;IAED,MAAM,GAAG,GAAG,QAAQ,IAAI,IAAA,0BAAmB,EAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,QAAQ,IAAI,IAAA,0BAAmB,EAAC,YAAY,CAAC,CAAC;IAE1D,6DAA6D;IAC7D,sEAAsE;IACtE,IAAI,QAAQ,EAAE;QACZ,OAAO,QAAQ,CAAC;KACjB;IAED,+DAA+D;IAC/D,iEAAiE;IACjE,+DAA+D;IAC/D,kBAAkB;IAClB,MAAM,cAAc,GAAG,0BAA0B,CAAC;IAClD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC7B,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC;IAExC,0EAA0E;IAC1E,8EAA8E;IAC9E,2DAA2D;IAC3D,2DAA2D;IAC3D,0DAA0D;IAC1D,MAAM,aAAa,GACjB,GAAG,KAAK,IAAI;QACZ,CAAC,MAAM,IAAA,oBAAY,EAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC,CAAC;YACtE,IAAI,CAAC;IAET,IAAI,aAAa,EAAE;QACjB,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,CACR,iDAAiD,GAAG,OAAO,MAAM,GAAG,CACrE,CAAC;QACF,OAAO,MAAM,CAAC;KACf;SAAM;QACL,OAAO,GAAG,CAAC;KACZ;AACH,CAAC;AAtDD,wBAsDC;AAmDD,SAAgB,gBAAgB,CAC9B,KAAe,EACf,iBAA0B;IAE1B,IAAI,KAAK,IAAI,iBAAiB,EAAE;QAC9B,OAAO,KAAK,YAAY,gBAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;KAC9D;SAAM;QACL,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AATD,4CASC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,sBAAsB,CAC1C,UAAsB,EACtB,MAAoB,EACpB,eAAqB,EACrB,KAAc,EACd,SAAkB;IAElB,MAAM,SAAS,GAAG,IAAA,wBAAgB,EAAC,KAAK,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAC7E,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC;IAC3B,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACtD,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;IACvB,IAAI,gBAAgB,EAAE;QACpB,aAAa,GAAG,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;KAChD;IACD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;IAC1D,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAChD,MAAM,YAAY,GAAG,MAAM,cAAc,EAAE,CAAC;IAC5C,IAAI,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;IAC1E,IAAI,iBAAiB,KAAK,SAAS,EAAE;QACnC,iBAAiB,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC;QAClD,IAAI,CAAC,cAAc,CACjB,SAAS,CAAC,0BAA0B,EACpC,iBAAiB,CAClB,CAAC;KACH;IACD,uGAAuG;IACvG,mDAAmD;IACnD,MAAM,SAAS,GAAG,oBAAoB,EAAE;QACtC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAErC,MAAM,YAAY,GAAqB;QACrC,eAAe,EAAE,aAAa;QAC9B,aAAa,EAAE,YAAY;QAC3B,QAAQ,EAAE,OAAO;QACjB,YAAY;QACZ,UAAU,EAAE,SAAS;QACrB,GAAG;QACH,WAAW,EAAE,UAAU;QACvB,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,iBAAiB;QAC7B,iBAAiB,EAAE,eAAe,CAAC,WAAW,EAAE;QAChD,MAAM;KACP,CAAC;IAEF,0BAA0B;IAC1B,IAAI,KAAK,EAAE;QACT,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC;KAC5B;IACD,IAAI,SAAS,EAAE;QACb,YAAY,CAAC,SAAS,GAAG,SAAS,CAAC;KACpC;IACD,IACE,MAAM,KAAK,SAAS;QACpB,MAAM,KAAK,SAAS;QACpB,MAAM,KAAK,SAAS;QACpB,MAAM,KAAK,YAAY,EACvB;QACA,YAAY,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;KACtD;IACD,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC1C,IAAI,MAAM,EAAE;QACV,YAAY,CAAC,WAAW,GAAG,MAAM,CAAC;KACnC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAnED,wDAmEC;AAED,MAAM,eAAe,GACnB,mFAAmF,CAAC;AACtF,MAAM,eAAe,GACnB,sEAAsE,CAAC;AACzE,MAAM,eAAe,GACnB,sFAAsF,CAAC;AACzF,MAAM,gBAAgB,GACpB,gIAAgI,CAAC;AAEnI;;;;;;;;GAQG;AACI,KAAK,UAAU,gBAAgB,CACpC,YAAe;IAEf,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACtD,IAAI,CAAC,KAAK,CAAC,0BAA0B,gBAAgB,EAAE,CAAC,CAAC;IACzD,sDAAsD;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,MAAM,IAAI,KAAK,CAAC;IAC9D,IAAI,QAAQ,EAAE;QACZ,IAAI,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC;KACb;IAED,MAAM,GAAG,GAAG,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,CAAC;IACrD,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAEzC,IAAI;QACF,MAAM,MAAM,CAAC,OAAO,CAClB,uDAAuD,EACvD;YACE,KAAK;YACL,IAAI;YACJ,IAAI,EAAE,gBAAgB;SACvB,CACF,CAAC;QAEF,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACf,IAAI,IAAA,kBAAW,EAAC,CAAC,CAAC,EAAE;YAClB,QAAQ,CAAC,CAAC,MAAM,EAAE;gBAChB,KAAK,GAAG;oBACN,IAAI,8BAA8B,EAAE,IAAI,iBAAiB,EAAE,EAAE;wBAC3D,IAAI,CAAC,SAAS,CACZ,mFAAmF;4BACjF,yDAAyD;4BACzD,iLAAiL;4BACjL,8JAA8J,CACjK,CAAC;qBACH;yBAAM;wBACL,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,IAAI,eAAe,CAAC,CAAC;qBAC9C;oBACD,OAAO,KAAK,CAAC;gBACf,KAAK,GAAG;oBACN,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;oBAChC,OAAO,KAAK,CAAC;gBACf,KAAK,GAAG;oBACN,+CAA+C;oBAC/C,2EAA2E;oBAC3E,4EAA4E;oBAC5E,IAAI,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,KAAK,wBAAiB,EAAE;wBAClE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;qBAC9B;yBAAM;wBACL,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;qBAC7B;oBACD,OAAO,IAAI,CAAC;aACf;SACF;QAED,mFAAmF;QACnF,0EAA0E;QAC1E,IAAI,CAAC,KAAK,CACR,wEAAwE,CACzE,CAAC;QACF,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAlED,4CAkEC;AAED,sGAAsG;AACtG,SAAS,8BAA8B;IACrC,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,MAAM,CAAC;AACrD,CAAC;AAED,mEAAmE;AACnE,SAAS,iBAAiB;IACxB,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,iBAAiB,CAAC;AAC3D,CAAC;AAED,gHAAgH;AAChH,+EAA+E;AAC/E,SAAgB,oBAAoB;IAClC,MAAM,kBAAkB,GAAG,qBAAqB,EAAE,CAAC;IACnD,OAAO,CACL,kBAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAC3E,CAAC;AACJ,CAAC;AALD,oDAKC;AAED,qDAAqD;AACrD,oFAAoF;AACpF,SAAgB,qBAAqB;IACnC,MAAM,UAAU,GAAG,IAAA,0BAAmB,EAAC,aAAa,CAAC,CAAC;IACtD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAC;IACzE,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;AACrD,CAAC;AAJD,sDAIC;AAED,2DAA2D;AAC3D,SAAS,gBAAgB;IACvB,MAAM,aAAa,GAAG,IAAA,0BAAmB,EAAC,mBAAmB,CAAC,CAAC;IAC/D,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;KAC5D;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,2CAA2C,aAAa,KAAK,CAAC,EAAE,CACjE,CAAC;KACH;AACH,CAAC;AAED,uFAAuF;AACvF,0DAA0D;AACnD,KAAK,UAAU,wBAAwB;;IAC5C,sDAAsD;IACtD,IAAI,UAAU,GAAG,MAAM,MAAM,EAAE,CAAC;IAChC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC;QAC/C,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC;QACzC,CAAC,CAAC,UAAU,CAAC;IAEf,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAC;IACjC,MAAM,aAAa,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,0CAAE,cAAc,CAAC;IAExD,OAAO,UAAU,KAAK,aAAa,CAAC;AACtC,CAAC;AAXD,4DAWC;AAED,SAAgB,mBAAmB,CAAC,IAAY;IAC9C,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;AAChD,CAAC;AAFD,kDAEC"} \ No newline at end of file +{"version":3,"file":"actions-util.js","sourceRoot":"","sources":["../src/actions-util.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/analyze.js b/lib/analyze.js index a6fec655f7..dc419b074a 100644 --- a/lib/analyze.js +++ b/lib/analyze.js @@ -242,7 +242,20 @@ async function runFinalize(outputDir, threadsFlag, memoryFlag, config, logger) { // Delete the tracer config env var to avoid tracing ourselves delete process.env[sharedEnv.ODASA_TRACER_CONFIGURATION]; } - fs.mkdirSync(outputDir, { recursive: true }); + // After switching to Node16, this entire block can be replaced with `await fs.promises.rm(outputDir, { recursive: true, force: true });`. + try { + await fs.promises.rmdir(outputDir, { + recursive: true, + maxRetries: 5, + retryDelay: 2000, + }); + } + catch (error) { + if ((error === null || error === void 0 ? void 0 : error.code) !== "ENOENT") { + throw error; + } + } + await fs.promises.mkdir(outputDir, { recursive: true }); await finalizeDatabaseCreation(config, threadsFlag, memoryFlag, logger); } exports.runFinalize = runFinalize; diff --git a/lib/analyze.js.map b/lib/analyze.js.map index a7d3e5289f..4bb4455b1d 100644 --- a/lib/analyze.js.map +++ b/lib/analyze.js.map @@ -1 +1 @@ -{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../src/analyze.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../src/analyze.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/codeql.js b/lib/codeql.js index d944c90843..5095865657 100644 --- a/lib/codeql.js +++ b/lib/codeql.js @@ -27,6 +27,7 @@ const fs = __importStar(require("fs")); const path = __importStar(require("path")); const toolrunner = __importStar(require("@actions/exec/lib/toolrunner")); const fast_deep_equal_1 = __importDefault(require("fast-deep-equal")); +const yaml = __importStar(require("js-yaml")); const query_string_1 = __importDefault(require("query-string")); const semver = __importStar(require("semver")); const actions_util_1 = require("./actions-util"); @@ -75,6 +76,7 @@ const CODEQL_VERSION_GROUP_RULES = "2.5.5"; const CODEQL_VERSION_SARIF_GROUP = "2.5.3"; exports.CODEQL_VERSION_COUNTS_LINES = "2.6.2"; const CODEQL_VERSION_CUSTOM_QUERY_HELP = "2.7.1"; +const CODEQL_VERSION_CONFIG_FILES = "2.8.2"; // Versions before 2.8.2 weren't tolerant to unknown properties exports.CODEQL_VERSION_ML_POWERED_QUERIES = "2.7.5"; /** * This variable controls using the new style of tracing from the CodeQL @@ -429,22 +431,30 @@ async function getCodeQLForCmd(cmd, checkVersion) { ...getExtraOptionsFromEnv(["database", "init"]), ]); }, - async databaseInitCluster(databasePath, languages, sourceRoot, processName, processLevel) { - const extraArgs = languages.map((language) => `--language=${language}`); - if (languages.filter(languages_1.isTracedLanguage).length > 0) { + async databaseInitCluster(config, sourceRoot, processName, processLevel) { + const extraArgs = config.languages.map((language) => `--language=${language}`); + if (config.languages.filter(languages_1.isTracedLanguage).length > 0) { extraArgs.push("--begin-tracing"); if (processName !== undefined) { extraArgs.push(`--trace-process-name=${processName}`); } else { + // We default to 3 if no other arguments are provided since this was the default + // behaviour of the Runner. Note this path never happens in the CodeQL Action + // because that always passes in a process name. extraArgs.push(`--trace-process-level=${processLevel || 3}`); } } + if (await util.codeQlVersionAbove(codeql, CODEQL_VERSION_CONFIG_FILES)) { + const configLocation = path.resolve(config.tempDir, "user-config.yaml"); + fs.writeFileSync(configLocation, yaml.dump(config.originalUserInput)); + extraArgs.push(`--codescanning-config=${configLocation}`); + } await runTool(cmd, [ "database", "init", "--db-cluster", - databasePath, + config.dbLocation, `--source-root=${sourceRoot}`, ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"]), @@ -560,7 +570,9 @@ async function getCodeQLForCmd(cmd, checkVersion) { if (extraSearchPath !== undefined) { codeqlArgs.push("--additional-packs", extraSearchPath); } - codeqlArgs.push(querySuitePath); + if (!(await util.codeQlVersionAbove(this, CODEQL_VERSION_CONFIG_FILES))) { + codeqlArgs.push(querySuitePath); + } await runTool(cmd, codeqlArgs); }, async databaseInterpretResults(databasePath, querySuitePaths, sarifFile, addSnippetsFlag, threadsFlag, automationDetailsId) { @@ -586,7 +598,10 @@ async function getCodeQLForCmd(cmd, checkVersion) { (await util.codeQlVersionAbove(this, CODEQL_VERSION_SARIF_GROUP))) { codeqlArgs.push("--sarif-category", automationDetailsId); } - codeqlArgs.push(databasePath, ...querySuitePaths); + codeqlArgs.push(databasePath); + if (!(await util.codeQlVersionAbove(this, CODEQL_VERSION_CONFIG_FILES))) { + codeqlArgs.push(...querySuitePaths); + } // capture stdout, which contains analysis summaries return await runTool(cmd, codeqlArgs); }, diff --git a/lib/codeql.js.map b/lib/codeql.js.map index aa9c2a3907..8830c891a5 100644 --- a/lib/codeql.js.map +++ b/lib/codeql.js.map @@ -1 +1 @@ -{"version":3,"file":"codeql.js","sourceRoot":"","sources":["../src/codeql.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAE7B,yEAA2D;AAE3D,sEAAuD;AACvD,gEAAsD;AACtD,+CAAiC;AAEjC,iDAA6E;AAC7E,kDAAoC;AAEpC,0DAA4C,CAAC,2CAA2C;AACxF,mDAAgD;AAChD,2CAAyD;AAEzD,uDAAyC;AACzC,yEAAoE;AACpE,6CAA+B;AAC/B,iCAAuC;AAuBvC,MAAa,sBAAuB,SAAQ,KAAK;IAC/C,YAAY,GAAW,EAAE,IAAc,EAAE,QAAgB,EAAE,KAAa;QACtE,KAAK,CACH,oBAAoB,GAAG,mBAAmB,IAAI;kBAClC,QAAQ;QAClB,KAAK,EAAE,CACV,CAAC;IACJ,CAAC;CACF;AARD,wDAQC;AA4ID;;;GAGG;AACH,IAAI,YAAY,GAAuB,SAAS,CAAC;AAEjD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,aAAa,CAAC;AACrD,MAAM,gCAAgC,GAAG,sBAAsB,CAAC;AAEhE;;;;;;;;GAQG;AACH,MAAM,sBAAsB,GAAG,OAAO,CAAC;AAEvC;;;;GAIG;AACH,MAAM,2BAA2B,GAAG,OAAO,CAAC;AAC5C,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAC3C,MAAM,sBAAsB,GAAG,OAAO,CAAC;AACvC,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAC3C,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAC9B,QAAA,2BAA2B,GAAG,OAAO,CAAC;AACnD,MAAM,gCAAgC,GAAG,OAAO,CAAC;AACpC,QAAA,iCAAiC,GAAG,OAAO,CAAC;AAEzD;;;;;;;;GAQG;AACU,QAAA,0BAA0B,GAAG,OAAO,CAAC;AAElD,SAAS,mBAAmB;IAC1B,IAAI,QAAgB,CAAC;IACrB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QAChC,QAAQ,GAAG,OAAO,CAAC;KACpB;SAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QACvC,QAAQ,GAAG,SAAS,CAAC;KACtB;SAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;QACxC,QAAQ,GAAG,OAAO,CAAC;KACpB;SAAM;QACL,OAAO,sBAAsB,CAAC;KAC/B;IACD,OAAO,iBAAiB,QAAQ,SAAS,CAAC;AAC5C,CAAC;AAED,SAAgB,yBAAyB,CAAC,MAAc;IACtD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;QACrB,OAAO,gCAAgC,CAAC;KACzC;SAAM;QACL,OAAO,gCAAgC,CAAC,MAAM,CAAC,CAAC;KACjD;AACH,CAAC;AAND,8DAMC;AAED,SAAS,gCAAgC,CAAC,MAAc;IACtD,IAAI,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,KAAK,SAAS,EAAE;QACzD,OAAO,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;KAChD;IAED,gHAAgH;IAChH,sFAAsF;IAEtF,IAAI,IAAA,mCAAoB,GAAE,EAAE;QAC1B,kFAAkF;QAClF,kFAAkF;QAClF,MAAM,CAAC,IAAI,CACT,uFAAuF,CACxF,CAAC;QACF,OAAO,gCAAgC,CAAC;KACzC;IACD,MAAM,CAAC,IAAI,CACT,wHAAwH,CACzH,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAA,oCAAqB,GAAE,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxE,OAAO,GAAG,uBAAuB,CAAC,CAAC,CAAC,IAAI,uBAAuB,CAAC,CAAC,CAAC,EAAE,CAAC;AACvE,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,UAAgC,EAChC,OAA2B,EAC3B,MAAc;IAEd,MAAM,sBAAsB,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IACjE,MAAM,wBAAwB,GAAG;QAC/B,yCAAyC;QACzC,CAAC,UAAU,CAAC,GAAG,EAAE,sBAAsB,CAAC;QACxC,kDAAkD;QAClD,CAAC,UAAU,CAAC,GAAG,EAAE,gCAAgC,CAAC;QAClD,wCAAwC;QACxC,CAAC,IAAI,CAAC,iBAAiB,EAAE,gCAAgC,CAAC;KAC3D,CAAC;IACF,oCAAoC;IACpC,gHAAgH;IAChH,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,MAAM,CAC3D,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,yBAAS,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IACzE,CAAC,CACF,CAAC;IACF,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAC/C,IAAI,OAAO,KAAK,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE;QACvC,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,GAAG;iBACtB,YAAY,CAAC,UAAU,CAAC;iBACxB,OAAO,CAAC,wDAAwD,EAAE;gBACjE,GAAG,EAAE,qBAAqB;aAC3B,CAAC,CAAC;YACL,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACtD,IAAI,OAAO,KAAK,SAAS,EAAE;gBACzB,MAAM,QAAQ,GAAG,MAAM,GAAG;qBACvB,YAAY,CAAC,UAAU,CAAC;qBACxB,OAAO,CACN,iEAAiE,EACjE,EAAE,QAAQ,EAAE,OAAO,EAAE,CACtB,CAAC;gBACJ,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC;gBACtC,MAAM,CAAC,IAAI,CACT,sDAAsD,WAAW,GAAG,CACrE,CAAC;gBACF,OAAO,WAAW,CAAC;aACpB;iBAAM;gBACL,MAAM,CAAC,IAAI,CACT,oEAAoE,gBAAgB,gCAAgC,IAAI,CAAC,SAAS,CAChI,OAAO,CAAC,IAAI,CAAC,MAAM,CACpB,GAAG,CACL,CAAC;aACH;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,IAAI,CACT,mEAAmE,CAAC,GAAG,CACxE,CAAC;SACH;KACF;IACD,KAAK,MAAM,cAAc,IAAI,qBAAqB,EAAE;QAClD,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,cAAc,CAAC;QAC5C,8GAA8G;QAC9G,IACE,MAAM,KAAK,IAAI,CAAC,iBAAiB;YACjC,UAAU,KAAK,gCAAgC,EAC/C;YACA,MAAM;SACP;QACD,MAAM,CAAC,eAAe,EAAE,cAAc,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChE,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC;gBACvE,KAAK,EAAE,eAAe;gBACtB,IAAI,EAAE,cAAc;gBACpB,GAAG,EAAE,qBAAqB;aAC3B,CAAC,CAAC;YACH,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE;gBACvC,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE;oBACnC,MAAM,CAAC,IAAI,CACT,0BAA0B,cAAc,CAAC,CAAC,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,GAAG,GAAG,CAC7F,CAAC;oBACF,OAAO,KAAK,CAAC,GAAG,CAAC;iBAClB;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,IAAI,CACT,+BAA+B,cAAc,CAAC,CAAC,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAC/F,CAAC;SACH;KACF;IACD,OAAO,sBAAsB,gCAAgC,sBAAsB,qBAAqB,IAAI,gBAAgB,EAAE,CAAC;AACjI,CAAC;AAEM,KAAK,UAAU,WAAW,CAC/B,SAA6B,EAC7B,UAAgC,EAChC,OAAe,EACf,YAAoB,EACpB,OAA2B,EAC3B,MAAc,EACd,YAAqB;IAErB,IAAI;QACF,wEAAwE;QACxE,2CAA2C;QAC3C,MAAM,WAAW,GAAG,SAAS,KAAK,QAAQ,CAAC;QAC3C,IAAI,WAAW,EAAE;YACf,SAAS,GAAG,SAAS,CAAC;SACvB;QACD,IAAI,YAAoB,CAAC;QACzB,IAAI,gBAAwB,CAAC;QAC7B,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC9C,YAAY,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACtE,gBAAgB,GAAG,OAAO,CAAC;SAC5B;aAAM;YACL,gBAAgB,GAAG,mBAAmB,CACpC,SAAS,IAAI,IAAI,qBAAqB,GAAG,CAC1C,CAAC;YACF,MAAM,eAAe,GAAG,eAAe,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;YAElE,wDAAwD;YACxD,YAAY,GAAG,SAAS,CAAC,IAAI,CAC3B,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,MAAM,CACP,CAAC;YAEF,uEAAuE;YACvE,qEAAqE;YACrE,2DAA2D;YAC3D,IAAI,CAAC,YAAY,IAAI,CAAC,SAAS,IAAI,CAAC,WAAW,EAAE;gBAC/C,MAAM,cAAc,GAAG,SAAS,CAAC,eAAe,CAC9C,QAAQ,EACR,YAAY,EACZ,MAAM,CACP,CAAC;gBACF,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,IAAA,oBAAa,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE;oBACnE,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CACpC,QAAQ,EACR,cAAc,CAAC,CAAC,CAAC,EACjB,YAAY,EACZ,MAAM,CACP,CAAC;oBACF,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,EAAE;wBAC/D,MAAM,CAAC,KAAK,CACV,0CAA0C,qBAAqB,EAAE,CAClE,CAAC;wBACF,YAAY,GAAG,eAAe,CAAC;qBAChC;iBACF;aACF;YAED,IAAI,YAAY,EAAE;gBAChB,MAAM,CAAC,KAAK,CAAC,yBAAyB,YAAY,EAAE,CAAC,CAAC;aACvD;iBAAM;gBACL,IAAI,CAAC,SAAS,EAAE;oBACd,SAAS,GAAG,MAAM,0BAA0B,CAC1C,UAAU,EACV,OAAO,EACP,MAAM,CACP,CAAC;iBACH;gBAED,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC3C,MAAM,iBAAiB,GAAG,sBAAW,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;gBACpE,MAAM,OAAO,GAAa,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC;gBACjE,wEAAwE;gBACxE,0DAA0D;gBAC1D,mDAAmD;gBACnD,qGAAqG;gBACrG,IACE,SAAS,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC;oBAC1C,iBAAiB,CAAC,OAAO,CAAC,KAAK,SAAS,EACxC;oBACA,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;oBACtD,OAAO,CAAC,aAAa,GAAG,SAAS,UAAU,CAAC,IAAI,EAAE,CAAC;iBACpD;qBAAM;oBACL,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;iBAC1D;gBACD,MAAM,CAAC,IAAI,CACT,iCAAiC,SAAS,0BAA0B,CACrE,CAAC;gBACF,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,YAAY,CAC7C,SAAS,EACT,OAAO,EACP,OAAO,CACR,CAAC;gBACF,MAAM,CAAC,KAAK,CAAC,6BAA6B,UAAU,YAAY,CAAC,CAAC;gBAElE,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,UAAU,CAChD,UAAU,EACV,OAAO,EACP,MAAM,CACP,CAAC;gBACF,YAAY,GAAG,MAAM,SAAS,CAAC,QAAQ,CACrC,eAAe,EACf,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,MAAM,CACP,CAAC;aACH;SACF;QACD,IAAI,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC5D,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;YAChC,SAAS,IAAI,MAAM,CAAC;SACrB;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;YACxE,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC9D;QAED,YAAY,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAC9D,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC;KACjE;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;KAC9D;AACH,CAAC;AA5HD,kCA4HC;AAED,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAClD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACtC,MAAM,IAAI,KAAK,CACb,wBAAwB,GAAG,iCAAiC,CAC7D,CAAC;KACH;IACD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AARD,kDAQC;AAED,SAAgB,eAAe,CAAC,OAAe,EAAE,MAAc;IAC7D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QAC1B,MAAM,CAAC,KAAK,CACV,kBAAkB,OAAO,gEAAgE,OAAO,GAAG,CACpG,CAAC;QACF,OAAO,GAAG,SAAS,OAAO,EAAE,CAAC;KAC9B;IAED,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,CAAC,EAAE;QACN,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,2BAA2B,CAAC,CAAC;KACvE;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAdD,0CAcC;AAED;;GAEG;AACI,KAAK,UAAU,SAAS,CAAC,GAAW;IACzC,IAAI,YAAY,KAAK,SAAS,EAAE;QAC9B,YAAY,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;KACjD;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AALD,8BAKC;AAED,SAAS,eAAe,CACtB,aAA8B,EAC9B,UAAkB,EAClB,qBAAyB;IAEzB,IAAI,OAAO,aAAa,CAAC,UAAU,CAAC,KAAK,UAAU,EAAE;QACnD,IAAI,qBAAqB,KAAK,SAAS,EAAE;YACvC,OAAO,qBAAqB,CAAC;SAC9B;QACD,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,UAAU,UAAU,+BAA+B,CAAC,CAAC;QACvE,CAAC,CAAC;QACF,OAAO,WAAkB,CAAC;KAC3B;IACD,OAAO,aAAa,CAAC,UAAU,CAAC,CAAC;AACnC,CAAC;AAED;;;;;GAKG;AACH,SAAgB,SAAS,CAAC,aAA8B;IACtD,YAAY,GAAG;QACb,OAAO,EAAE,eAAe,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC;QAC3E,UAAU,EAAE,eAAe,CACzB,aAAa,EACb,YAAY,EACZ,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CACjD;QACD,YAAY,EAAE,eAAe,CAAC,aAAa,EAAE,cAAc,CAAC;QAC5D,YAAY,EAAE,eAAe,CAAC,aAAa,EAAE,cAAc,CAAC;QAC5D,YAAY,EAAE,eAAe,CAAC,aAAa,EAAE,cAAc,CAAC;QAC5D,mBAAmB,EAAE,eAAe,CAAC,aAAa,EAAE,qBAAqB,CAAC;QAC1E,YAAY,EAAE,eAAe,CAAC,aAAa,EAAE,cAAc,CAAC;QAC5D,sBAAsB,EAAE,eAAe,CACrC,aAAa,EACb,wBAAwB,CACzB;QACD,gBAAgB,EAAE,eAAe,CAAC,aAAa,EAAE,kBAAkB,CAAC;QACpE,gBAAgB,EAAE,eAAe,CAAC,aAAa,EAAE,kBAAkB,CAAC;QACpE,cAAc,EAAE,eAAe,CAAC,aAAa,EAAE,gBAAgB,CAAC;QAChE,YAAY,EAAE,eAAe,CAAC,aAAa,EAAE,cAAc,CAAC;QAC5D,eAAe,EAAE,eAAe,CAAC,aAAa,EAAE,iBAAiB,CAAC;QAClE,cAAc,EAAE,eAAe,CAAC,aAAa,EAAE,gBAAgB,CAAC;QAChE,kBAAkB,EAAE,eAAe,CAAC,aAAa,EAAE,oBAAoB,CAAC;QACxE,wBAAwB,EAAE,eAAe,CACvC,aAAa,EACb,0BAA0B,CAC3B;QACD,qBAAqB,EAAE,eAAe,CACpC,aAAa,EACb,uBAAuB,CACxB;KACF,CAAC;IACF,OAAO,YAAY,CAAC;AACtB,CAAC;AAlCD,8BAkCC;AAED;;;;;GAKG;AACH,SAAgB,eAAe;IAC7B,IAAI,YAAY,KAAK,SAAS,EAAE;QAC9B,yEAAyE;QACzE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAND,0CAMC;AAED;;;;GAIG;AACI,KAAK,UAAU,mBAAmB;IACvC,OAAO,eAAe,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC;AAFD,kDAEC;AAED,KAAK,UAAU,eAAe,CAC5B,GAAW,EACX,YAAqB;IAErB,IAAI,aAAa,GAAgC,SAAS,CAAC;IAC3D,MAAM,MAAM,GAAG;QACb,OAAO;YACL,OAAO,GAAG,CAAC;QACb,CAAC;QACD,KAAK,CAAC,UAAU;YACd,IAAI,aAAa,KAAK,SAAS;gBAC7B,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;YAC9D,OAAO,MAAM,aAAa,CAAC;QAC7B,CAAC;QACD,KAAK,CAAC,YAAY;YAChB,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,YAAoB;YACrC,0CAA0C;YAC1C,+EAA+E;YAC/E,4EAA4E;YAC5E,6DAA6D;YAC7D,qEAAqE;YACrE,wEAAwE;YACxE,yDAAyD;YACzD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAC9B,YAAY,EACZ,SAAS,EACT,eAAe,CAChB,CAAC;YAEF,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7D,EAAE,CAAC,aAAa,CACd,WAAW,EACX;;;;;;;;;;;yEAWiE,CAClE,CAAC;YAEF,+EAA+E;YAC/E,4EAA4E;YAC5E,6DAA6D;YAC7D,qEAAqE;YACrE,wEAAwE;YACxE,yDAAyD;YACzD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YAEjE,MAAM,OAAO,CAAC,GAAG,EAAE;gBACjB,UAAU;gBACV,eAAe;gBACf,YAAY;gBACZ,GAAG,sBAAsB,CAAC,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;gBACxD,OAAO,CAAC,QAAQ;gBAChB,WAAW;gBACX,OAAO;aACR,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACvD,CAAC;QACD,KAAK,CAAC,YAAY,CAChB,YAAoB,EACpB,QAAkB,EAClB,UAAkB;YAElB,MAAM,OAAO,CAAC,GAAG,EAAE;gBACjB,UAAU;gBACV,MAAM;gBACN,YAAY;gBACZ,cAAc,QAAQ,EAAE;gBACxB,iBAAiB,UAAU,EAAE;gBAC7B,GAAG,sBAAsB,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;aAChD,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,mBAAmB,CACvB,YAAoB,EACpB,SAAqB,EACrB,UAAkB,EAClB,WAA+B,EAC/B,YAAgC;YAEhC,MAAM,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAC;YACxE,IAAI,SAAS,CAAC,MAAM,CAAC,4BAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjD,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAClC,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC7B,SAAS,CAAC,IAAI,CAAC,wBAAwB,WAAW,EAAE,CAAC,CAAC;iBACvD;qBAAM;oBACL,SAAS,CAAC,IAAI,CAAC,yBAAyB,YAAY,IAAI,CAAC,EAAE,CAAC,CAAC;iBAC9D;aACF;YACD,MAAM,OAAO,CAAC,GAAG,EAAE;gBACjB,UAAU;gBACV,MAAM;gBACN,cAAc;gBACd,YAAY;gBACZ,iBAAiB,UAAU,EAAE;gBAC7B,GAAG,SAAS;gBACZ,GAAG,sBAAsB,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;aAChD,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,QAAkB;YACnC,MAAM,OAAO,GACX,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC;YAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EACjB,QAAQ,EACR,OAAO,EACP,OAAO,CACR,CAAC;YAEF,+DAA+D;YAC/D,0FAA0F;YAC1F,qDAAqD;YACrD,8EAA8E;YAC9E,gHAAgH;YAChH,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;YAC/D,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG;gBACjC,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC;gBAC/B,wBAAwB;gBACxB,+BAA+B;aAChC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEZ,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;QAC9B,CAAC;QACD,KAAK,CAAC,sBAAsB,CAAC,YAAoB,EAAE,QAAkB;YACnE,yBAAyB;YACzB,IAAI,aAAa,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,UAAU,CAAC,UAAU,CAC7B,GAAG,EACH;gBACE,SAAS;gBACT,WAAW;gBACX,eAAe;gBACf,cAAc,QAAQ,EAAE;gBACxB,GAAG,sBAAsB,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aACpD,EACD;gBACE,MAAM,EAAE,IAAI;gBACZ,SAAS,EAAE;oBACT,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;wBACf,aAAa,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnC,CAAC;oBACD,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;wBACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC7B,CAAC;iBACF;aACF,CACF,CAAC,IAAI,EAAE,CAAC;YAET,oBAAoB;YACpB,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;YAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAC/B,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EACzB,OAAO,EACP,YAAY,GAAG,EAAE,CAClB,CAAC;YAEF,oBAAoB;YACpB,MAAM,IAAA,iDAAsB,EAC1B,GAAG,EACH;gBACE,UAAU;gBACV,eAAe;gBACf,GAAG,sBAAsB,CAAC,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;gBACxD,YAAY;gBACZ,IAAI;gBACJ,YAAY;aACb,EACD,6BAAa,CACd,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,gBAAgB,CACpB,YAAoB,EACpB,WAAmB,EACnB,UAAkB;YAElB,MAAM,IAAI,GAAG;gBACX,UAAU;gBACV,UAAU;gBACV,oBAAoB;gBACpB,WAAW;gBACX,GAAG,sBAAsB,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;gBACnD,YAAY;aACb,CAAC;YACF,IAAI,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,2BAA2B,CAAC;gBAClE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxB,MAAM,IAAA,iDAAsB,EAAC,GAAG,EAAE,IAAI,EAAE,6BAAa,CAAC,CAAC;QACzD,CAAC;QACD,KAAK,CAAC,gBAAgB;YACpB,MAAM,UAAU,GAAG;gBACjB,SAAS;gBACT,WAAW;gBACX,eAAe;gBACf,GAAG,sBAAsB,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aACpD,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAE9C,IAAI;gBACF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;aAC3B;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,IAAI,KAAK,CACb,oDAAoD,CAAC,EAAE,CACxD,CAAC;aACH;QACH,CAAC;QACD,KAAK,CAAC,cAAc,CAClB,OAAiB,EACjB,eAAmC;YAEnC,MAAM,UAAU,GAAG;gBACjB,SAAS;gBACT,SAAS;gBACT,GAAG,OAAO;gBACV,qBAAqB;gBACrB,GAAG,sBAAsB,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;aAClD,CAAC;YACF,IAAI,eAAe,KAAK,SAAS,EAAE;gBACjC,UAAU,CAAC,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC;aACxD;YACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAE9C,IAAI;gBACF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;aAC3B;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,EAAE,CAAC,CAAC;aACxE;QACH,CAAC;QACD,KAAK,CAAC,kBAAkB,CACtB,YAAoB,EACpB,eAAmC,EACnC,cAAsB,EACtB,UAAkB,EAClB,WAAmB;YAEnB,MAAM,UAAU,GAAG;gBACjB,UAAU;gBACV,aAAa;gBACb,UAAU;gBACV,WAAW;gBACX,YAAY;gBACZ,sBAAsB;gBACtB,IAAI;gBACJ,GAAG,sBAAsB,CAAC,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;aACvD,CAAC;YACF,IAAI,eAAe,KAAK,SAAS,EAAE;gBACjC,UAAU,CAAC,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC;aACxD;YACD,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAChC,MAAM,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACjC,CAAC;QACD,KAAK,CAAC,wBAAwB,CAC5B,YAAoB,EACpB,eAAyB,EACzB,SAAiB,EACjB,eAAuB,EACvB,WAAmB,EACnB,mBAAuC;YAEvC,MAAM,UAAU,GAAG;gBACjB,UAAU;gBACV,mBAAmB;gBACnB,WAAW;gBACX,uBAAuB;gBACvB,IAAI;gBACJ,YAAY,SAAS,EAAE;gBACvB,eAAe;gBACf,GAAG,sBAAsB,CAAC,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;aAC7D,CAAC;YACF,IAAI,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,0BAA0B,CAAC;gBACjE,UAAU,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACjD,IAAI,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,sBAAsB,CAAC;gBAC7D,UAAU,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YAC7C,IAAI,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,0BAA0B,CAAC;gBACjE,UAAU,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACjD,IAAI,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,gCAAgC,CAAC;gBACvE,UAAU,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAC5C,IACE,mBAAmB,KAAK,SAAS;gBACjC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAC,EACjE;gBACA,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;aAC1D;YACD,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,eAAe,CAAC,CAAC;YAClD,oDAAoD;YACpD,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACxC,CAAC;QACD,KAAK,CAAC,qBAAqB,CAAC,YAAoB;YAC9C,MAAM,UAAU,GAAG;gBACjB,UAAU;gBACV,gBAAgB;gBAChB,GAAG,sBAAsB,CAAC,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;gBACzD,YAAY;aACb,CAAC;YACF,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACxC,CAAC;QAED;;;;;;;;;WASG;QACH,KAAK,CAAC,YAAY,CAAC,KAAwB;YACzC,MAAM,UAAU,GAAG;gBACjB,MAAM;gBACN,UAAU;gBACV,eAAe;gBACf,GAAG,sBAAsB,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;gBAC/C,GAAG,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC;aACtC,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAE9C,IAAI;gBACF,MAAM,YAAY,GAAuB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC5D,IACE,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC;oBACjC,8EAA8E;oBAC9E,oEAAoE;oBACpE,mEAAmE;oBACnE,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAC1D;oBACA,OAAO,YAAY,CAAC;iBACrB;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;iBACzD;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,IAAI,KAAK,CACb,4DAA4D,MAAM,KAAK,CAAC,EAAE,CAC3E,CAAC;aACH;QACH,CAAC;QACD,KAAK,CAAC,eAAe,CACnB,YAAoB,EACpB,YAAoB;YAEpB,MAAM,UAAU,GAAG;gBACjB,UAAU;gBACV,SAAS;gBACT,YAAY;gBACZ,UAAU,YAAY,EAAE;gBACxB,GAAG,sBAAsB,CAAC,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;aACnD,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACjC,CAAC;QACD,KAAK,CAAC,cAAc,CAClB,YAAoB,EACpB,cAAsB,EACtB,YAAoB;YAEpB,MAAM,IAAI,GAAG;gBACX,UAAU;gBACV,QAAQ;gBACR,YAAY;gBACZ,YAAY,cAAc,EAAE;gBAC5B,UAAU,YAAY,EAAE;gBACxB,GAAG,sBAAsB,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;aAClD,CAAC;YACF,MAAM,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QACpD,CAAC;KACF,CAAC;IACF,IACE,YAAY;QACZ,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,EAChE;QACA,MAAM,IAAI,KAAK,CACb,+CAA+C,sBAAsB,oBAAoB,MAAM,MAAM,CAAC,UAAU,EAAE,EAAE,CACrH,CAAC;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAqB;IACpD,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;AAC3E,CAAC;AACD;;GAEG;AACH,SAAS,sBAAsB,CAAC,KAAe;IAC7C,MAAM,OAAO,GAAiB,IAAI,CAAC,uBAAuB,EAAE,CAAC;IAC7D,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAC,OAAY,EAAE,QAAkB;IACtD,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,EAAE,CAAC;KACX;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,MAAM,GAAG,GAAG,0BAA0B,QAAQ,CAAC,IAAI,CACjD,GAAG,CACJ,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,yBAAyB,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;KACtB;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACvB,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC;QACnB,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,SAAS,EAAE;YACvD,MAAM,GAAG,GAAG,yBAAyB,QAAQ,CAAC,IAAI,CAChD,GAAG,CACJ,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,8BAA8B,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;SACtB;QACD,OAAO,GAAG,CAAC,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,eAAe,CAC7B,OAAY,EACZ,KAAe,EACf,QAAkB;IAElB,MAAM,GAAG,GAAG,cAAc,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,QAAQ,GACZ,KAAK,CAAC,MAAM,KAAK,CAAC;QAChB,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC;QACnC,CAAC,CAAC,eAAe,CACb,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EACnB,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,CAAC,CAAC,CAAC,EACf,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAC1B,CAAC;IACR,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC;AAfD,0CAeC;AAED;;;;;;;GAOG;AACH,MAAM,YAAY,GAAG,KAAM,CAAC;AAE5B,KAAK,UAAU,OAAO,CAAC,GAAW,EAAE,OAAiB,EAAE;IACrD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,MAAM,QAAQ,GAAG,MAAM,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE;QAC1D,SAAS,EAAE;YACT,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;gBACvB,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,CAAC;YACD,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBAClE,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;YAC5C,CAAC;SACF;QACD,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC,IAAI,EAAE,CAAC;IACV,IAAI,QAAQ,KAAK,CAAC;QAChB,MAAM,IAAI,sBAAsB,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC/D,OAAO,MAAM,CAAC;AAChB,CAAC"} \ No newline at end of file +{"version":3,"file":"codeql.js","sourceRoot":"","sources":["../src/codeql.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/defaults.json b/lib/defaults.json index 1c57c0750b..5461a94c92 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,3 +1,3 @@ { - "bundleVersion": "codeql-bundle-20220214" + "bundleVersion": "codeql-bundle-20220224" } diff --git a/lib/init-action.js b/lib/init-action.js index c7fbcfa705..1af52e827d 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -92,10 +92,6 @@ async function run() { toolsVersion = initCodeQLResult.toolsVersion; await (0, util_1.enrichEnvironment)(util_1.Mode.actions, codeql); config = await (0, init_1.initConfig)((0, actions_util_1.getOptionalInput)("languages"), (0, actions_util_1.getOptionalInput)("queries"), (0, actions_util_1.getOptionalInput)("packs"), (0, actions_util_1.getOptionalInput)("config-file"), (0, actions_util_1.getOptionalInput)("db-location"), (0, actions_util_1.getOptionalInput)("debug") === "true", (0, actions_util_1.getOptionalInput)("debug-artifact-name") || util_1.DEFAULT_DEBUG_ARTIFACT_NAME, (0, actions_util_1.getOptionalInput)("debug-database-name") || util_1.DEFAULT_DEBUG_DATABASE_NAME, repositoryNwo, (0, actions_util_1.getTemporaryDirectory)(), (0, util_1.getRequiredEnvParam)("RUNNER_TOOL_CACHE"), codeql, (0, util_1.getRequiredEnvParam)("GITHUB_WORKSPACE"), gitHubVersion, apiDetails, featureFlags, logger); - if (config.languages.some(languages_1.isTracedLanguage)) { - // We currently do not support tracing on Windows 11 and Windows Server 2022 - (0, util_1.checkNotWindows11)(); - } if (config.languages.includes(languages_1.Language.python) && (0, actions_util_1.getRequiredInput)("setup-python-dependencies") === "true") { try { diff --git a/lib/init-action.js.map b/lib/init-action.js.map index eb09a01b03..6731c664ab 100644 --- a/lib/init-action.js.map +++ b/lib/init-action.js.map @@ -1 +1 @@ -{"version":3,"file":"init-action.js","sourceRoot":"","sources":["../src/init-action.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"init-action.js","sourceRoot":"","sources":["../src/init-action.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/init.js b/lib/init.js index eaf2463aef..8c4990972e 100644 --- a/lib/init.js +++ b/lib/init.js @@ -52,7 +52,7 @@ async function runInit(codeql, config, sourceRoot, processName, processLevel) { try { if (await (0, util_1.codeQlVersionAbove)(codeql, codeql_1.CODEQL_VERSION_NEW_TRACING)) { // Init a database cluster - await codeql.databaseInitCluster(config.dbLocation, config.languages, sourceRoot, processName, processLevel); + await codeql.databaseInitCluster(config, sourceRoot, processName, processLevel); } else { for (const language of config.languages) { diff --git a/lib/init.js.map b/lib/init.js.map index 04c0e5a2e6..af4090aa05 100644 --- a/lib/init.js.map +++ b/lib/init.js.map @@ -1 +1 @@ -{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/util.js b/lib/util.js index 1e78bafff1..d51f434144 100644 --- a/lib/util.js +++ b/lib/util.js @@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getMlPoweredJsQueriesStatus = exports.ML_POWERED_JS_QUERIES_PACK = exports.checkNotWindows11 = exports.isGoodVersion = exports.delay = exports.bundleDb = exports.codeQlVersionAbove = exports.isHTTPError = exports.UserError = exports.HTTPError = exports.getRequiredEnvParam = exports.isActions = exports.getMode = exports.enrichEnvironment = exports.initializeEnvironment = exports.Mode = exports.assertNever = exports.getGitHubAuth = exports.apiVersionInRange = exports.DisallowedAPIVersionReason = exports.checkGitHubVersionInRange = exports.getGitHubVersion = exports.GitHubVariant = exports.parseGitHubUrl = exports.getCodeQLDatabasePath = exports.getThreadsFlag = exports.getThreadsFlagValue = exports.getAddSnippetsFlag = exports.getMemoryFlag = exports.getMemoryFlagValue = exports.withTmpDir = exports.getToolNames = exports.getExtraOptionsEnvParam = exports.DEFAULT_DEBUG_DATABASE_NAME = exports.DEFAULT_DEBUG_ARTIFACT_NAME = exports.GITHUB_DOTCOM_URL = void 0; +exports.getMlPoweredJsQueriesStatus = exports.ML_POWERED_JS_QUERIES_PACK = exports.isGoodVersion = exports.delay = exports.bundleDb = exports.codeQlVersionAbove = exports.isHTTPError = exports.UserError = exports.HTTPError = exports.getRequiredEnvParam = exports.isActions = exports.getMode = exports.enrichEnvironment = exports.initializeEnvironment = exports.Mode = exports.assertNever = exports.getGitHubAuth = exports.apiVersionInRange = exports.DisallowedAPIVersionReason = exports.checkGitHubVersionInRange = exports.getGitHubVersion = exports.GitHubVariant = exports.parseGitHubUrl = exports.getCodeQLDatabasePath = exports.getThreadsFlag = exports.getThreadsFlagValue = exports.getAddSnippetsFlag = exports.getMemoryFlag = exports.getMemoryFlagValue = exports.withTmpDir = exports.getToolNames = exports.getExtraOptionsEnvParam = exports.DEFAULT_DEBUG_DATABASE_NAME = exports.DEFAULT_DEBUG_ARTIFACT_NAME = exports.GITHUB_DOTCOM_URL = void 0; const fs = __importStar(require("fs")); const os = __importStar(require("os")); const path = __importStar(require("path")); @@ -528,12 +528,6 @@ function isGoodVersion(versionSpec) { return !BROKEN_VERSIONS.includes(versionSpec); } exports.isGoodVersion = isGoodVersion; -function checkNotWindows11() { - if (os.platform() === "win32" && semver.gte(os.release(), "10.0.20348")) { - throw new Error("Tracing builds with CodeQL is currently not supported on Windows 11 and Windows Server 2022. Please modify your Actions workflow to use an earlier version of Windows for this job, for example by setting `runs-on: windows-2019`."); - } -} -exports.checkNotWindows11 = checkNotWindows11; /** * The ML-powered JS query pack to add to the analysis if a repo is opted into the ML-powered * queries beta. diff --git a/lib/util.js.map b/lib/util.js.map index 5e74053c1e..574dd0ca8f 100644 --- a/lib/util.js.map +++ b/lib/util.js.map @@ -1 +1 @@ -{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index a18578f7a8..3c832f45ea 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,19 +1,18 @@ { "name": "codeql", - "version": "1.1.3", + "version": "1.1.4", "lockfileVersion": 2, "requires": true, "packages": { "node_modules/@actions/artifact": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-0.5.2.tgz", - "integrity": "sha512-q/r8WSqyxBJ0ffLCRrtjCBTGnAYqP+ID4yG7f7YSlhrQ4thNg/d+Tq9f1YkLPKX46ZR97OWtGDY+oU/nxcqvLw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-1.0.0.tgz", + "integrity": "sha512-oje+cCiM2maVwoiN+LT9kh2C6UqiTcS1tDKins+nRfckX+C8JJD2kAmzpD5fn/p5Dibjrqk1mtwreAzgNxHrDg==", "dependencies": { "@actions/core": "^1.2.6", "@actions/http-client": "^1.0.11", - "@types/tmp": "^0.1.0", - "tmp": "^0.1.0", - "tmp-promise": "^2.0.2" + "tmp": "^0.2.1", + "tmp-promise": "^3.0.2" } }, "node_modules/@actions/core": { @@ -501,10 +500,6 @@ "@sinonjs/fake-timers": "^7.1.0" } }, - "node_modules/@types/tmp": { - "version": "0.1.0", - "integrity": "sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==" - }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "4.28.5", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.5.tgz", @@ -4361,8 +4356,9 @@ } }, "node_modules/removeNPMAbsolutePaths": { - "version": "2.0.0", - "integrity": "sha512-Hea7U6iJcD0NE/aqBqxBMPKeKaxjqMNyTTajmH2dH9hhafJ9Tem5r4UeJK8+BdE1MK9lqoOYqNM0Sq9rl1OIbQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/removeNPMAbsolutePaths/-/removeNPMAbsolutePaths-3.0.0.tgz", + "integrity": "sha512-g4DIbk+xI8YC1RafmVKaPyMcuQlKZ8N7RQMUvRv+YLHNw1PhyFtjsC6WBaiTCfDKFGQhBaRSc0b0qUjPeCdIdQ==", "dev": true, "bin": { "removeNPMAbsolutePaths": "bin/removeNPMAbsolutePaths" @@ -4933,30 +4929,22 @@ } }, "node_modules/tmp": { - "version": "0.1.0", - "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "dependencies": { - "rimraf": "^2.6.3" + "rimraf": "^3.0.0" }, "engines": { - "node": ">=6" + "node": ">=8.17.0" } }, "node_modules/tmp-promise": { - "version": "2.1.1", - "integrity": "sha512-Z048AOz/w9b6lCbJUpevIJpRpUztENl8zdv1bmAKVHimfqRFl92ROkmT9rp7TVBnrEw2gtMTol/2Cp2S2kJa4Q==", - "dependencies": { - "tmp": "0.1.0" - } - }, - "node_modules/tmp/node_modules/rimraf": { - "version": "2.7.1", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", + "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" + "tmp": "^0.2.0" } }, "node_modules/to-regex-range": { diff --git a/node_modules/@actions/artifact/lib/artifact-client.js b/node_modules/@actions/artifact/lib/artifact-client.js index 64f1bea094..3374f4bd9d 100644 --- a/node_modules/@actions/artifact/lib/artifact-client.js +++ b/node_modules/@actions/artifact/lib/artifact-client.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.create = void 0; const artifact_client_1 = require("./internal/artifact-client"); /** * Constructs an ArtifactClient diff --git a/node_modules/@actions/artifact/lib/artifact-client.js.map b/node_modules/@actions/artifact/lib/artifact-client.js.map index ee1a4929bd..6aadc1b0b4 100644 --- a/node_modules/@actions/artifact/lib/artifact-client.js.map +++ b/node_modules/@actions/artifact/lib/artifact-client.js.map @@ -1 +1 @@ -{"version":3,"file":"artifact-client.js","sourceRoot":"","sources":["../src/artifact-client.ts"],"names":[],"mappings":";;AAIA,gEAAgF;AAUhF;;GAEG;AACH,SAAgB,MAAM;IACpB,OAAO,uCAAqB,CAAC,MAAM,EAAE,CAAA;AACvC,CAAC;AAFD,wBAEC"} \ No newline at end of file +{"version":3,"file":"artifact-client.js","sourceRoot":"","sources":["../src/artifact-client.ts"],"names":[],"mappings":";;;AAIA,gEAAgF;AAUhF;;GAEG;AACH,SAAgB,MAAM;IACpB,OAAO,uCAAqB,CAAC,MAAM,EAAE,CAAA;AACvC,CAAC;AAFD,wBAEC"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/artifact-client.js b/node_modules/@actions/artifact/lib/internal/artifact-client.js index 1a5a7f8f86..d937578a87 100644 --- a/node_modules/@actions/artifact/lib/internal/artifact-client.js +++ b/node_modules/@actions/artifact/lib/internal/artifact-client.js @@ -1,4 +1,23 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -8,18 +27,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; - return result; -}; Object.defineProperty(exports, "__esModule", { value: true }); +exports.DefaultArtifactClient = void 0; const core = __importStar(require("@actions/core")); const upload_specification_1 = require("./upload-specification"); const upload_http_client_1 = require("./upload-http-client"); const utils_1 = require("./utils"); +const path_and_artifact_name_validation_1 = require("./path-and-artifact-name-validation"); const download_http_client_1 = require("./download-http-client"); const download_specification_1 = require("./download-specification"); const config_variables_1 = require("./config-variables"); @@ -36,7 +50,9 @@ class DefaultArtifactClient { */ uploadArtifact(name, files, rootDirectory, options) { return __awaiter(this, void 0, void 0, function* () { - utils_1.checkArtifactName(name); + core.info(`Starting artifact upload +For more detailed logs during the artifact upload process, enable step-debugging: https://docs.github.com/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging#enabling-step-debug-logging`); + path_and_artifact_name_validation_1.checkArtifactName(name); // Get specification for the files being uploaded const uploadSpecification = upload_specification_1.getUploadSpecification(name, rootDirectory, files); const uploadResponse = { @@ -57,12 +73,24 @@ class DefaultArtifactClient { throw new Error('No URL provided by the Artifact Service to upload an artifact to'); } core.debug(`Upload Resource URL: ${response.fileContainerResourceUrl}`); + core.info(`Container for artifact "${name}" successfully created. Starting upload of file(s)`); // Upload each of the files that were found concurrently const uploadResult = yield uploadHttpClient.uploadArtifactToFileContainer(response.fileContainerResourceUrl, uploadSpecification, options); // Update the size of the artifact to indicate we are done uploading // The uncompressed size is used for display when downloading a zip of the artifact from the UI + core.info(`File upload process has finished. Finalizing the artifact upload`); yield uploadHttpClient.patchArtifactSize(uploadResult.totalSize, name); - core.info(`Finished uploading artifact ${name}. Reported size is ${uploadResult.uploadSize} bytes. There were ${uploadResult.failedItems.length} items that failed to upload`); + if (uploadResult.failedItems.length > 0) { + core.info(`Upload finished. There were ${uploadResult.failedItems.length} items that failed to upload`); + } + else { + core.info(`Artifact has been finalized. All files have been successfully uploaded!`); + } + core.info(` +The raw size of all the files that were specified for upload is ${uploadResult.totalSize} bytes +The size of all the files that were uploaded is ${uploadResult.uploadSize} bytes. This takes into account any gzip compression used to reduce the upload size, time and storage + +Note: The size of downloaded zips can differ significantly from the reported size. For more information see: https://github.com/actions/upload-artifact#zipped-artifact-downloads \r\n`); uploadResponse.artifactItems = uploadSpecification.map(item => item.absoluteFilePath); uploadResponse.size = uploadResult.uploadSize; uploadResponse.failedItems = uploadResult.failedItems; @@ -125,6 +153,7 @@ class DefaultArtifactClient { while (downloadedArtifacts < artifacts.count) { const currentArtifactToDownload = artifacts.value[downloadedArtifacts]; downloadedArtifacts += 1; + core.info(`starting download of artifact ${currentArtifactToDownload.name} : ${downloadedArtifacts}/${artifacts.count}`); // Get container entries for the specific artifact const items = yield downloadHttpClient.getContainerItems(currentArtifactToDownload.name, currentArtifactToDownload.fileContainerResourceUrl); const downloadSpecification = download_specification_1.getDownloadSpecification(currentArtifactToDownload.name, items.value, path, true); diff --git a/node_modules/@actions/artifact/lib/internal/artifact-client.js.map b/node_modules/@actions/artifact/lib/internal/artifact-client.js.map index d29dc29dc7..00240ef27b 100644 --- a/node_modules/@actions/artifact/lib/internal/artifact-client.js.map +++ b/node_modules/@actions/artifact/lib/internal/artifact-client.js.map @@ -1 +1 @@ -{"version":3,"file":"artifact-client.js","sourceRoot":"","sources":["../../src/internal/artifact-client.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"artifact-client.js","sourceRoot":"","sources":["../../src/internal/artifact-client.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/config-variables.js b/node_modules/@actions/artifact/lib/internal/config-variables.js index c6925aa671..f8a1828ebd 100644 --- a/node_modules/@actions/artifact/lib/internal/config-variables.js +++ b/node_modules/@actions/artifact/lib/internal/config-variables.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.getRetentionDays = exports.getWorkSpaceDirectory = exports.getWorkFlowRunId = exports.getRuntimeUrl = exports.getRuntimeToken = exports.getDownloadFileConcurrency = exports.getInitialRetryIntervalInMilliseconds = exports.getRetryMultiplier = exports.getRetryLimit = exports.getUploadChunkSize = exports.getUploadFileConcurrency = void 0; // The number of concurrent uploads that happens at the same time function getUploadFileConcurrency() { return 2; diff --git a/node_modules/@actions/artifact/lib/internal/config-variables.js.map b/node_modules/@actions/artifact/lib/internal/config-variables.js.map index 1226552c68..3032dd4e73 100644 --- a/node_modules/@actions/artifact/lib/internal/config-variables.js.map +++ b/node_modules/@actions/artifact/lib/internal/config-variables.js.map @@ -1 +1 @@ -{"version":3,"file":"config-variables.js","sourceRoot":"","sources":["../../src/internal/config-variables.ts"],"names":[],"mappings":";;AAAA,iEAAiE;AACjE,SAAgB,wBAAwB;IACtC,OAAO,CAAC,CAAA;AACV,CAAC;AAFD,4DAEC;AAED,2FAA2F;AAC3F,4CAA4C;AAC5C,SAAgB,kBAAkB;IAChC,OAAO,CAAC,GAAG,IAAI,GAAG,IAAI,CAAA,CAAC,cAAc;AACvC,CAAC;AAFD,gDAEC;AAED,yFAAyF;AACzF,SAAgB,aAAa;IAC3B,OAAO,CAAC,CAAA;AACV,CAAC;AAFD,sCAEC;AAED,wGAAwG;AACxG,0GAA0G;AAC1G,SAAgB,kBAAkB;IAChC,OAAO,GAAG,CAAA;AACZ,CAAC;AAFD,gDAEC;AAED,yGAAyG;AACzG,SAAgB,qCAAqC;IACnD,OAAO,IAAI,CAAA;AACb,CAAC;AAFD,sFAEC;AAED,mEAAmE;AACnE,SAAgB,0BAA0B;IACxC,OAAO,CAAC,CAAA;AACV,CAAC;AAFD,gEAEC;AAED,SAAgB,eAAe;IAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IAClD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;KACpE;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAND,0CAMC;AAED,SAAgB,aAAa;IAC3B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;IACrD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;KAClE;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAND,sCAMC;AAED,SAAgB,gBAAgB;IAC9B,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAClD,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;KAC5D;IACD,OAAO,aAAa,CAAA;AACtB,CAAC;AAND,4CAMC;AAED,SAAgB,qBAAqB;IACnC,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAC1D,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;KAC/D;IACD,OAAO,kBAAkB,CAAA;AAC3B,CAAC;AAND,sDAMC;AAED,SAAgB,gBAAgB;IAC9B,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;AAC7C,CAAC;AAFD,4CAEC"} \ No newline at end of file +{"version":3,"file":"config-variables.js","sourceRoot":"","sources":["../../src/internal/config-variables.ts"],"names":[],"mappings":";;;AAAA,iEAAiE;AACjE,SAAgB,wBAAwB;IACtC,OAAO,CAAC,CAAA;AACV,CAAC;AAFD,4DAEC;AAED,2FAA2F;AAC3F,4CAA4C;AAC5C,SAAgB,kBAAkB;IAChC,OAAO,CAAC,GAAG,IAAI,GAAG,IAAI,CAAA,CAAC,cAAc;AACvC,CAAC;AAFD,gDAEC;AAED,yFAAyF;AACzF,SAAgB,aAAa;IAC3B,OAAO,CAAC,CAAA;AACV,CAAC;AAFD,sCAEC;AAED,wGAAwG;AACxG,0GAA0G;AAC1G,SAAgB,kBAAkB;IAChC,OAAO,GAAG,CAAA;AACZ,CAAC;AAFD,gDAEC;AAED,yGAAyG;AACzG,SAAgB,qCAAqC;IACnD,OAAO,IAAI,CAAA;AACb,CAAC;AAFD,sFAEC;AAED,mEAAmE;AACnE,SAAgB,0BAA0B;IACxC,OAAO,CAAC,CAAA;AACV,CAAC;AAFD,gEAEC;AAED,SAAgB,eAAe;IAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IAClD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;KACpE;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAND,0CAMC;AAED,SAAgB,aAAa;IAC3B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;IACrD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;KAClE;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAND,sCAMC;AAED,SAAgB,gBAAgB;IAC9B,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAClD,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;KAC5D;IACD,OAAO,aAAa,CAAA;AACtB,CAAC;AAND,4CAMC;AAED,SAAgB,qBAAqB;IACnC,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAC1D,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;KAC/D;IACD,OAAO,kBAAkB,CAAA;AAC3B,CAAC;AAND,sDAMC;AAED,SAAgB,gBAAgB;IAC9B,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;AAC7C,CAAC;AAFD,4CAEC"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/contracts.d.ts b/node_modules/@actions/artifact/lib/internal/contracts.d.ts index 154e0e8f1c..943f689fce 100644 --- a/node_modules/@actions/artifact/lib/internal/contracts.d.ts +++ b/node_modules/@actions/artifact/lib/internal/contracts.d.ts @@ -25,8 +25,18 @@ export interface PatchArtifactSizeSuccessResponse { uploadUrl: string; } export interface UploadResults { + /** + * The size in bytes of data that was transferred during the upload process to the actions backend service. This takes into account possible + * gzip compression to reduce the amount of data that needs to be transferred + */ uploadSize: number; + /** + * The raw size of the files that were specified for upload + */ totalSize: number; + /** + * An array of files that failed to upload + */ failedItems: string[]; } export interface ListArtifactsResponse { diff --git a/node_modules/@actions/artifact/lib/internal/download-http-client.js b/node_modules/@actions/artifact/lib/internal/download-http-client.js index 9a8d7076d3..a3d16f8c8d 100644 --- a/node_modules/@actions/artifact/lib/internal/download-http-client.js +++ b/node_modules/@actions/artifact/lib/internal/download-http-client.js @@ -1,4 +1,23 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -8,14 +27,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; - return result; -}; Object.defineProperty(exports, "__esModule", { value: true }); +exports.DownloadHttpClient = void 0; const fs = __importStar(require("fs")); const core = __importStar(require("@actions/core")); const zlib = __importStar(require("zlib")); @@ -167,9 +180,6 @@ class DownloadHttpClient { let response; try { response = yield makeDownloadRequest(); - if (core.isDebug()) { - utils_1.displayHttpDiagnostics(response); - } } catch (error) { // if an error is caught, it is usually indicative of a timeout so retry the download diff --git a/node_modules/@actions/artifact/lib/internal/download-http-client.js.map b/node_modules/@actions/artifact/lib/internal/download-http-client.js.map index 6dcfc771f2..b46f0c5da7 100644 --- a/node_modules/@actions/artifact/lib/internal/download-http-client.js.map +++ b/node_modules/@actions/artifact/lib/internal/download-http-client.js.map @@ -1 +1 @@ -{"version":3,"file":"download-http-client.js","sourceRoot":"","sources":["../../src/internal/download-http-client.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"download-http-client.js","sourceRoot":"","sources":["../../src/internal/download-http-client.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/download-specification.js b/node_modules/@actions/artifact/lib/internal/download-specification.js index ef656d7a5b..8981abe95b 100644 --- a/node_modules/@actions/artifact/lib/internal/download-specification.js +++ b/node_modules/@actions/artifact/lib/internal/download-specification.js @@ -1,12 +1,25 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); var __importStar = (this && this.__importStar) || function (mod) { if (mod && mod.__esModule) return mod; var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); return result; }; Object.defineProperty(exports, "__esModule", { value: true }); +exports.getDownloadSpecification = void 0; const path = __importStar(require("path")); /** * Creates a specification for a set of files that will be downloaded diff --git a/node_modules/@actions/artifact/lib/internal/download-specification.js.map b/node_modules/@actions/artifact/lib/internal/download-specification.js.map index fb48c31408..17e505e1f0 100644 --- a/node_modules/@actions/artifact/lib/internal/download-specification.js.map +++ b/node_modules/@actions/artifact/lib/internal/download-specification.js.map @@ -1 +1 @@ -{"version":3,"file":"download-specification.js","sourceRoot":"","sources":["../../src/internal/download-specification.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4B;AAyB5B;;;;;;GAMG;AACH,SAAgB,wBAAwB,CACtC,YAAoB,EACpB,eAAiC,EACjC,YAAoB,EACpB,oBAA6B;IAE7B,oEAAoE;IACpE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;IAErC,MAAM,cAAc,GAA0B;QAC5C,oBAAoB,EAAE,oBAAoB;YACxC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC;YACvC,CAAC,CAAC,YAAY;QAChB,kBAAkB,EAAE,EAAE;QACtB,kBAAkB,EAAE,EAAE;QACtB,eAAe,EAAE,EAAE;KACpB,CAAA;IAED,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE;QACnC,wEAAwE;QACxE,IACE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,YAAY,GAAG,CAAC;YACzC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,YAAY,IAAI,CAAC,EAC1C;YACA,2CAA2C;YAC3C,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACtD,oIAAoI;YACpI,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,YAAY,EACZ,oBAAoB;gBAClB,CAAC,CAAC,mBAAmB;gBACrB,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAClD,CAAA;YAED,2GAA2G;YAC3G,6FAA6F;YAC7F,IAAI,KAAK,CAAC,QAAQ,KAAK,MAAM,EAAE;gBAC7B,wFAAwF;gBACxF,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;gBACvC,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,EAAE;oBAC1B,kGAAkG;oBAClG,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;iBACjD;qBAAM;oBACL,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC;wBAClC,cAAc,EAAE,KAAK,CAAC,eAAe;wBACrC,UAAU,EAAE,QAAQ;qBACrB,CAAC,CAAA;iBACH;aACF;SACF;KACF;IAED,cAAc,CAAC,kBAAkB,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC3D,OAAO,cAAc,CAAA;AACvB,CAAC;AAtDD,4DAsDC"} \ No newline at end of file +{"version":3,"file":"download-specification.js","sourceRoot":"","sources":["../../src/internal/download-specification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4B;AAyB5B;;;;;;GAMG;AACH,SAAgB,wBAAwB,CACtC,YAAoB,EACpB,eAAiC,EACjC,YAAoB,EACpB,oBAA6B;IAE7B,oEAAoE;IACpE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;IAErC,MAAM,cAAc,GAA0B;QAC5C,oBAAoB,EAAE,oBAAoB;YACxC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC;YACvC,CAAC,CAAC,YAAY;QAChB,kBAAkB,EAAE,EAAE;QACtB,kBAAkB,EAAE,EAAE;QACtB,eAAe,EAAE,EAAE;KACpB,CAAA;IAED,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE;QACnC,wEAAwE;QACxE,IACE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,YAAY,GAAG,CAAC;YACzC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,YAAY,IAAI,CAAC,EAC1C;YACA,2CAA2C;YAC3C,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACtD,oIAAoI;YACpI,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,YAAY,EACZ,oBAAoB;gBAClB,CAAC,CAAC,mBAAmB;gBACrB,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAClD,CAAA;YAED,2GAA2G;YAC3G,6FAA6F;YAC7F,IAAI,KAAK,CAAC,QAAQ,KAAK,MAAM,EAAE;gBAC7B,wFAAwF;gBACxF,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;gBACvC,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,EAAE;oBAC1B,kGAAkG;oBAClG,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;iBACjD;qBAAM;oBACL,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC;wBAClC,cAAc,EAAE,KAAK,CAAC,eAAe;wBACrC,UAAU,EAAE,QAAQ;qBACrB,CAAC,CAAA;iBACH;aACF;SACF;KACF;IAED,cAAc,CAAC,kBAAkB,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC3D,OAAO,cAAc,CAAA;AACvB,CAAC;AAtDD,4DAsDC"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/http-manager.js b/node_modules/@actions/artifact/lib/internal/http-manager.js index 0c757cab5b..3c5eb476a5 100644 --- a/node_modules/@actions/artifact/lib/internal/http-manager.js +++ b/node_modules/@actions/artifact/lib/internal/http-manager.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.HttpManager = void 0; const utils_1 = require("./utils"); /** * Used for managing http clients during either upload or download diff --git a/node_modules/@actions/artifact/lib/internal/http-manager.js.map b/node_modules/@actions/artifact/lib/internal/http-manager.js.map index de9e267f62..7c7a4acd99 100644 --- a/node_modules/@actions/artifact/lib/internal/http-manager.js.map +++ b/node_modules/@actions/artifact/lib/internal/http-manager.js.map @@ -1 +1 @@ -{"version":3,"file":"http-manager.js","sourceRoot":"","sources":["../../src/internal/http-manager.ts"],"names":[],"mappings":";;AACA,mCAAwC;AAExC;;GAEG;AACH,MAAa,WAAW;IAItB,YAAY,WAAmB,EAAE,SAAiB;QAChD,IAAI,WAAW,GAAG,CAAC,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;SACrD;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,wBAAgB,CAAC,SAAS,CAAC,CAAC,CAAA;IACzE,CAAC;IAED,SAAS,CAAC,KAAa;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC5B,CAAC;IAED,mGAAmG;IACnG,+HAA+H;IAC/H,uBAAuB,CAAC,KAAa;QACnC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAA;QAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,wBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACxD,CAAC;IAED,2BAA2B;QACzB,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;YAC5C,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAA;SACpC;IACH,CAAC;CACF;AA5BD,kCA4BC"} \ No newline at end of file +{"version":3,"file":"http-manager.js","sourceRoot":"","sources":["../../src/internal/http-manager.ts"],"names":[],"mappings":";;;AACA,mCAAwC;AAExC;;GAEG;AACH,MAAa,WAAW;IAItB,YAAY,WAAmB,EAAE,SAAiB;QAChD,IAAI,WAAW,GAAG,CAAC,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;SACrD;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,wBAAgB,CAAC,SAAS,CAAC,CAAC,CAAA;IACzE,CAAC;IAED,SAAS,CAAC,KAAa;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC5B,CAAC;IAED,mGAAmG;IACnG,+HAA+H;IAC/H,uBAAuB,CAAC,KAAa;QACnC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAA;QAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,wBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACxD,CAAC;IAED,2BAA2B;QACzB,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;YAC5C,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAA;SACpC;IACH,CAAC;CACF;AA5BD,kCA4BC"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/path-and-artifact-name-validation.d.ts b/node_modules/@actions/artifact/lib/internal/path-and-artifact-name-validation.d.ts new file mode 100644 index 0000000000..04aea3d282 --- /dev/null +++ b/node_modules/@actions/artifact/lib/internal/path-and-artifact-name-validation.d.ts @@ -0,0 +1,8 @@ +/** + * Scans the name of the artifact to make sure there are no illegal characters + */ +export declare function checkArtifactName(name: string): void; +/** + * Scans the name of the filePath used to make sure there are no illegal characters + */ +export declare function checkArtifactFilePath(path: string): void; diff --git a/node_modules/@actions/artifact/lib/internal/path-and-artifact-name-validation.js b/node_modules/@actions/artifact/lib/internal/path-and-artifact-name-validation.js new file mode 100644 index 0000000000..7fb2b02b9b --- /dev/null +++ b/node_modules/@actions/artifact/lib/internal/path-and-artifact-name-validation.js @@ -0,0 +1,67 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.checkArtifactFilePath = exports.checkArtifactName = void 0; +const core_1 = require("@actions/core"); +/** + * Invalid characters that cannot be in the artifact name or an uploaded file. Will be rejected + * from the server if attempted to be sent over. These characters are not allowed due to limitations with certain + * file systems such as NTFS. To maintain platform-agnostic behavior, all characters that are not supported by an + * individual filesystem/platform will not be supported on all fileSystems/platforms + * + * FilePaths can include characters such as \ and / which are not permitted in the artifact name alone + */ +const invalidArtifactFilePathCharacters = new Map([ + ['"', ' Double quote "'], + [':', ' Colon :'], + ['<', ' Less than <'], + ['>', ' Greater than >'], + ['|', ' Vertical bar |'], + ['*', ' Asterisk *'], + ['?', ' Question mark ?'], + ['\r', ' Carriage return \\r'], + ['\n', ' Line feed \\n'] +]); +const invalidArtifactNameCharacters = new Map([ + ...invalidArtifactFilePathCharacters, + ['\\', ' Backslash \\'], + ['/', ' Forward slash /'] +]); +/** + * Scans the name of the artifact to make sure there are no illegal characters + */ +function checkArtifactName(name) { + if (!name) { + throw new Error(`Artifact name: ${name}, is incorrectly provided`); + } + for (const [invalidCharacterKey, errorMessageForCharacter] of invalidArtifactNameCharacters) { + if (name.includes(invalidCharacterKey)) { + throw new Error(`Artifact name is not valid: ${name}. Contains the following character: ${errorMessageForCharacter} + +Invalid characters include: ${Array.from(invalidArtifactNameCharacters.values()).toString()} + +These characters are not allowed in the artifact name due to limitations with certain file systems such as NTFS. To maintain file system agnostic behavior, these characters are intentionally not allowed to prevent potential problems with downloads on different file systems.`); + } + } + core_1.info(`Artifact name is valid!`); +} +exports.checkArtifactName = checkArtifactName; +/** + * Scans the name of the filePath used to make sure there are no illegal characters + */ +function checkArtifactFilePath(path) { + if (!path) { + throw new Error(`Artifact path: ${path}, is incorrectly provided`); + } + for (const [invalidCharacterKey, errorMessageForCharacter] of invalidArtifactFilePathCharacters) { + if (path.includes(invalidCharacterKey)) { + throw new Error(`Artifact path is not valid: ${path}. Contains the following character: ${errorMessageForCharacter} + +Invalid characters include: ${Array.from(invalidArtifactFilePathCharacters.values()).toString()} + +The following characters are not allowed in files that are uploaded due to limitations with certain file systems such as NTFS. To maintain file system agnostic behavior, these characters are intentionally not allowed to prevent potential problems with downloads on different file systems. + `); + } + } +} +exports.checkArtifactFilePath = checkArtifactFilePath; +//# sourceMappingURL=path-and-artifact-name-validation.js.map \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/path-and-artifact-name-validation.js.map b/node_modules/@actions/artifact/lib/internal/path-and-artifact-name-validation.js.map new file mode 100644 index 0000000000..2070858da2 --- /dev/null +++ b/node_modules/@actions/artifact/lib/internal/path-and-artifact-name-validation.js.map @@ -0,0 +1 @@ +{"version":3,"file":"path-and-artifact-name-validation.js","sourceRoot":"","sources":["../../src/internal/path-and-artifact-name-validation.ts"],"names":[],"mappings":";;;AAAA,wCAAkC;AAElC;;;;;;;GAOG;AACH,MAAM,iCAAiC,GAAG,IAAI,GAAG,CAAiB;IAChE,CAAC,GAAG,EAAE,iBAAiB,CAAC;IACxB,CAAC,GAAG,EAAE,UAAU,CAAC;IACjB,CAAC,GAAG,EAAE,cAAc,CAAC;IACrB,CAAC,GAAG,EAAE,iBAAiB,CAAC;IACxB,CAAC,GAAG,EAAE,iBAAiB,CAAC;IACxB,CAAC,GAAG,EAAE,aAAa,CAAC;IACpB,CAAC,GAAG,EAAE,kBAAkB,CAAC;IACzB,CAAC,IAAI,EAAE,sBAAsB,CAAC;IAC9B,CAAC,IAAI,EAAE,gBAAgB,CAAC;CACzB,CAAC,CAAA;AAEF,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAiB;IAC5D,GAAG,iCAAiC;IACpC,CAAC,IAAI,EAAE,eAAe,CAAC;IACvB,CAAC,GAAG,EAAE,kBAAkB,CAAC;CAC1B,CAAC,CAAA;AAEF;;GAEG;AACH,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,2BAA2B,CAAC,CAAA;KACnE;IAED,KAAK,MAAM,CACT,mBAAmB,EACnB,wBAAwB,CACzB,IAAI,6BAA6B,EAAE;QAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CACb,+BAA+B,IAAI,uCAAuC,wBAAwB;;8BAE5E,KAAK,CAAC,IAAI,CAC9B,6BAA6B,CAAC,MAAM,EAAE,CACvC,CAAC,QAAQ,EAAE;;mRAE+P,CAC5Q,CAAA;SACF;KACF;IAED,WAAI,CAAC,yBAAyB,CAAC,CAAA;AACjC,CAAC;AAvBD,8CAuBC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CAAC,IAAY;IAChD,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,2BAA2B,CAAC,CAAA;KACnE;IAED,KAAK,MAAM,CACT,mBAAmB,EACnB,wBAAwB,CACzB,IAAI,iCAAiC,EAAE;QACtC,IAAI,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CACb,+BAA+B,IAAI,uCAAuC,wBAAwB;;8BAE5E,KAAK,CAAC,IAAI,CAC9B,iCAAiC,CAAC,MAAM,EAAE,CAC3C,CAAC,QAAQ,EAAE;;;WAGT,CACJ,CAAA;SACF;KACF;AACH,CAAC;AAtBD,sDAsBC"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/requestUtils.js b/node_modules/@actions/artifact/lib/internal/requestUtils.js index ca0b0f86e7..2d3dfca8ce 100644 --- a/node_modules/@actions/artifact/lib/internal/requestUtils.js +++ b/node_modules/@actions/artifact/lib/internal/requestUtils.js @@ -1,4 +1,23 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -8,14 +27,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; - return result; -}; Object.defineProperty(exports, "__esModule", { value: true }); +exports.retryHttpClientRequest = exports.retry = void 0; const utils_1 = require("./utils"); const core = __importStar(require("@actions/core")); const config_variables_1 = require("./config-variables"); diff --git a/node_modules/@actions/artifact/lib/internal/requestUtils.js.map b/node_modules/@actions/artifact/lib/internal/requestUtils.js.map index 6d16218bd8..5a1943fe8a 100644 --- a/node_modules/@actions/artifact/lib/internal/requestUtils.js.map +++ b/node_modules/@actions/artifact/lib/internal/requestUtils.js.map @@ -1 +1 @@ -{"version":3,"file":"requestUtils.js","sourceRoot":"","sources":["../../src/internal/requestUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,mCAMgB;AAChB,oDAAqC;AACrC,yDAAgD;AAEhD,SAAsB,KAAK,CACzB,IAAY,EACZ,SAA6C,EAC7C,mBAAwC,EACxC,WAAmB;;QAEnB,IAAI,QAAQ,GAAoC,SAAS,CAAA;QACzD,IAAI,UAAU,GAAuB,SAAS,CAAA;QAC9C,IAAI,WAAW,GAAG,KAAK,CAAA;QACvB,IAAI,YAAY,GAAG,EAAE,CAAA;QACrB,IAAI,sBAAsB,GAAuB,SAAS,CAAA;QAC1D,IAAI,OAAO,GAAG,CAAC,CAAA;QAEf,OAAO,OAAO,IAAI,WAAW,EAAE;YAC7B,IAAI;gBACF,QAAQ,GAAG,MAAM,SAAS,EAAE,CAAA;gBAC5B,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAA;gBAExC,IAAI,2BAAmB,CAAC,UAAU,CAAC,EAAE;oBACnC,OAAO,QAAQ,CAAA;iBAChB;gBAED,uFAAuF;gBACvF,IAAI,UAAU,EAAE;oBACd,sBAAsB,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;iBAC7D;gBAED,WAAW,GAAG,6BAAqB,CAAC,UAAU,CAAC,CAAA;gBAC/C,YAAY,GAAG,mCAAmC,UAAU,EAAE,CAAA;aAC/D;YAAC,OAAO,KAAK,EAAE;gBACd,WAAW,GAAG,IAAI,CAAA;gBAClB,YAAY,GAAG,KAAK,CAAC,OAAO,CAAA;aAC7B;YAED,IAAI,CAAC,WAAW,EAAE;gBAChB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,2BAA2B,CAAC,CAAA;gBAC7C,IAAI,QAAQ,EAAE;oBACZ,8BAAsB,CAAC,QAAQ,CAAC,CAAA;iBACjC;gBACD,MAAK;aACN;YAED,IAAI,CAAC,IAAI,CACP,GAAG,IAAI,cAAc,OAAO,OAAO,WAAW,uBAAuB,YAAY,EAAE,CACpF,CAAA;YAED,MAAM,aAAK,CAAC,6CAAqC,CAAC,OAAO,CAAC,CAAC,CAAA;YAC3D,OAAO,EAAE,CAAA;SACV;QAED,IAAI,QAAQ,EAAE;YACZ,8BAAsB,CAAC,QAAQ,CAAC,CAAA;SACjC;QAED,IAAI,sBAAsB,EAAE;YAC1B,MAAM,KAAK,CAAC,GAAG,IAAI,YAAY,sBAAsB,EAAE,CAAC,CAAA;SACzD;QACD,MAAM,KAAK,CAAC,GAAG,IAAI,YAAY,YAAY,EAAE,CAAC,CAAA;IAChD,CAAC;CAAA;AA1DD,sBA0DC;AAED,SAAsB,sBAAsB,CAC1C,IAAY,EACZ,MAA0C,EAC1C,sBAA2C,IAAI,GAAG,EAAE,EACpD,WAAW,GAAG,gCAAa,EAAE;;QAE7B,OAAO,MAAM,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAmB,EAAE,WAAW,CAAC,CAAA;IACpE,CAAC;CAAA;AAPD,wDAOC"} \ No newline at end of file +{"version":3,"file":"requestUtils.js","sourceRoot":"","sources":["../../src/internal/requestUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAMgB;AAChB,oDAAqC;AACrC,yDAAgD;AAEhD,SAAsB,KAAK,CACzB,IAAY,EACZ,SAA6C,EAC7C,mBAAwC,EACxC,WAAmB;;QAEnB,IAAI,QAAQ,GAAoC,SAAS,CAAA;QACzD,IAAI,UAAU,GAAuB,SAAS,CAAA;QAC9C,IAAI,WAAW,GAAG,KAAK,CAAA;QACvB,IAAI,YAAY,GAAG,EAAE,CAAA;QACrB,IAAI,sBAAsB,GAAuB,SAAS,CAAA;QAC1D,IAAI,OAAO,GAAG,CAAC,CAAA;QAEf,OAAO,OAAO,IAAI,WAAW,EAAE;YAC7B,IAAI;gBACF,QAAQ,GAAG,MAAM,SAAS,EAAE,CAAA;gBAC5B,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAA;gBAExC,IAAI,2BAAmB,CAAC,UAAU,CAAC,EAAE;oBACnC,OAAO,QAAQ,CAAA;iBAChB;gBAED,uFAAuF;gBACvF,IAAI,UAAU,EAAE;oBACd,sBAAsB,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;iBAC7D;gBAED,WAAW,GAAG,6BAAqB,CAAC,UAAU,CAAC,CAAA;gBAC/C,YAAY,GAAG,mCAAmC,UAAU,EAAE,CAAA;aAC/D;YAAC,OAAO,KAAK,EAAE;gBACd,WAAW,GAAG,IAAI,CAAA;gBAClB,YAAY,GAAG,KAAK,CAAC,OAAO,CAAA;aAC7B;YAED,IAAI,CAAC,WAAW,EAAE;gBAChB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,2BAA2B,CAAC,CAAA;gBAC7C,IAAI,QAAQ,EAAE;oBACZ,8BAAsB,CAAC,QAAQ,CAAC,CAAA;iBACjC;gBACD,MAAK;aACN;YAED,IAAI,CAAC,IAAI,CACP,GAAG,IAAI,cAAc,OAAO,OAAO,WAAW,uBAAuB,YAAY,EAAE,CACpF,CAAA;YAED,MAAM,aAAK,CAAC,6CAAqC,CAAC,OAAO,CAAC,CAAC,CAAA;YAC3D,OAAO,EAAE,CAAA;SACV;QAED,IAAI,QAAQ,EAAE;YACZ,8BAAsB,CAAC,QAAQ,CAAC,CAAA;SACjC;QAED,IAAI,sBAAsB,EAAE;YAC1B,MAAM,KAAK,CAAC,GAAG,IAAI,YAAY,sBAAsB,EAAE,CAAC,CAAA;SACzD;QACD,MAAM,KAAK,CAAC,GAAG,IAAI,YAAY,YAAY,EAAE,CAAC,CAAA;IAChD,CAAC;CAAA;AA1DD,sBA0DC;AAED,SAAsB,sBAAsB,CAC1C,IAAY,EACZ,MAA0C,EAC1C,sBAA2C,IAAI,GAAG,EAAE,EACpD,WAAW,GAAG,gCAAa,EAAE;;QAE7B,OAAO,MAAM,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAmB,EAAE,WAAW,CAAC,CAAA;IACpE,CAAC;CAAA;AAPD,wDAOC"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/status-reporter.d.ts b/node_modules/@actions/artifact/lib/internal/status-reporter.d.ts index a3e44862c8..e301f7ac62 100644 --- a/node_modules/@actions/artifact/lib/internal/status-reporter.d.ts +++ b/node_modules/@actions/artifact/lib/internal/status-reporter.d.ts @@ -11,11 +11,10 @@ export declare class StatusReporter { private displayFrequencyInMilliseconds; private largeFiles; private totalFileStatus; - private largeFileStatus; constructor(displayFrequencyInMilliseconds: number); setTotalNumberOfFilesToProcess(fileTotal: number): void; start(): void; - updateLargeFileStatus(fileName: string, numerator: number, denominator: number): void; + updateLargeFileStatus(fileName: string, chunkStartIndex: number, chunkEndIndex: number, totalUploadFileSize: number): void; stop(): void; incrementProcessedCount(): void; private formatPercentage; diff --git a/node_modules/@actions/artifact/lib/internal/status-reporter.js b/node_modules/@actions/artifact/lib/internal/status-reporter.js index 9f29886ad3..46b77a4254 100644 --- a/node_modules/@actions/artifact/lib/internal/status-reporter.js +++ b/node_modules/@actions/artifact/lib/internal/status-reporter.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.StatusReporter = void 0; const core_1 = require("@actions/core"); /** * Status Reporter that displays information about the progress/status of an artifact that is being uploaded or downloaded @@ -14,11 +15,11 @@ class StatusReporter { this.processedCount = 0; this.largeFiles = new Map(); this.totalFileStatus = undefined; - this.largeFileStatus = undefined; this.displayFrequencyInMilliseconds = displayFrequencyInMilliseconds; } setTotalNumberOfFilesToProcess(fileTotal) { this.totalNumberOfFilesToProcess = fileTotal; + this.processedCount = 0; } start() { // displays information about the total upload/download status @@ -27,30 +28,17 @@ class StatusReporter { const percentage = this.formatPercentage(this.processedCount, this.totalNumberOfFilesToProcess); core_1.info(`Total file count: ${this.totalNumberOfFilesToProcess} ---- Processed file #${this.processedCount} (${percentage.slice(0, percentage.indexOf('.') + 2)}%)`); }, this.displayFrequencyInMilliseconds); - // displays extra information about any large files that take a significant amount of time to upload or download every 1 second - this.largeFileStatus = setInterval(() => { - for (const value of Array.from(this.largeFiles.values())) { - core_1.info(value); - } - // delete all entries in the map after displaying the information so it will not be displayed again unless explicitly added - this.largeFiles.clear(); - }, 1000); } // if there is a large file that is being uploaded in chunks, this is used to display extra information about the status of the upload - updateLargeFileStatus(fileName, numerator, denominator) { + updateLargeFileStatus(fileName, chunkStartIndex, chunkEndIndex, totalUploadFileSize) { // display 1 decimal place without any rounding - const percentage = this.formatPercentage(numerator, denominator); - const displayInformation = `Uploading ${fileName} (${percentage.slice(0, percentage.indexOf('.') + 2)}%)`; - // any previously added display information should be overwritten for the specific large file because a map is being used - this.largeFiles.set(fileName, displayInformation); + const percentage = this.formatPercentage(chunkEndIndex, totalUploadFileSize); + core_1.info(`Uploaded ${fileName} (${percentage.slice(0, percentage.indexOf('.') + 2)}%) bytes ${chunkStartIndex}:${chunkEndIndex}`); } stop() { if (this.totalFileStatus) { clearInterval(this.totalFileStatus); } - if (this.largeFileStatus) { - clearInterval(this.largeFileStatus); - } } incrementProcessedCount() { this.processedCount++; diff --git a/node_modules/@actions/artifact/lib/internal/status-reporter.js.map b/node_modules/@actions/artifact/lib/internal/status-reporter.js.map index 6108484134..ce4bb697ea 100644 --- a/node_modules/@actions/artifact/lib/internal/status-reporter.js.map +++ b/node_modules/@actions/artifact/lib/internal/status-reporter.js.map @@ -1 +1 @@ -{"version":3,"file":"status-reporter.js","sourceRoot":"","sources":["../../src/internal/status-reporter.ts"],"names":[],"mappings":";;AAAA,wCAAkC;AAElC;;;;;;GAMG;AAEH,MAAa,cAAc;IAQzB,YAAY,8BAAsC;QAP1C,gCAA2B,GAAG,CAAC,CAAA;QAC/B,mBAAc,GAAG,CAAC,CAAA;QAElB,eAAU,GAAG,IAAI,GAAG,EAAkB,CAAA;QAK5C,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;QAChC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;QAChC,IAAI,CAAC,8BAA8B,GAAG,8BAA8B,CAAA;IACtE,CAAC;IAED,8BAA8B,CAAC,SAAiB;QAC9C,IAAI,CAAC,2BAA2B,GAAG,SAAS,CAAA;IAC9C,CAAC;IAED,KAAK;QACH,8DAA8D;QAC9D,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;YACtC,+CAA+C;YAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CACtC,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,2BAA2B,CACjC,CAAA;YACD,WAAI,CACF,qBACE,IAAI,CAAC,2BACP,yBAAyB,IAAI,CAAC,cAAc,KAAK,UAAU,CAAC,KAAK,CAC/D,CAAC,EACD,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAC5B,IAAI,CACN,CAAA;QACH,CAAC,EAAE,IAAI,CAAC,8BAA8B,CAAC,CAAA;QAEvC,+HAA+H;QAC/H,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;YACtC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE;gBACxD,WAAI,CAAC,KAAK,CAAC,CAAA;aACZ;YACD,2HAA2H;YAC3H,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;QACzB,CAAC,EAAE,IAAI,CAAC,CAAA;IACV,CAAC;IAED,sIAAsI;IACtI,qBAAqB,CACnB,QAAgB,EAChB,SAAiB,EACjB,WAAmB;QAEnB,+CAA+C;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;QAChE,MAAM,kBAAkB,GAAG,aAAa,QAAQ,KAAK,UAAU,CAAC,KAAK,CACnE,CAAC,EACD,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAC5B,IAAI,CAAA;QAEL,yHAAyH;QACzH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAA;IACnD,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;SACpC;QAED,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;SACpC;IACH,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,cAAc,EAAE,CAAA;IACvB,CAAC;IAEO,gBAAgB,CAAC,SAAiB,EAAE,WAAmB;QAC7D,0HAA0H;QAC1H,OAAO,CAAC,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IAChE,CAAC;CACF;AAjFD,wCAiFC"} \ No newline at end of file +{"version":3,"file":"status-reporter.js","sourceRoot":"","sources":["../../src/internal/status-reporter.ts"],"names":[],"mappings":";;;AAAA,wCAAkC;AAElC;;;;;;GAMG;AAEH,MAAa,cAAc;IAOzB,YAAY,8BAAsC;QAN1C,gCAA2B,GAAG,CAAC,CAAA;QAC/B,mBAAc,GAAG,CAAC,CAAA;QAElB,eAAU,GAAG,IAAI,GAAG,EAAkB,CAAA;QAI5C,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;QAChC,IAAI,CAAC,8BAA8B,GAAG,8BAA8B,CAAA;IACtE,CAAC;IAED,8BAA8B,CAAC,SAAiB;QAC9C,IAAI,CAAC,2BAA2B,GAAG,SAAS,CAAA;QAC5C,IAAI,CAAC,cAAc,GAAG,CAAC,CAAA;IACzB,CAAC;IAED,KAAK;QACH,8DAA8D;QAC9D,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;YACtC,+CAA+C;YAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CACtC,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,2BAA2B,CACjC,CAAA;YACD,WAAI,CACF,qBACE,IAAI,CAAC,2BACP,yBAAyB,IAAI,CAAC,cAAc,KAAK,UAAU,CAAC,KAAK,CAC/D,CAAC,EACD,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAC5B,IAAI,CACN,CAAA;QACH,CAAC,EAAE,IAAI,CAAC,8BAA8B,CAAC,CAAA;IACzC,CAAC;IAED,sIAAsI;IACtI,qBAAqB,CACnB,QAAgB,EAChB,eAAuB,EACvB,aAAqB,EACrB,mBAA2B;QAE3B,+CAA+C;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAA;QAC5E,WAAI,CACF,YAAY,QAAQ,KAAK,UAAU,CAAC,KAAK,CACvC,CAAC,EACD,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAC5B,YAAY,eAAe,IAAI,aAAa,EAAE,CAChD,CAAA;IACH,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;SACpC;IACH,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,cAAc,EAAE,CAAA;IACvB,CAAC;IAEO,gBAAgB,CAAC,SAAiB,EAAE,WAAmB;QAC7D,0HAA0H;QAC1H,OAAO,CAAC,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IAChE,CAAC;CACF;AAnED,wCAmEC"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/upload-gzip.js b/node_modules/@actions/artifact/lib/internal/upload-gzip.js index a13f12d6c6..b8e2e46820 100644 --- a/node_modules/@actions/artifact/lib/internal/upload-gzip.js +++ b/node_modules/@actions/artifact/lib/internal/upload-gzip.js @@ -1,4 +1,23 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -15,18 +34,25 @@ var __asyncValues = (this && this.__asyncValues) || function (o) { function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; } function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); } }; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; - return result; -}; Object.defineProperty(exports, "__esModule", { value: true }); +exports.createGZipFileInBuffer = exports.createGZipFileOnDisk = void 0; const fs = __importStar(require("fs")); const zlib = __importStar(require("zlib")); const util_1 = require("util"); const stat = util_1.promisify(fs.stat); +/** + * GZipping certain files that are already compressed will likely not yield further size reductions. Creating large temporary gzip + * files then will just waste a lot of time before ultimately being discarded (especially for very large files). + * If any of these types of files are encountered then on-disk gzip creation will be skipped and the original file will be uploaded as-is + */ +const gzipExemptFileExtensions = [ + '.gzip', + '.zip', + '.tar.lz', + '.tar.gz', + '.tar.bz2', + '.7z' +]; /** * Creates a Gzip compressed file of an original file at the provided temporary filepath location * @param {string} originalFilePath filepath of whatever will be compressed. The original file will be unmodified @@ -35,6 +61,12 @@ const stat = util_1.promisify(fs.stat); */ function createGZipFileOnDisk(originalFilePath, tempFilePath) { return __awaiter(this, void 0, void 0, function* () { + for (const gzipExemptExtension of gzipExemptFileExtensions) { + if (originalFilePath.endsWith(gzipExemptExtension)) { + // return a really large number so that the original file gets uploaded + return Number.MAX_SAFE_INTEGER; + } + } return new Promise((resolve, reject) => { const inputStream = fs.createReadStream(originalFilePath); const gzip = zlib.createGzip(); diff --git a/node_modules/@actions/artifact/lib/internal/upload-gzip.js.map b/node_modules/@actions/artifact/lib/internal/upload-gzip.js.map index 25c7de1b87..b649695d46 100644 --- a/node_modules/@actions/artifact/lib/internal/upload-gzip.js.map +++ b/node_modules/@actions/artifact/lib/internal/upload-gzip.js.map @@ -1 +1 @@ -{"version":3,"file":"upload-gzip.js","sourceRoot":"","sources":["../../src/internal/upload-gzip.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,2CAA4B;AAC5B,+BAA8B;AAC9B,MAAM,IAAI,GAAG,gBAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;AAE/B;;;;;GAKG;AACH,SAAsB,oBAAoB,CACxC,gBAAwB,EACxB,YAAoB;;QAEpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,EAAE,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;YACzD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;YAC9B,MAAM,YAAY,GAAG,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAA;YACvD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YACzC,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAS,EAAE;gBACnC,qIAAqI;gBACrI,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAA;gBAC5C,OAAO,CAAC,IAAI,CAAC,CAAA;YACf,CAAC,CAAA,CAAC,CAAA;YACF,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;gBAC/B,sCAAsC;gBACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBAClB,MAAM,CAAA;YACR,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AApBD,oDAoBC;AAED;;;;GAIG;AACH,SAAsB,sBAAsB,CAC1C,gBAAwB;;QAExB,OAAO,IAAI,OAAO,CAAC,CAAM,OAAO,EAAC,EAAE;;YACjC,MAAM,WAAW,GAAG,EAAE,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;YACzD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;YAC9B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACtB,8IAA8I;YAC9I,MAAM,MAAM,GAAG,EAAE,CAAA;;gBACjB,KAA0B,IAAA,SAAA,cAAA,IAAI,CAAA,UAAA;oBAAnB,MAAM,KAAK,iBAAA,CAAA;oBACpB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;iBACnB;;;;;;;;;YACD,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;QAChC,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC;CAAA;AAdD,wDAcC"} \ No newline at end of file +{"version":3,"file":"upload-gzip.js","sourceRoot":"","sources":["../../src/internal/upload-gzip.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,2CAA4B;AAC5B,+BAA8B;AAC9B,MAAM,IAAI,GAAG,gBAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;AAE/B;;;;GAIG;AACH,MAAM,wBAAwB,GAAG;IAC/B,OAAO;IACP,MAAM;IACN,SAAS;IACT,SAAS;IACT,UAAU;IACV,KAAK;CACN,CAAA;AAED;;;;;GAKG;AACH,SAAsB,oBAAoB,CACxC,gBAAwB,EACxB,YAAoB;;QAEpB,KAAK,MAAM,mBAAmB,IAAI,wBAAwB,EAAE;YAC1D,IAAI,gBAAgB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;gBAClD,uEAAuE;gBACvE,OAAO,MAAM,CAAC,gBAAgB,CAAA;aAC/B;SACF;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,EAAE,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;YACzD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;YAC9B,MAAM,YAAY,GAAG,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAA;YACvD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YACzC,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAS,EAAE;gBACnC,qIAAqI;gBACrI,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAA;gBAC5C,OAAO,CAAC,IAAI,CAAC,CAAA;YACf,CAAC,CAAA,CAAC,CAAA;YACF,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;gBAC/B,sCAAsC;gBACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBAClB,MAAM,CAAA;YACR,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AA3BD,oDA2BC;AAED;;;;GAIG;AACH,SAAsB,sBAAsB,CAC1C,gBAAwB;;QAExB,OAAO,IAAI,OAAO,CAAC,CAAM,OAAO,EAAC,EAAE;;YACjC,MAAM,WAAW,GAAG,EAAE,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;YACzD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;YAC9B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACtB,8IAA8I;YAC9I,MAAM,MAAM,GAAG,EAAE,CAAA;;gBACjB,KAA0B,IAAA,SAAA,cAAA,IAAI,CAAA,UAAA;oBAAnB,MAAM,KAAK,iBAAA,CAAA;oBACpB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;iBACnB;;;;;;;;;YACD,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;QAChC,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC;CAAA;AAdD,wDAcC"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/upload-http-client.js b/node_modules/@actions/artifact/lib/internal/upload-http-client.js index cb576028d9..f68027b5df 100644 --- a/node_modules/@actions/artifact/lib/internal/upload-http-client.js +++ b/node_modules/@actions/artifact/lib/internal/upload-http-client.js @@ -1,4 +1,23 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -8,14 +27,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; - return result; -}; Object.defineProperty(exports, "__esModule", { value: true }); +exports.UploadHttpClient = void 0; const fs = __importStar(require("fs")); const core = __importStar(require("@actions/core")); const tmp = __importStar(require("tmp-promise")); @@ -161,27 +174,33 @@ class UploadHttpClient { */ uploadFileAsync(httpClientIndex, parameters) { return __awaiter(this, void 0, void 0, function* () { - const totalFileSize = (yield stat(parameters.file)).size; + const fileStat = yield stat(parameters.file); + const totalFileSize = fileStat.size; + const isFIFO = fileStat.isFIFO(); let offset = 0; let isUploadSuccessful = true; let failedChunkSizes = 0; let uploadFileSize = 0; let isGzip = true; - // the file that is being uploaded is less than 64k in size, to increase throughput and to minimize disk I/O + // the file that is being uploaded is less than 64k in size to increase throughput and to minimize disk I/O // for creating a new GZip file, an in-memory buffer is used for compression - if (totalFileSize < 65536) { + // with named pipes the file size is reported as zero in that case don't read the file in memory + if (!isFIFO && totalFileSize < 65536) { + core.debug(`${parameters.file} is less than 64k in size. Creating a gzip file in-memory to potentially reduce the upload size`); const buffer = yield upload_gzip_1.createGZipFileInBuffer(parameters.file); - //An open stream is needed in the event of a failure and we need to retry. If a NodeJS.ReadableStream is directly passed in, + // An open stream is needed in the event of a failure and we need to retry. If a NodeJS.ReadableStream is directly passed in, // it will not properly get reset to the start of the stream if a chunk upload needs to be retried let openUploadStream; if (totalFileSize < buffer.byteLength) { // compression did not help with reducing the size, use a readable stream from the original file for upload + core.debug(`The gzip file created for ${parameters.file} did not help with reducing the size of the file. The original file will be uploaded as-is`); openUploadStream = () => fs.createReadStream(parameters.file); isGzip = false; uploadFileSize = totalFileSize; } else { // create a readable stream using a PassThrough stream that is both readable and writable + core.debug(`A gzip file created for ${parameters.file} helped with reducing the size of the original file. The file will be uploaded using gzip.`); openUploadStream = () => { const passThrough = new stream.PassThrough(); passThrough.end(buffer); @@ -206,25 +225,27 @@ class UploadHttpClient { // the file that is being uploaded is greater than 64k in size, a temporary file gets created on disk using the // npm tmp-promise package and this file gets used to create a GZipped file const tempFile = yield tmp.file(); + core.debug(`${parameters.file} is greater than 64k in size. Creating a gzip file on-disk ${tempFile.path} to potentially reduce the upload size`); // create a GZip file of the original file being uploaded, the original file should not be modified in any way uploadFileSize = yield upload_gzip_1.createGZipFileOnDisk(parameters.file, tempFile.path); let uploadFilePath = tempFile.path; // compression did not help with size reduction, use the original file for upload and delete the temp GZip file - if (totalFileSize < uploadFileSize) { + // for named pipes totalFileSize is zero, this assumes compression did help + if (!isFIFO && totalFileSize < uploadFileSize) { + core.debug(`The gzip file created for ${parameters.file} did not help with reducing the size of the file. The original file will be uploaded as-is`); uploadFileSize = totalFileSize; uploadFilePath = parameters.file; isGzip = false; } + else { + core.debug(`The gzip file created for ${parameters.file} is smaller than the original file. The file will be uploaded using gzip.`); + } let abortFileUpload = false; // upload only a single chunk at a time while (offset < uploadFileSize) { const chunkSize = Math.min(uploadFileSize - offset, parameters.maxChunkSize); - // if an individual file is greater than 100MB (1024*1024*100) in size, display extra information about the upload status - if (uploadFileSize > 104857600) { - this.statusReporter.updateLargeFileStatus(parameters.file, offset, uploadFileSize); - } - const start = offset; - const end = offset + chunkSize - 1; + const startChunkIndex = offset; + const endChunkIndex = offset + chunkSize - 1; offset += parameters.maxChunkSize; if (abortFileUpload) { // if we don't want to continue in the event of an error, any pending upload chunks will be marked as failed @@ -232,10 +253,10 @@ class UploadHttpClient { continue; } const result = yield this.uploadChunk(httpClientIndex, parameters.resourceUrl, () => fs.createReadStream(uploadFilePath, { - start, - end, + start: startChunkIndex, + end: endChunkIndex, autoClose: false - }), start, end, uploadFileSize, isGzip, totalFileSize); + }), startChunkIndex, endChunkIndex, uploadFileSize, isGzip, totalFileSize); if (!result) { // Chunk failed to upload, report as failed and do not continue uploading any more chunks for the file. It is possible that part of a chunk was // successfully uploaded so the server may report a different size for what was uploaded @@ -244,9 +265,16 @@ class UploadHttpClient { core.warning(`Aborting upload for ${parameters.file} due to failure`); abortFileUpload = true; } + else { + // if an individual file is greater than 8MB (1024*1024*8) in size, display extra information about the upload status + if (uploadFileSize > 8388608) { + this.statusReporter.updateLargeFileStatus(parameters.file, startChunkIndex, endChunkIndex, uploadFileSize); + } + } } // Delete the temporary file that was created as part of the upload. If the temp file does not get manually deleted by // calling cleanup, it gets removed when the node process exits. For more info see: https://www.npmjs.com/package/tmp-promise#about + core.debug(`deleting temporary gzip file ${tempFile.path}`); yield tempFile.cleanup(); return { isSuccess: isUploadSuccessful, diff --git a/node_modules/@actions/artifact/lib/internal/upload-http-client.js.map b/node_modules/@actions/artifact/lib/internal/upload-http-client.js.map index 1758285054..3347380fbb 100644 --- a/node_modules/@actions/artifact/lib/internal/upload-http-client.js.map +++ b/node_modules/@actions/artifact/lib/internal/upload-http-client.js.map @@ -1 +1 @@ -{"version":3,"file":"upload-http-client.js","sourceRoot":"","sources":["../../src/internal/upload-http-client.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"upload-http-client.js","sourceRoot":"","sources":["../../src/internal/upload-http-client.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/upload-specification.js b/node_modules/@actions/artifact/lib/internal/upload-specification.js index ad222223f7..214cfc8b5c 100644 --- a/node_modules/@actions/artifact/lib/internal/upload-specification.js +++ b/node_modules/@actions/artifact/lib/internal/upload-specification.js @@ -1,16 +1,29 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); var __importStar = (this && this.__importStar) || function (mod) { if (mod && mod.__esModule) return mod; var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; + if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); return result; }; Object.defineProperty(exports, "__esModule", { value: true }); +exports.getUploadSpecification = void 0; const fs = __importStar(require("fs")); const core_1 = require("@actions/core"); const path_1 = require("path"); -const utils_1 = require("./utils"); +const path_and_artifact_name_validation_1 = require("./path-and-artifact-name-validation"); /** * Creates a specification that describes how each file that is part of the artifact will be uploaded * @param artifactName the name of the artifact being uploaded. Used during upload to denote where the artifact is stored on the server @@ -18,7 +31,7 @@ const utils_1 = require("./utils"); * @param artifactFiles a list of absolute file paths that denote what should be uploaded as part of the artifact */ function getUploadSpecification(artifactName, rootDirectory, artifactFiles) { - utils_1.checkArtifactName(artifactName); + // artifact name was checked earlier on, no need to check again const specifications = []; if (!fs.existsSync(rootDirectory)) { throw new Error(`Provided rootDirectory ${rootDirectory} does not exist`); @@ -61,7 +74,7 @@ function getUploadSpecification(artifactName, rootDirectory, artifactFiles) { } // Check for forbidden characters in file paths that will be rejected during upload const uploadPath = file.replace(rootDirectory, ''); - utils_1.checkArtifactFilePath(uploadPath); + path_and_artifact_name_validation_1.checkArtifactFilePath(uploadPath); /* uploadFilePath denotes where the file will be uploaded in the file container on the server. During a run, if multiple artifacts are uploaded, they will all be saved in the same container. The artifact name is used as the root directory in the container to separate and distinguish uploaded artifacts diff --git a/node_modules/@actions/artifact/lib/internal/upload-specification.js.map b/node_modules/@actions/artifact/lib/internal/upload-specification.js.map index b0415ef96a..dfc17d359f 100644 --- a/node_modules/@actions/artifact/lib/internal/upload-specification.js.map +++ b/node_modules/@actions/artifact/lib/internal/upload-specification.js.map @@ -1 +1 @@ -{"version":3,"file":"upload-specification.js","sourceRoot":"","sources":["../../src/internal/upload-specification.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uCAAwB;AACxB,wCAAmC;AACnC,+BAA6C;AAC7C,mCAAgE;AAOhE;;;;;GAKG;AACH,SAAgB,sBAAsB,CACpC,YAAoB,EACpB,aAAqB,EACrB,aAAuB;IAEvB,yBAAiB,CAAC,YAAY,CAAC,CAAA;IAE/B,MAAM,cAAc,GAA0B,EAAE,CAAA;IAEhD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,0BAA0B,aAAa,iBAAiB,CAAC,CAAA;KAC1E;IACD,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,EAAE;QAC9C,MAAM,IAAI,KAAK,CACb,0BAA0B,aAAa,2BAA2B,CACnE,CAAA;KACF;IACD,sFAAsF;IACtF,aAAa,GAAG,gBAAS,CAAC,aAAa,CAAC,CAAA;IACxC,aAAa,GAAG,cAAO,CAAC,aAAa,CAAC,CAAA;IAEtC;;;;;;;;;;;;;;;;;;MAkBE;IACF,KAAK,IAAI,IAAI,IAAI,aAAa,EAAE;QAC9B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,iBAAiB,CAAC,CAAA;SAC/C;QACD,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;YACrC,sFAAsF;YACtF,IAAI,GAAG,gBAAS,CAAC,IAAI,CAAC,CAAA;YACtB,IAAI,GAAG,cAAO,CAAC,IAAI,CAAC,CAAA;YACpB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;gBACnC,MAAM,IAAI,KAAK,CACb,sBAAsB,aAAa,2CAA2C,IAAI,EAAE,CACrF,CAAA;aACF;YAED,mFAAmF;YACnF,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAA;YAClD,6BAAqB,CAAC,UAAU,CAAC,CAAA;YAEjC;;;;;;;;;cASE;YACF,cAAc,CAAC,IAAI,CAAC;gBAClB,gBAAgB,EAAE,IAAI;gBACtB,cAAc,EAAE,WAAI,CAAC,YAAY,EAAE,UAAU,CAAC;aAC/C,CAAC,CAAA;SACH;aAAM;YACL,uDAAuD;YACvD,YAAK,CAAC,YAAY,IAAI,kDAAkD,CAAC,CAAA;SAC1E;KACF;IACD,OAAO,cAAc,CAAA;AACvB,CAAC;AA9ED,wDA8EC"} \ No newline at end of file +{"version":3,"file":"upload-specification.js","sourceRoot":"","sources":["../../src/internal/upload-specification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,wCAAmC;AACnC,+BAA6C;AAC7C,2FAAyE;AAOzE;;;;;GAKG;AACH,SAAgB,sBAAsB,CACpC,YAAoB,EACpB,aAAqB,EACrB,aAAuB;IAEvB,+DAA+D;IAC/D,MAAM,cAAc,GAA0B,EAAE,CAAA;IAEhD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,0BAA0B,aAAa,iBAAiB,CAAC,CAAA;KAC1E;IACD,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,EAAE;QAC9C,MAAM,IAAI,KAAK,CACb,0BAA0B,aAAa,2BAA2B,CACnE,CAAA;KACF;IACD,sFAAsF;IACtF,aAAa,GAAG,gBAAS,CAAC,aAAa,CAAC,CAAA;IACxC,aAAa,GAAG,cAAO,CAAC,aAAa,CAAC,CAAA;IAEtC;;;;;;;;;;;;;;;;;;MAkBE;IACF,KAAK,IAAI,IAAI,IAAI,aAAa,EAAE;QAC9B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,iBAAiB,CAAC,CAAA;SAC/C;QACD,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;YACrC,sFAAsF;YACtF,IAAI,GAAG,gBAAS,CAAC,IAAI,CAAC,CAAA;YACtB,IAAI,GAAG,cAAO,CAAC,IAAI,CAAC,CAAA;YACpB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;gBACnC,MAAM,IAAI,KAAK,CACb,sBAAsB,aAAa,2CAA2C,IAAI,EAAE,CACrF,CAAA;aACF;YAED,mFAAmF;YACnF,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAA;YAClD,yDAAqB,CAAC,UAAU,CAAC,CAAA;YAEjC;;;;;;;;;cASE;YACF,cAAc,CAAC,IAAI,CAAC;gBAClB,gBAAgB,EAAE,IAAI;gBACtB,cAAc,EAAE,WAAI,CAAC,YAAY,EAAE,UAAU,CAAC;aAC/C,CAAC,CAAA;SACH;aAAM;YACL,uDAAuD;YACvD,YAAK,CAAC,YAAY,IAAI,kDAAkD,CAAC,CAAA;SAC1E;KACF;IACD,OAAO,cAAc,CAAA;AACvB,CAAC;AA7ED,wDA6EC"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/lib/internal/utils.d.ts b/node_modules/@actions/artifact/lib/internal/utils.d.ts index 8121049910..64b37f86bb 100644 --- a/node_modules/@actions/artifact/lib/internal/utils.d.ts +++ b/node_modules/@actions/artifact/lib/internal/utils.d.ts @@ -58,14 +58,6 @@ export declare function getArtifactUrl(): string; * Other information such as the headers, the response code and message might be useful, so this is displayed. */ export declare function displayHttpDiagnostics(response: IHttpClientResponse): void; -/** - * Scans the name of the artifact to make sure there are no illegal characters - */ -export declare function checkArtifactName(name: string): void; -/** - * Scans the name of the filePath used to make sure there are no illegal characters - */ -export declare function checkArtifactFilePath(path: string): void; export declare function createDirectoriesForArtifact(directories: string[]): Promise; export declare function createEmptyFilesForArtifact(emptyFilesToCreate: string[]): Promise; export declare function getFileSize(filePath: string): Promise; diff --git a/node_modules/@actions/artifact/lib/internal/utils.js b/node_modules/@actions/artifact/lib/internal/utils.js index 7313992a4d..8d3e2740e3 100644 --- a/node_modules/@actions/artifact/lib/internal/utils.js +++ b/node_modules/@actions/artifact/lib/internal/utils.js @@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); +exports.sleep = exports.getProperRetention = exports.rmFile = exports.getFileSize = exports.createEmptyFilesForArtifact = exports.createDirectoriesForArtifact = exports.displayHttpDiagnostics = exports.getArtifactUrl = exports.createHttpClient = exports.getUploadHeaders = exports.getDownloadHeaders = exports.getContentRange = exports.tryGetRetryAfterValueTimeInMilliseconds = exports.isThrottledStatusCode = exports.isRetryableStatusCode = exports.isForbiddenStatusCode = exports.isSuccessStatusCode = exports.getApiVersion = exports.parseEnvNumber = exports.getExponentialRetryTimeInMilliseconds = void 0; const core_1 = require("@actions/core"); const fs_1 = require("fs"); const http_client_1 = require("@actions/http-client"); @@ -28,7 +29,7 @@ function getExponentialRetryTimeInMilliseconds(retryCount) { const minTime = config_variables_1.getInitialRetryIntervalInMilliseconds() * config_variables_1.getRetryMultiplier() * retryCount; const maxTime = minTime * config_variables_1.getRetryMultiplier(); // returns a random number between the minTime (inclusive) and the maxTime (exclusive) - return Math.random() * (maxTime - minTime) + minTime; + return Math.trunc(Math.random() * (maxTime - minTime) + minTime); } exports.getExponentialRetryTimeInMilliseconds = getExponentialRetryTimeInMilliseconds; /** @@ -207,48 +208,6 @@ Header Information: ${JSON.stringify(response.message.headers, undefined, 2)} ###### End Diagnostic HTTP information ######`); } exports.displayHttpDiagnostics = displayHttpDiagnostics; -/** - * Invalid characters that cannot be in the artifact name or an uploaded file. Will be rejected - * from the server if attempted to be sent over. These characters are not allowed due to limitations with certain - * file systems such as NTFS. To maintain platform-agnostic behavior, all characters that are not supported by an - * individual filesystem/platform will not be supported on all fileSystems/platforms - * - * FilePaths can include characters such as \ and / which are not permitted in the artifact name alone - */ -const invalidArtifactFilePathCharacters = ['"', ':', '<', '>', '|', '*', '?']; -const invalidArtifactNameCharacters = [ - ...invalidArtifactFilePathCharacters, - '\\', - '/' -]; -/** - * Scans the name of the artifact to make sure there are no illegal characters - */ -function checkArtifactName(name) { - if (!name) { - throw new Error(`Artifact name: ${name}, is incorrectly provided`); - } - for (const invalidChar of invalidArtifactNameCharacters) { - if (name.includes(invalidChar)) { - throw new Error(`Artifact name is not valid: ${name}. Contains character: "${invalidChar}". Invalid artifact name characters include: ${invalidArtifactNameCharacters.toString()}.`); - } - } -} -exports.checkArtifactName = checkArtifactName; -/** - * Scans the name of the filePath used to make sure there are no illegal characters - */ -function checkArtifactFilePath(path) { - if (!path) { - throw new Error(`Artifact path: ${path}, is incorrectly provided`); - } - for (const invalidChar of invalidArtifactFilePathCharacters) { - if (path.includes(invalidChar)) { - throw new Error(`Artifact path is not valid: ${path}. Contains character: "${invalidChar}". Invalid characters include: ${invalidArtifactFilePathCharacters.toString()}.`); - } - } -} -exports.checkArtifactFilePath = checkArtifactFilePath; function createDirectoriesForArtifact(directories) { return __awaiter(this, void 0, void 0, function* () { for (const directory of directories) { diff --git a/node_modules/@actions/artifact/lib/internal/utils.js.map b/node_modules/@actions/artifact/lib/internal/utils.js.map index b17039d64d..6c8ab495a0 100644 --- a/node_modules/@actions/artifact/lib/internal/utils.js.map +++ b/node_modules/@actions/artifact/lib/internal/utils.js.map @@ -1 +1 @@ -{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/internal/utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/internal/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAkD;AAClD,2BAAiC;AACjC,sDAA0D;AAC1D,oDAAiE;AAGjE,yDAM2B;AAE3B;;;GAGG;AACH,SAAgB,qCAAqC,CACnD,UAAkB;IAElB,IAAI,UAAU,GAAG,CAAC,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;KACrD;SAAM,IAAI,UAAU,KAAK,CAAC,EAAE;QAC3B,OAAO,wDAAqC,EAAE,CAAA;KAC/C;IAED,MAAM,OAAO,GACX,wDAAqC,EAAE,GAAG,qCAAkB,EAAE,GAAG,UAAU,CAAA;IAC7E,MAAM,OAAO,GAAG,OAAO,GAAG,qCAAkB,EAAE,CAAA;IAE9C,sFAAsF;IACtF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC,CAAA;AAClE,CAAC;AAfD,sFAeC;AAED;;GAEG;AACH,SAAgB,cAAc,CAAC,GAAW;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;IACtC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE;QACpC,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAND,wCAMC;AAED;;GAEG;AACH,SAAgB,aAAa;IAC3B,OAAO,aAAa,CAAA;AACtB,CAAC;AAFD,sCAEC;AAED,SAAgB,mBAAmB,CAAC,UAAmB;IACrD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAA;KACb;IACD,OAAO,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG,CAAA;AAC9C,CAAC;AALD,kDAKC;AAED,SAAgB,qBAAqB,CAAC,UAAmB;IACvD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAA;KACb;IACD,OAAO,UAAU,KAAK,uBAAS,CAAC,SAAS,CAAA;AAC3C,CAAC;AALD,sDAKC;AAED,SAAgB,qBAAqB,CAAC,UAA8B;IAClE,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAA;KACb;IAED,MAAM,oBAAoB,GAAG;QAC3B,uBAAS,CAAC,UAAU;QACpB,uBAAS,CAAC,cAAc;QACxB,uBAAS,CAAC,mBAAmB;QAC7B,uBAAS,CAAC,kBAAkB;QAC5B,uBAAS,CAAC,eAAe;QACzB,GAAG,CAAC,oBAAoB;KACzB,CAAA;IACD,OAAO,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;AAClD,CAAC;AAdD,sDAcC;AAED,SAAgB,qBAAqB,CAAC,UAAmB;IACvD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAA;KACb;IACD,OAAO,UAAU,KAAK,uBAAS,CAAC,eAAe,CAAA;AACjD,CAAC;AALD,sDAKC;AAED;;;;GAIG;AACH,SAAgB,uCAAuC,CACrD,OAA4B;IAE5B,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;QAC1B,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA;QAChD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;YACrB,WAAI,CAAC,iDAAiD,SAAS,EAAE,CAAC,CAAA;YAClE,OAAO,SAAS,GAAG,IAAI,CAAA;SACxB;QACD,WAAI,CACF,sCAAsC,SAAS,oCAAoC,CACpF,CAAA;QACD,OAAO,SAAS,CAAA;KACjB;IACD,WAAI,CACF,8EAA8E,CAC/E,CAAA;IACD,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACpB,OAAO,SAAS,CAAA;AAClB,CAAC;AApBD,0FAoBC;AAED,SAAgB,eAAe,CAC7B,KAAa,EACb,GAAW,EACX,KAAa;IAEb,oCAAoC;IACpC,8BAA8B;IAC9B,2CAA2C;IAC3C,iCAAiC;IACjC,OAAO,SAAS,KAAK,IAAI,GAAG,IAAI,KAAK,EAAE,CAAA;AACzC,CAAC;AAVD,0CAUC;AAED;;;;;;;GAOG;AACH,SAAgB,kBAAkB,CAChC,WAAmB,EACnB,WAAqB,EACrB,UAAoB;IAEpB,MAAM,cAAc,GAAa,EAAE,CAAA;IAEnC,IAAI,WAAW,EAAE;QACf,cAAc,CAAC,cAAc,CAAC,GAAG,WAAW,CAAA;KAC7C;IACD,IAAI,WAAW,EAAE;QACf,cAAc,CAAC,YAAY,CAAC,GAAG,YAAY,CAAA;QAC3C,mEAAmE;QACnE,cAAc,CAAC,YAAY,CAAC,GAAG,IAAI,CAAA;KACpC;IACD,IAAI,UAAU,EAAE;QACd,6GAA6G;QAC7G,cAAc,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAA;QAC1C,cAAc,CACZ,QAAQ,CACT,GAAG,wCAAwC,aAAa,EAAE,EAAE,CAAA;KAC9D;SAAM;QACL,sEAAsE;QACtE,cAAc,CAAC,QAAQ,CAAC,GAAG,gCAAgC,aAAa,EAAE,EAAE,CAAA;KAC7E;IAED,OAAO,cAAc,CAAA;AACvB,CAAC;AA3BD,gDA2BC;AAED;;;;;;;;;GASG;AACH,SAAgB,gBAAgB,CAC9B,WAAmB,EACnB,WAAqB,EACrB,MAAgB,EAChB,kBAA2B,EAC3B,aAAsB,EACtB,YAAqB;IAErB,MAAM,cAAc,GAAa,EAAE,CAAA;IACnC,cAAc,CAAC,QAAQ,CAAC,GAAG,gCAAgC,aAAa,EAAE,EAAE,CAAA;IAC5E,IAAI,WAAW,EAAE;QACf,cAAc,CAAC,cAAc,CAAC,GAAG,WAAW,CAAA;KAC7C;IACD,IAAI,WAAW,EAAE;QACf,cAAc,CAAC,YAAY,CAAC,GAAG,YAAY,CAAA;QAC3C,mEAAmE;QACnE,cAAc,CAAC,YAAY,CAAC,GAAG,IAAI,CAAA;KACpC;IACD,IAAI,MAAM,EAAE;QACV,cAAc,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAA;QAC3C,cAAc,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAAA;KACxD;IACD,IAAI,aAAa,EAAE;QACjB,cAAc,CAAC,gBAAgB,CAAC,GAAG,aAAa,CAAA;KACjD;IACD,IAAI,YAAY,EAAE;QAChB,cAAc,CAAC,eAAe,CAAC,GAAG,YAAY,CAAA;KAC/C;IAED,OAAO,cAAc,CAAA;AACvB,CAAC;AA9BD,4CA8BC;AAED,SAAgB,gBAAgB,CAAC,SAAiB;IAChD,OAAO,IAAI,wBAAU,CAAC,SAAS,EAAE;QAC/B,IAAI,8BAAuB,CAAC,kCAAe,EAAE,CAAC;KAC/C,CAAC,CAAA;AACJ,CAAC;AAJD,4CAIC;AAED,SAAgB,cAAc;IAC5B,MAAM,WAAW,GAAG,GAAG,gCAAa,EAAE,6BAA6B,mCAAgB,EAAE,0BAA0B,aAAa,EAAE,EAAE,CAAA;IAChI,YAAK,CAAC,iBAAiB,WAAW,EAAE,CAAC,CAAA;IACrC,OAAO,WAAW,CAAA;AACpB,CAAC;AAJD,wCAIC;AAED;;;;;;;;GAQG;AACH,SAAgB,sBAAsB,CAAC,QAA6B;IAClE,WAAI,CACF;eACW,QAAQ,CAAC,OAAO,CAAC,UAAU;kBACxB,QAAQ,CAAC,OAAO,CAAC,aAAa;sBAC1B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;8CAC9B,CAC3C,CAAA;AACH,CAAC;AARD,wDAQC;AAED,SAAsB,4BAA4B,CAChD,WAAqB;;QAErB,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE;YACnC,MAAM,aAAE,CAAC,KAAK,CAAC,SAAS,EAAE;gBACxB,SAAS,EAAE,IAAI;aAChB,CAAC,CAAA;SACH;IACH,CAAC;CAAA;AARD,oEAQC;AAED,SAAsB,2BAA2B,CAC/C,kBAA4B;;QAE5B,KAAK,MAAM,QAAQ,IAAI,kBAAkB,EAAE;YACzC,MAAM,CAAC,MAAM,aAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,CAAA;SAC7C;IACH,CAAC;CAAA;AAND,kEAMC;AAED,SAAsB,WAAW,CAAC,QAAgB;;QAChD,MAAM,KAAK,GAAG,MAAM,aAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACrC,YAAK,CACH,GAAG,QAAQ,UAAU,KAAK,CAAC,IAAI,cAAc,KAAK,CAAC,OAAO,aAAa,KAAK,CAAC,MAAM,GAAG,CACvF,CAAA;QACD,OAAO,KAAK,CAAC,IAAI,CAAA;IACnB,CAAC;CAAA;AAND,kCAMC;AAED,SAAsB,MAAM,CAAC,QAAgB;;QAC3C,MAAM,aAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3B,CAAC;CAAA;AAFD,wBAEC;AAED,SAAgB,kBAAkB,CAChC,cAAsB,EACtB,gBAAoC;IAEpC,IAAI,cAAc,GAAG,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;KAC1D;IAED,IAAI,SAAS,GAAG,cAAc,CAAA;IAC9B,IAAI,gBAAgB,EAAE;QACpB,MAAM,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAA;QAC/C,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,YAAY,GAAG,SAAS,EAAE;YACpD,cAAO,CACL,uGAAuG,YAAY,OAAO,CAC3H,CAAA;YACD,SAAS,GAAG,YAAY,CAAA;SACzB;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAnBD,gDAmBC;AAED,SAAsB,KAAK,CAAC,YAAoB;;QAC9C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;IAClE,CAAC;CAAA;AAFD,sBAEC"} \ No newline at end of file diff --git a/node_modules/@actions/artifact/package.json b/node_modules/@actions/artifact/package.json index 3e1eae458e..6dd84aa236 100644 --- a/node_modules/@actions/artifact/package.json +++ b/node_modules/@actions/artifact/package.json @@ -1,6 +1,6 @@ { "name": "@actions/artifact", - "version": "0.5.2", + "version": "1.0.0", "preview": true, "description": "Actions artifact lib", "keywords": [ @@ -39,11 +39,11 @@ "dependencies": { "@actions/core": "^1.2.6", "@actions/http-client": "^1.0.11", - "@types/tmp": "^0.1.0", - "tmp": "^0.1.0", - "tmp-promise": "^2.0.2" + "tmp": "^0.2.1", + "tmp-promise": "^3.0.2" }, "devDependencies": { + "@types/tmp": "^0.2.1", "typescript": "^3.8.3" } -} \ No newline at end of file +} diff --git a/node_modules/@actions/core/package.json b/node_modules/@actions/core/package.json index 05b90f630b..94037492f7 100644 --- a/node_modules/@actions/core/package.json +++ b/node_modules/@actions/core/package.json @@ -38,4 +38,4 @@ "devDependencies": { "@types/node": "^12.0.2" } -} \ No newline at end of file +} diff --git a/node_modules/@actions/exec/package.json b/node_modules/@actions/exec/package.json index 7813f8a59b..ff0cebfe94 100644 --- a/node_modules/@actions/exec/package.json +++ b/node_modules/@actions/exec/package.json @@ -38,4 +38,4 @@ "dependencies": { "@actions/io": "^1.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/@actions/github/package.json b/node_modules/@actions/github/package.json index 9ef4aed47f..0288f178d8 100644 --- a/node_modules/@actions/github/package.json +++ b/node_modules/@actions/github/package.json @@ -47,4 +47,4 @@ "jest": "^25.1.0", "proxy": "^1.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/@actions/http-client/node_modules/tunnel/package.json b/node_modules/@actions/http-client/node_modules/tunnel/package.json index 27cce6b483..bcd7b95ae1 100644 --- a/node_modules/@actions/http-client/node_modules/tunnel/package.json +++ b/node_modules/@actions/http-client/node_modules/tunnel/package.json @@ -31,4 +31,4 @@ "engines": { "node": ">=0.6.11 <=0.7.0 || >=0.7.3" } -} \ No newline at end of file +} diff --git a/node_modules/@actions/http-client/package.json b/node_modules/@actions/http-client/package.json index d75dd4dd52..0c99fd41ef 100644 --- a/node_modules/@actions/http-client/package.json +++ b/node_modules/@actions/http-client/package.json @@ -36,4 +36,4 @@ "dependencies": { "tunnel": "0.0.6" } -} \ No newline at end of file +} diff --git a/node_modules/@actions/io/package.json b/node_modules/@actions/io/package.json index ce12f37a86..114e8e5959 100644 --- a/node_modules/@actions/io/package.json +++ b/node_modules/@actions/io/package.json @@ -34,4 +34,4 @@ "bugs": { "url": "https://github.com/actions/toolkit/issues" } -} \ No newline at end of file +} diff --git a/node_modules/@actions/tool-cache/node_modules/semver/package.json b/node_modules/@actions/tool-cache/node_modules/semver/package.json index a330b56c26..bdd442f500 100644 --- a/node_modules/@actions/tool-cache/node_modules/semver/package.json +++ b/node_modules/@actions/tool-cache/node_modules/semver/package.json @@ -25,4 +25,4 @@ "tap": { "check-coverage": true } -} \ No newline at end of file +} diff --git a/node_modules/@actions/tool-cache/node_modules/uuid/package.json b/node_modules/@actions/tool-cache/node_modules/uuid/package.json index 4b23f72c79..efc07b8f6c 100644 --- a/node_modules/@actions/tool-cache/node_modules/uuid/package.json +++ b/node_modules/@actions/tool-cache/node_modules/uuid/package.json @@ -46,4 +46,4 @@ "commit-msg": "commitlint -E HUSKY_GIT_PARAMS" } } -} \ No newline at end of file +} diff --git a/node_modules/@actions/tool-cache/package.json b/node_modules/@actions/tool-cache/package.json index 941cb178f8..2d15bd6032 100644 --- a/node_modules/@actions/tool-cache/package.json +++ b/node_modules/@actions/tool-cache/package.json @@ -49,4 +49,4 @@ "@types/uuid": "^3.4.4", "nock": "^10.0.6" } -} \ No newline at end of file +} diff --git a/node_modules/@ava/typescript/node_modules/escape-string-regexp/package.json b/node_modules/@ava/typescript/node_modules/escape-string-regexp/package.json index 4e7d8199b9..7d8362c2bb 100644 --- a/node_modules/@ava/typescript/node_modules/escape-string-regexp/package.json +++ b/node_modules/@ava/typescript/node_modules/escape-string-regexp/package.json @@ -37,4 +37,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/@ava/typescript/package.json b/node_modules/@ava/typescript/package.json index 2dd1688740..355fcc0fd5 100644 --- a/node_modules/@ava/typescript/package.json +++ b/node_modules/@ava/typescript/package.json @@ -55,4 +55,4 @@ "test/broken-fixtures" ] } -} \ No newline at end of file +} diff --git a/node_modules/@chrisgavin/safe-which/package.json b/node_modules/@chrisgavin/safe-which/package.json index c1cb306215..f9a6b9ca20 100644 --- a/node_modules/@chrisgavin/safe-which/package.json +++ b/node_modules/@chrisgavin/safe-which/package.json @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/node_modules/@eslint/eslintrc/node_modules/argparse/package.json b/node_modules/@eslint/eslintrc/node_modules/argparse/package.json index b16de2518a..62fba0a9fc 100644 --- a/node_modules/@eslint/eslintrc/node_modules/argparse/package.json +++ b/node_modules/@eslint/eslintrc/node_modules/argparse/package.json @@ -31,4 +31,4 @@ "mocha": "^3.1.0", "ndoc": "^5.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/@eslint/eslintrc/node_modules/ignore/package.json b/node_modules/@eslint/eslintrc/node_modules/ignore/package.json index 873bff3ede..8cb1b78732 100644 --- a/node_modules/@eslint/eslintrc/node_modules/ignore/package.json +++ b/node_modules/@eslint/eslintrc/node_modules/ignore/package.json @@ -61,4 +61,4 @@ "engines": { "node": ">= 4" } -} \ No newline at end of file +} diff --git a/node_modules/@eslint/eslintrc/node_modules/js-yaml/package.json b/node_modules/@eslint/eslintrc/node_modules/js-yaml/package.json index 67a6d909ce..0d2366762c 100644 --- a/node_modules/@eslint/eslintrc/node_modules/js-yaml/package.json +++ b/node_modules/@eslint/eslintrc/node_modules/js-yaml/package.json @@ -46,4 +46,4 @@ "scripts": { "test": "make test" } -} \ No newline at end of file +} diff --git a/node_modules/@eslint/eslintrc/node_modules/strip-json-comments/package.json b/node_modules/@eslint/eslintrc/node_modules/strip-json-comments/package.json index ea63318611..64b0092258 100644 --- a/node_modules/@eslint/eslintrc/node_modules/strip-json-comments/package.json +++ b/node_modules/@eslint/eslintrc/node_modules/strip-json-comments/package.json @@ -44,4 +44,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/@eslint/eslintrc/package.json b/node_modules/@eslint/eslintrc/package.json index 105f3c6a17..35f5129707 100644 --- a/node_modules/@eslint/eslintrc/package.json +++ b/node_modules/@eslint/eslintrc/package.json @@ -60,4 +60,4 @@ "engines": { "node": "^10.12.0 || >=12.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/@nodelib/fs.scandir/package.json b/node_modules/@nodelib/fs.scandir/package.json index 5a32a9fea5..95723d58fd 100644 --- a/node_modules/@nodelib/fs.scandir/package.json +++ b/node_modules/@nodelib/fs.scandir/package.json @@ -32,4 +32,4 @@ "run-parallel": "^1.1.9" }, "gitHead": "3b1ef7554ad7c061b3580858101d483fba847abf" -} \ No newline at end of file +} diff --git a/node_modules/@nodelib/fs.stat/package.json b/node_modules/@nodelib/fs.stat/package.json index 96a5ebb31a..8c79d19a0b 100644 --- a/node_modules/@nodelib/fs.stat/package.json +++ b/node_modules/@nodelib/fs.stat/package.json @@ -26,4 +26,4 @@ "watch": "npm run clean && npm run compile:watch" }, "gitHead": "3b1ef7554ad7c061b3580858101d483fba847abf" -} \ No newline at end of file +} diff --git a/node_modules/@nodelib/fs.walk/package.json b/node_modules/@nodelib/fs.walk/package.json index 9490845bfa..82fa491ef2 100644 --- a/node_modules/@nodelib/fs.walk/package.json +++ b/node_modules/@nodelib/fs.walk/package.json @@ -32,4 +32,4 @@ "fastq": "^1.6.0" }, "gitHead": "3b1ef7554ad7c061b3580858101d483fba847abf" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/auth-token/node_modules/@octokit/types/package.json b/node_modules/@octokit/auth-token/node_modules/@octokit/types/package.json index 4af23ddce8..db02d026cb 100644 --- a/node_modules/@octokit/auth-token/node_modules/@octokit/types/package.json +++ b/node_modules/@octokit/auth-token/node_modules/@octokit/types/package.json @@ -46,4 +46,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/auth-token/package.json b/node_modules/@octokit/auth-token/package.json index 6d9a778822..c0bb27f260 100644 --- a/node_modules/@octokit/auth-token/package.json +++ b/node_modules/@octokit/auth-token/package.json @@ -45,4 +45,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/core/node_modules/@octokit/types/package.json b/node_modules/@octokit/core/node_modules/@octokit/types/package.json index 4af23ddce8..db02d026cb 100644 --- a/node_modules/@octokit/core/node_modules/@octokit/types/package.json +++ b/node_modules/@octokit/core/node_modules/@octokit/types/package.json @@ -46,4 +46,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/core/package.json b/node_modules/@octokit/core/package.json index a073a2b8f4..8c4b1ee710 100644 --- a/node_modules/@octokit/core/package.json +++ b/node_modules/@octokit/core/package.json @@ -54,4 +54,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/endpoint/node_modules/@octokit/types/package.json b/node_modules/@octokit/endpoint/node_modules/@octokit/types/package.json index 4af23ddce8..db02d026cb 100644 --- a/node_modules/@octokit/endpoint/node_modules/@octokit/types/package.json +++ b/node_modules/@octokit/endpoint/node_modules/@octokit/types/package.json @@ -46,4 +46,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/endpoint/package.json b/node_modules/@octokit/endpoint/package.json index 141e0b9253..7d3fac742e 100644 --- a/node_modules/@octokit/endpoint/package.json +++ b/node_modules/@octokit/endpoint/package.json @@ -48,4 +48,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/graphql/node_modules/@octokit/types/package.json b/node_modules/@octokit/graphql/node_modules/@octokit/types/package.json index 4af23ddce8..db02d026cb 100644 --- a/node_modules/@octokit/graphql/node_modules/@octokit/types/package.json +++ b/node_modules/@octokit/graphql/node_modules/@octokit/types/package.json @@ -46,4 +46,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/graphql/package.json b/node_modules/@octokit/graphql/package.json index b694ee354e..78087d9a23 100644 --- a/node_modules/@octokit/graphql/package.json +++ b/node_modules/@octokit/graphql/package.json @@ -51,4 +51,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/openapi-types/package.json b/node_modules/@octokit/openapi-types/package.json index e4afd02921..6c57804c20 100644 --- a/node_modules/@octokit/openapi-types/package.json +++ b/node_modules/@octokit/openapi-types/package.json @@ -17,4 +17,4 @@ "octokit": { "openapi-version": "3.1.2" } -} \ No newline at end of file +} diff --git a/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types/package.json b/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types/package.json index 4af23ddce8..db02d026cb 100644 --- a/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types/package.json +++ b/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types/package.json @@ -46,4 +46,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/plugin-paginate-rest/package.json b/node_modules/@octokit/plugin-paginate-rest/package.json index 4509b30f1a..f63a7239b1 100644 --- a/node_modules/@octokit/plugin-paginate-rest/package.json +++ b/node_modules/@octokit/plugin-paginate-rest/package.json @@ -48,4 +48,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/package.json b/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/package.json index 4af23ddce8..db02d026cb 100644 --- a/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/package.json +++ b/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/package.json @@ -46,4 +46,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/plugin-rest-endpoint-methods/package.json b/node_modules/@octokit/plugin-rest-endpoint-methods/package.json index c18037861b..a093eca3c0 100644 --- a/node_modules/@octokit/plugin-rest-endpoint-methods/package.json +++ b/node_modules/@octokit/plugin-rest-endpoint-methods/package.json @@ -54,4 +54,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/plugin-retry/package.json b/node_modules/@octokit/plugin-retry/package.json index 09f95020a4..a1d1aabff6 100644 --- a/node_modules/@octokit/plugin-retry/package.json +++ b/node_modules/@octokit/plugin-retry/package.json @@ -39,4 +39,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/request-error/node_modules/@octokit/types/package.json b/node_modules/@octokit/request-error/node_modules/@octokit/types/package.json index 4af23ddce8..db02d026cb 100644 --- a/node_modules/@octokit/request-error/node_modules/@octokit/types/package.json +++ b/node_modules/@octokit/request-error/node_modules/@octokit/types/package.json @@ -46,4 +46,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/request-error/package.json b/node_modules/@octokit/request-error/package.json index c078ba7b0d..14b0ff5757 100644 --- a/node_modules/@octokit/request-error/package.json +++ b/node_modules/@octokit/request-error/package.json @@ -51,4 +51,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/request/node_modules/@octokit/types/package.json b/node_modules/@octokit/request/node_modules/@octokit/types/package.json index 4af23ddce8..db02d026cb 100644 --- a/node_modules/@octokit/request/node_modules/@octokit/types/package.json +++ b/node_modules/@octokit/request/node_modules/@octokit/types/package.json @@ -46,4 +46,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/request/package.json b/node_modules/@octokit/request/package.json index 873c49878b..db18c8086e 100644 --- a/node_modules/@octokit/request/package.json +++ b/node_modules/@octokit/request/package.json @@ -61,4 +61,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@octokit/types/package.json b/node_modules/@octokit/types/package.json index 76b0b316bf..8450df0a42 100644 --- a/node_modules/@octokit/types/package.json +++ b/node_modules/@octokit/types/package.json @@ -51,4 +51,4 @@ }, "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/@sinonjs/commons/package.json b/node_modules/@sinonjs/commons/package.json index 345e2c05ef..f0e6c14bc5 100644 --- a/node_modules/@sinonjs/commons/package.json +++ b/node_modules/@sinonjs/commons/package.json @@ -64,4 +64,4 @@ "pre-commit": "lint-staged" } } -} \ No newline at end of file +} diff --git a/node_modules/@sinonjs/fake-timers/package.json b/node_modules/@sinonjs/fake-timers/package.json index b8cb7cc1b1..9a46180188 100644 --- a/node_modules/@sinonjs/fake-timers/package.json +++ b/node_modules/@sinonjs/fake-timers/package.json @@ -81,4 +81,4 @@ "tsd": { "directory": "test" } -} \ No newline at end of file +} diff --git a/node_modules/@sinonjs/samsam/package.json b/node_modules/@sinonjs/samsam/package.json index 93a32035a0..15ac91dfcd 100644 --- a/node_modules/@sinonjs/samsam/package.json +++ b/node_modules/@sinonjs/samsam/package.json @@ -87,4 +87,4 @@ "pre-commit": "lint-staged" } } -} \ No newline at end of file +} diff --git a/node_modules/@sinonjs/text-encoding/package.json b/node_modules/@sinonjs/text-encoding/package.json index edb635a03b..bc210c6768 100644 --- a/node_modules/@sinonjs/text-encoding/package.json +++ b/node_modules/@sinonjs/text-encoding/package.json @@ -34,4 +34,4 @@ }, "homepage": "https://github.com/inexorabletash/text-encoding", "license": "(Unlicense OR Apache-2.0)" -} \ No newline at end of file +} diff --git a/node_modules/@types/tmp/LICENSE b/node_modules/@types/tmp/LICENSE deleted file mode 100644 index 4b1ad51b2f..0000000000 --- a/node_modules/@types/tmp/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ - MIT License - - Copyright (c) Microsoft Corporation. All rights reserved. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE diff --git a/node_modules/@types/tmp/README.md b/node_modules/@types/tmp/README.md deleted file mode 100644 index 69f6ed5610..0000000000 --- a/node_modules/@types/tmp/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Installation -> `npm install --save @types/tmp` - -# Summary -This package contains type definitions for tmp ( http://github.com/raszi/node-tmp ). - -# Details -Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/tmp - -Additional Details - * Last updated: Mon, 01 Apr 2019 20:55:52 GMT - * Dependencies: none - * Global values: none - -# Credits -These definitions were written by Jared Klopper , Gyusun Yeom , Alan Plum . diff --git a/node_modules/@types/tmp/index.d.ts b/node_modules/@types/tmp/index.d.ts deleted file mode 100644 index b761fd3717..0000000000 --- a/node_modules/@types/tmp/index.d.ts +++ /dev/null @@ -1,70 +0,0 @@ -// Type definitions for tmp 0.1 -// Project: http://github.com/raszi/node-tmp -// Definitions by: Jared Klopper -// Gyusun Yeom -// Alan Plum -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -export interface TmpNameOptions { - prefix?: string; - postfix?: string; - template?: string; - dir?: string; - tries?: number; -} - -export interface FileOptions extends TmpNameOptions { - mode?: number; - keep?: boolean; - discardDescriptor?: boolean; - detachDescriptor?: boolean; -} - -export interface DirOptions extends TmpNameOptions { - mode?: number; - keep?: boolean; - unsafeCleanup?: boolean; -} - -export interface FileResult { - name: string; - fd: number; - removeCallback: () => void; -} - -export interface DirResult { - name: string; - removeCallback: () => void; -} - -export type FileCallback = ( - err: any, - name: string, - fd: number, - removeCallback: () => void -) => void; - -export type DirCallback = ( - err: any, - name: string, - removeCallback: () => void -) => void; - -export type TmpNameCallback = (err: any, name: string) => void; - -export function file(options: FileOptions, cb: FileCallback): void; -export function file(cb: FileCallback): void; - -export function fileSync(options?: FileOptions): FileResult; - -export function dir(options: DirOptions, cb: DirCallback): void; -export function dir(cb: DirCallback): void; - -export function dirSync(options?: DirOptions): DirResult; - -export function tmpName(options: TmpNameOptions, cb: TmpNameCallback): void; -export function tmpName(cb: TmpNameCallback): void; - -export function tmpNameSync(options?: TmpNameOptions): string; - -export function setGracefulCleanup(): void; diff --git a/node_modules/@types/tmp/package.json b/node_modules/@types/tmp/package.json deleted file mode 100644 index 7bc8899523..0000000000 --- a/node_modules/@types/tmp/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "@types/tmp", - "version": "0.1.0", - "description": "TypeScript definitions for tmp", - "license": "MIT", - "contributors": [ - { - "name": "Jared Klopper", - "url": "https://github.com/optical", - "githubUsername": "optical" - }, - { - "name": "Gyusun Yeom", - "url": "https://github.com/Perlmint", - "githubUsername": "Perlmint" - }, - { - "name": "Alan Plum", - "url": "https://github.com/pluma", - "githubUsername": "pluma" - } - ], - "main": "", - "types": "index", - "repository": { - "type": "git", - "url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git", - "directory": "types/tmp" - }, - "scripts": {}, - "dependencies": {}, - "typesPublisherContentHash": "d148a6fe31794f2a5b222ae9d0f38d575acbb5e0fed205877913f4e52e33a357", - "typeScriptVersion": "2.0" -} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/package.json b/node_modules/@typescript-eslint/eslint-plugin/package.json index 6f65b3115b..ace446103a 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/package.json +++ b/node_modules/@typescript-eslint/eslint-plugin/package.json @@ -75,4 +75,4 @@ "url": "https://opencollective.com/typescript-eslint" }, "gitHead": "15f718415eb4e522440a5d81f38d65ee81535795" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/package.json b/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/package.json index 259ec0f615..574d12026c 100644 --- a/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/package.json +++ b/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/package.json @@ -75,4 +75,4 @@ }, "homepage": "https://github.com/mysticatea/eslint-utils#readme", "funding": "https://github.com/sponsors/mysticatea" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/experimental-utils/package.json b/node_modules/@typescript-eslint/experimental-utils/package.json index 627ad2967a..55d4799686 100644 --- a/node_modules/@typescript-eslint/experimental-utils/package.json +++ b/node_modules/@typescript-eslint/experimental-utils/package.json @@ -64,4 +64,4 @@ } }, "gitHead": "15f718415eb4e522440a5d81f38d65ee81535795" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager/package.json b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager/package.json index 909b9bff7f..dac4e9669d 100644 --- a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager/package.json +++ b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager/package.json @@ -65,4 +65,4 @@ } }, "gitHead": "101abc72f0baced5cdf609d99418ad9f10830c73" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types/package.json b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types/package.json index ecab7c6dbd..36c5b73c68 100644 --- a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types/package.json +++ b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types/package.json @@ -53,4 +53,4 @@ "typescript": "*" }, "gitHead": "101abc72f0baced5cdf609d99418ad9f10830c73" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree/package.json b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree/package.json index ccfa9dd415..c7fbcbbbf3 100644 --- a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree/package.json +++ b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree/package.json @@ -83,4 +83,4 @@ } }, "gitHead": "101abc72f0baced5cdf609d99418ad9f10830c73" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys/package.json b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys/package.json index 2e1437a8d7..6ac516f605 100644 --- a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys/package.json +++ b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys/package.json @@ -56,4 +56,4 @@ } }, "gitHead": "101abc72f0baced5cdf609d99418ad9f10830c73" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys/package.json b/node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys/package.json index e033598324..82c2115bdb 100644 --- a/node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys/package.json +++ b/node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys/package.json @@ -52,4 +52,4 @@ "url": "https://github.com/eslint/eslint-visitor-keys/issues" }, "homepage": "https://github.com/eslint/eslint-visitor-keys#readme" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/parser/package.json b/node_modules/@typescript-eslint/parser/package.json index 7ed7ae110e..cbb12a6ee4 100644 --- a/node_modules/@typescript-eslint/parser/package.json +++ b/node_modules/@typescript-eslint/parser/package.json @@ -72,4 +72,4 @@ } }, "gitHead": "101abc72f0baced5cdf609d99418ad9f10830c73" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/scope-manager/package.json b/node_modules/@typescript-eslint/scope-manager/package.json index 0cba1a5c6d..42a2bc7e04 100644 --- a/node_modules/@typescript-eslint/scope-manager/package.json +++ b/node_modules/@typescript-eslint/scope-manager/package.json @@ -65,4 +65,4 @@ } }, "gitHead": "15f718415eb4e522440a5d81f38d65ee81535795" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/types/package.json b/node_modules/@typescript-eslint/types/package.json index 043ecda7fb..2350cfda4c 100644 --- a/node_modules/@typescript-eslint/types/package.json +++ b/node_modules/@typescript-eslint/types/package.json @@ -53,4 +53,4 @@ "typescript": "*" }, "gitHead": "15f718415eb4e522440a5d81f38d65ee81535795" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/typescript-estree/package.json b/node_modules/@typescript-eslint/typescript-estree/package.json index 64d81a62eb..fd517cad0c 100644 --- a/node_modules/@typescript-eslint/typescript-estree/package.json +++ b/node_modules/@typescript-eslint/typescript-estree/package.json @@ -83,4 +83,4 @@ } }, "gitHead": "15f718415eb4e522440a5d81f38d65ee81535795" -} \ No newline at end of file +} diff --git a/node_modules/@typescript-eslint/visitor-keys/package.json b/node_modules/@typescript-eslint/visitor-keys/package.json index 9fe898a610..b262d3a2d8 100644 --- a/node_modules/@typescript-eslint/visitor-keys/package.json +++ b/node_modules/@typescript-eslint/visitor-keys/package.json @@ -56,4 +56,4 @@ } }, "gitHead": "15f718415eb4e522440a5d81f38d65ee81535795" -} \ No newline at end of file +} diff --git a/node_modules/acorn-jsx/package.json b/node_modules/acorn-jsx/package.json index 4ee8e38d6c..6debde9caa 100644 --- a/node_modules/acorn-jsx/package.json +++ b/node_modules/acorn-jsx/package.json @@ -24,4 +24,4 @@ "devDependencies": { "acorn": "^8.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/acorn-walk/package.json b/node_modules/acorn-walk/package.json index 6f91c14d7c..1a718380a8 100644 --- a/node_modules/acorn-walk/package.json +++ b/node_modules/acorn-walk/package.json @@ -44,4 +44,4 @@ "prepare": "cd ..; npm run build:walk" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/acorn/package.json b/node_modules/acorn/package.json index 2e118ef71e..2f151bb0d6 100644 --- a/node_modules/acorn/package.json +++ b/node_modules/acorn/package.json @@ -36,4 +36,4 @@ "bin": { "acorn": "./bin/acorn" } -} \ No newline at end of file +} diff --git a/node_modules/aggregate-error/package.json b/node_modules/aggregate-error/package.json index 975b087d95..6cac475020 100644 --- a/node_modules/aggregate-error/package.json +++ b/node_modules/aggregate-error/package.json @@ -38,4 +38,4 @@ "tsd": "^0.7.1", "xo": "^0.25.3" } -} \ No newline at end of file +} diff --git a/node_modules/ajv/package.json b/node_modules/ajv/package.json index 1a294858df..559a933c8c 100644 --- a/node_modules/ajv/package.json +++ b/node_modules/ajv/package.json @@ -103,4 +103,4 @@ "type": "github", "url": "https://github.com/sponsors/epoberezkin" } -} \ No newline at end of file +} diff --git a/node_modules/ansi-colors/package.json b/node_modules/ansi-colors/package.json index eb1facb6df..e11093140b 100644 --- a/node_modules/ansi-colors/package.json +++ b/node_modules/ansi-colors/package.json @@ -106,4 +106,4 @@ "kleur" ] } -} \ No newline at end of file +} diff --git a/node_modules/ansi-regex/package.json b/node_modules/ansi-regex/package.json index 4e9cc3b72c..dd9939efa8 100644 --- a/node_modules/ansi-regex/package.json +++ b/node_modules/ansi-regex/package.json @@ -52,4 +52,4 @@ "tsd": "^0.9.0", "xo": "^0.25.3" } -} \ No newline at end of file +} diff --git a/node_modules/ansi-styles/package.json b/node_modules/ansi-styles/package.json index a5eb4ff0f6..7a09ba8a58 100644 --- a/node_modules/ansi-styles/package.json +++ b/node_modules/ansi-styles/package.json @@ -53,4 +53,4 @@ "ava": { "require": "babel-polyfill" } -} \ No newline at end of file +} diff --git a/node_modules/anymatch/package.json b/node_modules/anymatch/package.json index 767eb294f1..f9b528479e 100644 --- a/node_modules/anymatch/package.json +++ b/node_modules/anymatch/package.json @@ -45,4 +45,4 @@ "engines": { "node": ">= 8" } -} \ No newline at end of file +} diff --git a/node_modules/argparse/package.json b/node_modules/argparse/package.json index b6e3bf4515..647d2aff18 100644 --- a/node_modules/argparse/package.json +++ b/node_modules/argparse/package.json @@ -28,4 +28,4 @@ "mocha": "^8.0.1", "nyc": "^15.1.0" } -} \ No newline at end of file +} diff --git a/node_modules/array-find-index/package.json b/node_modules/array-find-index/package.json index ed7544350e..ee2e62db09 100644 --- a/node_modules/array-find-index/package.json +++ b/node_modules/array-find-index/package.json @@ -32,4 +32,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/array-includes/package.json b/node_modules/array-includes/package.json index 73159e1d17..aa5c91b451 100644 --- a/node_modules/array-includes/package.json +++ b/node_modules/array-includes/package.json @@ -90,4 +90,4 @@ "engines": { "node": ">= 0.4" } -} \ No newline at end of file +} diff --git a/node_modules/array-union/package.json b/node_modules/array-union/package.json index ca61e74cb6..b96483928c 100644 --- a/node_modules/array-union/package.json +++ b/node_modules/array-union/package.json @@ -35,4 +35,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/array.prototype.flat/package.json b/node_modules/array.prototype.flat/package.json index 892f1c8b5f..97159a1231 100644 --- a/node_modules/array.prototype.flat/package.json +++ b/node_modules/array.prototype.flat/package.json @@ -93,4 +93,4 @@ "nyc" ] } -} \ No newline at end of file +} diff --git a/node_modules/arrgv/package.json b/node_modules/arrgv/package.json index 620775aeb2..37a4436bb4 100644 --- a/node_modules/arrgv/package.json +++ b/node_modules/arrgv/package.json @@ -30,4 +30,4 @@ "argv" ], "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/arrify/package.json b/node_modules/arrify/package.json index 223b18354c..5041651bd4 100644 --- a/node_modules/arrify/package.json +++ b/node_modules/arrify/package.json @@ -32,4 +32,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/astral-regex/package.json b/node_modules/astral-regex/package.json index 744e3ea077..dd55d97262 100644 --- a/node_modules/astral-regex/package.json +++ b/node_modules/astral-regex/package.json @@ -30,4 +30,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/acorn/package.json b/node_modules/ava/node_modules/acorn/package.json index 2f3bdf3187..d7948c8b45 100644 --- a/node_modules/ava/node_modules/acorn/package.json +++ b/node_modules/ava/node_modules/acorn/package.json @@ -47,4 +47,4 @@ "bin": { "acorn": "./bin/acorn" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/aggregate-error/package.json b/node_modules/ava/node_modules/aggregate-error/package.json index ceeea16b83..f087c7184e 100644 --- a/node_modules/ava/node_modules/aggregate-error/package.json +++ b/node_modules/ava/node_modules/aggregate-error/package.json @@ -42,4 +42,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/ansi-regex/package.json b/node_modules/ava/node_modules/ansi-regex/package.json index dded7ec0e6..f6a177d568 100644 --- a/node_modules/ava/node_modules/ansi-regex/package.json +++ b/node_modules/ava/node_modules/ansi-regex/package.json @@ -55,4 +55,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/ansi-styles/package.json b/node_modules/ava/node_modules/ansi-styles/package.json index 84a225913e..5710e7f8cd 100644 --- a/node_modules/ava/node_modules/ansi-styles/package.json +++ b/node_modules/ava/node_modules/ansi-styles/package.json @@ -51,4 +51,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/array-union/package.json b/node_modules/ava/node_modules/array-union/package.json index e3bce3eb9a..76bce56eba 100644 --- a/node_modules/ava/node_modules/array-union/package.json +++ b/node_modules/ava/node_modules/array-union/package.json @@ -43,4 +43,4 @@ "esModuleInterop": true } } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/arrify/package.json b/node_modules/ava/node_modules/arrify/package.json index b56bf128e7..c3622e791f 100644 --- a/node_modules/ava/node_modules/arrify/package.json +++ b/node_modules/ava/node_modules/arrify/package.json @@ -35,4 +35,4 @@ "tsd": "^0.14.0", "xo": "^0.39.1" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/callsites/package.json b/node_modules/ava/node_modules/callsites/package.json index 8ce19f3f7a..aa646db77e 100644 --- a/node_modules/ava/node_modules/callsites/package.json +++ b/node_modules/ava/node_modules/callsites/package.json @@ -39,4 +39,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/chalk/package.json b/node_modules/ava/node_modules/chalk/package.json index c9c72e727c..1e61602b69 100644 --- a/node_modules/ava/node_modules/chalk/package.json +++ b/node_modules/ava/node_modules/chalk/package.json @@ -74,4 +74,4 @@ "source/vendor" ] } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/clean-stack/package.json b/node_modules/ava/node_modules/clean-stack/package.json index 7fe788d45a..a35576ec7a 100644 --- a/node_modules/ava/node_modules/clean-stack/package.json +++ b/node_modules/ava/node_modules/clean-stack/package.json @@ -41,4 +41,4 @@ "browser": { "os": false } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/escape-string-regexp/package.json b/node_modules/ava/node_modules/escape-string-regexp/package.json index 4e7d8199b9..7d8362c2bb 100644 --- a/node_modules/ava/node_modules/escape-string-regexp/package.json +++ b/node_modules/ava/node_modules/escape-string-regexp/package.json @@ -37,4 +37,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/globby/node_modules/slash/package.json b/node_modules/ava/node_modules/globby/node_modules/slash/package.json index dc722fc742..a9f2df6218 100644 --- a/node_modules/ava/node_modules/globby/node_modules/slash/package.json +++ b/node_modules/ava/node_modules/globby/node_modules/slash/package.json @@ -35,4 +35,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/globby/package.json b/node_modules/ava/node_modules/globby/package.json index bd857c6290..c9dcc8fdf3 100644 --- a/node_modules/ava/node_modules/globby/package.json +++ b/node_modules/ava/node_modules/globby/package.json @@ -84,4 +84,4 @@ "fixtures" ] } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/indent-string/package.json b/node_modules/ava/node_modules/indent-string/package.json index 85de577e82..0b00c07c1b 100644 --- a/node_modules/ava/node_modules/indent-string/package.json +++ b/node_modules/ava/node_modules/indent-string/package.json @@ -37,4 +37,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/ms/package.json b/node_modules/ava/node_modules/ms/package.json index 93f6b8d82b..49971890df 100644 --- a/node_modules/ava/node_modules/ms/package.json +++ b/node_modules/ava/node_modules/ms/package.json @@ -35,4 +35,4 @@ "mocha": "4.0.1", "prettier": "2.0.5" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/p-map/package.json b/node_modules/ava/node_modules/p-map/package.json index 2742862a42..485bd87348 100644 --- a/node_modules/ava/node_modules/p-map/package.json +++ b/node_modules/ava/node_modules/p-map/package.json @@ -52,4 +52,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/ava/node_modules/strip-ansi/package.json b/node_modules/ava/node_modules/strip-ansi/package.json index c5c1bc4f33..dfa2553ae8 100644 --- a/node_modules/ava/node_modules/strip-ansi/package.json +++ b/node_modules/ava/node_modules/strip-ansi/package.json @@ -54,4 +54,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/ava/package.json b/node_modules/ava/package.json index 6124938119..4a3fb6d382 100644 --- a/node_modules/ava/package.json +++ b/node_modules/ava/package.json @@ -145,4 +145,4 @@ "optional": true } } -} \ No newline at end of file +} diff --git a/node_modules/balanced-match/package.json b/node_modules/balanced-match/package.json index 55ba6f00ea..61349c6eda 100644 --- a/node_modules/balanced-match/package.json +++ b/node_modules/balanced-match/package.json @@ -46,4 +46,4 @@ "android-browser/4.2..latest" ] } -} \ No newline at end of file +} diff --git a/node_modules/before-after-hook/package.json b/node_modules/before-after-hook/package.json index ddd5acbe72..1aa58a5c8c 100644 --- a/node_modules/before-after-hook/package.json +++ b/node_modules/before-after-hook/package.json @@ -67,4 +67,4 @@ } ] } -} \ No newline at end of file +} diff --git a/node_modules/binary-extensions/package.json b/node_modules/binary-extensions/package.json index 8e930fa0d7..3465f26d53 100644 --- a/node_modules/binary-extensions/package.json +++ b/node_modules/binary-extensions/package.json @@ -35,4 +35,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/blueimp-md5/package.json b/node_modules/blueimp-md5/package.json index c7b89fc148..a7eb7656af 100644 --- a/node_modules/blueimp-md5/package.json +++ b/node_modules/blueimp-md5/package.json @@ -70,4 +70,4 @@ "js/*.js.map" ], "main": "js/md5.js" -} \ No newline at end of file +} diff --git a/node_modules/bottleneck/package.json b/node_modules/bottleneck/package.json index 8abb774219..b16999761f 100644 --- a/node_modules/bottleneck/package.json +++ b/node_modules/bottleneck/package.json @@ -53,4 +53,4 @@ "typescript": "^2.6.2" }, "dependencies": {} -} \ No newline at end of file +} diff --git a/node_modules/brace-expansion/package.json b/node_modules/brace-expansion/package.json index c8e652883c..a18faa8fd6 100644 --- a/node_modules/brace-expansion/package.json +++ b/node_modules/brace-expansion/package.json @@ -44,4 +44,4 @@ "android-browser/4.2..latest" ] } -} \ No newline at end of file +} diff --git a/node_modules/braces/package.json b/node_modules/braces/package.json index da327631e1..3f52e346f6 100644 --- a/node_modules/braces/package.json +++ b/node_modules/braces/package.json @@ -74,4 +74,4 @@ "gulp-format-md" ] } -} \ No newline at end of file +} diff --git a/node_modules/call-bind/package.json b/node_modules/call-bind/package.json index 9802552949..f3ee0e9c05 100644 --- a/node_modules/call-bind/package.json +++ b/node_modules/call-bind/package.json @@ -77,4 +77,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/callsites/package.json b/node_modules/callsites/package.json index 46b1de0c64..89130c7343 100644 --- a/node_modules/callsites/package.json +++ b/node_modules/callsites/package.json @@ -36,4 +36,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/cbor/package.json b/node_modules/cbor/package.json index 66e13784e6..abbba39163 100644 --- a/node_modules/cbor/package.json +++ b/node_modules/cbor/package.json @@ -61,4 +61,4 @@ "node": ">=12.19" }, "gitHead": "0b4f6e3fc2c92bda222e0249ec70e59d4d7bca4a" -} \ No newline at end of file +} diff --git a/node_modules/chalk/package.json b/node_modules/chalk/package.json index aed521aec0..e4234c86b6 100644 --- a/node_modules/chalk/package.json +++ b/node_modules/chalk/package.json @@ -68,4 +68,4 @@ "test/_flow.js" ] } -} \ No newline at end of file +} diff --git a/node_modules/charenc/package.json b/node_modules/charenc/package.json index 80ac698dea..aece310799 100644 --- a/node_modules/charenc/package.json +++ b/node_modules/charenc/package.json @@ -21,4 +21,4 @@ "engines": { "node": "*" } -} \ No newline at end of file +} diff --git a/node_modules/chokidar/package.json b/node_modules/chokidar/package.json index 26d41e372f..a1f3434f72 100644 --- a/node_modules/chokidar/package.json +++ b/node_modules/chokidar/package.json @@ -75,4 +75,4 @@ "text" ] } -} \ No newline at end of file +} diff --git a/node_modules/chunkd/package.json b/node_modules/chunkd/package.json index 6dfab968b6..70edf04fc7 100644 --- a/node_modules/chunkd/package.json +++ b/node_modules/chunkd/package.json @@ -51,4 +51,4 @@ "ts-node/register" ] } -} \ No newline at end of file +} diff --git a/node_modules/ci-info/package.json b/node_modules/ci-info/package.json index 11adcfb0cc..136015c8d3 100644 --- a/node_modules/ci-info/package.json +++ b/node_modules/ci-info/package.json @@ -33,4 +33,4 @@ "standard": "^16.0.4", "tape": "^5.3.2" } -} \ No newline at end of file +} diff --git a/node_modules/ci-parallel-vars/package.json b/node_modules/ci-parallel-vars/package.json index 60ab70eb5b..7dc76e5955 100644 --- a/node_modules/ci-parallel-vars/package.json +++ b/node_modules/ci-parallel-vars/package.json @@ -33,4 +33,4 @@ "flow-bin": "^0.73.0", "spawndamnit": "^2.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/clean-stack/package.json b/node_modules/clean-stack/package.json index fb9bd0b772..66a4d26b4b 100644 --- a/node_modules/clean-stack/package.json +++ b/node_modules/clean-stack/package.json @@ -36,4 +36,4 @@ "browser": { "os": false } -} \ No newline at end of file +} diff --git a/node_modules/clean-yaml-object/package.json b/node_modules/clean-yaml-object/package.json index 27a6564ba4..98305ac567 100644 --- a/node_modules/clean-yaml-object/package.json +++ b/node_modules/clean-yaml-object/package.json @@ -34,4 +34,4 @@ "nyc": "^5.3.0", "xo": "^0.12.1" } -} \ No newline at end of file +} diff --git a/node_modules/cli-truncate/node_modules/ansi-regex/package.json b/node_modules/cli-truncate/node_modules/ansi-regex/package.json index dded7ec0e6..f6a177d568 100644 --- a/node_modules/cli-truncate/node_modules/ansi-regex/package.json +++ b/node_modules/cli-truncate/node_modules/ansi-regex/package.json @@ -55,4 +55,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/cli-truncate/node_modules/emoji-regex/package.json b/node_modules/cli-truncate/node_modules/emoji-regex/package.json index d1f9043111..eac892a16a 100644 --- a/node_modules/cli-truncate/node_modules/emoji-regex/package.json +++ b/node_modules/cli-truncate/node_modules/emoji-regex/package.json @@ -49,4 +49,4 @@ "mocha": "^6.1.4", "regexgen": "^1.3.0" } -} \ No newline at end of file +} diff --git a/node_modules/cli-truncate/node_modules/string-width/package.json b/node_modules/cli-truncate/node_modules/string-width/package.json index 9f59f117bd..b2353bd16f 100644 --- a/node_modules/cli-truncate/node_modules/string-width/package.json +++ b/node_modules/cli-truncate/node_modules/string-width/package.json @@ -56,4 +56,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/cli-truncate/node_modules/strip-ansi/package.json b/node_modules/cli-truncate/node_modules/strip-ansi/package.json index c5c1bc4f33..dfa2553ae8 100644 --- a/node_modules/cli-truncate/node_modules/strip-ansi/package.json +++ b/node_modules/cli-truncate/node_modules/strip-ansi/package.json @@ -54,4 +54,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/cli-truncate/package.json b/node_modules/cli-truncate/package.json index 0b64e222fa..31d9e1131b 100644 --- a/node_modules/cli-truncate/package.json +++ b/node_modules/cli-truncate/package.json @@ -45,4 +45,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/cliui/package.json b/node_modules/cliui/package.json index b1fee6e1df..3426665dc4 100644 --- a/node_modules/cliui/package.json +++ b/node_modules/cliui/package.json @@ -80,4 +80,4 @@ "engine": { "node": ">=10" } -} \ No newline at end of file +} diff --git a/node_modules/code-excerpt/package.json b/node_modules/code-excerpt/package.json index 5e1300ddf3..77b0e534e3 100644 --- a/node_modules/code-excerpt/package.json +++ b/node_modules/code-excerpt/package.json @@ -27,4 +27,4 @@ "tsd": "^0.11.0", "xo": "^0.32.0" } -} \ No newline at end of file +} diff --git a/node_modules/color-convert/package.json b/node_modules/color-convert/package.json index 6446c22d5b..dfbc471407 100644 --- a/node_modules/color-convert/package.json +++ b/node_modules/color-convert/package.json @@ -43,4 +43,4 @@ "dependencies": { "color-name": "1.1.3" } -} \ No newline at end of file +} diff --git a/node_modules/color-name/package.json b/node_modules/color-name/package.json index 40d5885354..d061123ef0 100644 --- a/node_modules/color-name/package.json +++ b/node_modules/color-name/package.json @@ -22,4 +22,4 @@ "url": "https://github.com/dfcreative/color-name/issues" }, "homepage": "https://github.com/dfcreative/color-name" -} \ No newline at end of file +} diff --git a/node_modules/commander/package.json b/node_modules/commander/package.json index 9db388e947..737c757aa9 100644 --- a/node_modules/commander/package.json +++ b/node_modules/commander/package.json @@ -66,4 +66,4 @@ "node": ">= 12" }, "support": true -} \ No newline at end of file +} diff --git a/node_modules/common-path-prefix/package.json b/node_modules/common-path-prefix/package.json index 5fbc77c3af..e85fd8412d 100644 --- a/node_modules/common-path-prefix/package.json +++ b/node_modules/common-path-prefix/package.json @@ -38,4 +38,4 @@ "nyc": "^14.1.1", "standard": "^14.0.2" } -} \ No newline at end of file +} diff --git a/node_modules/concat-map/package.json b/node_modules/concat-map/package.json index 396f2c1b9d..4ab7eb9b6b 100644 --- a/node_modules/concat-map/package.json +++ b/node_modules/concat-map/package.json @@ -56,4 +56,4 @@ ] } } -} \ No newline at end of file +} diff --git a/node_modules/concordance/package.json b/node_modules/concordance/package.json index 05d665974c..e5353c480e 100644 --- a/node_modules/concordance/package.json +++ b/node_modules/concordance/package.json @@ -47,4 +47,4 @@ "eslint-plugin-unicorn": "^17.2.0", "proxyquire": "^2.1.3" } -} \ No newline at end of file +} diff --git a/node_modules/console-log-level/package.json b/node_modules/console-log-level/package.json index 55a7bcc1cd..d9af83d61b 100644 --- a/node_modules/console-log-level/package.json +++ b/node_modules/console-log-level/package.json @@ -34,4 +34,4 @@ 55.778253, 12.593208 ] -} \ No newline at end of file +} diff --git a/node_modules/convert-to-spaces/package.json b/node_modules/convert-to-spaces/package.json index 330450e4dd..1f85fa0fe3 100644 --- a/node_modules/convert-to-spaces/package.json +++ b/node_modules/convert-to-spaces/package.json @@ -22,4 +22,4 @@ "ava": "^0.18.2", "xo": "^0.17.1" } -} \ No newline at end of file +} diff --git a/node_modules/cross-spawn/package.json b/node_modules/cross-spawn/package.json index af692031e0..232ff97e04 100644 --- a/node_modules/cross-spawn/package.json +++ b/node_modules/cross-spawn/package.json @@ -70,4 +70,4 @@ "engines": { "node": ">= 8" } -} \ No newline at end of file +} diff --git a/node_modules/crypt/package.json b/node_modules/crypt/package.json index b4b8c991c8..240cab76a6 100644 --- a/node_modules/crypt/package.json +++ b/node_modules/crypt/package.json @@ -19,4 +19,4 @@ "engines": { "node": "*" } -} \ No newline at end of file +} diff --git a/node_modules/currently-unhandled/package.json b/node_modules/currently-unhandled/package.json index 99380249b1..3baae3d8b0 100644 --- a/node_modules/currently-unhandled/package.json +++ b/node_modules/currently-unhandled/package.json @@ -68,4 +68,4 @@ "node" ] } -} \ No newline at end of file +} diff --git a/node_modules/date-time/package.json b/node_modules/date-time/package.json index d5d4d50c26..549f551ec5 100644 --- a/node_modules/date-time/package.json +++ b/node_modules/date-time/package.json @@ -38,4 +38,4 @@ "tsd": "^0.7.1", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/debug/package.json b/node_modules/debug/package.json index 4f3407ed8b..cb7efa8eec 100644 --- a/node_modules/debug/package.json +++ b/node_modules/debug/package.json @@ -56,4 +56,4 @@ "engines": { "node": ">=6.0" } -} \ No newline at end of file +} diff --git a/node_modules/decode-uri-component/package.json b/node_modules/decode-uri-component/package.json index 020274ff3e..183bd7c6a3 100644 --- a/node_modules/decode-uri-component/package.json +++ b/node_modules/decode-uri-component/package.json @@ -34,4 +34,4 @@ "nyc": "^10.3.2", "xo": "^0.16.0" } -} \ No newline at end of file +} diff --git a/node_modules/deep-is/package.json b/node_modules/deep-is/package.json index d3fe0febc2..63628f0d01 100644 --- a/node_modules/deep-is/package.json +++ b/node_modules/deep-is/package.json @@ -58,4 +58,4 @@ ] } } -} \ No newline at end of file +} diff --git a/node_modules/define-properties/package.json b/node_modules/define-properties/package.json index 06d4ccdeb8..8bdb3571e2 100644 --- a/node_modules/define-properties/package.json +++ b/node_modules/define-properties/package.json @@ -62,4 +62,4 @@ "engines": { "node": ">= 0.4" } -} \ No newline at end of file +} diff --git a/node_modules/del/package.json b/node_modules/del/package.json index 0018aa419e..ffb2cf07f2 100644 --- a/node_modules/del/package.json +++ b/node_modules/del/package.json @@ -63,4 +63,4 @@ "tsd": "^0.13.1", "xo": "^0.33.1" } -} \ No newline at end of file +} diff --git a/node_modules/deprecation/package.json b/node_modules/deprecation/package.json index 02e6bc9d4e..a45fd513b4 100644 --- a/node_modules/deprecation/package.json +++ b/node_modules/deprecation/package.json @@ -31,4 +31,4 @@ "@pika/plugin-standard-pkg": "^0.4.0", "semantic-release": "^15.13.3" } -} \ No newline at end of file +} diff --git a/node_modules/diff/package.json b/node_modules/diff/package.json index 4225a21580..2b6eea7f1c 100644 --- a/node_modules/diff/package.json +++ b/node_modules/diff/package.json @@ -84,4 +84,4 @@ "webpack-dev-server": "^3.1.14" }, "optionalDependencies": {} -} \ No newline at end of file +} diff --git a/node_modules/dir-glob/package.json b/node_modules/dir-glob/package.json index e2334d4afb..8c38b04dcc 100644 --- a/node_modules/dir-glob/package.json +++ b/node_modules/dir-glob/package.json @@ -35,4 +35,4 @@ "rimraf": "^2.5.0", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/doctrine/package.json b/node_modules/doctrine/package.json index df921e4676..92667d3437 100644 --- a/node_modules/doctrine/package.json +++ b/node_modules/doctrine/package.json @@ -54,4 +54,4 @@ "dependencies": { "esutils": "^2.0.2" } -} \ No newline at end of file +} diff --git a/node_modules/eastasianwidth/package.json b/node_modules/eastasianwidth/package.json index f6e210d798..cb7ac6ab3b 100644 --- a/node_modules/eastasianwidth/package.json +++ b/node_modules/eastasianwidth/package.json @@ -15,4 +15,4 @@ "devDependencies": { "mocha": "~1.9.0" } -} \ No newline at end of file +} diff --git a/node_modules/emittery/package.json b/node_modules/emittery/package.json index d31c9ef3df..f75e266601 100644 --- a/node_modules/emittery/package.json +++ b/node_modules/emittery/package.json @@ -63,4 +63,4 @@ "text" ] } -} \ No newline at end of file +} diff --git a/node_modules/emoji-regex/package.json b/node_modules/emoji-regex/package.json index cb5ad36774..6d32352829 100644 --- a/node_modules/emoji-regex/package.json +++ b/node_modules/emoji-regex/package.json @@ -47,4 +47,4 @@ "regexgen": "^1.3.0", "unicode-12.0.0": "^0.7.9" } -} \ No newline at end of file +} diff --git a/node_modules/enquirer/package.json b/node_modules/enquirer/package.json index f4815e037a..1d986c7356 100644 --- a/node_modules/enquirer/package.json +++ b/node_modules/enquirer/package.json @@ -108,4 +108,4 @@ "prompt-skeleton" ] } -} \ No newline at end of file +} diff --git a/node_modules/error-ex/package.json b/node_modules/error-ex/package.json index 01f328d44e..f3d9ae0e3b 100644 --- a/node_modules/error-ex/package.json +++ b/node_modules/error-ex/package.json @@ -43,4 +43,4 @@ "dependencies": { "is-arrayish": "^0.2.1" } -} \ No newline at end of file +} diff --git a/node_modules/es-abstract/package.json b/node_modules/es-abstract/package.json index 9b048f249a..142f8db1b3 100644 --- a/node_modules/es-abstract/package.json +++ b/node_modules/es-abstract/package.json @@ -132,4 +132,4 @@ "nyc" ] } -} \ No newline at end of file +} diff --git a/node_modules/es-to-primitive/package.json b/node_modules/es-to-primitive/package.json index 475c3ffdbe..0c301e6e6d 100644 --- a/node_modules/es-to-primitive/package.json +++ b/node_modules/es-to-primitive/package.json @@ -78,4 +78,4 @@ "engines": { "node": ">= 0.4" } -} \ No newline at end of file +} diff --git a/node_modules/escalade/package.json b/node_modules/escalade/package.json index a94ee79096..0d1bfce981 100644 --- a/node_modules/escalade/package.json +++ b/node_modules/escalade/package.json @@ -58,4 +58,4 @@ "esm": "3.2.25", "uvu": "0.3.3" } -} \ No newline at end of file +} diff --git a/node_modules/escape-string-regexp/package.json b/node_modules/escape-string-regexp/package.json index ddf8dee2fb..f307df34a2 100644 --- a/node_modules/escape-string-regexp/package.json +++ b/node_modules/escape-string-regexp/package.json @@ -38,4 +38,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-config-prettier/package.json b/node_modules/eslint-config-prettier/package.json index 8d836597ca..f5bc0bb9c2 100644 --- a/node_modules/eslint-config-prettier/package.json +++ b/node_modules/eslint-config-prettier/package.json @@ -14,4 +14,4 @@ "peerDependencies": { "eslint": ">=7.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-import-resolver-node/node_modules/debug/package.json b/node_modules/eslint-import-resolver-node/node_modules/debug/package.json index e884995b0a..191c815478 100644 --- a/node_modules/eslint-import-resolver-node/node_modules/debug/package.json +++ b/node_modules/eslint-import-resolver-node/node_modules/debug/package.json @@ -48,4 +48,4 @@ "main": "./src/index.js", "browser": "./src/browser.js", "unpkg": "./dist/debug.js" -} \ No newline at end of file +} diff --git a/node_modules/eslint-import-resolver-node/package.json b/node_modules/eslint-import-resolver-node/package.json index 8a90887ced..993f1b89b6 100644 --- a/node_modules/eslint-import-resolver-node/package.json +++ b/node_modules/eslint-import-resolver-node/package.json @@ -39,4 +39,4 @@ "mocha": "^3.5.3", "nyc": "^11.9.0" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-module-utils/node_modules/debug/package.json b/node_modules/eslint-module-utils/node_modules/debug/package.json index e884995b0a..191c815478 100644 --- a/node_modules/eslint-module-utils/node_modules/debug/package.json +++ b/node_modules/eslint-module-utils/node_modules/debug/package.json @@ -48,4 +48,4 @@ "main": "./src/index.js", "browser": "./src/browser.js", "unpkg": "./dist/debug.js" -} \ No newline at end of file +} diff --git a/node_modules/eslint-module-utils/node_modules/find-up/package.json b/node_modules/eslint-module-utils/node_modules/find-up/package.json index 7ec1b7ef81..7ec85bb79b 100644 --- a/node_modules/eslint-module-utils/node_modules/find-up/package.json +++ b/node_modules/eslint-module-utils/node_modules/find-up/package.json @@ -50,4 +50,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/eslint-module-utils/node_modules/locate-path/package.json b/node_modules/eslint-module-utils/node_modules/locate-path/package.json index e05a6304bf..17bcd7ff69 100644 --- a/node_modules/eslint-module-utils/node_modules/locate-path/package.json +++ b/node_modules/eslint-module-utils/node_modules/locate-path/package.json @@ -44,4 +44,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/eslint-module-utils/node_modules/p-limit/package.json b/node_modules/eslint-module-utils/node_modules/p-limit/package.json index 275cb73ae4..90db5794d5 100644 --- a/node_modules/eslint-module-utils/node_modules/p-limit/package.json +++ b/node_modules/eslint-module-utils/node_modules/p-limit/package.json @@ -46,4 +46,4 @@ "time-span": "^2.0.0", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-module-utils/node_modules/p-locate/package.json b/node_modules/eslint-module-utils/node_modules/p-locate/package.json index b938aa4c59..767002b385 100644 --- a/node_modules/eslint-module-utils/node_modules/p-locate/package.json +++ b/node_modules/eslint-module-utils/node_modules/p-locate/package.json @@ -51,4 +51,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/eslint-module-utils/node_modules/p-try/package.json b/node_modules/eslint-module-utils/node_modules/p-try/package.json index a4623262b2..ba2513ade7 100644 --- a/node_modules/eslint-module-utils/node_modules/p-try/package.json +++ b/node_modules/eslint-module-utils/node_modules/p-try/package.json @@ -40,4 +40,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/eslint-module-utils/node_modules/path-exists/package.json b/node_modules/eslint-module-utils/node_modules/path-exists/package.json index ed507545d7..efd56267e8 100644 --- a/node_modules/eslint-module-utils/node_modules/path-exists/package.json +++ b/node_modules/eslint-module-utils/node_modules/path-exists/package.json @@ -37,4 +37,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/eslint-module-utils/node_modules/pkg-dir/package.json b/node_modules/eslint-module-utils/node_modules/pkg-dir/package.json index 267b3ae012..2bb7277c63 100644 --- a/node_modules/eslint-module-utils/node_modules/pkg-dir/package.json +++ b/node_modules/eslint-module-utils/node_modules/pkg-dir/package.json @@ -50,4 +50,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-module-utils/package.json b/node_modules/eslint-module-utils/package.json index 6fc53cc042..f726b79585 100644 --- a/node_modules/eslint-module-utils/package.json +++ b/node_modules/eslint-module-utils/package.json @@ -29,4 +29,4 @@ "debug": "^3.2.7", "pkg-dir": "^2.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-eslint-comments/package.json b/node_modules/eslint-plugin-eslint-comments/package.json index cbae8dda3e..a2ba9b25b2 100644 --- a/node_modules/eslint-plugin-eslint-comments/package.json +++ b/node_modules/eslint-plugin-eslint-comments/package.json @@ -80,4 +80,4 @@ }, "homepage": "https://github.com/mysticatea/eslint-plugin-eslint-comments#readme", "funding": "https://github.com/sponsors/mysticatea" -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-filenames/package.json b/node_modules/eslint-plugin-filenames/package.json index 0402d11a24..0c34e99a93 100644 --- a/node_modules/eslint-plugin-filenames/package.json +++ b/node_modules/eslint-plugin-filenames/package.json @@ -47,4 +47,4 @@ "filename", "path" ] -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/parser/package.json b/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/parser/package.json index e67cda600d..0d74acfd06 100644 --- a/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/parser/package.json +++ b/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/parser/package.json @@ -72,4 +72,4 @@ } }, "gitHead": "7bf8c9cb0235e225aab08b7793ff17f6ab1dc52e" -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/scope-manager/package.json b/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/scope-manager/package.json index 07dec2e35e..5c01b34265 100644 --- a/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/scope-manager/package.json +++ b/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/scope-manager/package.json @@ -65,4 +65,4 @@ } }, "gitHead": "7bf8c9cb0235e225aab08b7793ff17f6ab1dc52e" -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/types/package.json b/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/types/package.json index 2bdddef792..e256cd7ffd 100644 --- a/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/types/package.json +++ b/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/types/package.json @@ -53,4 +53,4 @@ "typescript": "*" }, "gitHead": "7bf8c9cb0235e225aab08b7793ff17f6ab1dc52e" -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/typescript-estree/package.json b/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/typescript-estree/package.json index 7c8e4e6048..c19f587324 100644 --- a/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/typescript-estree/package.json +++ b/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/typescript-estree/package.json @@ -83,4 +83,4 @@ } }, "gitHead": "7bf8c9cb0235e225aab08b7793ff17f6ab1dc52e" -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/visitor-keys/package.json b/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/visitor-keys/package.json index 04d054776b..a0c457c2fe 100644 --- a/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/visitor-keys/package.json +++ b/node_modules/eslint-plugin-github/node_modules/@typescript-eslint/visitor-keys/package.json @@ -56,4 +56,4 @@ } }, "gitHead": "7bf8c9cb0235e225aab08b7793ff17f6ab1dc52e" -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-github/package.json b/node_modules/eslint-plugin-github/package.json index a8fea7acec..884a5bb111 100644 --- a/node_modules/eslint-plugin-github/package.json +++ b/node_modules/eslint-plugin-github/package.json @@ -54,4 +54,4 @@ "globals": "^13.7.0", "mocha": "^8.3.2" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-i18n-text/package.json b/node_modules/eslint-plugin-i18n-text/package.json index d1b092c024..7a4146e248 100644 --- a/node_modules/eslint-plugin-i18n-text/package.json +++ b/node_modules/eslint-plugin-i18n-text/package.json @@ -24,4 +24,4 @@ "mocha": "^6.2.0", "prettier": "^1.18.2" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-import/node_modules/debug/package.json b/node_modules/eslint-plugin-import/node_modules/debug/package.json index 0b1b9df8b4..dc787ba767 100644 --- a/node_modules/eslint-plugin-import/node_modules/debug/package.json +++ b/node_modules/eslint-plugin-import/node_modules/debug/package.json @@ -46,4 +46,4 @@ "debug/debug.js": "debug.js" } } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-import/node_modules/find-up/package.json b/node_modules/eslint-plugin-import/node_modules/find-up/package.json index 7ec1b7ef81..7ec85bb79b 100644 --- a/node_modules/eslint-plugin-import/node_modules/find-up/package.json +++ b/node_modules/eslint-plugin-import/node_modules/find-up/package.json @@ -50,4 +50,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-import/node_modules/locate-path/package.json b/node_modules/eslint-plugin-import/node_modules/locate-path/package.json index e05a6304bf..17bcd7ff69 100644 --- a/node_modules/eslint-plugin-import/node_modules/locate-path/package.json +++ b/node_modules/eslint-plugin-import/node_modules/locate-path/package.json @@ -44,4 +44,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-import/node_modules/ms/package.json b/node_modules/eslint-plugin-import/node_modules/ms/package.json index 63aaff3abf..6a31c81fac 100644 --- a/node_modules/eslint-plugin-import/node_modules/ms/package.json +++ b/node_modules/eslint-plugin-import/node_modules/ms/package.json @@ -34,4 +34,4 @@ "lint-staged": "3.4.1", "mocha": "3.4.1" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-import/node_modules/p-limit/package.json b/node_modules/eslint-plugin-import/node_modules/p-limit/package.json index 275cb73ae4..90db5794d5 100644 --- a/node_modules/eslint-plugin-import/node_modules/p-limit/package.json +++ b/node_modules/eslint-plugin-import/node_modules/p-limit/package.json @@ -46,4 +46,4 @@ "time-span": "^2.0.0", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-import/node_modules/p-locate/package.json b/node_modules/eslint-plugin-import/node_modules/p-locate/package.json index b938aa4c59..767002b385 100644 --- a/node_modules/eslint-plugin-import/node_modules/p-locate/package.json +++ b/node_modules/eslint-plugin-import/node_modules/p-locate/package.json @@ -51,4 +51,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-import/node_modules/p-try/package.json b/node_modules/eslint-plugin-import/node_modules/p-try/package.json index a4623262b2..ba2513ade7 100644 --- a/node_modules/eslint-plugin-import/node_modules/p-try/package.json +++ b/node_modules/eslint-plugin-import/node_modules/p-try/package.json @@ -40,4 +40,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-import/node_modules/path-exists/package.json b/node_modules/eslint-plugin-import/node_modules/path-exists/package.json index ed507545d7..efd56267e8 100644 --- a/node_modules/eslint-plugin-import/node_modules/path-exists/package.json +++ b/node_modules/eslint-plugin-import/node_modules/path-exists/package.json @@ -37,4 +37,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-import/package.json b/node_modules/eslint-plugin-import/package.json index ab43e4bc9e..e3bc5a8d96 100644 --- a/node_modules/eslint-plugin-import/package.json +++ b/node_modules/eslint-plugin-import/package.json @@ -116,4 +116,4 @@ "resolve": "^1.20.0", "tsconfig-paths": "^3.9.0" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-no-async-foreach/package.json b/node_modules/eslint-plugin-no-async-foreach/package.json index 0ce033466a..48ff06ae7c 100644 --- a/node_modules/eslint-plugin-no-async-foreach/package.json +++ b/node_modules/eslint-plugin-no-async-foreach/package.json @@ -23,4 +23,4 @@ "node": ">=0.10.0" }, "license": "ISC" -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-no-only-tests/package.json b/node_modules/eslint-plugin-no-only-tests/package.json index 5b47c13ade..9a50814ac5 100644 --- a/node_modules/eslint-plugin-no-only-tests/package.json +++ b/node_modules/eslint-plugin-no-only-tests/package.json @@ -33,4 +33,4 @@ "url": "https://github.com/levibuzolic/no-only-tests/issues" }, "homepage": "https://github.com/levibuzolic/no-only-tests#readme" -} \ No newline at end of file +} diff --git a/node_modules/eslint-plugin-prettier/package.json b/node_modules/eslint-plugin-prettier/package.json index 1f2c8546f8..1ad1afdc78 100644 --- a/node_modules/eslint-plugin-prettier/package.json +++ b/node_modules/eslint-plugin-prettier/package.json @@ -55,4 +55,4 @@ "node": ">=6.0.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/eslint-rule-documentation/package.json b/node_modules/eslint-rule-documentation/package.json index 821f737860..056faee0e9 100644 --- a/node_modules/eslint-rule-documentation/package.json +++ b/node_modules/eslint-rule-documentation/package.json @@ -37,4 +37,4 @@ "xo": { "space": 2 } -} \ No newline at end of file +} diff --git a/node_modules/eslint-scope/package.json b/node_modules/eslint-scope/package.json index 9ae6624ce9..b700b92afb 100644 --- a/node_modules/eslint-scope/package.json +++ b/node_modules/eslint-scope/package.json @@ -45,4 +45,4 @@ "shelljs": "^0.8.3", "typescript": "^3.5.2" } -} \ No newline at end of file +} diff --git a/node_modules/eslint-utils/node_modules/eslint-visitor-keys/package.json b/node_modules/eslint-utils/node_modules/eslint-visitor-keys/package.json index 98262a15c1..63267be643 100644 --- a/node_modules/eslint-utils/node_modules/eslint-visitor-keys/package.json +++ b/node_modules/eslint-utils/node_modules/eslint-visitor-keys/package.json @@ -37,4 +37,4 @@ "url": "https://github.com/eslint/eslint-visitor-keys/issues" }, "homepage": "https://github.com/eslint/eslint-visitor-keys#readme" -} \ No newline at end of file +} diff --git a/node_modules/eslint-utils/package.json b/node_modules/eslint-utils/package.json index 1de02b13ca..661a97fb09 100644 --- a/node_modules/eslint-utils/package.json +++ b/node_modules/eslint-utils/package.json @@ -62,4 +62,4 @@ }, "homepage": "https://github.com/mysticatea/eslint-utils#readme", "funding": "https://github.com/sponsors/mysticatea" -} \ No newline at end of file +} diff --git a/node_modules/eslint-visitor-keys/package.json b/node_modules/eslint-visitor-keys/package.json index 959b517925..a3b8dd684a 100644 --- a/node_modules/eslint-visitor-keys/package.json +++ b/node_modules/eslint-visitor-keys/package.json @@ -36,4 +36,4 @@ "url": "https://github.com/eslint/eslint-visitor-keys/issues" }, "homepage": "https://github.com/eslint/eslint-visitor-keys#readme" -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/ansi-styles/package.json b/node_modules/eslint/node_modules/ansi-styles/package.json index 1a7731952d..8df0116d2e 100644 --- a/node_modules/eslint/node_modules/ansi-styles/package.json +++ b/node_modules/eslint/node_modules/ansi-styles/package.json @@ -54,4 +54,4 @@ "tsd": "^0.11.0", "xo": "^0.25.3" } -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/argparse/package.json b/node_modules/eslint/node_modules/argparse/package.json index b16de2518a..62fba0a9fc 100644 --- a/node_modules/eslint/node_modules/argparse/package.json +++ b/node_modules/eslint/node_modules/argparse/package.json @@ -31,4 +31,4 @@ "mocha": "^3.1.0", "ndoc": "^5.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/chalk/package.json b/node_modules/eslint/node_modules/chalk/package.json index efe4541a6d..c86592aadc 100644 --- a/node_modules/eslint/node_modules/chalk/package.json +++ b/node_modules/eslint/node_modules/chalk/package.json @@ -65,4 +65,4 @@ "unicorn/better-regex": "off" } } -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/color-convert/package.json b/node_modules/eslint/node_modules/color-convert/package.json index d169f869b2..6e48000c7c 100644 --- a/node_modules/eslint/node_modules/color-convert/package.json +++ b/node_modules/eslint/node_modules/color-convert/package.json @@ -45,4 +45,4 @@ "dependencies": { "color-name": "~1.1.4" } -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/color-name/package.json b/node_modules/eslint/node_modules/color-name/package.json index fecb8dcfb6..7acc90285c 100644 --- a/node_modules/eslint/node_modules/color-name/package.json +++ b/node_modules/eslint/node_modules/color-name/package.json @@ -25,4 +25,4 @@ "url": "https://github.com/colorjs/color-name/issues" }, "homepage": "https://github.com/colorjs/color-name" -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/doctrine/package.json b/node_modules/eslint/node_modules/doctrine/package.json index ff109c462d..b66099863d 100644 --- a/node_modules/eslint/node_modules/doctrine/package.json +++ b/node_modules/eslint/node_modules/doctrine/package.json @@ -55,4 +55,4 @@ "dependencies": { "esutils": "^2.0.2" } -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/escape-string-regexp/package.json b/node_modules/eslint/node_modules/escape-string-regexp/package.json index 053b31334f..10a648a8d1 100644 --- a/node_modules/eslint/node_modules/escape-string-regexp/package.json +++ b/node_modules/eslint/node_modules/escape-string-regexp/package.json @@ -35,4 +35,4 @@ "tsd": "^0.11.0", "xo": "^0.28.3" } -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/has-flag/package.json b/node_modules/eslint/node_modules/has-flag/package.json index 55d0058e44..9b7c18236a 100644 --- a/node_modules/eslint/node_modules/has-flag/package.json +++ b/node_modules/eslint/node_modules/has-flag/package.json @@ -43,4 +43,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/ignore/package.json b/node_modules/eslint/node_modules/ignore/package.json index 873bff3ede..8cb1b78732 100644 --- a/node_modules/eslint/node_modules/ignore/package.json +++ b/node_modules/eslint/node_modules/ignore/package.json @@ -61,4 +61,4 @@ "engines": { "node": ">= 4" } -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/js-yaml/package.json b/node_modules/eslint/node_modules/js-yaml/package.json index 67a6d909ce..0d2366762c 100644 --- a/node_modules/eslint/node_modules/js-yaml/package.json +++ b/node_modules/eslint/node_modules/js-yaml/package.json @@ -46,4 +46,4 @@ "scripts": { "test": "make test" } -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/strip-json-comments/package.json b/node_modules/eslint/node_modules/strip-json-comments/package.json index ea63318611..64b0092258 100644 --- a/node_modules/eslint/node_modules/strip-json-comments/package.json +++ b/node_modules/eslint/node_modules/strip-json-comments/package.json @@ -44,4 +44,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/eslint/node_modules/supports-color/package.json b/node_modules/eslint/node_modules/supports-color/package.json index 12d9e2923b..746ec7cacd 100644 --- a/node_modules/eslint/node_modules/supports-color/package.json +++ b/node_modules/eslint/node_modules/supports-color/package.json @@ -50,4 +50,4 @@ "xo": "^0.24.0" }, "browser": "browser.js" -} \ No newline at end of file +} diff --git a/node_modules/eslint/package.json b/node_modules/eslint/package.json index 932d039a22..1845500824 100644 --- a/node_modules/eslint/package.json +++ b/node_modules/eslint/package.json @@ -143,4 +143,4 @@ "engines": { "node": "^10.12.0 || >=12.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/espree/node_modules/eslint-visitor-keys/package.json b/node_modules/espree/node_modules/eslint-visitor-keys/package.json index 98262a15c1..63267be643 100644 --- a/node_modules/espree/node_modules/eslint-visitor-keys/package.json +++ b/node_modules/espree/node_modules/eslint-visitor-keys/package.json @@ -37,4 +37,4 @@ "url": "https://github.com/eslint/eslint-visitor-keys/issues" }, "homepage": "https://github.com/eslint/eslint-visitor-keys#readme" -} \ No newline at end of file +} diff --git a/node_modules/espree/package.json b/node_modules/espree/package.json index 51d63111c5..724e6fcee7 100644 --- a/node_modules/espree/package.json +++ b/node_modules/espree/package.json @@ -61,4 +61,4 @@ "generate-rcrelease": "eslint-generate-prerelease rc", "publish-release": "eslint-publish-release" } -} \ No newline at end of file +} diff --git a/node_modules/esprima/package.json b/node_modules/esprima/package.json index 55d445995e..4148b8ce4f 100644 --- a/node_modules/esprima/package.json +++ b/node_modules/esprima/package.json @@ -109,4 +109,4 @@ "generate-regex": "node tools/generate-identifier-regex.js", "generate-xhtml-entities": "node tools/generate-xhtml-entities.js" } -} \ No newline at end of file +} diff --git a/node_modules/esquery/node_modules/estraverse/package.json b/node_modules/esquery/node_modules/estraverse/package.json index 0cf551dd78..bc99e7c4a6 100644 --- a/node_modules/esquery/node_modules/estraverse/package.json +++ b/node_modules/esquery/node_modules/estraverse/package.json @@ -37,4 +37,4 @@ "lint": "jshint estraverse.js", "unit-test": "mocha --compilers js:babel-register" } -} \ No newline at end of file +} diff --git a/node_modules/esquery/package.json b/node_modules/esquery/package.json index e525e2c660..3d818750d3 100644 --- a/node_modules/esquery/package.json +++ b/node_modules/esquery/package.json @@ -75,4 +75,4 @@ "dependencies": { "estraverse": "^5.1.0" } -} \ No newline at end of file +} diff --git a/node_modules/esrecurse/node_modules/estraverse/package.json b/node_modules/esrecurse/node_modules/estraverse/package.json index 0cf551dd78..bc99e7c4a6 100644 --- a/node_modules/esrecurse/node_modules/estraverse/package.json +++ b/node_modules/esrecurse/node_modules/estraverse/package.json @@ -37,4 +37,4 @@ "lint": "jshint estraverse.js", "unit-test": "mocha --compilers js:babel-register" } -} \ No newline at end of file +} diff --git a/node_modules/esrecurse/package.json b/node_modules/esrecurse/package.json index c3018ca5c4..dec5b1bc1f 100755 --- a/node_modules/esrecurse/package.json +++ b/node_modules/esrecurse/package.json @@ -49,4 +49,4 @@ "es2015" ] } -} \ No newline at end of file +} diff --git a/node_modules/estraverse/package.json b/node_modules/estraverse/package.json index 17849599f7..1138238672 100644 --- a/node_modules/estraverse/package.json +++ b/node_modules/estraverse/package.json @@ -37,4 +37,4 @@ "lint": "jshint estraverse.js", "unit-test": "mocha --compilers js:babel-register" } -} \ No newline at end of file +} diff --git a/node_modules/esutils/package.json b/node_modules/esutils/package.json index 0578338b85..8396f4cee3 100644 --- a/node_modules/esutils/package.json +++ b/node_modules/esutils/package.json @@ -41,4 +41,4 @@ "unit-test": "mocha --compilers coffee:coffee-script -R spec", "generate-regex": "node tools/generate-identifier-regex.js" } -} \ No newline at end of file +} diff --git a/node_modules/execa/node_modules/get-stream/package.json b/node_modules/execa/node_modules/get-stream/package.json index 5463d07cdc..0c084ac923 100644 --- a/node_modules/execa/node_modules/get-stream/package.json +++ b/node_modules/execa/node_modules/get-stream/package.json @@ -44,4 +44,4 @@ "tsd": "^0.13.1", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/execa/package.json b/node_modules/execa/package.json index d94fb111ef..441e23c8a8 100644 --- a/node_modules/execa/package.json +++ b/node_modules/execa/package.json @@ -71,4 +71,4 @@ "**/test/**" ] } -} \ No newline at end of file +} diff --git a/node_modules/fast-deep-equal/package.json b/node_modules/fast-deep-equal/package.json index 916b152b98..3cfe66c68e 100644 --- a/node_modules/fast-deep-equal/package.json +++ b/node_modules/fast-deep-equal/package.json @@ -58,4 +58,4 @@ "es6/" ], "types": "index.d.ts" -} \ No newline at end of file +} diff --git a/node_modules/fast-diff/package.json b/node_modules/fast-diff/package.json index ad043fecab..b1a7a29740 100644 --- a/node_modules/fast-diff/package.json +++ b/node_modules/fast-diff/package.json @@ -23,4 +23,4 @@ "keywords": [ "diff" ] -} \ No newline at end of file +} diff --git a/node_modules/fast-glob/package.json b/node_modules/fast-glob/package.json index 5e5c0e3510..c917469a74 100644 --- a/node_modules/fast-glob/package.json +++ b/node_modules/fast-glob/package.json @@ -91,4 +91,4 @@ "bench-sync-partial-flatten": "node ./out/benchmark --mode sync --pattern \"{fixtures,out}/{first,second}/*\"", "bench-sync-partial-deep": "node ./out/benchmark --mode sync --pattern \"{fixtures,out}/**\"" } -} \ No newline at end of file +} diff --git a/node_modules/fast-json-stable-stringify/package.json b/node_modules/fast-json-stable-stringify/package.json index 730ca8e2af..ad2c8bff7c 100644 --- a/node_modules/fast-json-stable-stringify/package.json +++ b/node_modules/fast-json-stable-stringify/package.json @@ -49,4 +49,4 @@ "text-summary" ] } -} \ No newline at end of file +} diff --git a/node_modules/fast-levenshtein/package.json b/node_modules/fast-levenshtein/package.json index 62d1175673..5b4736d453 100644 --- a/node_modules/fast-levenshtein/package.json +++ b/node_modules/fast-levenshtein/package.json @@ -36,4 +36,4 @@ ], "author": "Ramesh Nair (http://www.hiddentao.com/)", "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/fastq/package.json b/node_modules/fastq/package.json index 41c544d731..e681d2d4bf 100644 --- a/node_modules/fastq/package.json +++ b/node_modules/fastq/package.json @@ -44,4 +44,4 @@ "dependencies": { "reusify": "^1.0.4" } -} \ No newline at end of file +} diff --git a/node_modules/figures/node_modules/escape-string-regexp/package.json b/node_modules/figures/node_modules/escape-string-regexp/package.json index 4e7d8199b9..7d8362c2bb 100644 --- a/node_modules/figures/node_modules/escape-string-regexp/package.json +++ b/node_modules/figures/node_modules/escape-string-regexp/package.json @@ -37,4 +37,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/figures/package.json b/node_modules/figures/package.json index 73de39212a..0528984e9d 100644 --- a/node_modules/figures/package.json +++ b/node_modules/figures/package.json @@ -44,4 +44,4 @@ "typescript": "^4.3.5", "xo": "^0.40.3" } -} \ No newline at end of file +} diff --git a/node_modules/file-entry-cache/package.json b/node_modules/file-entry-cache/package.json index bd99d0a172..f03ef48cc6 100644 --- a/node_modules/file-entry-cache/package.json +++ b/node_modules/file-entry-cache/package.json @@ -77,4 +77,4 @@ "dependencies": { "flat-cache": "^3.0.4" } -} \ No newline at end of file +} diff --git a/node_modules/file-url/package.json b/node_modules/file-url/package.json index dbcd4f1b4e..ca4f2f574c 100644 --- a/node_modules/file-url/package.json +++ b/node_modules/file-url/package.json @@ -32,4 +32,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/fill-range/package.json b/node_modules/fill-range/package.json index c3868058fa..07d30767f5 100644 --- a/node_modules/fill-range/package.json +++ b/node_modules/fill-range/package.json @@ -66,4 +66,4 @@ "reflinks": true } } -} \ No newline at end of file +} diff --git a/node_modules/filter-obj/package.json b/node_modules/filter-obj/package.json index d44fdf7a12..0705b902e9 100644 --- a/node_modules/filter-obj/package.json +++ b/node_modules/filter-obj/package.json @@ -34,4 +34,4 @@ "ava": "0.0.4", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/find-up/package.json b/node_modules/find-up/package.json index 4dbde215e2..8f42361082 100644 --- a/node_modules/find-up/package.json +++ b/node_modules/find-up/package.json @@ -53,4 +53,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/flat-cache/package.json b/node_modules/flat-cache/package.json index e3e8776130..8bc6f87c51 100644 --- a/node_modules/flat-cache/package.json +++ b/node_modules/flat-cache/package.json @@ -81,4 +81,4 @@ "flatted": "^3.1.0", "rimraf": "^3.0.2" } -} \ No newline at end of file +} diff --git a/node_modules/flatted/package.json b/node_modules/flatted/package.json index 1fe9ca4fac..405ccfd799 100644 --- a/node_modules/flatted/package.json +++ b/node_modules/flatted/package.json @@ -55,4 +55,4 @@ "import": "./esm/index.js", "default": "./cjs/index.js" } -} \ No newline at end of file +} diff --git a/node_modules/fs-extra/package.json b/node_modules/fs-extra/package.json index 2ac3a13281..8ceeb7499d 100644 --- a/node_modules/fs-extra/package.json +++ b/node_modules/fs-extra/package.json @@ -61,4 +61,4 @@ "test": "npm run lint && npm run unit", "unit": "node test.js" } -} \ No newline at end of file +} diff --git a/node_modules/fs.realpath/package.json b/node_modules/fs.realpath/package.json index 6e98eaab95..3edc57d21c 100644 --- a/node_modules/fs.realpath/package.json +++ b/node_modules/fs.realpath/package.json @@ -23,4 +23,4 @@ "old.js", "index.js" ] -} \ No newline at end of file +} diff --git a/node_modules/fs/package.json b/node_modules/fs/package.json index f1fa735a76..11661b0395 100644 --- a/node_modules/fs/package.json +++ b/node_modules/fs/package.json @@ -17,4 +17,4 @@ "url": "https://github.com/npm/security-holder/issues" }, "homepage": "https://github.com/npm/security-holder#readme" -} \ No newline at end of file +} diff --git a/node_modules/fsevents/package.json b/node_modules/fsevents/package.json index 6ea89ed033..af6da84ae6 100644 --- a/node_modules/fsevents/package.json +++ b/node_modules/fsevents/package.json @@ -59,4 +59,4 @@ "devDependencies": { "node-gyp": "^6.1.0" } -} \ No newline at end of file +} diff --git a/node_modules/function-bind/package.json b/node_modules/function-bind/package.json index 0dd444554b..20a1727cbf 100644 --- a/node_modules/function-bind/package.json +++ b/node_modules/function-bind/package.json @@ -60,4 +60,4 @@ "android-browser/4.2..latest" ] } -} \ No newline at end of file +} diff --git a/node_modules/functional-red-black-tree/package.json b/node_modules/functional-red-black-tree/package.json index a8cacfdee0..13d6f270cb 100644 --- a/node_modules/functional-red-black-tree/package.json +++ b/node_modules/functional-red-black-tree/package.json @@ -37,4 +37,4 @@ "bugs": { "url": "https://github.com/mikolalysenko/functional-red-black-tree/issues" } -} \ No newline at end of file +} diff --git a/node_modules/get-caller-file/package.json b/node_modules/get-caller-file/package.json index 3218e973a0..b0dd571391 100644 --- a/node_modules/get-caller-file/package.json +++ b/node_modules/get-caller-file/package.json @@ -39,4 +39,4 @@ "engines": { "node": "6.* || 8.* || >= 10.*" } -} \ No newline at end of file +} diff --git a/node_modules/get-intrinsic/package.json b/node_modules/get-intrinsic/package.json index a981f65c64..5172972d4b 100644 --- a/node_modules/get-intrinsic/package.json +++ b/node_modules/get-intrinsic/package.json @@ -75,4 +75,4 @@ "has": "^1.0.3", "has-symbols": "^1.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/github-linguist/node_modules/commander/package.json b/node_modules/github-linguist/node_modules/commander/package.json index 8b14f0069c..0023c5cdf5 100644 --- a/node_modules/github-linguist/node_modules/commander/package.json +++ b/node_modules/github-linguist/node_modules/commander/package.json @@ -35,4 +35,4 @@ "typescript": "^3.6.3" }, "typings": "typings/index.d.ts" -} \ No newline at end of file +} diff --git a/node_modules/github-linguist/node_modules/globby/package.json b/node_modules/github-linguist/node_modules/globby/package.json index 12b3d364fb..9251488626 100644 --- a/node_modules/github-linguist/node_modules/globby/package.json +++ b/node_modules/github-linguist/node_modules/globby/package.json @@ -66,4 +66,4 @@ "rimraf": "^2.2.8", "xo": "^0.16.0" } -} \ No newline at end of file +} diff --git a/node_modules/github-linguist/node_modules/pify/package.json b/node_modules/github-linguist/node_modules/pify/package.json index 279aa197ff..311d1982e0 100644 --- a/node_modules/github-linguist/node_modules/pify/package.json +++ b/node_modules/github-linguist/node_modules/pify/package.json @@ -45,4 +45,4 @@ "v8-natives": "0.0.2", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/github-linguist/package.json b/node_modules/github-linguist/package.json index ceefe403f8..e184645f87 100644 --- a/node_modules/github-linguist/package.json +++ b/node_modules/github-linguist/package.json @@ -69,4 +69,4 @@ "ts-node": "^10.2.1", "typescript": "^3.9.10" } -} \ No newline at end of file +} diff --git a/node_modules/glob-parent/package.json b/node_modules/glob-parent/package.json index 97b835035f..125c971c27 100644 --- a/node_modules/glob-parent/package.json +++ b/node_modules/glob-parent/package.json @@ -45,4 +45,4 @@ "base", "wildcard" ] -} \ No newline at end of file +} diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json index 3359b17050..b345ae1e9f 100644 --- a/node_modules/glob/package.json +++ b/node_modules/glob/package.json @@ -48,4 +48,4 @@ "funding": { "url": "https://github.com/sponsors/isaacs" } -} \ No newline at end of file +} diff --git a/node_modules/globals/package.json b/node_modules/globals/package.json index cacf57f38c..596fa6f6d9 100644 --- a/node_modules/globals/package.json +++ b/node_modules/globals/package.json @@ -52,4 +52,4 @@ "resolveJsonModule": true } } -} \ No newline at end of file +} diff --git a/node_modules/globby/package.json b/node_modules/globby/package.json index 69561d523b..e20929eb0b 100644 --- a/node_modules/globby/package.json +++ b/node_modules/globby/package.json @@ -79,4 +79,4 @@ "fixtures" ] } -} \ No newline at end of file +} diff --git a/node_modules/graceful-fs/package.json b/node_modules/graceful-fs/package.json index 1c646a8166..032c7d0b58 100644 --- a/node_modules/graceful-fs/package.json +++ b/node_modules/graceful-fs/package.json @@ -47,4 +47,4 @@ "polyfills.js", "clone.js" ] -} \ No newline at end of file +} diff --git a/node_modules/has-bigints/package.json b/node_modules/has-bigints/package.json index 225e6d51e1..2a74a71f28 100644 --- a/node_modules/has-bigints/package.json +++ b/node_modules/has-bigints/package.json @@ -50,4 +50,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/has-flag/package.json b/node_modules/has-flag/package.json index ff188fa378..e1eb17a15e 100644 --- a/node_modules/has-flag/package.json +++ b/node_modules/has-flag/package.json @@ -41,4 +41,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/has-symbols/package.json b/node_modules/has-symbols/package.json index 5424451c29..6254719876 100644 --- a/node_modules/has-symbols/package.json +++ b/node_modules/has-symbols/package.json @@ -93,4 +93,4 @@ "core-js" ] } -} \ No newline at end of file +} diff --git a/node_modules/has/package.json b/node_modules/has/package.json index bee8485c0f..44b75ef945 100644 --- a/node_modules/has/package.json +++ b/node_modules/has/package.json @@ -45,4 +45,4 @@ "pretest": "npm run lint", "test": "tape test" } -} \ No newline at end of file +} diff --git a/node_modules/hosted-git-info/package.json b/node_modules/hosted-git-info/package.json index 9e7ba79a15..8cc554c3e9 100644 --- a/node_modules/hosted-git-info/package.json +++ b/node_modules/hosted-git-info/package.json @@ -37,4 +37,4 @@ "git-host.js", "git-host-info.js" ] -} \ No newline at end of file +} diff --git a/node_modules/human-signals/package.json b/node_modules/human-signals/package.json index e06b43fa1c..fd1d0274f6 100644 --- a/node_modules/human-signals/package.json +++ b/node_modules/human-signals/package.json @@ -61,4 +61,4 @@ "engines": { "node": ">=10.17.0" } -} \ No newline at end of file +} diff --git a/node_modules/ignore-by-default/package.json b/node_modules/ignore-by-default/package.json index 67feb562c2..4cc04ae5db 100644 --- a/node_modules/ignore-by-default/package.json +++ b/node_modules/ignore-by-default/package.json @@ -34,4 +34,4 @@ "figures": "^3.2.0", "standard": "^14.3.4" } -} \ No newline at end of file +} diff --git a/node_modules/ignore/package.json b/node_modules/ignore/package.json index 6b6e1d6ce9..45de575cda 100644 --- a/node_modules/ignore/package.json +++ b/node_modules/ignore/package.json @@ -68,4 +68,4 @@ "engines": { "node": ">= 4" } -} \ No newline at end of file +} diff --git a/node_modules/import-fresh/node_modules/resolve-from/package.json b/node_modules/import-fresh/node_modules/resolve-from/package.json index 65f1e2bcb3..05c09ae99e 100644 --- a/node_modules/import-fresh/node_modules/resolve-from/package.json +++ b/node_modules/import-fresh/node_modules/resolve-from/package.json @@ -31,4 +31,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/import-fresh/package.json b/node_modules/import-fresh/package.json index 3111f17fb0..f4a3eb6948 100644 --- a/node_modules/import-fresh/package.json +++ b/node_modules/import-fresh/package.json @@ -40,4 +40,4 @@ "tsd": "^0.7.3", "xo": "^0.23.0" } -} \ No newline at end of file +} diff --git a/node_modules/imurmurhash/package.json b/node_modules/imurmurhash/package.json index 1e91c12bd6..302914e7dd 100644 --- a/node_modules/imurmurhash/package.json +++ b/node_modules/imurmurhash/package.json @@ -35,4 +35,4 @@ "engines": { "node": ">=0.8.19" } -} \ No newline at end of file +} diff --git a/node_modules/indent-string/package.json b/node_modules/indent-string/package.json index 5db5db01a8..27e3a0fe9b 100644 --- a/node_modules/indent-string/package.json +++ b/node_modules/indent-string/package.json @@ -34,4 +34,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/inflight/package.json b/node_modules/inflight/package.json index b7095d05d2..6084d3509a 100644 --- a/node_modules/inflight/package.json +++ b/node_modules/inflight/package.json @@ -26,4 +26,4 @@ }, "homepage": "https://github.com/isaacs/inflight", "license": "ISC" -} \ No newline at end of file +} diff --git a/node_modules/inherits/package.json b/node_modules/inherits/package.json index 47220feb93..7cf62b95c4 100644 --- a/node_modules/inherits/package.json +++ b/node_modules/inherits/package.json @@ -26,4 +26,4 @@ "inherits.js", "inherits_browser.js" ] -} \ No newline at end of file +} diff --git a/node_modules/irregular-plurals/package.json b/node_modules/irregular-plurals/package.json index 56c534abab..6305c81f27 100644 --- a/node_modules/irregular-plurals/package.json +++ b/node_modules/irregular-plurals/package.json @@ -43,4 +43,4 @@ "resolveJsonModule": true } } -} \ No newline at end of file +} diff --git a/node_modules/is-arrayish/package.json b/node_modules/is-arrayish/package.json index 47b168d296..8b2d1c3083 100644 --- a/node_modules/is-arrayish/package.json +++ b/node_modules/is-arrayish/package.json @@ -31,4 +31,4 @@ "should": "^7.0.1", "xo": "^0.6.1" } -} \ No newline at end of file +} diff --git a/node_modules/is-bigint/package.json b/node_modules/is-bigint/package.json index f8200e692f..ac61df2498 100644 --- a/node_modules/is-bigint/package.json +++ b/node_modules/is-bigint/package.json @@ -52,4 +52,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/is-binary-path/package.json b/node_modules/is-binary-path/package.json index e3bdf2a7ff..a90845fbc1 100644 --- a/node_modules/is-binary-path/package.json +++ b/node_modules/is-binary-path/package.json @@ -37,4 +37,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/is-boolean-object/package.json b/node_modules/is-boolean-object/package.json index 19df27f172..d1d8396d1c 100644 --- a/node_modules/is-boolean-object/package.json +++ b/node_modules/is-boolean-object/package.json @@ -83,4 +83,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/is-buffer/package.json b/node_modules/is-buffer/package.json index 9f304ee577..ea12137a63 100644 --- a/node_modules/is-buffer/package.json +++ b/node_modules/is-buffer/package.json @@ -48,4 +48,4 @@ "testling": { "files": "test/*.js" } -} \ No newline at end of file +} diff --git a/node_modules/is-callable/package.json b/node_modules/is-callable/package.json index b5f7655932..3c8dbebbe1 100644 --- a/node_modules/is-callable/package.json +++ b/node_modules/is-callable/package.json @@ -97,4 +97,4 @@ "rimraf" ] } -} \ No newline at end of file +} diff --git a/node_modules/is-core-module/package.json b/node_modules/is-core-module/package.json index 0965e71145..b890ae7912 100644 --- a/node_modules/is-core-module/package.json +++ b/node_modules/is-core-module/package.json @@ -65,4 +65,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/is-date-object/package.json b/node_modules/is-date-object/package.json index 43fba59ee8..0807cdacac 100644 --- a/node_modules/is-date-object/package.json +++ b/node_modules/is-date-object/package.json @@ -73,4 +73,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/is-error/package.json b/node_modules/is-error/package.json index 441791f231..c42be85cce 100644 --- a/node_modules/is-error/package.json +++ b/node_modules/is-error/package.json @@ -42,4 +42,4 @@ ], "pre-commit.silent": true, "ngen-version": "5.1.0" -} \ No newline at end of file +} diff --git a/node_modules/is-extglob/package.json b/node_modules/is-extglob/package.json index 00ad5c9fc3..7a908369d3 100644 --- a/node_modules/is-extglob/package.json +++ b/node_modules/is-extglob/package.json @@ -66,4 +66,4 @@ "reflinks": true } } -} \ No newline at end of file +} diff --git a/node_modules/is-fullwidth-code-point/package.json b/node_modules/is-fullwidth-code-point/package.json index a674145587..78ad3f69f0 100644 --- a/node_modules/is-fullwidth-code-point/package.json +++ b/node_modules/is-fullwidth-code-point/package.json @@ -39,4 +39,4 @@ "tsd-check": "^0.5.0", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/is-glob/package.json b/node_modules/is-glob/package.json index b7afb44d29..806000dbda 100644 --- a/node_modules/is-glob/package.json +++ b/node_modules/is-glob/package.json @@ -78,4 +78,4 @@ "vinyl" ] } -} \ No newline at end of file +} diff --git a/node_modules/is-negative-zero/package.json b/node_modules/is-negative-zero/package.json index c9e1d2f692..3be2bf0ec5 100644 --- a/node_modules/is-negative-zero/package.json +++ b/node_modules/is-negative-zero/package.json @@ -76,4 +76,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/is-number-object/package.json b/node_modules/is-number-object/package.json index 6066d1d792..fe1a494f74 100644 --- a/node_modules/is-number-object/package.json +++ b/node_modules/is-number-object/package.json @@ -75,4 +75,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/is-number/package.json b/node_modules/is-number/package.json index 1749833c1e..3715072609 100644 --- a/node_modules/is-number/package.json +++ b/node_modules/is-number/package.json @@ -79,4 +79,4 @@ "reflinks": true } } -} \ No newline at end of file +} diff --git a/node_modules/is-path-cwd/package.json b/node_modules/is-path-cwd/package.json index 064cba0b0f..82dc163af0 100644 --- a/node_modules/is-path-cwd/package.json +++ b/node_modules/is-path-cwd/package.json @@ -33,4 +33,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/is-path-inside/package.json b/node_modules/is-path-inside/package.json index c28f8c4d38..6ab6a7872d 100644 --- a/node_modules/is-path-inside/package.json +++ b/node_modules/is-path-inside/package.json @@ -33,4 +33,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/is-plain-object/package.json b/node_modules/is-plain-object/package.json index dd823ea9b4..3ea169a7d0 100644 --- a/node_modules/is-plain-object/package.json +++ b/node_modules/is-plain-object/package.json @@ -82,4 +82,4 @@ "reflinks": true } } -} \ No newline at end of file +} diff --git a/node_modules/is-promise/package.json b/node_modules/is-promise/package.json index 2a3b769b05..2a3c5404ac 100644 --- a/node_modules/is-promise/package.json +++ b/node_modules/is-promise/package.json @@ -27,4 +27,4 @@ }, "author": "ForbesLindesay", "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/is-regex/package.json b/node_modules/is-regex/package.json index b4e26fb676..39644c95ad 100644 --- a/node_modules/is-regex/package.json +++ b/node_modules/is-regex/package.json @@ -83,4 +83,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/is-stream/package.json b/node_modules/is-stream/package.json index b67dfab294..9b68e6ae2d 100644 --- a/node_modules/is-stream/package.json +++ b/node_modules/is-stream/package.json @@ -39,4 +39,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/is-string/package.json b/node_modules/is-string/package.json index 7ec9f5d1b5..49758a3370 100644 --- a/node_modules/is-string/package.json +++ b/node_modules/is-string/package.json @@ -75,4 +75,4 @@ "commitLimit": false, "backfillLimit": false } -} \ No newline at end of file +} diff --git a/node_modules/is-symbol/package.json b/node_modules/is-symbol/package.json index 02aeab2374..c695b43488 100644 --- a/node_modules/is-symbol/package.json +++ b/node_modules/is-symbol/package.json @@ -74,4 +74,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/is-typedarray/package.json b/node_modules/is-typedarray/package.json index 6fc813ab70..37f7ae31c1 100644 --- a/node_modules/is-typedarray/package.json +++ b/node_modules/is-typedarray/package.json @@ -27,4 +27,4 @@ "url": "https://github.com/hughsk/is-typedarray/issues" }, "homepage": "https://github.com/hughsk/is-typedarray" -} \ No newline at end of file +} diff --git a/node_modules/is-unicode-supported/package.json b/node_modules/is-unicode-supported/package.json index 377edba66c..3ba3715f7d 100644 --- a/node_modules/is-unicode-supported/package.json +++ b/node_modules/is-unicode-supported/package.json @@ -40,4 +40,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/isarray/package.json b/node_modules/isarray/package.json index 615e6c214b..d62879f992 100644 --- a/node_modules/isarray/package.json +++ b/node_modules/isarray/package.json @@ -26,4 +26,4 @@ "url": "http://juliangruber.com" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/isexe/package.json b/node_modules/isexe/package.json index 5e8bc7867a..e452689442 100644 --- a/node_modules/isexe/package.json +++ b/node_modules/isexe/package.json @@ -28,4 +28,4 @@ "url": "https://github.com/isaacs/isexe/issues" }, "homepage": "https://github.com/isaacs/isexe#readme" -} \ No newline at end of file +} diff --git a/node_modules/js-string-escape/package.json b/node_modules/js-string-escape/package.json index 5675486fed..285a5e0bfc 100644 --- a/node_modules/js-string-escape/package.json +++ b/node_modules/js-string-escape/package.json @@ -35,4 +35,4 @@ "files": [ "index.js" ] -} \ No newline at end of file +} diff --git a/node_modules/js-tokens/package.json b/node_modules/js-tokens/package.json index a4c280b678..66752fab27 100644 --- a/node_modules/js-tokens/package.json +++ b/node_modules/js-tokens/package.json @@ -27,4 +27,4 @@ "everything.js": "1.0.3", "mocha": "5.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/js-yaml/package.json b/node_modules/js-yaml/package.json index 546fc6c6c4..17574da805 100644 --- a/node_modules/js-yaml/package.json +++ b/node_modules/js-yaml/package.json @@ -63,4 +63,4 @@ "rollup-plugin-terser": "^7.0.2", "shelljs": "^0.8.4" } -} \ No newline at end of file +} diff --git a/node_modules/json-parse-better-errors/package.json b/node_modules/json-parse-better-errors/package.json index 89b9301d6f..c4c2c20a68 100644 --- a/node_modules/json-parse-better-errors/package.json +++ b/node_modules/json-parse-better-errors/package.json @@ -42,4 +42,4 @@ ] } } -} \ No newline at end of file +} diff --git a/node_modules/json-schema-traverse/package.json b/node_modules/json-schema-traverse/package.json index e2d61a06da..156606327b 100644 --- a/node_modules/json-schema-traverse/package.json +++ b/node_modules/json-schema-traverse/package.json @@ -40,4 +40,4 @@ "text-summary" ] } -} \ No newline at end of file +} diff --git a/node_modules/json-stable-stringify-without-jsonify/package.json b/node_modules/json-stable-stringify-without-jsonify/package.json index 8c86b95520..b1a85716b3 100644 --- a/node_modules/json-stable-stringify-without-jsonify/package.json +++ b/node_modules/json-stable-stringify-without-jsonify/package.json @@ -41,4 +41,4 @@ "url": "http://substack.net" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/json-stringify-safe/package.json b/node_modules/json-stringify-safe/package.json index 7493a587d9..8e17b1266a 100644 --- a/node_modules/json-stringify-safe/package.json +++ b/node_modules/json-stringify-safe/package.json @@ -28,4 +28,4 @@ "must": ">= 0.12 < 0.13", "sinon": ">= 1.12.2 < 2" } -} \ No newline at end of file +} diff --git a/node_modules/json5/package.json b/node_modules/json5/package.json index 17bd44316b..b51b76241f 100644 --- a/node_modules/json5/package.json +++ b/node_modules/json5/package.json @@ -73,4 +73,4 @@ "sinon": "^4.4.2", "unicode-9.0.0": "^0.7.5" } -} \ No newline at end of file +} diff --git a/node_modules/jsonfile/package.json b/node_modules/jsonfile/package.json index 48cacce476..29e783f4f1 100644 --- a/node_modules/jsonfile/package.json +++ b/node_modules/jsonfile/package.json @@ -34,4 +34,4 @@ "test": "npm run lint && npm run unit", "unit": "mocha" } -} \ No newline at end of file +} diff --git a/node_modules/jsonschema/package.json b/node_modules/jsonschema/package.json index 8d384e2d45..5954258856 100644 --- a/node_modules/jsonschema/package.json +++ b/node_modules/jsonschema/package.json @@ -35,4 +35,4 @@ "scripts": { "test": "./node_modules/.bin/mocha -R spec" } -} \ No newline at end of file +} diff --git a/node_modules/language-map/package.json b/node_modules/language-map/package.json index 84bdc1fb51..011e25d36d 100644 --- a/node_modules/language-map/package.json +++ b/node_modules/language-map/package.json @@ -33,4 +33,4 @@ "mocha": "^5.2.0", "request": "^2.34.0" } -} \ No newline at end of file +} diff --git a/node_modules/levn/package.json b/node_modules/levn/package.json index 5f56e37624..0c356d6978 100644 --- a/node_modules/levn/package.json +++ b/node_modules/levn/package.json @@ -43,4 +43,4 @@ "livescript": "^1.6.0", "mocha": "^7.1.1" } -} \ No newline at end of file +} diff --git a/node_modules/load-json-file/package.json b/node_modules/load-json-file/package.json index 83a78986db..8e9a7d3aec 100644 --- a/node_modules/load-json-file/package.json +++ b/node_modules/load-json-file/package.json @@ -35,4 +35,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/locate-path/package.json b/node_modules/locate-path/package.json index cbc1ff7079..44f8b78b7e 100644 --- a/node_modules/locate-path/package.json +++ b/node_modules/locate-path/package.json @@ -45,4 +45,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/lodash.camelcase/package.json b/node_modules/lodash.camelcase/package.json index d1c3337e7e..25acf0a7cf 100644 --- a/node_modules/lodash.camelcase/package.json +++ b/node_modules/lodash.camelcase/package.json @@ -16,4 +16,4 @@ "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} \ No newline at end of file +} diff --git a/node_modules/lodash.clonedeep/package.json b/node_modules/lodash.clonedeep/package.json index 06e0a424b9..bc21c1cbab 100644 --- a/node_modules/lodash.clonedeep/package.json +++ b/node_modules/lodash.clonedeep/package.json @@ -16,4 +16,4 @@ "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} \ No newline at end of file +} diff --git a/node_modules/lodash.get/package.json b/node_modules/lodash.get/package.json index cb3be35f7d..eb9e53c6b1 100644 --- a/node_modules/lodash.get/package.json +++ b/node_modules/lodash.get/package.json @@ -16,4 +16,4 @@ "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} \ No newline at end of file +} diff --git a/node_modules/lodash.kebabcase/package.json b/node_modules/lodash.kebabcase/package.json index 9644a22ff4..337279a659 100644 --- a/node_modules/lodash.kebabcase/package.json +++ b/node_modules/lodash.kebabcase/package.json @@ -16,4 +16,4 @@ "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} \ No newline at end of file +} diff --git a/node_modules/lodash.merge/package.json b/node_modules/lodash.merge/package.json index 41a93f294e..f6b0b85082 100644 --- a/node_modules/lodash.merge/package.json +++ b/node_modules/lodash.merge/package.json @@ -15,4 +15,4 @@ "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} \ No newline at end of file +} diff --git a/node_modules/lodash.set/package.json b/node_modules/lodash.set/package.json index 3862a9c8d9..7cf684ec24 100644 --- a/node_modules/lodash.set/package.json +++ b/node_modules/lodash.set/package.json @@ -16,4 +16,4 @@ "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} \ No newline at end of file +} diff --git a/node_modules/lodash.snakecase/package.json b/node_modules/lodash.snakecase/package.json index be31f5e110..65f3a43084 100644 --- a/node_modules/lodash.snakecase/package.json +++ b/node_modules/lodash.snakecase/package.json @@ -16,4 +16,4 @@ "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} \ No newline at end of file +} diff --git a/node_modules/lodash.truncate/package.json b/node_modules/lodash.truncate/package.json index fc90c66c33..c1a2e03a53 100644 --- a/node_modules/lodash.truncate/package.json +++ b/node_modules/lodash.truncate/package.json @@ -16,4 +16,4 @@ "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} \ No newline at end of file +} diff --git a/node_modules/lodash.upperfirst/package.json b/node_modules/lodash.upperfirst/package.json index cb46cf1e64..55cc424d81 100644 --- a/node_modules/lodash.upperfirst/package.json +++ b/node_modules/lodash.upperfirst/package.json @@ -16,4 +16,4 @@ "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} \ No newline at end of file +} diff --git a/node_modules/lodash/package.json b/node_modules/lodash/package.json index f7f9d6d1b0..bddf1787d0 100644 --- a/node_modules/lodash/package.json +++ b/node_modules/lodash/package.json @@ -16,4 +16,4 @@ "scripts": { "test": "echo \"See https://travis-ci.org/lodash-archive/lodash-cli for testing details.\"" } -} \ No newline at end of file +} diff --git a/node_modules/long/package.json b/node_modules/long/package.json index 27f9661997..c083112137 100644 --- a/node_modules/long/package.json +++ b/node_modules/long/package.json @@ -41,4 +41,4 @@ "devDependencies": { "esm2umd": "^0.2.0" } -} \ No newline at end of file +} diff --git a/node_modules/long/umd/package.json b/node_modules/long/umd/package.json index c9a4422614..5bbefffbab 100644 --- a/node_modules/long/umd/package.json +++ b/node_modules/long/umd/package.json @@ -1,3 +1,3 @@ { "type": "commonjs" -} \ No newline at end of file +} diff --git a/node_modules/lru-cache/package.json b/node_modules/lru-cache/package.json index 717e19bf3e..43b7502c3e 100644 --- a/node_modules/lru-cache/package.json +++ b/node_modules/lru-cache/package.json @@ -31,4 +31,4 @@ "engines": { "node": ">=10" } -} \ No newline at end of file +} diff --git a/node_modules/map-age-cleaner/package.json b/node_modules/map-age-cleaner/package.json index 4478f2268a..f0df64616c 100644 --- a/node_modules/map-age-cleaner/package.json +++ b/node_modules/map-age-cleaner/package.json @@ -56,4 +56,4 @@ "dist/test.js" ] } -} \ No newline at end of file +} diff --git a/node_modules/matcher/node_modules/escape-string-regexp/package.json b/node_modules/matcher/node_modules/escape-string-regexp/package.json index 4e7d8199b9..7d8362c2bb 100644 --- a/node_modules/matcher/node_modules/escape-string-regexp/package.json +++ b/node_modules/matcher/node_modules/escape-string-regexp/package.json @@ -37,4 +37,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/matcher/package.json b/node_modules/matcher/package.json index 96620d97cd..b3e8661a32 100644 --- a/node_modules/matcher/package.json +++ b/node_modules/matcher/package.json @@ -49,4 +49,4 @@ "tsd": "^0.17.0", "xo": "^0.45.0" } -} \ No newline at end of file +} diff --git a/node_modules/md5-hex/package.json b/node_modules/md5-hex/package.json index a71c112601..230b568cad 100644 --- a/node_modules/md5-hex/package.json +++ b/node_modules/md5-hex/package.json @@ -38,4 +38,4 @@ "xo": "^0.24.0" }, "browser": "browser.js" -} \ No newline at end of file +} diff --git a/node_modules/md5/package.json b/node_modules/md5/package.json index 8548989c21..7618a073ed 100644 --- a/node_modules/md5/package.json +++ b/node_modules/md5/package.json @@ -35,4 +35,4 @@ }, "optionalDependencies": {}, "license": "BSD-3-Clause" -} \ No newline at end of file +} diff --git a/node_modules/mem/node_modules/mimic-fn/package.json b/node_modules/mem/node_modules/mimic-fn/package.json index 931462ce36..edf1918fe5 100644 --- a/node_modules/mem/node_modules/mimic-fn/package.json +++ b/node_modules/mem/node_modules/mimic-fn/package.json @@ -42,4 +42,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/mem/package.json b/node_modules/mem/package.json index 641d78d880..e40fbe4f8c 100644 --- a/node_modules/mem/package.json +++ b/node_modules/mem/package.json @@ -73,4 +73,4 @@ "@typescript-eslint/no-empty-function": "off" } } -} \ No newline at end of file +} diff --git a/node_modules/merge-stream/package.json b/node_modules/merge-stream/package.json index 94b2250626..1a4c54ca50 100644 --- a/node_modules/merge-stream/package.json +++ b/node_modules/merge-stream/package.json @@ -16,4 +16,4 @@ "from2": "^2.0.3", "istanbul": "^0.4.5" } -} \ No newline at end of file +} diff --git a/node_modules/merge2/package.json b/node_modules/merge2/package.json index 6967bf8994..7777307fde 100644 --- a/node_modules/merge2/package.json +++ b/node_modules/merge2/package.json @@ -40,4 +40,4 @@ "README.md", "index.js" ] -} \ No newline at end of file +} diff --git a/node_modules/micromatch/package.json b/node_modules/micromatch/package.json index 3bac26e13b..18520c606d 100644 --- a/node_modules/micromatch/package.json +++ b/node_modules/micromatch/package.json @@ -116,4 +116,4 @@ "multimatch" ] } -} \ No newline at end of file +} diff --git a/node_modules/mimic-fn/package.json b/node_modules/mimic-fn/package.json index cddfcb379d..5c00a5ae07 100644 --- a/node_modules/mimic-fn/package.json +++ b/node_modules/mimic-fn/package.json @@ -39,4 +39,4 @@ "tsd": "^0.7.1", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/minimatch/package.json b/node_modules/minimatch/package.json index 8c89ea278f..c4514c8077 100644 --- a/node_modules/minimatch/package.json +++ b/node_modules/minimatch/package.json @@ -27,4 +27,4 @@ "files": [ "minimatch.js" ] -} \ No newline at end of file +} diff --git a/node_modules/minimist/package.json b/node_modules/minimist/package.json index 6d71716891..c091d41375 100644 --- a/node_modules/minimist/package.json +++ b/node_modules/minimist/package.json @@ -42,4 +42,4 @@ "url": "http://substack.net" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/ms/package.json b/node_modules/ms/package.json index 3408eef7c2..eea666e1fb 100644 --- a/node_modules/ms/package.json +++ b/node_modules/ms/package.json @@ -34,4 +34,4 @@ "lint-staged": "5.0.0", "mocha": "4.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/natural-compare/package.json b/node_modules/natural-compare/package.json index 54360999fb..1a71362eea 100644 --- a/node_modules/natural-compare/package.json +++ b/node_modules/natural-compare/package.json @@ -39,4 +39,4 @@ "input": "index.js" } } -} \ No newline at end of file +} diff --git a/node_modules/nise/package.json b/node_modules/nise/package.json index 4a8e230819..85b15f0be6 100644 --- a/node_modules/nise/package.json +++ b/node_modules/nise/package.json @@ -77,4 +77,4 @@ "pre-commit": "lint-staged" } } -} \ No newline at end of file +} diff --git a/node_modules/nock/package.json b/node_modules/nock/package.json index 6462045cf9..a03ea3f075 100644 --- a/node_modules/nock/package.json +++ b/node_modules/nock/package.json @@ -86,4 +86,4 @@ } ] } -} \ No newline at end of file +} diff --git a/node_modules/node-fetch/package.json b/node_modules/node-fetch/package.json index 1c402989a7..fd935cdfc5 100644 --- a/node_modules/node-fetch/package.json +++ b/node_modules/node-fetch/package.json @@ -73,4 +73,4 @@ "string-to-arraybuffer": "^1.0.2", "teeny-request": "3.7.0" } -} \ No newline at end of file +} diff --git a/node_modules/nofilter/package.json b/node_modules/nofilter/package.json index 9567ea1d07..dfa3132c78 100644 --- a/node_modules/nofilter/package.json +++ b/node_modules/nofilter/package.json @@ -57,4 +57,4 @@ "engines": { "node": ">=12.19" } -} \ No newline at end of file +} diff --git a/node_modules/normalize-package-data/node_modules/semver/package.json b/node_modules/normalize-package-data/node_modules/semver/package.json index 90e287ecfb..69d2db162c 100644 --- a/node_modules/normalize-package-data/node_modules/semver/package.json +++ b/node_modules/normalize-package-data/node_modules/semver/package.json @@ -25,4 +25,4 @@ "tap": { "check-coverage": true } -} \ No newline at end of file +} diff --git a/node_modules/normalize-package-data/package.json b/node_modules/normalize-package-data/package.json index b427a60527..dea34bb7ff 100644 --- a/node_modules/normalize-package-data/package.json +++ b/node_modules/normalize-package-data/package.json @@ -28,4 +28,4 @@ "lib/*.json", "AUTHORS" ] -} \ No newline at end of file +} diff --git a/node_modules/normalize-path/package.json b/node_modules/normalize-path/package.json index 101634b955..ad61098a8a 100644 --- a/node_modules/normalize-path/package.json +++ b/node_modules/normalize-path/package.json @@ -74,4 +74,4 @@ "reflinks": true } } -} \ No newline at end of file +} diff --git a/node_modules/npm-run-path/package.json b/node_modules/npm-run-path/package.json index 7705a79e52..39497091c3 100644 --- a/node_modules/npm-run-path/package.json +++ b/node_modules/npm-run-path/package.json @@ -41,4 +41,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/object-assign/package.json b/node_modules/object-assign/package.json index 3aa7326260..503eb1e6d0 100644 --- a/node_modules/object-assign/package.json +++ b/node_modules/object-assign/package.json @@ -39,4 +39,4 @@ "matcha": "^0.7.0", "xo": "^0.16.0" } -} \ No newline at end of file +} diff --git a/node_modules/object-inspect/package.json b/node_modules/object-inspect/package.json index e663f718e9..f5682877a3 100644 --- a/node_modules/object-inspect/package.json +++ b/node_modules/object-inspect/package.json @@ -72,4 +72,4 @@ "core-js" ] } -} \ No newline at end of file +} diff --git a/node_modules/object-keys/package.json b/node_modules/object-keys/package.json index f466e99794..3aa903c0e3 100644 --- a/node_modules/object-keys/package.json +++ b/node_modules/object-keys/package.json @@ -85,4 +85,4 @@ "engines": { "node": ">= 0.4" } -} \ No newline at end of file +} diff --git a/node_modules/object.assign/package.json b/node_modules/object.assign/package.json index a294eeee8e..7da23c63d9 100644 --- a/node_modules/object.assign/package.json +++ b/node_modules/object.assign/package.json @@ -80,4 +80,4 @@ "engines": { "node": ">= 0.4" } -} \ No newline at end of file +} diff --git a/node_modules/object.values/package.json b/node_modules/object.values/package.json index 2529393e09..7fac4b865e 100644 --- a/node_modules/object.values/package.json +++ b/node_modules/object.values/package.json @@ -87,4 +87,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/once/package.json b/node_modules/once/package.json index c827b25950..16815b2fa1 100644 --- a/node_modules/once/package.json +++ b/node_modules/once/package.json @@ -30,4 +30,4 @@ ], "author": "Isaac Z. Schlueter (http://blog.izs.me/)", "license": "ISC" -} \ No newline at end of file +} diff --git a/node_modules/onetime/package.json b/node_modules/onetime/package.json index 82d063dbd5..c4fe4e245d 100644 --- a/node_modules/onetime/package.json +++ b/node_modules/onetime/package.json @@ -40,4 +40,4 @@ "tsd": "^0.7.1", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/optionator/package.json b/node_modules/optionator/package.json index b35b4a8687..83fb1c2c93 100644 --- a/node_modules/optionator/package.json +++ b/node_modules/optionator/package.json @@ -40,4 +40,4 @@ "livescript": "^1.6.0", "mocha": "^7.1.1" } -} \ No newline at end of file +} diff --git a/node_modules/p-defer/package.json b/node_modules/p-defer/package.json index d7f9b811ba..f3ba494106 100644 --- a/node_modules/p-defer/package.json +++ b/node_modules/p-defer/package.json @@ -38,4 +38,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/p-event/package.json b/node_modules/p-event/package.json index 9e839d6e8f..14ecd75c25 100644 --- a/node_modules/p-event/package.json +++ b/node_modules/p-event/package.json @@ -55,4 +55,4 @@ "tsd": "^0.18.0", "xo": "^0.45.0" } -} \ No newline at end of file +} diff --git a/node_modules/p-limit/package.json b/node_modules/p-limit/package.json index 0f8a0bdd77..c4bee2c077 100644 --- a/node_modules/p-limit/package.json +++ b/node_modules/p-limit/package.json @@ -51,4 +51,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/p-locate/package.json b/node_modules/p-locate/package.json index 45cde7a21b..d74c430978 100644 --- a/node_modules/p-locate/package.json +++ b/node_modules/p-locate/package.json @@ -53,4 +53,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/p-map/package.json b/node_modules/p-map/package.json index 8782cb6afc..42b87d82d9 100644 --- a/node_modules/p-map/package.json +++ b/node_modules/p-map/package.json @@ -50,4 +50,4 @@ "tsd": "^0.7.4", "xo": "^0.27.2" } -} \ No newline at end of file +} diff --git a/node_modules/p-timeout/package.json b/node_modules/p-timeout/package.json index 48f924cb0b..c74bcd0c12 100644 --- a/node_modules/p-timeout/package.json +++ b/node_modules/p-timeout/package.json @@ -44,4 +44,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/parent-module/package.json b/node_modules/parent-module/package.json index 9b98a7099f..3416e8823c 100644 --- a/node_modules/parent-module/package.json +++ b/node_modules/parent-module/package.json @@ -43,4 +43,4 @@ "execa": "^1.0.0", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/parse-json/package.json b/node_modules/parse-json/package.json index 9bbcba68c3..7aca6eded9 100644 --- a/node_modules/parse-json/package.json +++ b/node_modules/parse-json/package.json @@ -40,4 +40,4 @@ "nyc": "^11.2.1", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/parse-ms/package.json b/node_modules/parse-ms/package.json index 556e3e088f..c9dc8ff357 100644 --- a/node_modules/parse-ms/package.json +++ b/node_modules/parse-ms/package.json @@ -37,4 +37,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/path-exists/package.json b/node_modules/path-exists/package.json index bf17c90fc3..714931291d 100644 --- a/node_modules/path-exists/package.json +++ b/node_modules/path-exists/package.json @@ -38,4 +38,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/path-is-absolute/package.json b/node_modules/path-is-absolute/package.json index b17117f3ea..91196d5e9c 100644 --- a/node_modules/path-is-absolute/package.json +++ b/node_modules/path-is-absolute/package.json @@ -40,4 +40,4 @@ "devDependencies": { "xo": "^0.16.0" } -} \ No newline at end of file +} diff --git a/node_modules/path-key/package.json b/node_modules/path-key/package.json index 95d21612d3..87b222c252 100644 --- a/node_modules/path-key/package.json +++ b/node_modules/path-key/package.json @@ -36,4 +36,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/path-parse/package.json b/node_modules/path-parse/package.json index a168451820..36c23f84e7 100644 --- a/node_modules/path-parse/package.json +++ b/node_modules/path-parse/package.json @@ -30,4 +30,4 @@ "url": "https://github.com/jbgutierrez/path-parse/issues" }, "homepage": "https://github.com/jbgutierrez/path-parse#readme" -} \ No newline at end of file +} diff --git a/node_modules/path-to-regexp/package.json b/node_modules/path-to-regexp/package.json index c58301982e..4d1a36be8a 100644 --- a/node_modules/path-to-regexp/package.json +++ b/node_modules/path-to-regexp/package.json @@ -44,4 +44,4 @@ "dependencies": { "isarray": "0.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/path-type/package.json b/node_modules/path-type/package.json index 25d8b90c3d..9d09e32201 100644 --- a/node_modules/path-type/package.json +++ b/node_modules/path-type/package.json @@ -42,4 +42,4 @@ "tsd-check": "^0.3.0", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/path/package.json b/node_modules/path/package.json index de70fbf83a..21fcdb4416 100644 --- a/node_modules/path/package.json +++ b/node_modules/path/package.json @@ -21,4 +21,4 @@ "process": "^0.11.1", "util": "^0.10.3" } -} \ No newline at end of file +} diff --git a/node_modules/picomatch/package.json b/node_modules/picomatch/package.json index 4aabed1bd3..4c8acf0b06 100644 --- a/node_modules/picomatch/package.json +++ b/node_modules/picomatch/package.json @@ -78,4 +78,4 @@ "picomatch" ] } -} \ No newline at end of file +} diff --git a/node_modules/pinkie-promise/package.json b/node_modules/pinkie-promise/package.json index 189af4d7f4..3515f8ff34 100644 --- a/node_modules/pinkie-promise/package.json +++ b/node_modules/pinkie-promise/package.json @@ -32,4 +32,4 @@ "devDependencies": { "mocha": "*" } -} \ No newline at end of file +} diff --git a/node_modules/pinkie/package.json b/node_modules/pinkie/package.json index 75775a3e3b..cb9057b815 100644 --- a/node_modules/pinkie/package.json +++ b/node_modules/pinkie/package.json @@ -33,4 +33,4 @@ "promises-aplus-tests": "*", "xo": "^0.10.1" } -} \ No newline at end of file +} diff --git a/node_modules/pkg-conf/package.json b/node_modules/pkg-conf/package.json index 5d68c2f94e..bf1bfd9e45 100644 --- a/node_modules/pkg-conf/package.json +++ b/node_modules/pkg-conf/package.json @@ -49,4 +49,4 @@ "fixture": { "foo": true } -} \ No newline at end of file +} diff --git a/node_modules/pkg-up/node_modules/find-up/package.json b/node_modules/pkg-up/node_modules/find-up/package.json index 7ec1b7ef81..7ec85bb79b 100644 --- a/node_modules/pkg-up/node_modules/find-up/package.json +++ b/node_modules/pkg-up/node_modules/find-up/package.json @@ -50,4 +50,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/pkg-up/node_modules/locate-path/package.json b/node_modules/pkg-up/node_modules/locate-path/package.json index e05a6304bf..17bcd7ff69 100644 --- a/node_modules/pkg-up/node_modules/locate-path/package.json +++ b/node_modules/pkg-up/node_modules/locate-path/package.json @@ -44,4 +44,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/pkg-up/node_modules/p-limit/package.json b/node_modules/pkg-up/node_modules/p-limit/package.json index 275cb73ae4..90db5794d5 100644 --- a/node_modules/pkg-up/node_modules/p-limit/package.json +++ b/node_modules/pkg-up/node_modules/p-limit/package.json @@ -46,4 +46,4 @@ "time-span": "^2.0.0", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/pkg-up/node_modules/p-locate/package.json b/node_modules/pkg-up/node_modules/p-locate/package.json index b938aa4c59..767002b385 100644 --- a/node_modules/pkg-up/node_modules/p-locate/package.json +++ b/node_modules/pkg-up/node_modules/p-locate/package.json @@ -51,4 +51,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/pkg-up/node_modules/p-try/package.json b/node_modules/pkg-up/node_modules/p-try/package.json index a4623262b2..ba2513ade7 100644 --- a/node_modules/pkg-up/node_modules/p-try/package.json +++ b/node_modules/pkg-up/node_modules/p-try/package.json @@ -40,4 +40,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/pkg-up/node_modules/path-exists/package.json b/node_modules/pkg-up/node_modules/path-exists/package.json index ed507545d7..efd56267e8 100644 --- a/node_modules/pkg-up/node_modules/path-exists/package.json +++ b/node_modules/pkg-up/node_modules/path-exists/package.json @@ -37,4 +37,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/pkg-up/package.json b/node_modules/pkg-up/package.json index 5a9647218a..973c31c5bd 100644 --- a/node_modules/pkg-up/package.json +++ b/node_modules/pkg-up/package.json @@ -47,4 +47,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/plur/package.json b/node_modules/plur/package.json index 97957914b9..65028451e2 100644 --- a/node_modules/plur/package.json +++ b/node_modules/plur/package.json @@ -42,4 +42,4 @@ "tsd": "^0.18.0", "xo": "^0.46.4" } -} \ No newline at end of file +} diff --git a/node_modules/prelude-ls/package.json b/node_modules/prelude-ls/package.json index af954a1c1e..c313c3da34 100644 --- a/node_modules/prelude-ls/package.json +++ b/node_modules/prelude-ls/package.json @@ -43,4 +43,4 @@ "browserify": "^16.5.1", "sinon": "~8.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/prettier-linter-helpers/package.json b/node_modules/prettier-linter-helpers/package.json index 084fe3f84a..38434a0dcc 100644 --- a/node_modules/prettier-linter-helpers/package.json +++ b/node_modules/prettier-linter-helpers/package.json @@ -35,4 +35,4 @@ "engines": { "node": ">=6.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/pretty-ms/package.json b/node_modules/pretty-ms/package.json index 582aa3355d..e38540118a 100644 --- a/node_modules/pretty-ms/package.json +++ b/node_modules/pretty-ms/package.json @@ -46,4 +46,4 @@ "tsd": "^0.11.0", "xo": "^0.30.0" } -} \ No newline at end of file +} diff --git a/node_modules/process/package.json b/node_modules/process/package.json index 390815d12e..d2cfaade44 100644 --- a/node_modules/process/package.json +++ b/node_modules/process/package.json @@ -24,4 +24,4 @@ "mocha": "2.2.1", "zuul": "^3.10.3" } -} \ No newline at end of file +} diff --git a/node_modules/progress/package.json b/node_modules/progress/package.json index 87d8ff0317..bb81fa0bcd 100644 --- a/node_modules/progress/package.json +++ b/node_modules/progress/package.json @@ -23,4 +23,4 @@ "node": ">=0.4.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/propagate/package.json b/node_modules/propagate/package.json index b4df513bbf..e78fe4250d 100644 --- a/node_modules/propagate/package.json +++ b/node_modules/propagate/package.json @@ -50,4 +50,4 @@ ] }, "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/punycode/package.json b/node_modules/punycode/package.json index 1d21784d75..9202ccf8c0 100644 --- a/node_modules/punycode/package.json +++ b/node_modules/punycode/package.json @@ -55,4 +55,4 @@ } } } -} \ No newline at end of file +} diff --git a/node_modules/query-string/package.json b/node_modules/query-string/package.json index 6c280ddb89..bb94e319d6 100644 --- a/node_modules/query-string/package.json +++ b/node_modules/query-string/package.json @@ -51,4 +51,4 @@ "tsd": "^0.7.3", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/node_modules/find-up/package.json b/node_modules/read-pkg-up/node_modules/find-up/package.json index 7ec1b7ef81..7ec85bb79b 100644 --- a/node_modules/read-pkg-up/node_modules/find-up/package.json +++ b/node_modules/read-pkg-up/node_modules/find-up/package.json @@ -50,4 +50,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/node_modules/load-json-file/package.json b/node_modules/read-pkg-up/node_modules/load-json-file/package.json index bd05910b47..8bfb1c600d 100644 --- a/node_modules/read-pkg-up/node_modules/load-json-file/package.json +++ b/node_modules/read-pkg-up/node_modules/load-json-file/package.json @@ -40,4 +40,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/node_modules/locate-path/package.json b/node_modules/read-pkg-up/node_modules/locate-path/package.json index e05a6304bf..17bcd7ff69 100644 --- a/node_modules/read-pkg-up/node_modules/locate-path/package.json +++ b/node_modules/read-pkg-up/node_modules/locate-path/package.json @@ -44,4 +44,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/node_modules/p-limit/package.json b/node_modules/read-pkg-up/node_modules/p-limit/package.json index 275cb73ae4..90db5794d5 100644 --- a/node_modules/read-pkg-up/node_modules/p-limit/package.json +++ b/node_modules/read-pkg-up/node_modules/p-limit/package.json @@ -46,4 +46,4 @@ "time-span": "^2.0.0", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/node_modules/p-locate/package.json b/node_modules/read-pkg-up/node_modules/p-locate/package.json index b938aa4c59..767002b385 100644 --- a/node_modules/read-pkg-up/node_modules/p-locate/package.json +++ b/node_modules/read-pkg-up/node_modules/p-locate/package.json @@ -51,4 +51,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/node_modules/p-try/package.json b/node_modules/read-pkg-up/node_modules/p-try/package.json index a4623262b2..ba2513ade7 100644 --- a/node_modules/read-pkg-up/node_modules/p-try/package.json +++ b/node_modules/read-pkg-up/node_modules/p-try/package.json @@ -40,4 +40,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/node_modules/path-exists/package.json b/node_modules/read-pkg-up/node_modules/path-exists/package.json index ed507545d7..efd56267e8 100644 --- a/node_modules/read-pkg-up/node_modules/path-exists/package.json +++ b/node_modules/read-pkg-up/node_modules/path-exists/package.json @@ -37,4 +37,4 @@ "xo": { "esnext": true } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/node_modules/path-type/package.json b/node_modules/read-pkg-up/node_modules/path-type/package.json index fc952c3154..09f564095d 100644 --- a/node_modules/read-pkg-up/node_modules/path-type/package.json +++ b/node_modules/read-pkg-up/node_modules/path-type/package.json @@ -42,4 +42,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/node_modules/pify/package.json b/node_modules/read-pkg-up/node_modules/pify/package.json index 8370717af8..468d85760f 100644 --- a/node_modules/read-pkg-up/node_modules/pify/package.json +++ b/node_modules/read-pkg-up/node_modules/pify/package.json @@ -48,4 +48,4 @@ "v8-natives": "^1.0.0", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/node_modules/read-pkg/package.json b/node_modules/read-pkg-up/node_modules/read-pkg/package.json index 19b9c1bf79..1a40fe0ed4 100644 --- a/node_modules/read-pkg-up/node_modules/read-pkg/package.json +++ b/node_modules/read-pkg-up/node_modules/read-pkg/package.json @@ -39,4 +39,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/read-pkg-up/package.json b/node_modules/read-pkg-up/package.json index 63b9464f7c..5126ad07f6 100644 --- a/node_modules/read-pkg-up/package.json +++ b/node_modules/read-pkg-up/package.json @@ -54,4 +54,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/readdirp/package.json b/node_modules/readdirp/package.json index 5f1f071f38..dba53888ea 100644 --- a/node_modules/readdirp/package.json +++ b/node_modules/readdirp/package.json @@ -119,4 +119,4 @@ ] } } -} \ No newline at end of file +} diff --git a/node_modules/regexpp/package.json b/node_modules/regexpp/package.json index bee0304fa7..029cbe74e3 100644 --- a/node_modules/regexpp/package.json +++ b/node_modules/regexpp/package.json @@ -81,4 +81,4 @@ }, "homepage": "https://github.com/mysticatea/regexpp#readme", "funding": "https://github.com/sponsors/mysticatea" -} \ No newline at end of file +} diff --git a/node_modules/removeNPMAbsolutePaths/README.md b/node_modules/removeNPMAbsolutePaths/README.md index 5904ddcc55..453ce6cba0 100644 --- a/node_modules/removeNPMAbsolutePaths/README.md +++ b/node_modules/removeNPMAbsolutePaths/README.md @@ -1,11 +1,11 @@ [![NPM version][npm-image]][npm-url] -[![build status][travis-image]][travis-url] +[![Node.js CI][ci-image]][ci-url] [![Test coverage][coveralls-image]][coveralls-url] [![Downloads][downloads-image]][downloads-url] # removeNPMAbsolutePaths -removeNPMAbsolutePaths is a small utility to remove the fields that npm adds to the modules in `node_modules` containing local aboslute paths. +removeNPMAbsolutePaths is a small utility to remove the fields that npm adds to the modules in `node_modules` containing local absolute paths. It has been noted that the `package.json` of modules in the `node_modules` folder contain some extra fields like `_args` and `where` which contain the absolute path of the module. According to NPM those fields are not even used. @@ -26,15 +26,19 @@ $ removeNPMAbsolutePaths '' ``` or use it from whithin your code ```javascript -var removeNPMAbsolutePaths = require('removeNPMAbsolutePaths'); -removeNPMAbsolutePaths('') - .then(results => results.forEach(result => { +const removeNPMAbsolutePaths = require('removeNPMAbsolutePaths'); + +try { + const results = await removeNPMAbsolutePaths(''); + results.forEach(result => { // Print only information about files that couldn't be processed if (!result.success) { console.log(result.err.message); } - })) - .catch(err => console.log(err.message)); + }); +} catch(err) { + console.log(err.message); +} ``` Using `removeNPMAbsolutePaths` from within Javascript returns a promise containing information about all the folders and files processed and whether they where successfully processed and rewritten or not. @@ -61,8 +65,8 @@ MIT [npm-image]: https://img.shields.io/npm/v/removeNPMAbsolutePaths.svg?style=flat-square [npm-url]: https://www.npmjs.com/package/removeNPMAbsolutePaths -[travis-image]: https://img.shields.io/travis/juanjoDiaz/removeNPMAbsolutePaths/master.svg?style=flat-square -[travis-url]: https://travis-ci.org/juanjoDiaz/removeNPMAbsolutePaths +[ci-image]: https://github.com/juanjoDiaz/removeNPMAbsolutePaths/actions/workflows/on-push.yaml/badge.svg +[ci-url]: https://github.com/juanjoDiaz/removeNPMAbsolutePaths/actions/workflows/on-push.yaml [coveralls-image]: https://img.shields.io/coveralls/juanjoDiaz/removeNPMAbsolutePaths/master.svg?style=flat-square [coveralls-url]: https://coveralls.io/github/juanjoDiaz/removeNPMAbsolutePaths?branch=master [downloads-image]: https://img.shields.io/npm/dm/removeNPMAbsolutePaths.svg?style=flat-square diff --git a/node_modules/removeNPMAbsolutePaths/package.json b/node_modules/removeNPMAbsolutePaths/package.json index 28ccddcaa4..563aea8494 100644 --- a/node_modules/removeNPMAbsolutePaths/package.json +++ b/node_modules/removeNPMAbsolutePaths/package.json @@ -1,6 +1,6 @@ { "name": "removeNPMAbsolutePaths", - "version": "2.0.0", + "version": "3.0.0", "description": "Remove the fields containing local aboslute paths created by NPM", "keywords": [ "npm", @@ -10,9 +10,7 @@ "scripts": { "lint": "eslint bin/removeNPMAbsolutePaths src test --ignore-pattern 'test/data/malformed/module/'", "test": "mocha test", - "test-with-coverage": "nyc --reporter=text mocha test", - "travis": "npm run lint && npm run test-with-coverage", - "coveralls": "nyc report --reporter=text-lcov | coveralls" + "test-with-coverage": "nyc --reporter=text --reporter=lcov mocha test" }, "author": "Juanjo Diaz ", "repository": { @@ -35,18 +33,18 @@ "src/" ], "devDependencies": { - "chai": "^4.2.0", + "chai": "^4.3.6", "chai-as-promised": "^7.1.1", - "coveralls": "^3.0.5", - "eslint": "^6.0.1", - "eslint-config-airbnb-base": "^13.2.0", - "eslint-plugin-import": "^2.18.0", - "mocha": "^6.1.4", - "nyc": "^14.1.1", - "sinon": "^7.3.2", - "sinon-chai": "^3.3.0" + "coveralls": "^3.1.1", + "eslint": "^8.9.0", + "eslint-config-airbnb-base": "^15.0.0", + "eslint-plugin-import": "^2.25.4", + "mocha": "^9.2.1", + "nyc": "^15.1.0", + "sinon": "^13.0.1", + "sinon-chai": "^3.7.0" }, "engines": { "node": ">=4.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/removeNPMAbsolutePaths/src/errno.js b/node_modules/removeNPMAbsolutePaths/src/errno.js index d5ba943153..cdfbbcace9 100644 --- a/node_modules/removeNPMAbsolutePaths/src/errno.js +++ b/node_modules/removeNPMAbsolutePaths/src/errno.js @@ -303,8 +303,7 @@ const all = [ }, ]; -module.exports = {}; - -all.forEach((error) => { - module.exports[error.errno] = error.description; -}); +module.exports = all.reduce((obj, error) => ({ + ...obj, + [error.errno]: error.description, +})); diff --git a/node_modules/removeNPMAbsolutePaths/src/removeNPMAbsolutePaths.js b/node_modules/removeNPMAbsolutePaths/src/removeNPMAbsolutePaths.js index da7690e314..8dd0c1307f 100644 --- a/node_modules/removeNPMAbsolutePaths/src/removeNPMAbsolutePaths.js +++ b/node_modules/removeNPMAbsolutePaths/src/removeNPMAbsolutePaths.js @@ -3,14 +3,9 @@ const path = require('path'); const { stat, readdir, readFile, writeFile, -} = require('fs'); -const { promisify } = require('util'); -const errno = require('./errno'); +} = require('fs').promises; -const statAsync = promisify(stat); -const readdirAsync = promisify(readdir); -const readFileAsync = promisify(readFile); -const writeFileAsync = promisify(writeFile); +const errno = require('./errno'); class ProcessingError extends Error { constructor(message, err) { @@ -21,7 +16,7 @@ class ProcessingError extends Error { async function getStats(filePath) { try { - return await statAsync(filePath); + return await stat(filePath); } catch (err) { throw new ProcessingError(`Can't read directory/file at "${filePath}"`, err); } @@ -31,7 +26,7 @@ async function processFile(filePath, opts) { try { let data; try { - data = await readFileAsync(filePath, 'utf8'); + data = await readFile(filePath, 'utf8'); } catch (err) { throw new ProcessingError(`Can't read file at "${filePath}"`, err); } @@ -54,7 +49,7 @@ async function processFile(filePath, opts) { if (shouldWriteFile || opts.force) { try { - await writeFileAsync(filePath, JSON.stringify(obj, null, ' ')); + await writeFile(filePath, `${JSON.stringify(obj, null, ' ')}${data.endsWith('\n') ? '\n' : ''}`); } catch (err) { throw new ProcessingError(`Can't write processed file to "${filePath}"`, err); } @@ -72,7 +67,7 @@ async function processDir(dirPath, opts) { try { let files; try { - files = await readdirAsync(dirPath); + files = await readdir(dirPath); } catch (err) { throw new ProcessingError(`Can't read directory at "${dirPath}"`, err); } @@ -98,26 +93,23 @@ async function processDir(dirPath, opts) { return arr; } - if (value.constructor === Array) { - return arr.concat(value); + if (Array.isArray(value)) { + return [...arr, ...value]; } - arr.push(value); - return arr; + return [...arr, value]; }, [{ dirPath, success: true }]); } catch (err) { return [{ dirPath, err, success: false }]; } } -async function removeNPMAbsolutePaths(filePath, opts) { - opts = opts || {}; // eslint-disable-line no-param-reassign - +async function removeNPMAbsolutePaths(filePath, opts = {}) { if (!filePath) { throw new ProcessingError('Missing path.\nThe first argument should be the path to a directory or a package.json file.'); } - if (opts.fields && (opts.fields.constructor !== Array || opts.fields.length === 0)) { + if (opts.fields && (!Array.isArray(opts.fields) || opts.fields.length === 0)) { throw new ProcessingError('Invalid option: fields.\nThe fields option should be an array cotaining the names of the specific fields that should be removed.'); } diff --git a/node_modules/require-directory/package.json b/node_modules/require-directory/package.json index 0970ec04c1..25ece4b311 100644 --- a/node_modules/require-directory/package.json +++ b/node_modules/require-directory/package.json @@ -37,4 +37,4 @@ "test": "mocha", "lint": "jshint index.js test/test.js" } -} \ No newline at end of file +} diff --git a/node_modules/require-from-string/package.json b/node_modules/require-from-string/package.json index cbc3134a21..800d46efcb 100644 --- a/node_modules/require-from-string/package.json +++ b/node_modules/require-from-string/package.json @@ -25,4 +25,4 @@ "devDependencies": { "mocha": "*" } -} \ No newline at end of file +} diff --git a/node_modules/resolve-cwd/package.json b/node_modules/resolve-cwd/package.json index a7d509c0fe..fb050ac321 100644 --- a/node_modules/resolve-cwd/package.json +++ b/node_modules/resolve-cwd/package.json @@ -40,4 +40,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/resolve-from/package.json b/node_modules/resolve-from/package.json index 3d6db83a4f..c1a83c5a4c 100644 --- a/node_modules/resolve-from/package.json +++ b/node_modules/resolve-from/package.json @@ -33,4 +33,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/resolve/package.json b/node_modules/resolve/package.json index 138c106f62..4799ea0ba9 100644 --- a/node_modules/resolve/package.json +++ b/node_modules/resolve/package.json @@ -48,4 +48,4 @@ "is-core-module": "^2.2.0", "path-parse": "^1.0.6" } -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/module_dir/zmodules/bbb/package.json b/node_modules/resolve/test/module_dir/zmodules/bbb/package.json index a60376465b..c13b8cf6ac 100644 --- a/node_modules/resolve/test/module_dir/zmodules/bbb/package.json +++ b/node_modules/resolve/test/module_dir/zmodules/bbb/package.json @@ -1,3 +1,3 @@ { "main": "main.js" -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/resolver/baz/package.json b/node_modules/resolve/test/resolver/baz/package.json index 6ba9318a03..b56b5d9111 100644 --- a/node_modules/resolve/test/resolver/baz/package.json +++ b/node_modules/resolve/test/resolver/baz/package.json @@ -1,4 +1,4 @@ { "name": "baz", "main": "quux.js" -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/resolver/browser_field/package.json b/node_modules/resolve/test/resolver/browser_field/package.json index 291ab03bc5..bf406f0830 100644 --- a/node_modules/resolve/test/resolver/browser_field/package.json +++ b/node_modules/resolve/test/resolver/browser_field/package.json @@ -2,4 +2,4 @@ "name": "browser_field", "main": "a", "browser": "b" -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/resolver/dot_main/package.json b/node_modules/resolve/test/resolver/dot_main/package.json index d08e00e9d8..4fa6f73027 100644 --- a/node_modules/resolve/test/resolver/dot_main/package.json +++ b/node_modules/resolve/test/resolver/dot_main/package.json @@ -1,3 +1,3 @@ { "main": "." -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/resolver/dot_slash_main/package.json b/node_modules/resolve/test/resolver/dot_slash_main/package.json index a92bfd7b10..a2b6f341d7 100644 --- a/node_modules/resolve/test/resolver/dot_slash_main/package.json +++ b/node_modules/resolve/test/resolver/dot_slash_main/package.json @@ -1,3 +1,3 @@ { "main": "./" -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/resolver/incorrect_main/package.json b/node_modules/resolve/test/resolver/incorrect_main/package.json index b3b73da086..cd6c5ecafe 100644 --- a/node_modules/resolve/test/resolver/incorrect_main/package.json +++ b/node_modules/resolve/test/resolver/incorrect_main/package.json @@ -1,3 +1,3 @@ { "main": "wrong.js" -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/resolver/invalid_main/package.json b/node_modules/resolve/test/resolver/invalid_main/package.json index 3158504f65..0cf8279950 100644 --- a/node_modules/resolve/test/resolver/invalid_main/package.json +++ b/node_modules/resolve/test/resolver/invalid_main/package.json @@ -4,4 +4,4 @@ "why is this a thing", "srsly omg wtf" ] -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/resolver/multirepo/package.json b/node_modules/resolve/test/resolver/multirepo/package.json index 9c6d56b61b..8508f9d2c4 100644 --- a/node_modules/resolve/test/resolver/multirepo/package.json +++ b/node_modules/resolve/test/resolver/multirepo/package.json @@ -17,4 +17,4 @@ "devDependencies": { "lerna": "^3.4.3" } -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/resolver/multirepo/packages/package-a/package.json b/node_modules/resolve/test/resolver/multirepo/packages/package-a/package.json index a2bbfff899..204de51e05 100644 --- a/node_modules/resolve/test/resolver/multirepo/packages/package-a/package.json +++ b/node_modules/resolve/test/resolver/multirepo/packages/package-a/package.json @@ -11,4 +11,4 @@ "dependencies": { "@my-scope/package-b": "^0.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/resolver/multirepo/packages/package-b/package.json b/node_modules/resolve/test/resolver/multirepo/packages/package-b/package.json index f7adacdebb..f57c3b5f5e 100644 --- a/node_modules/resolve/test/resolver/multirepo/packages/package-b/package.json +++ b/node_modules/resolve/test/resolver/multirepo/packages/package-b/package.json @@ -11,4 +11,4 @@ "dependencies": { "@my-scope/package-a": "^0.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/resolve/test/resolver/nested_symlinks/mylib/package.json b/node_modules/resolve/test/resolver/nested_symlinks/mylib/package.json index f3fffe71cb..acfe9e9517 100644 --- a/node_modules/resolve/test/resolver/nested_symlinks/mylib/package.json +++ b/node_modules/resolve/test/resolver/nested_symlinks/mylib/package.json @@ -12,4 +12,4 @@ "dependencies": { "buffer": "*" } -} \ No newline at end of file +} diff --git a/node_modules/reusify/package.json b/node_modules/reusify/package.json index 4572b152fe..ee66aeecb6 100644 --- a/node_modules/reusify/package.json +++ b/node_modules/reusify/package.json @@ -42,4 +42,4 @@ "standard": "^10.0.3", "tape": "^4.8.0" } -} \ No newline at end of file +} diff --git a/node_modules/rimraf/package.json b/node_modules/rimraf/package.json index 56eb030670..1bf8d5e387 100644 --- a/node_modules/rimraf/package.json +++ b/node_modules/rimraf/package.json @@ -29,4 +29,4 @@ "funding": { "url": "https://github.com/sponsors/isaacs" } -} \ No newline at end of file +} diff --git a/node_modules/run-parallel/package.json b/node_modules/run-parallel/package.json index 87ebaf64be..8774dfc96e 100644 --- a/node_modules/run-parallel/package.json +++ b/node_modules/run-parallel/package.json @@ -39,4 +39,4 @@ "test-browser-local": "airtap --local -- test/*.js", "test-node": "tape test/*.js" } -} \ No newline at end of file +} diff --git a/node_modules/semver/package.json b/node_modules/semver/package.json index 6642c91bbe..4e1154195a 100644 --- a/node_modules/semver/package.json +++ b/node_modules/semver/package.json @@ -38,4 +38,4 @@ "dependencies": { "lru-cache": "^6.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/serialize-error/node_modules/type-fest/package.json b/node_modules/serialize-error/node_modules/type-fest/package.json index ecf6b85a9d..d2c123efb0 100644 --- a/node_modules/serialize-error/node_modules/type-fest/package.json +++ b/node_modules/serialize-error/node_modules/type-fest/package.json @@ -42,4 +42,4 @@ "func-call-spacing": "off" } } -} \ No newline at end of file +} diff --git a/node_modules/serialize-error/package.json b/node_modules/serialize-error/package.json index b0e4ccbfa7..51e371aa86 100644 --- a/node_modules/serialize-error/package.json +++ b/node_modules/serialize-error/package.json @@ -38,4 +38,4 @@ "tsd": "^0.11.0", "xo": "^0.30.0" } -} \ No newline at end of file +} diff --git a/node_modules/shebang-command/package.json b/node_modules/shebang-command/package.json index 3df239d17a..21f081c542 100644 --- a/node_modules/shebang-command/package.json +++ b/node_modules/shebang-command/package.json @@ -31,4 +31,4 @@ "ava": "^2.3.0", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/shebang-regex/package.json b/node_modules/shebang-regex/package.json index c59ff7284e..f2096d466b 100644 --- a/node_modules/shebang-regex/package.json +++ b/node_modules/shebang-regex/package.json @@ -32,4 +32,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/signal-exit/package.json b/node_modules/signal-exit/package.json index 8cede96abe..59b0ac126d 100644 --- a/node_modules/signal-exit/package.json +++ b/node_modules/signal-exit/package.json @@ -35,4 +35,4 @@ "standard-version": "^2.3.0", "tap": "^8.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/sinon/lib/package.json b/node_modules/sinon/lib/package.json index c9a4422614..5bbefffbab 100644 --- a/node_modules/sinon/lib/package.json +++ b/node_modules/sinon/lib/package.json @@ -1,3 +1,3 @@ { "type": "commonjs" -} \ No newline at end of file +} diff --git a/node_modules/sinon/node_modules/@sinonjs/fake-timers/package.json b/node_modules/sinon/node_modules/@sinonjs/fake-timers/package.json index 53e9870a5b..fdd7f54501 100644 --- a/node_modules/sinon/node_modules/@sinonjs/fake-timers/package.json +++ b/node_modules/sinon/node_modules/@sinonjs/fake-timers/package.json @@ -68,4 +68,4 @@ "fake-timers.js" ] } -} \ No newline at end of file +} diff --git a/node_modules/sinon/node_modules/has-flag/package.json b/node_modules/sinon/node_modules/has-flag/package.json index 55d0058e44..9b7c18236a 100644 --- a/node_modules/sinon/node_modules/has-flag/package.json +++ b/node_modules/sinon/node_modules/has-flag/package.json @@ -43,4 +43,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/sinon/node_modules/supports-color/package.json b/node_modules/sinon/node_modules/supports-color/package.json index 12d9e2923b..746ec7cacd 100644 --- a/node_modules/sinon/node_modules/supports-color/package.json +++ b/node_modules/sinon/node_modules/supports-color/package.json @@ -50,4 +50,4 @@ "xo": "^0.24.0" }, "browser": "browser.js" -} \ No newline at end of file +} diff --git a/node_modules/sinon/package.json b/node_modules/sinon/package.json index ca0f3883c9..35d0885446 100644 --- a/node_modules/sinon/package.json +++ b/node_modules/sinon/package.json @@ -138,4 +138,4 @@ "pre-commit": "lint-staged" } } -} \ No newline at end of file +} diff --git a/node_modules/slash/package.json b/node_modules/slash/package.json index c845a31bb8..6609ae225a 100644 --- a/node_modules/slash/package.json +++ b/node_modules/slash/package.json @@ -32,4 +32,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/slash2/package.json b/node_modules/slash2/package.json index fedaeabfa4..0ada687944 100644 --- a/node_modules/slash2/package.json +++ b/node_modules/slash2/package.json @@ -31,4 +31,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/slice-ansi/node_modules/ansi-styles/package.json b/node_modules/slice-ansi/node_modules/ansi-styles/package.json index 84a225913e..5710e7f8cd 100644 --- a/node_modules/slice-ansi/node_modules/ansi-styles/package.json +++ b/node_modules/slice-ansi/node_modules/ansi-styles/package.json @@ -51,4 +51,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/slice-ansi/node_modules/is-fullwidth-code-point/package.json b/node_modules/slice-ansi/node_modules/is-fullwidth-code-point/package.json index 20692b62fc..e95cd44472 100644 --- a/node_modules/slice-ansi/node_modules/is-fullwidth-code-point/package.json +++ b/node_modules/slice-ansi/node_modules/is-fullwidth-code-point/package.json @@ -42,4 +42,4 @@ "tsd": "^0.14.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/slice-ansi/package.json b/node_modules/slice-ansi/package.json index b10a66c58d..0c919be6e4 100644 --- a/node_modules/slice-ansi/package.json +++ b/node_modules/slice-ansi/package.json @@ -50,4 +50,4 @@ "strip-ansi": "^7.0.0", "xo": "^0.38.2" } -} \ No newline at end of file +} diff --git a/node_modules/spdx-correct/package.json b/node_modules/spdx-correct/package.json index 4002158a86..bc87fd5c94 100644 --- a/node_modules/spdx-correct/package.json +++ b/node_modules/spdx-correct/package.json @@ -36,4 +36,4 @@ "lint": "standard && standard-markdown README.md", "test": "defence README.md | replace-require-self | node && node test.js" } -} \ No newline at end of file +} diff --git a/node_modules/spdx-exceptions/package.json b/node_modules/spdx-exceptions/package.json index 1b39b16d95..2bafc6a38b 100644 --- a/node_modules/spdx-exceptions/package.json +++ b/node_modules/spdx-exceptions/package.json @@ -14,4 +14,4 @@ "scripts": { "build": "node build.js" } -} \ No newline at end of file +} diff --git a/node_modules/spdx-expression-parse/package.json b/node_modules/spdx-expression-parse/package.json index 93d94baa44..71575209cd 100644 --- a/node_modules/spdx-expression-parse/package.json +++ b/node_modules/spdx-expression-parse/package.json @@ -37,4 +37,4 @@ "test:mocha": "mocha test/index.js", "test": "npm run test:mocha && npm run test:readme" } -} \ No newline at end of file +} diff --git a/node_modules/spdx-license-ids/package.json b/node_modules/spdx-license-ids/package.json index a21e425872..2f41ece087 100644 --- a/node_modules/spdx-license-ids/package.json +++ b/node_modules/spdx-license-ids/package.json @@ -36,4 +36,4 @@ "eslintConfig": { "extends": "@shinnn" } -} \ No newline at end of file +} diff --git a/node_modules/split-on-first/package.json b/node_modules/split-on-first/package.json index c037f75730..fa204a16ee 100644 --- a/node_modules/split-on-first/package.json +++ b/node_modules/split-on-first/package.json @@ -33,4 +33,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/sprintf-js/package.json b/node_modules/sprintf-js/package.json index b49b1926d8..dee071f289 100644 --- a/node_modules/sprintf-js/package.json +++ b/node_modules/sprintf-js/package.json @@ -19,4 +19,4 @@ "grunt-contrib-watch": "*", "grunt-contrib-uglify": "*" } -} \ No newline at end of file +} diff --git a/node_modules/stack-utils/node_modules/escape-string-regexp/package.json b/node_modules/stack-utils/node_modules/escape-string-regexp/package.json index d7bec7c3d4..ff7f90854d 100644 --- a/node_modules/stack-utils/node_modules/escape-string-regexp/package.json +++ b/node_modules/stack-utils/node_modules/escape-string-regexp/package.json @@ -40,4 +40,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/stack-utils/package.json b/node_modules/stack-utils/package.json index e0cef31700..565acf6ef7 100644 --- a/node_modules/stack-utils/package.json +++ b/node_modules/stack-utils/package.json @@ -36,4 +36,4 @@ "source-map-support": "^0.5.20", "tap": "^15.0.9" } -} \ No newline at end of file +} diff --git a/node_modules/strict-uri-encode/package.json b/node_modules/strict-uri-encode/package.json index bacf50a3fd..565fb632b4 100644 --- a/node_modules/strict-uri-encode/package.json +++ b/node_modules/strict-uri-encode/package.json @@ -28,4 +28,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/string-width/package.json b/node_modules/string-width/package.json index f70939d0f6..53b2afc09e 100644 --- a/node_modules/string-width/package.json +++ b/node_modules/string-width/package.json @@ -53,4 +53,4 @@ "tsd": "^0.7.1", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/string.prototype.trimend/package.json b/node_modules/string.prototype.trimend/package.json index 1a0608b8fc..b552bfa43b 100644 --- a/node_modules/string.prototype.trimend/package.json +++ b/node_modules/string.prototype.trimend/package.json @@ -66,4 +66,4 @@ "call-bind": "^1.0.2", "define-properties": "^1.1.3" } -} \ No newline at end of file +} diff --git a/node_modules/string.prototype.trimstart/package.json b/node_modules/string.prototype.trimstart/package.json index efb1aac9b6..c965ca2de3 100644 --- a/node_modules/string.prototype.trimstart/package.json +++ b/node_modules/string.prototype.trimstart/package.json @@ -66,4 +66,4 @@ "call-bind": "^1.0.2", "define-properties": "^1.1.3" } -} \ No newline at end of file +} diff --git a/node_modules/strip-ansi/package.json b/node_modules/strip-ansi/package.json index 1cea4c0d9a..daafb34e80 100644 --- a/node_modules/strip-ansi/package.json +++ b/node_modules/strip-ansi/package.json @@ -51,4 +51,4 @@ "tsd": "^0.10.0", "xo": "^0.25.3" } -} \ No newline at end of file +} diff --git a/node_modules/strip-bom/package.json b/node_modules/strip-bom/package.json index f37e6ab2e2..10f8fdd7e5 100644 --- a/node_modules/strip-bom/package.json +++ b/node_modules/strip-bom/package.json @@ -37,4 +37,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/strip-final-newline/package.json b/node_modules/strip-final-newline/package.json index f05ea36b88..40b7e802c9 100644 --- a/node_modules/strip-final-newline/package.json +++ b/node_modules/strip-final-newline/package.json @@ -37,4 +37,4 @@ "ava": "^0.25.0", "xo": "^0.23.0" } -} \ No newline at end of file +} diff --git a/node_modules/supertap/node_modules/argparse/package.json b/node_modules/supertap/node_modules/argparse/package.json index b16de2518a..62fba0a9fc 100644 --- a/node_modules/supertap/node_modules/argparse/package.json +++ b/node_modules/supertap/node_modules/argparse/package.json @@ -31,4 +31,4 @@ "mocha": "^3.1.0", "ndoc": "^5.0.1" } -} \ No newline at end of file +} diff --git a/node_modules/supertap/node_modules/js-yaml/package.json b/node_modules/supertap/node_modules/js-yaml/package.json index 67a6d909ce..0d2366762c 100644 --- a/node_modules/supertap/node_modules/js-yaml/package.json +++ b/node_modules/supertap/node_modules/js-yaml/package.json @@ -46,4 +46,4 @@ "scripts": { "test": "make test" } -} \ No newline at end of file +} diff --git a/node_modules/supertap/package.json b/node_modules/supertap/package.json index ccc858925d..a99c5dc384 100644 --- a/node_modules/supertap/package.json +++ b/node_modules/supertap/package.json @@ -50,4 +50,4 @@ "ava": { "serial": true } -} \ No newline at end of file +} diff --git a/node_modules/supports-color/package.json b/node_modules/supports-color/package.json index efeb00b064..d85b3b4708 100644 --- a/node_modules/supports-color/package.json +++ b/node_modules/supports-color/package.json @@ -50,4 +50,4 @@ "xo": "^0.20.0" }, "browser": "browser.js" -} \ No newline at end of file +} diff --git a/node_modules/svg-element-attributes/package.json b/node_modules/svg-element-attributes/package.json index 1c91e346a5..45a22b9f2b 100644 --- a/node_modules/svg-element-attributes/package.json +++ b/node_modules/svg-element-attributes/package.json @@ -73,4 +73,4 @@ "preset-wooorm" ] } -} \ No newline at end of file +} diff --git a/node_modules/table/node_modules/ajv/package.json b/node_modules/table/node_modules/ajv/package.json index 2551c209c3..6bf862d66f 100644 --- a/node_modules/table/node_modules/ajv/package.json +++ b/node_modules/table/node_modules/ajv/package.json @@ -120,4 +120,4 @@ "lint-staged": { "*.{json,yaml,js,ts}": "prettier --write" } -} \ No newline at end of file +} diff --git a/node_modules/table/node_modules/ansi-styles/package.json b/node_modules/table/node_modules/ansi-styles/package.json index ec506b2fd5..71ec137ec1 100644 --- a/node_modules/table/node_modules/ansi-styles/package.json +++ b/node_modules/table/node_modules/ansi-styles/package.json @@ -53,4 +53,4 @@ "tsd": "^0.11.0", "xo": "^0.25.3" } -} \ No newline at end of file +} diff --git a/node_modules/table/node_modules/color-convert/package.json b/node_modules/table/node_modules/color-convert/package.json index d169f869b2..6e48000c7c 100644 --- a/node_modules/table/node_modules/color-convert/package.json +++ b/node_modules/table/node_modules/color-convert/package.json @@ -45,4 +45,4 @@ "dependencies": { "color-name": "~1.1.4" } -} \ No newline at end of file +} diff --git a/node_modules/table/node_modules/color-name/package.json b/node_modules/table/node_modules/color-name/package.json index fecb8dcfb6..7acc90285c 100644 --- a/node_modules/table/node_modules/color-name/package.json +++ b/node_modules/table/node_modules/color-name/package.json @@ -25,4 +25,4 @@ "url": "https://github.com/colorjs/color-name/issues" }, "homepage": "https://github.com/colorjs/color-name" -} \ No newline at end of file +} diff --git a/node_modules/table/node_modules/json-schema-traverse/package.json b/node_modules/table/node_modules/json-schema-traverse/package.json index 7632fe5aef..e32dfbaeec 100644 --- a/node_modules/table/node_modules/json-schema-traverse/package.json +++ b/node_modules/table/node_modules/json-schema-traverse/package.json @@ -40,4 +40,4 @@ "text-summary" ] } -} \ No newline at end of file +} diff --git a/node_modules/table/node_modules/slice-ansi/package.json b/node_modules/table/node_modules/slice-ansi/package.json index 3f928bd00e..4860f05a01 100644 --- a/node_modules/table/node_modules/slice-ansi/package.json +++ b/node_modules/table/node_modules/slice-ansi/package.json @@ -49,4 +49,4 @@ "strip-ansi": "^6.0.0", "xo": "^0.26.1" } -} \ No newline at end of file +} diff --git a/node_modules/table/package.json b/node_modules/table/package.json index b8354d9022..ed3ce70e03 100644 --- a/node_modules/table/package.json +++ b/node_modules/table/package.json @@ -91,4 +91,4 @@ "test": "npm run create-validators && mocha --require ts-node/register \"./test/**/*.ts\"" }, "version": "6.7.1" -} \ No newline at end of file +} diff --git a/node_modules/temp-dir/package.json b/node_modules/temp-dir/package.json index ad951f1491..ec1c7c1e17 100644 --- a/node_modules/temp-dir/package.json +++ b/node_modules/temp-dir/package.json @@ -38,4 +38,4 @@ "tsd": "^0.7.2", "xo": "^0.24.0" } -} \ No newline at end of file +} diff --git a/node_modules/text-table/package.json b/node_modules/text-table/package.json index 176cff110a..13104896a8 100644 --- a/node_modules/text-table/package.json +++ b/node_modules/text-table/package.json @@ -42,4 +42,4 @@ "url": "http://substack.net" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/node_modules/time-zone/package.json b/node_modules/time-zone/package.json index 8e3e1e1a11..f50f1b03a3 100644 --- a/node_modules/time-zone/package.json +++ b/node_modules/time-zone/package.json @@ -32,4 +32,4 @@ "ava": "*", "xo": "*" } -} \ No newline at end of file +} diff --git a/node_modules/tmp-promise/.circleci/config.yml b/node_modules/tmp-promise/.circleci/config.yml index 8c92782787..918b120891 100644 --- a/node_modules/tmp-promise/.circleci/config.yml +++ b/node_modules/tmp-promise/.circleci/config.yml @@ -1,53 +1,53 @@ -version: 2 - -common_steps: &common_steps - steps: - - checkout - - - run: - name: Install dependencies - command: npm install - - - run: - name: Run tests - command: npm run mocha - - - run: - name: Check Typescript types - command: npm run check-types - when: always - -jobs: - node-8: - docker: - - image: circleci/node:8 - - <<: *common_steps - - node-10: - docker: - - image: circleci/node:10 - - <<: *common_steps - - node-11: - docker: - - image: circleci/node:11 - - <<: *common_steps - - node-12: - docker: - - image: circleci/node:12 - - <<: *common_steps - -workflows: - version: 2 - - on-commit: - jobs: - - node-8 - - node-10 - - node-11 - - node-12 +version: 2 + +common_steps: &common_steps + steps: + - checkout + + - run: + name: Install dependencies + command: npm install + + - run: + name: Run tests + command: npm run mocha + + - run: + name: Check Typescript types + command: npm run check-types + when: always + +jobs: + node-8: + docker: + - image: circleci/node:8 + + <<: *common_steps + + node-10: + docker: + - image: circleci/node:10 + + <<: *common_steps + + node-11: + docker: + - image: circleci/node:11 + + <<: *common_steps + + node-12: + docker: + - image: circleci/node:12 + + <<: *common_steps + +workflows: + version: 2 + + on-commit: + jobs: + - node-8 + - node-10 + - node-11 + - node-12 diff --git a/node_modules/tmp-promise/README.md b/node_modules/tmp-promise/README.md index 3877eebafc..49f667f3c6 100644 --- a/node_modules/tmp-promise/README.md +++ b/node_modules/tmp-promise/README.md @@ -1,316 +1,316 @@ -# tmp-promise - -[![CircleCI](https://circleci.com/gh/benjamingr/tmp-promise.svg?style=svg)](https://circleci.com/gh/benjamingr/tmp-promise) -[![npm version](https://badge.fury.io/js/tmp-promise.svg)](https://badge.fury.io/js/tmp-promise) - -A simple utility for creating temporary files or directories. - -The [tmp](https://github.com/raszi/node-tmp) package with promises support. If you want to use `tmp` with `async/await` then this helper might be for you. - -This documentation is mostly copied from that package's - but with promise usage instead of callback usage adapted. - -## Installation - - npm i tmp-promise - -**Note:** Node.js 8+ is supported - older versions of Node.js are not supported by the Node.js foundation. If you need to use an older version of Node.js install tmp-promise@1.10 - - npm i tmp-promise@1.1.0 - -## About - -This adds promises support to a [widely used library][2]. This package is used to create temporary files and directories in a [Node.js][1] environment. - - -tmp-promise offers both an asynchronous and a synchronous API. For all API calls, all -the parameters are optional. - -Internally, tmp uses crypto for determining random file names, or, when using templates, a six letter random identifier. And just in case that you do not have that much entropy left on your system, tmp will fall back to pseudo random numbers. - -You can set whether you want to remove the temporary file on process exit or not, and the destination directory can also be set. - -tmp-promise also uses promise [disposers](http://stackoverflow.com/questions/28915677/what-is-the-promise-disposer-pattern) to provide a nice way to perform cleanup when you're done working with the files. - -## Usage (API Reference) - -### Asynchronous file creation - -Simple temporary file creation, the file will be closed and unlinked on process exit. - -With Node.js 10 and es - modules: - -```js -import { file } from 'tmp-promise' - -(async () => { - const {fd, path, cleanup} = await file(); - // work with file here in fd - cleanup(); -})(); -``` - -Or the older way: - -```javascript -var tmp = require('tmp-promise'); - -tmp.file().then(o => { - console.log("File: ", o.path); - console.log("Filedescriptor: ", o.fd); - - // If we don't need the file anymore we could manually call cleanup - // But that is not necessary if we didn't pass the keep option because the library - // will clean after itself. - o.cleanup(); -}); -``` - -Simple temporary file creation with a [disposer](http://stackoverflow.com/questions/28915677/what-is-the-promise-disposer-pattern): - -With Node.js 10 and es - modules: - -```js -import { withFile } from 'tmp-promise' - -withFile(async ({path, fd}) => { - // when this function returns or throws - release the file - await doSomethingWithFile(db); -}); -``` - -Or the older way: - -```js -tmp.withFile(o => { - console.log("File: ", o.path); - console.log("Filedescriptor: ", o.fd); - // the file remains opens until the below promise resolves - return somePromiseReturningFn(); -}).then(v => { - // file is closed here automatically, v is the value of somePromiseReturningFn -}); -``` - - -### Synchronous file creation - -A synchronous version of the above. - -```javascript -var tmp = require('tmp-promise'); - -var tmpobj = tmp.fileSync(); -console.log("File: ", tmpobj.name); -console.log("Filedescriptor: ", tmpobj.fd); - -// If we don't need the file anymore we could manually call the removeCallback -// But that is not necessary if we didn't pass the keep option because the library -// will clean after itself. -tmpobj.removeCallback(); -``` - -Note that this might throw an exception if either the maximum limit of retries -for creating a temporary name fails, or, in case that you do not have the permission -to write to the directory where the temporary file should be created in. - -### Asynchronous directory creation - -Simple temporary directory creation, it will be removed on process exit. - -If the directory still contains items on process exit, then it won't be removed. - -```javascript -var tmp = require('tmp-promise'); - -tmp.dir().then(o => { - console.log("Dir: ", o.path); - - // Manual cleanup - o.cleanup(); -}); -``` - -If you want to cleanup the directory even when there are entries in it, then -you can pass the `unsafeCleanup` option when creating it. - -You can also use a [disposer](http://stackoverflow.com/questions/28915677/what-is-the-promise-disposer-pattern) here which takes care of cleanup automatically: - -```javascript -var tmp = require('tmp-promise'); - -tmp.withDir(o => { - console.log("Dir: ", o.path); - - // automatic cleanup when the below promise resolves - return somePromiseReturningFn(); -}).then(v => { - // the directory has been cleaned here -}); -``` - -### Synchronous directory creation - -A synchronous version of the above. - -```javascript -var tmp = require('tmp-promise'); - -var tmpobj = tmp.dirSync(); -console.log("Dir: ", tmpobj.name); -// Manual cleanup -tmpobj.removeCallback(); -``` - -Note that this might throw an exception if either the maximum limit of retries -for creating a temporary name fails, or, in case that you do not have the permission -to write to the directory where the temporary directory should be created in. - -### Asynchronous filename generation - -It is possible with this library to generate a unique filename in the specified -directory. - -```javascript -var tmp = require('tmp-promise'); - -tmp.tmpName().then(path => { - console.log("Created temporary filename: ", path); -}); -``` - -### Synchronous filename generation - -A synchronous version of the above. - -```javascript -var tmp = require('tmp-promise'); - -var name = tmp.tmpNameSync(); -console.log("Created temporary filename: ", name); -``` - -## Advanced usage - -### Asynchronous file creation - -Creates a file with mode `0644`, prefix will be `prefix-` and postfix will be `.txt`. - -```javascript -var tmp = require('tmp-promise'); - -tmp.file({ mode: 0644, prefix: 'prefix-', postfix: '.txt' }).then(o => { - console.log("File: ", o.path); - console.log("Filedescriptor: ", o.fd); -}); -``` - -### Synchronous file creation - -A synchronous version of the above. - -```javascript -var tmp = require('tmp-promise'); - -var tmpobj = tmp.fileSync({ mode: 0644, prefix: 'prefix-', postfix: '.txt' }); -console.log("File: ", tmpobj.name); -console.log("Filedescriptor: ", tmpobj.fd); -``` - -### Asynchronous directory creation - -Creates a directory with mode `0755`, prefix will be `myTmpDir_`. - -```javascript -var tmp = require('tmp-promise'); - -tmp.dir({ mode: 0750, prefix: 'myTmpDir_' }).then(o => { - console.log("Dir: ", o.path); -}); -``` - -### Synchronous directory creation - -Again, a synchronous version of the above. - -```javascript -var tmp = require('tmp-promise'); - -var tmpobj = tmp.dirSync({ mode: 0750, prefix: 'myTmpDir_' }); -console.log("Dir: ", tmpobj.name); -``` - - -### mkstemp like, asynchronously - -Creates a new temporary directory with mode `0700` and filename like `/tmp/tmp-nk2J1u`. - -```javascript -var tmp = require('tmp-promise'); -tmp.dir({ template: '/tmp/tmp-XXXXXX' }).then(console.log); -``` - - -### mkstemp like, synchronously - -This will behave similarly to the asynchronous version. - -```javascript -var tmp = require('tmp-promise'); - -var tmpobj = tmp.dirSync({ template: '/tmp/tmp-XXXXXX' }); -console.log("Dir: ", tmpobj.name); -``` - -### Asynchronous filename generation - -The `tmpName()` function accepts the `prefix`, `postfix`, `dir`, etc. parameters also: - -```javascript -var tmp = require('tmp-promise'); - -tmp.tmpName({ template: '/tmp/tmp-XXXXXX' }).then(path => - console.log("Created temporary filename: ", path); -); -``` - -### Synchronous filename generation - -The `tmpNameSync()` function works similarly to `tmpName()`. - -```javascript -var tmp = require('tmp-promise'); -var tmpname = tmp.tmpNameSync({ template: '/tmp/tmp-XXXXXX' }); -console.log("Created temporary filename: ", tmpname); -``` - - -## Graceful cleanup - -One may want to cleanup the temporary files even when an uncaught exception -occurs. To enforce this, you can call the `setGracefulCleanup()` method: - -```javascript -var tmp = require('tmp'); - -tmp.setGracefulCleanup(); -``` - -## Options - -All options are optional :) - - * `mode`: the file mode to create with, it fallbacks to `0600` on file creation and `0700` on directory creation - * `prefix`: the optional prefix, fallbacks to `tmp-` if not provided - * `postfix`: the optional postfix, fallbacks to `.tmp` on file creation - * `template`: [`mkstemp`][3] like filename template, no default - * `dir`: the optional temporary directory, fallbacks to system default (guesses from environment) - * `tries`: how many times should the function try to get a unique filename before giving up, default `3` - * `keep`: signals that the temporary file or directory should not be deleted on exit, default is `false`, means delete - * Please keep in mind that it is recommended in this case to call the provided `cleanupCallback` function manually. - * `unsafeCleanup`: recursively removes the created temporary directory, even when it's not empty. default is `false` - - - -[1]: http://nodejs.org/ -[2]: https://www.npmjs.com/browse/depended/tmp -[3]: http://www.kernel.org/doc/man-pages/online/pages/man3/mkstemp.3.html +# tmp-promise + +[![CircleCI](https://circleci.com/gh/benjamingr/tmp-promise.svg?style=svg)](https://circleci.com/gh/benjamingr/tmp-promise) +[![npm version](https://badge.fury.io/js/tmp-promise.svg)](https://badge.fury.io/js/tmp-promise) + +A simple utility for creating temporary files or directories. + +The [tmp](https://github.com/raszi/node-tmp) package with promises support. If you want to use `tmp` with `async/await` then this helper might be for you. + +This documentation is mostly copied from that package's - but with promise usage instead of callback usage adapted. + +## Installation + + npm i tmp-promise + +**Note:** Node.js 8+ is supported - older versions of Node.js are not supported by the Node.js foundation. If you need to use an older version of Node.js install tmp-promise@1.10 + + npm i tmp-promise@1.1.0 + +## About + +This adds promises support to a [widely used library][2]. This package is used to create temporary files and directories in a [Node.js][1] environment. + + +tmp-promise offers both an asynchronous and a synchronous API. For all API calls, all +the parameters are optional. + +Internally, tmp uses crypto for determining random file names, or, when using templates, a six letter random identifier. And just in case that you do not have that much entropy left on your system, tmp will fall back to pseudo random numbers. + +You can set whether you want to remove the temporary file on process exit or not, and the destination directory can also be set. + +tmp-promise also uses promise [disposers](http://stackoverflow.com/questions/28915677/what-is-the-promise-disposer-pattern) to provide a nice way to perform cleanup when you're done working with the files. + +## Usage (API Reference) + +### Asynchronous file creation + +Simple temporary file creation, the file will be closed and unlinked on process exit. + +With Node.js 10 and es - modules: + +```js +import { file } from 'tmp-promise' + +(async () => { + const {fd, path, cleanup} = await file(); + // work with file here in fd + cleanup(); +})(); +``` + +Or the older way: + +```javascript +var tmp = require('tmp-promise'); + +tmp.file().then(o => { + console.log("File: ", o.path); + console.log("Filedescriptor: ", o.fd); + + // If we don't need the file anymore we could manually call cleanup + // But that is not necessary if we didn't pass the keep option because the library + // will clean after itself. + o.cleanup(); +}); +``` + +Simple temporary file creation with a [disposer](http://stackoverflow.com/questions/28915677/what-is-the-promise-disposer-pattern): + +With Node.js 10 and es - modules: + +```js +import { withFile } from 'tmp-promise' + +withFile(async ({path, fd}) => { + // when this function returns or throws - release the file + await doSomethingWithFile(db); +}); +``` + +Or the older way: + +```js +tmp.withFile(o => { + console.log("File: ", o.path); + console.log("Filedescriptor: ", o.fd); + // the file remains opens until the below promise resolves + return somePromiseReturningFn(); +}).then(v => { + // file is closed here automatically, v is the value of somePromiseReturningFn +}); +``` + + +### Synchronous file creation + +A synchronous version of the above. + +```javascript +var tmp = require('tmp-promise'); + +var tmpobj = tmp.fileSync(); +console.log("File: ", tmpobj.name); +console.log("Filedescriptor: ", tmpobj.fd); + +// If we don't need the file anymore we could manually call the removeCallback +// But that is not necessary if we didn't pass the keep option because the library +// will clean after itself. +tmpobj.removeCallback(); +``` + +Note that this might throw an exception if either the maximum limit of retries +for creating a temporary name fails, or, in case that you do not have the permission +to write to the directory where the temporary file should be created in. + +### Asynchronous directory creation + +Simple temporary directory creation, it will be removed on process exit. + +If the directory still contains items on process exit, then it won't be removed. + +```javascript +var tmp = require('tmp-promise'); + +tmp.dir().then(o => { + console.log("Dir: ", o.path); + + // Manual cleanup + o.cleanup(); +}); +``` + +If you want to cleanup the directory even when there are entries in it, then +you can pass the `unsafeCleanup` option when creating it. + +You can also use a [disposer](http://stackoverflow.com/questions/28915677/what-is-the-promise-disposer-pattern) here which takes care of cleanup automatically: + +```javascript +var tmp = require('tmp-promise'); + +tmp.withDir(o => { + console.log("Dir: ", o.path); + + // automatic cleanup when the below promise resolves + return somePromiseReturningFn(); +}).then(v => { + // the directory has been cleaned here +}); +``` + +### Synchronous directory creation + +A synchronous version of the above. + +```javascript +var tmp = require('tmp-promise'); + +var tmpobj = tmp.dirSync(); +console.log("Dir: ", tmpobj.name); +// Manual cleanup +tmpobj.removeCallback(); +``` + +Note that this might throw an exception if either the maximum limit of retries +for creating a temporary name fails, or, in case that you do not have the permission +to write to the directory where the temporary directory should be created in. + +### Asynchronous filename generation + +It is possible with this library to generate a unique filename in the specified +directory. + +```javascript +var tmp = require('tmp-promise'); + +tmp.tmpName().then(path => { + console.log("Created temporary filename: ", path); +}); +``` + +### Synchronous filename generation + +A synchronous version of the above. + +```javascript +var tmp = require('tmp-promise'); + +var name = tmp.tmpNameSync(); +console.log("Created temporary filename: ", name); +``` + +## Advanced usage + +### Asynchronous file creation + +Creates a file with mode `0644`, prefix will be `prefix-` and postfix will be `.txt`. + +```javascript +var tmp = require('tmp-promise'); + +tmp.file({ mode: 0644, prefix: 'prefix-', postfix: '.txt' }).then(o => { + console.log("File: ", o.path); + console.log("Filedescriptor: ", o.fd); +}); +``` + +### Synchronous file creation + +A synchronous version of the above. + +```javascript +var tmp = require('tmp-promise'); + +var tmpobj = tmp.fileSync({ mode: 0644, prefix: 'prefix-', postfix: '.txt' }); +console.log("File: ", tmpobj.name); +console.log("Filedescriptor: ", tmpobj.fd); +``` + +### Asynchronous directory creation + +Creates a directory with mode `0755`, prefix will be `myTmpDir_`. + +```javascript +var tmp = require('tmp-promise'); + +tmp.dir({ mode: 0750, prefix: 'myTmpDir_' }).then(o => { + console.log("Dir: ", o.path); +}); +``` + +### Synchronous directory creation + +Again, a synchronous version of the above. + +```javascript +var tmp = require('tmp-promise'); + +var tmpobj = tmp.dirSync({ mode: 0750, prefix: 'myTmpDir_' }); +console.log("Dir: ", tmpobj.name); +``` + + +### mkstemp like, asynchronously + +Creates a new temporary directory with mode `0700` and filename like `/tmp/tmp-nk2J1u`. + +```javascript +var tmp = require('tmp-promise'); +tmp.dir({ template: '/tmp/tmp-XXXXXX' }).then(console.log); +``` + + +### mkstemp like, synchronously + +This will behave similarly to the asynchronous version. + +```javascript +var tmp = require('tmp-promise'); + +var tmpobj = tmp.dirSync({ template: '/tmp/tmp-XXXXXX' }); +console.log("Dir: ", tmpobj.name); +``` + +### Asynchronous filename generation + +The `tmpName()` function accepts the `prefix`, `postfix`, `dir`, etc. parameters also: + +```javascript +var tmp = require('tmp-promise'); + +tmp.tmpName({ template: '/tmp/tmp-XXXXXX' }).then(path => + console.log("Created temporary filename: ", path); +); +``` + +### Synchronous filename generation + +The `tmpNameSync()` function works similarly to `tmpName()`. + +```javascript +var tmp = require('tmp-promise'); +var tmpname = tmp.tmpNameSync({ template: '/tmp/tmp-XXXXXX' }); +console.log("Created temporary filename: ", tmpname); +``` + + +## Graceful cleanup + +One may want to cleanup the temporary files even when an uncaught exception +occurs. To enforce this, you can call the `setGracefulCleanup()` method: + +```javascript +var tmp = require('tmp'); + +tmp.setGracefulCleanup(); +``` + +## Options + +All options are optional :) + + * `mode`: the file mode to create with, it fallbacks to `0600` on file creation and `0700` on directory creation + * `prefix`: the optional prefix, fallbacks to `tmp-` if not provided + * `postfix`: the optional postfix, fallbacks to `.tmp` on file creation + * `template`: [`mkstemp`][3] like filename template, no default + * `dir`: the optional temporary directory, fallbacks to system default (guesses from environment) + * `tries`: how many times should the function try to get a unique filename before giving up, default `3` + * `keep`: signals that the temporary file or directory should not be deleted on exit, default is `false`, means delete + * Please keep in mind that it is recommended in this case to call the provided `cleanupCallback` function manually. + * `unsafeCleanup`: recursively removes the created temporary directory, even when it's not empty. default is `false` + + + +[1]: http://nodejs.org/ +[2]: https://www.npmjs.com/browse/depended/tmp +[3]: http://www.kernel.org/doc/man-pages/online/pages/man3/mkstemp.3.html diff --git a/node_modules/tmp-promise/example-usage.js b/node_modules/tmp-promise/example-usage.js index 261421656f..1ea9ca5847 100644 --- a/node_modules/tmp-promise/example-usage.js +++ b/node_modules/tmp-promise/example-usage.js @@ -1,9 +1,9 @@ -var tmp = require("./index.js"); -var Promise = require("bluebird"); // just for delay, this works with native promises -// disposer -tmp.withFile((path) => { - console.log("Created at path", path); - return Promise.delay(1000); -}).then(() => { - console.log("File automatically disposed"); +var tmp = require("./index.js"); +var Promise = require("bluebird"); // just for delay, this works with native promises +// disposer +tmp.withFile((path) => { + console.log("Created at path", path); + return Promise.delay(1000); +}).then(() => { + console.log("File automatically disposed"); }); \ No newline at end of file diff --git a/node_modules/tmp-promise/index.d.ts b/node_modules/tmp-promise/index.d.ts index cffd32f3f0..055da8a097 100644 --- a/node_modules/tmp-promise/index.d.ts +++ b/node_modules/tmp-promise/index.d.ts @@ -1,27 +1,27 @@ -import { fileSync, dirSync, tmpNameSync, setGracefulCleanup } from "tmp"; -import { FileOptions, DirOptions, TmpNameOptions } from "tmp"; - -export interface DirectoryResult { - path: string; - cleanup(): Promise; -} - -export interface FileResult extends DirectoryResult { - fd: number; -} - -export function file(options?: FileOptions): Promise; -export function withFile( - fn: (result: FileResult) => Promise, - options?: FileOptions -): Promise; - -export function dir(options?: DirOptions): Promise; -export function withDir( - fn: (results: DirectoryResult) => Promise, - options?: DirOptions -): Promise; - -export function tmpName(options?: TmpNameOptions): Promise; - -export { fileSync, dirSync, tmpNameSync, setGracefulCleanup }; +import { fileSync, dirSync, tmpNameSync, setGracefulCleanup } from "tmp"; +import { FileOptions, DirOptions, TmpNameOptions } from "tmp"; + +export interface DirectoryResult { + path: string; + cleanup: () => Promise; +} + +export interface FileResult extends DirectoryResult { + fd: number; +} + +export function file(options?: FileOptions): Promise; +export function withFile( + fn: (result: FileResult) => Promise, + options?: FileOptions +): Promise; + +export function dir(options?: DirOptions): Promise; +export function withDir( + fn: (results: DirectoryResult) => Promise, + options?: DirOptions +): Promise; + +export function tmpName(options?: TmpNameOptions): Promise; + +export { fileSync, dirSync, tmpNameSync, setGracefulCleanup }; diff --git a/node_modules/tmp-promise/index.js b/node_modules/tmp-promise/index.js index 55d2a03971..0a39d0fa7a 100644 --- a/node_modules/tmp-promise/index.js +++ b/node_modules/tmp-promise/index.js @@ -1,48 +1,50 @@ -const {promisify} = require("util"); -const tmp = require("tmp"); - -// file -module.exports.fileSync = tmp.fileSync; -const fileWithOptions = promisify((options, cb) => - tmp.file(options, (err, path, fd, cleanup) => - err ? cb(err) : cb(undefined, { path, fd, cleanup: promisify(cleanup) }) - ) -); -module.exports.file = async (options) => fileWithOptions(options); - -module.exports.withFile = async function withFile(fn, options) { - const { path, fd, cleanup } = await module.exports.file(options); - try { - return await fn({ path, fd }); - } finally { - await cleanup(); - } -}; - - -// directory -module.exports.dirSync = tmp.dirSync; -const dirWithOptions = promisify((options, cb) => - tmp.dir(options, (err, path, cleanup) => - err ? cb(err) : cb(undefined, { path, cleanup: promisify(cleanup) }) - ) -); -module.exports.dir = async (options) => dirWithOptions(options); - -module.exports.withDir = async function withDir(fn, options) { - const { path, cleanup } = await module.exports.dir(options); - try { - return await fn({ path }); - } finally { - await cleanup(); - } -}; - - -// name generation -module.exports.tmpNameSync = tmp.tmpNameSync; -module.exports.tmpName = promisify(tmp.tmpName); - -module.exports.tmpdir = tmp.tmpdir; - -module.exports.setGracefulCleanup = tmp.setGracefulCleanup; +'use strict'; + +const { promisify } = require("util"); +const tmp = require("tmp"); + +// file +module.exports.fileSync = tmp.fileSync; +const fileWithOptions = promisify((options, cb) => + tmp.file(options, (err, path, fd, cleanup) => + err ? cb(err) : cb(undefined, { path, fd, cleanup: promisify(cleanup) }) + ) +); +module.exports.file = async (options) => fileWithOptions(options); + +module.exports.withFile = async function withFile(fn, options) { + const { path, fd, cleanup } = await module.exports.file(options); + try { + return await fn({ path, fd }); + } finally { + await cleanup(); + } +}; + + +// directory +module.exports.dirSync = tmp.dirSync; +const dirWithOptions = promisify((options, cb) => + tmp.dir(options, (err, path, cleanup) => + err ? cb(err) : cb(undefined, { path, cleanup: promisify(cleanup) }) + ) +); +module.exports.dir = async (options) => dirWithOptions(options); + +module.exports.withDir = async function withDir(fn, options) { + const { path, cleanup } = await module.exports.dir(options); + try { + return await fn({ path }); + } finally { + await cleanup(); + } +}; + + +// name generation +module.exports.tmpNameSync = tmp.tmpNameSync; +module.exports.tmpName = promisify(tmp.tmpName); + +module.exports.tmpdir = tmp.tmpdir; + +module.exports.setGracefulCleanup = tmp.setGracefulCleanup; diff --git a/node_modules/tmp-promise/index.test-d.ts b/node_modules/tmp-promise/index.test-d.ts index f60bd2e0ef..375f0ec089 100644 --- a/node_modules/tmp-promise/index.test-d.ts +++ b/node_modules/tmp-promise/index.test-d.ts @@ -1,31 +1,31 @@ -import { file, withFile, dir, withDir, tmpName } from "."; - -async function fileExample() { - const { path, fd, cleanup } = await file({ discardDescriptor: true }); - await cleanup(); - - await withFile( - async ({ path, fd, cleanup }) => { - console.log(fd); - await cleanup(); - }, - { discardDescriptor: true } - ); -} - -async function dirExample() { - const { path, cleanup } = await dir({ unsafeCleanup: true }); - await cleanup(); - - await withDir( - async ({ path, cleanup }) => { - console.log(path); - await cleanup(); - }, - { unsafeCleanup: true } - ); -} - -async function tmpNameExample() { - const name = await tmpName({ tries: 3 }); -} +import { file, withFile, dir, withDir, tmpName } from "."; + +async function fileExample() { + const { path, fd, cleanup } = await file({ discardDescriptor: true }); + await cleanup(); + + await withFile( + async ({ path, fd, cleanup }) => { + console.log(fd); + await cleanup(); + }, + { discardDescriptor: true } + ); +} + +async function dirExample() { + const { path, cleanup } = await dir({ unsafeCleanup: true }); + await cleanup(); + + await withDir( + async ({ path, cleanup }) => { + console.log(path); + await cleanup(); + }, + { unsafeCleanup: true } + ); +} + +async function tmpNameExample() { + const name = await tmpName({ tries: 3 }); +} diff --git a/node_modules/tmp-promise/package.json b/node_modules/tmp-promise/package.json index b1daa32991..029a1f9722 100644 --- a/node_modules/tmp-promise/package.json +++ b/node_modules/tmp-promise/package.json @@ -1,13 +1,14 @@ { "name": "tmp-promise", - "version": "2.1.1", + "version": "3.0.3", "description": "The tmp package with promises support and disposers.", "main": "index.js", "types": "index.d.ts", "scripts": { "mocha": "mocha", "check-types": "tsd", - "test": "npm run mocha && npm run check-types" + "test": "npm run mocha && npm run check-types", + "publish": "node publish" }, "keywords": [ "tmp", @@ -16,18 +17,18 @@ "mkdtemp", "mktemp" ], - "author": "Benjamin Gruenbaum and collaborators.", + "author": "Benjamin Gruenbaum and Collaborators.", "license": "MIT", "repository": { "type": "git", "url": "git://github.com/benjamingr/tmp-promise.git" }, "dependencies": { - "tmp": "0.1.0" + "tmp": "^0.2.0" }, "devDependencies": { - "@types/tmp": "^0.1.0", - "mocha": "^6.1.4", - "tsd": "^0.7.2" + "@types/tmp": "^0.2.0", + "mocha": "7.1.2", + "tsd": "0.11.0" } -} \ No newline at end of file +} diff --git a/node_modules/tmp-promise/publish.js b/node_modules/tmp-promise/publish.js new file mode 100644 index 0000000000..21feefa501 --- /dev/null +++ b/node_modules/tmp-promise/publish.js @@ -0,0 +1,8 @@ +'use strict'; + +const { execSync } = require('child_process'); +const { version } = require('./package'); + +execSync('npm run test'); +execSync(`git tag v${version}`); +execSync('npm publish'); \ No newline at end of file diff --git a/node_modules/tmp-promise/test.js b/node_modules/tmp-promise/test.js index e0c69fa8fa..eb956658b9 100644 --- a/node_modules/tmp-promise/test.js +++ b/node_modules/tmp-promise/test.js @@ -1,152 +1,153 @@ -const fs = require('fs') -const {promisify} = require('util') -const assert = require('assert') -const {extname} = require('path') - -const tmp = require('.') - -async function checkFileResult(result) { - assert.deepEqual(Object.keys(result).sort(), ['cleanup', 'fd', 'path']) - - const { path, fd, cleanup } = result - assert.ok(typeof path === 'string') - assert.ok(typeof fd === 'number') - assert.ok(typeof cleanup === 'function') - - // Check that the path is a fille. - assert.ok(fs.statSync(path).isFile()) - - // Check that the fd is correct and points to the file. - const message = 'hello there!' - fs.writeSync(fd, message) - fs.fdatasyncSync(fd) - assert.equal(fs.readFileSync(path), message) - - // Check that the cleanup works. - await cleanup() - assert.throws(() => fs.statSync(path)) -} - -describe('file()', function() -{ - context('when called without options', function() - { - it('creates the file, returns the expected result, and the cleanup function works', async function() - { - const result = await tmp.file() - await checkFileResult(result) - }) - }) - - context('when called with options', function() - { - it('creates the file, returns the expected result, and the cleanup function works', async function() - { - const prefix = 'myTmpDir_' - const result = await tmp.file({ prefix }) - await checkFileResult(result) - assert.ok(result.path.includes(prefix)) - }) - }) - - it('propagates errors', async function() { - try { - await tmp.file({ dir: 'nonexistent-path' }); - throw Error('Expected to throw'); - } catch (e) { - assert.ok(e.message.startsWith('ENOENT: no such file or directory')); - } - }); -}) - -async function checkDirResult(result) { - assert.deepEqual(Object.keys(result).sort(), ['cleanup', 'path']) - - const { path, cleanup } = result - assert.ok(typeof path === 'string') - assert.ok(typeof cleanup === 'function') - - assert.ok(fs.statSync(path).isDirectory()) - - await cleanup() - assert.throws(() => fs.statSync(path)) -} - -describe('dir()', function() -{ - context('when called without options', function() - { - it('creates the directory, returns the expected result, and the cleanup function works', async function() - { - const result = await tmp.dir() - await checkDirResult(result) - }) - }) - - context('when called with options', function() - { - it('creates the directory, returns the expected result, and the cleanup function works', async function() - { - const prefix = 'myTmpDir_' - const result = await tmp.dir({ prefix }) - await checkDirResult(result) - assert.ok(result.path.includes(prefix)) - }) - }) - - it('propagates errors', async function() { - try { - await tmp.dir({ dir: 'nonexistent-path' }); - throw Error('Expected to throw'); - } catch (e) { - assert.ok(e.message.startsWith('ENOENT: no such file or directory')); - } - }); -}) - -describe('withFile()', function() -{ - it("file doesn't exist after going out of scope", function() - { - var filepath - - return tmp.withFile(function(o) - { - filepath = o.path - - fs.accessSync(filepath) - assert.strictEqual(extname(filepath), '.txt') - }, {discardDescriptor: true, postfix: '.txt'}) - .then(function() - { - assert.throws(function() - { - fs.accessSync(filepath) - }, filepath + ' still exists') - }) - }) -}) - - -describe('withDir()', function() -{ - it("dir doesn't exist after going out of scope", function() - { - var filepath - - return tmp.withDir(function(o) - { - filepath = o.path - - fs.accessSync(filepath) - assert.strictEqual(extname(filepath), '.dir') - }, {postfix: '.dir'}) - .then(function() - { - assert.throws(function() - { - fs.accessSync(filepath) - }, filepath + ' still exists') - }) - }) -}) +'use strict'; + +const fs = require('fs') +const assert = require('assert') +const { extname } = require('path') + +const tmp = require('.') + +async function checkFileResult(result) { + assert.deepEqual(Object.keys(result).sort(), ['cleanup', 'fd', 'path']) + + const { path, fd, cleanup } = result + assert.ok(typeof path === 'string') + assert.ok(typeof fd === 'number') + assert.ok(typeof cleanup === 'function') + + // Check that the path is a fille. + assert.ok(fs.statSync(path).isFile()) + + // Check that the fd is correct and points to the file. + const message = 'hello there!' + fs.writeSync(fd, message) + fs.fdatasyncSync(fd) + assert.equal(fs.readFileSync(path), message) + + // Check that the cleanup works. + await cleanup() + assert.throws(() => fs.statSync(path)) +} + +describe('file()', function() +{ + context('when called without options', function() + { + it('creates the file, returns the expected result, and the cleanup function works', async function() + { + const result = await tmp.file() + await checkFileResult(result) + }) + }) + + context('when called with options', function() + { + it('creates the file, returns the expected result, and the cleanup function works', async function() + { + const prefix = 'myTmpDir_' + const result = await tmp.file({ prefix }) + await checkFileResult(result) + assert.ok(result.path.includes(prefix)) + }) + }) + + it('propagates errors', async function() { + try { + await tmp.file({ dir: 'nonexistent-path' }); + throw Error('Expected to throw'); + } catch (e) { + assert.ok(e.message.startsWith('ENOENT: no such file or directory')); + } + }); +}) + +async function checkDirResult(result) { + assert.deepEqual(Object.keys(result).sort(), ['cleanup', 'path']) + + const { path, cleanup } = result + assert.ok(typeof path === 'string') + assert.ok(typeof cleanup === 'function') + + assert.ok(fs.statSync(path).isDirectory()) + + await cleanup() + assert.throws(() => fs.statSync(path)) +} + +describe('dir()', function() +{ + context('when called without options', function() + { + it('creates the directory, returns the expected result, and the cleanup function works', async function() + { + const result = await tmp.dir() + await checkDirResult(result) + }) + }) + + context('when called with options', function() + { + it('creates the directory, returns the expected result, and the cleanup function works', async function() + { + const prefix = 'myTmpDir_' + const result = await tmp.dir({ prefix }) + await checkDirResult(result) + assert.ok(result.path.includes(prefix)) + }) + }) + + it('propagates errors', async function() { + try { + await tmp.dir({ dir: 'nonexistent-path' }); + throw Error('Expected to throw'); + } catch (e) { + assert.ok(e.message.startsWith('ENOENT: no such file or directory')); + } + }); +}) + +describe('withFile()', function() +{ + it("file doesn't exist after going out of scope", function() + { + var filepath + + return tmp.withFile(function(o) + { + filepath = o.path + + fs.accessSync(filepath) + assert.strictEqual(extname(filepath), '.txt') + }, {discardDescriptor: true, postfix: '.txt'}) + .then(function() + { + assert.throws(function() + { + fs.accessSync(filepath) + }, filepath + ' still exists') + }) + }) +}) + + +describe('withDir()', function() +{ + it("dir doesn't exist after going out of scope", function() + { + var filepath + + return tmp.withDir(function(o) + { + filepath = o.path + + fs.accessSync(filepath) + assert.strictEqual(extname(filepath), '.dir') + }, {postfix: '.dir'}) + .then(function() + { + assert.throws(function() + { + fs.accessSync(filepath) + }, filepath + ' still exists') + }) + }) +}) diff --git a/node_modules/tmp/CHANGELOG.md b/node_modules/tmp/CHANGELOG.md new file mode 100644 index 0000000000..0aa5488224 --- /dev/null +++ b/node_modules/tmp/CHANGELOG.md @@ -0,0 +1,288 @@ + + +## v0.2.1 (2020-04-28) + +#### :rocket: Enhancement +* [#252](https://github.com/raszi/node-tmp/pull/252) Closes [#250](https://github.com/raszi/node-tmp/issues/250): introduce tmpdir option for overriding the system tmp dir ([@silkentrance](https://github.com/silkentrance)) + +#### :house: Internal +* [#253](https://github.com/raszi/node-tmp/pull/253) Closes [#191](https://github.com/raszi/node-tmp/issues/191): generate changelog from pull requests using lerna-changelog ([@silkentrance](https://github.com/silkentrance)) + +#### Committers: 1 +- Carsten Klein ([@silkentrance](https://github.com/silkentrance)) + + +## v0.2.0 (2020-04-25) + +#### :rocket: Enhancement +* [#234](https://github.com/raszi/node-tmp/pull/234) feat: stabilize tmp for v0.2.0 release ([@silkentrance](https://github.com/silkentrance)) + +#### :bug: Bug Fix +* [#231](https://github.com/raszi/node-tmp/pull/231) Closes [#230](https://github.com/raszi/node-tmp/issues/230): regression after fix for #197 ([@silkentrance](https://github.com/silkentrance)) +* [#220](https://github.com/raszi/node-tmp/pull/220) Closes [#197](https://github.com/raszi/node-tmp/issues/197): return sync callback when using the sync interface, otherwise return the async callback ([@silkentrance](https://github.com/silkentrance)) +* [#193](https://github.com/raszi/node-tmp/pull/193) Closes [#192](https://github.com/raszi/node-tmp/issues/192): tmp must not exit the process on its own ([@silkentrance](https://github.com/silkentrance)) + +#### :memo: Documentation +* [#221](https://github.com/raszi/node-tmp/pull/221) Gh 206 document name option ([@silkentrance](https://github.com/silkentrance)) + +#### :house: Internal +* [#226](https://github.com/raszi/node-tmp/pull/226) Closes [#212](https://github.com/raszi/node-tmp/issues/212): enable direct name option test ([@silkentrance](https://github.com/silkentrance)) +* [#225](https://github.com/raszi/node-tmp/pull/225) Closes [#211](https://github.com/raszi/node-tmp/issues/211): existing tests must clean up after themselves ([@silkentrance](https://github.com/silkentrance)) +* [#224](https://github.com/raszi/node-tmp/pull/224) Closes [#217](https://github.com/raszi/node-tmp/issues/217): name tests must use tmpName ([@silkentrance](https://github.com/silkentrance)) +* [#223](https://github.com/raszi/node-tmp/pull/223) Closes [#214](https://github.com/raszi/node-tmp/issues/214): refactor tests and lib ([@silkentrance](https://github.com/silkentrance)) +* [#198](https://github.com/raszi/node-tmp/pull/198) Update dependencies to latest versions ([@matsev](https://github.com/matsev)) + +#### Committers: 2 +- Carsten Klein ([@silkentrance](https://github.com/silkentrance)) +- Mattias Severson ([@matsev](https://github.com/matsev)) + + +## v0.1.0 (2019-03-20) + +#### :rocket: Enhancement +* [#177](https://github.com/raszi/node-tmp/pull/177) fix: fail early if there is no tmp dir specified ([@silkentrance](https://github.com/silkentrance)) +* [#159](https://github.com/raszi/node-tmp/pull/159) Closes [#121](https://github.com/raszi/node-tmp/issues/121) ([@silkentrance](https://github.com/silkentrance)) +* [#161](https://github.com/raszi/node-tmp/pull/161) Closes [#155](https://github.com/raszi/node-tmp/issues/155) ([@silkentrance](https://github.com/silkentrance)) +* [#166](https://github.com/raszi/node-tmp/pull/166) fix: avoid relying on Node’s internals ([@addaleax](https://github.com/addaleax)) +* [#144](https://github.com/raszi/node-tmp/pull/144) prepend opts.dir || tmpDir to template if no path is given ([@silkentrance](https://github.com/silkentrance)) + +#### :bug: Bug Fix +* [#183](https://github.com/raszi/node-tmp/pull/183) Closes [#182](https://github.com/raszi/node-tmp/issues/182) fileSync takes empty string postfix option ([@gutte](https://github.com/gutte)) +* [#130](https://github.com/raszi/node-tmp/pull/130) Closes [#129](https://github.com/raszi/node-tmp/issues/129) install process listeners safely ([@silkentrance](https://github.com/silkentrance)) + +#### :memo: Documentation +* [#188](https://github.com/raszi/node-tmp/pull/188) HOTCloses [#187](https://github.com/raszi/node-tmp/issues/187): restore behaviour for #182 ([@silkentrance](https://github.com/silkentrance)) +* [#180](https://github.com/raszi/node-tmp/pull/180) fix gh-179: template no longer accepts arbitrary paths ([@silkentrance](https://github.com/silkentrance)) +* [#175](https://github.com/raszi/node-tmp/pull/175) docs: add `unsafeCleanup` option to jsdoc ([@kerimdzhanov](https://github.com/kerimdzhanov)) +* [#151](https://github.com/raszi/node-tmp/pull/151) docs: fix link to tmp-promise ([@silkentrance](https://github.com/silkentrance)) + +#### :house: Internal +* [#184](https://github.com/raszi/node-tmp/pull/184) test: add missing tests for #182 ([@silkentrance](https://github.com/silkentrance)) +* [#171](https://github.com/raszi/node-tmp/pull/171) chore: drop old NodeJS support ([@poppinlp](https://github.com/poppinlp)) +* [#170](https://github.com/raszi/node-tmp/pull/170) chore: update dependencies ([@raszi](https://github.com/raszi)) +* [#165](https://github.com/raszi/node-tmp/pull/165) test: add missing tests ([@raszi](https://github.com/raszi)) +* [#163](https://github.com/raszi/node-tmp/pull/163) chore: add lint npm task ([@raszi](https://github.com/raszi)) +* [#107](https://github.com/raszi/node-tmp/pull/107) chore: add coverage report ([@raszi](https://github.com/raszi)) +* [#141](https://github.com/raszi/node-tmp/pull/141) test: refactor tests for mocha ([@silkentrance](https://github.com/silkentrance)) +* [#154](https://github.com/raszi/node-tmp/pull/154) chore: change Travis configuration ([@raszi](https://github.com/raszi)) +* [#152](https://github.com/raszi/node-tmp/pull/152) fix: drop Node v0.6.0 ([@raszi](https://github.com/raszi)) + +#### Committers: 6 +- Anna Henningsen ([@addaleax](https://github.com/addaleax)) +- Carsten Klein ([@silkentrance](https://github.com/silkentrance)) +- Dan Kerimdzhanov ([@kerimdzhanov](https://github.com/kerimdzhanov)) +- Gustav Klingstedt ([@gutte](https://github.com/gutte)) +- KARASZI István ([@raszi](https://github.com/raszi)) +- PoppinL ([@poppinlp](https://github.com/poppinlp)) + + +## v0.0.33 (2017-08-12) + +#### :rocket: Enhancement +* [#147](https://github.com/raszi/node-tmp/pull/147) fix: with name option try at most once to get a unique tmp name ([@silkentrance](https://github.com/silkentrance)) + +#### :bug: Bug Fix +* [#149](https://github.com/raszi/node-tmp/pull/149) fix(fileSync): must honor detachDescriptor and discardDescriptor options ([@silkentrance](https://github.com/silkentrance)) +* [#119](https://github.com/raszi/node-tmp/pull/119) Closes [#115](https://github.com/raszi/node-tmp/issues/115) ([@silkentrance](https://github.com/silkentrance)) + +#### :memo: Documentation +* [#128](https://github.com/raszi/node-tmp/pull/128) Closes [#127](https://github.com/raszi/node-tmp/issues/127) add reference to tmp-promise ([@silkentrance](https://github.com/silkentrance)) + +#### :house: Internal +* [#135](https://github.com/raszi/node-tmp/pull/135) Closes [#133](https://github.com/raszi/node-tmp/issues/133), #134 ([@silkentrance](https://github.com/silkentrance)) +* [#123](https://github.com/raszi/node-tmp/pull/123) docs: update tmp.js MIT license header to 2017 ([@madnight](https://github.com/madnight)) +* [#122](https://github.com/raszi/node-tmp/pull/122) chore: add issue template ([@silkentrance](https://github.com/silkentrance)) + +#### Committers: 2 +- Carsten Klein ([@silkentrance](https://github.com/silkentrance)) +- Fabian Beuke ([@madnight](https://github.com/madnight)) + + +## v0.0.32 (2017-03-24) + +#### :memo: Documentation +* [#106](https://github.com/raszi/node-tmp/pull/106) doc: add proper JSDoc documentation ([@raszi](https://github.com/raszi)) + +#### :house: Internal +* [#111](https://github.com/raszi/node-tmp/pull/111) test: add Windows tests ([@binki](https://github.com/binki)) +* [#110](https://github.com/raszi/node-tmp/pull/110) chore: add AppVeyor ([@binki](https://github.com/binki)) +* [#105](https://github.com/raszi/node-tmp/pull/105) chore: use const where possible ([@raszi](https://github.com/raszi)) +* [#104](https://github.com/raszi/node-tmp/pull/104) style: fix various style issues ([@raszi](https://github.com/raszi)) + +#### Committers: 2 +- KARASZI István ([@raszi](https://github.com/raszi)) +- Nathan Phillip Brink ([@binki](https://github.com/binki)) + + +## v0.0.31 (2016-11-21) + +#### :rocket: Enhancement +* [#99](https://github.com/raszi/node-tmp/pull/99) feat: add next callback functionality ([@silkentrance](https://github.com/silkentrance)) +* [#94](https://github.com/raszi/node-tmp/pull/94) feat: add options to control descriptor management ([@pabigot](https://github.com/pabigot)) + +#### :house: Internal +* [#101](https://github.com/raszi/node-tmp/pull/101) fix: Include files in the package.json ([@raszi](https://github.com/raszi)) + +#### Committers: 3 +- Carsten Klein ([@silkentrance](https://github.com/silkentrance)) +- KARASZI István ([@raszi](https://github.com/raszi)) +- Peter A. Bigot ([@pabigot](https://github.com/pabigot)) + + +## v0.0.30 (2016-11-01) + +#### :bug: Bug Fix +* [#96](https://github.com/raszi/node-tmp/pull/96) fix: constants for Node 6 ([@jnj16180340](https://github.com/jnj16180340)) +* [#98](https://github.com/raszi/node-tmp/pull/98) fix: garbage collector ([@Ari-H](https://github.com/Ari-H)) + +#### Committers: 2 +- Nate Johnson ([@jnj16180340](https://github.com/jnj16180340)) +- [@Ari-H](https://github.com/Ari-H) + + +## v0.0.29 (2016-09-18) + +#### :rocket: Enhancement +* [#87](https://github.com/raszi/node-tmp/pull/87) fix: replace calls to deprecated fs API functions ([@OlliV](https://github.com/OlliV)) + +#### :bug: Bug Fix +* [#70](https://github.com/raszi/node-tmp/pull/70) fix: prune `_removeObjects` correctly ([@joliss](https://github.com/joliss)) +* [#71](https://github.com/raszi/node-tmp/pull/71) Fix typo ([@gcampax](https://github.com/gcampax)) + +#### :memo: Documentation +* [#77](https://github.com/raszi/node-tmp/pull/77) docs: change mkstemps to mkstemp ([@thefourtheye](https://github.com/thefourtheye)) + +#### :house: Internal +* [#92](https://github.com/raszi/node-tmp/pull/92) chore: add Travis CI support for Node 6 ([@amilajack](https://github.com/amilajack)) +* [#79](https://github.com/raszi/node-tmp/pull/79) fix: remove unneeded require statement ([@whmountains](https://github.com/whmountains)) + +#### Committers: 6 +- Amila Welihinda ([@amilajack](https://github.com/amilajack)) +- Caleb Whiting ([@whmountains](https://github.com/whmountains)) +- Giovanni Campagna ([@gcampax](https://github.com/gcampax)) +- Jo Liss ([@joliss](https://github.com/joliss)) +- Olli Vanhoja ([@OlliV](https://github.com/OlliV)) +- Sakthipriyan Vairamani ([@thefourtheye](https://github.com/thefourtheye)) + + +## v0.0.28 (2015-09-27) + +#### :bug: Bug Fix +* [#63](https://github.com/raszi/node-tmp/pull/63) fix: delete for _rmdirRecursiveSync ([@voltrevo](https://github.com/voltrevo)) + +#### :memo: Documentation +* [#64](https://github.com/raszi/node-tmp/pull/64) docs: fix typo in the README ([@JTKnox91](https://github.com/JTKnox91)) + +#### :house: Internal +* [#67](https://github.com/raszi/node-tmp/pull/67) test: add node v4.0 v4.1 to travis config ([@raszi](https://github.com/raszi)) +* [#66](https://github.com/raszi/node-tmp/pull/66) chore(deps): update deps ([@raszi](https://github.com/raszi)) + +#### Committers: 3 +- Andrew Morris ([@voltrevo](https://github.com/voltrevo)) +- John T. Knox ([@JTKnox91](https://github.com/JTKnox91)) +- KARASZI István ([@raszi](https://github.com/raszi)) + + +## v0.0.27 (2015-08-15) + +#### :bug: Bug Fix +* [#60](https://github.com/raszi/node-tmp/pull/60) fix: unlinking when the file has been already removed ([@silkentrance](https://github.com/silkentrance)) + +#### :memo: Documentation +* [#55](https://github.com/raszi/node-tmp/pull/55) docs(README): update README ([@raszi](https://github.com/raszi)) + +#### :house: Internal +* [#56](https://github.com/raszi/node-tmp/pull/56) style(jshint): fix JSHint error ([@raszi](https://github.com/raszi)) +* [#53](https://github.com/raszi/node-tmp/pull/53) chore: update license attribute ([@pdehaan](https://github.com/pdehaan)) + +#### Committers: 3 +- Carsten Klein ([@silkentrance](https://github.com/silkentrance)) +- KARASZI István ([@raszi](https://github.com/raszi)) +- Peter deHaan ([@pdehaan](https://github.com/pdehaan)) + + +## v0.0.26 (2015-05-12) + +#### :rocket: Enhancement +* [#40](https://github.com/raszi/node-tmp/pull/40) Fix for #39 ([@silkentrance](https://github.com/silkentrance)) +* [#42](https://github.com/raszi/node-tmp/pull/42) Fix for #17 ([@silkentrance](https://github.com/silkentrance)) +* [#41](https://github.com/raszi/node-tmp/pull/41) Fix for #37 ([@silkentrance](https://github.com/silkentrance)) +* [#32](https://github.com/raszi/node-tmp/pull/32) add ability to customize file/dir names ([@shime](https://github.com/shime)) +* [#29](https://github.com/raszi/node-tmp/pull/29) tmp.file have responsibility to close file, not only unlink file ([@vhain](https://github.com/vhain)) + +#### :bug: Bug Fix +* [#51](https://github.com/raszi/node-tmp/pull/51) fix(windows): fix tempDir on windows ([@raszi](https://github.com/raszi)) +* [#49](https://github.com/raszi/node-tmp/pull/49) remove object from _removeObjects if cleanup fn is called Closes [#48](https://github.com/raszi/node-tmp/issues/48) ([@bmeck](https://github.com/bmeck)) + +#### :memo: Documentation +* [#45](https://github.com/raszi/node-tmp/pull/45) Fix for #44 ([@silkentrance](https://github.com/silkentrance)) + +#### :house: Internal +* [#34](https://github.com/raszi/node-tmp/pull/34) Create LICENSE ([@ScottWeinstein](https://github.com/ScottWeinstein)) + +#### Committers: 6 +- Bradley Farias ([@bmeck](https://github.com/bmeck)) +- Carsten Klein ([@silkentrance](https://github.com/silkentrance)) +- Hrvoje Šimić ([@shime](https://github.com/shime)) +- Juwan Yoo ([@vhain](https://github.com/vhain)) +- KARASZI István ([@raszi](https://github.com/raszi)) +- Scott Weinstein ([@ScottWeinstein](https://github.com/ScottWeinstein)) + + +## v0.0.24 (2014-07-11) + +#### :rocket: Enhancement +* [#25](https://github.com/raszi/node-tmp/pull/25) Added removeCallback passing ([@foxel](https://github.com/foxel)) + +#### Committers: 1 +- Andrey Kupreychik ([@foxel](https://github.com/foxel)) + + +## v0.0.23 (2013-12-03) + +#### :rocket: Enhancement +* [#21](https://github.com/raszi/node-tmp/pull/21) If we are not on node 0.8, don't register an uncaughtException handler ([@wibblymat](https://github.com/wibblymat)) + +#### Committers: 1 +- Mat Scales ([@wibblymat](https://github.com/wibblymat)) + + +## v0.0.22 (2013-11-29) + +#### :rocket: Enhancement +* [#19](https://github.com/raszi/node-tmp/pull/19) Rethrow only on node v0.8. ([@mcollina](https://github.com/mcollina)) + +#### Committers: 1 +- Matteo Collina ([@mcollina](https://github.com/mcollina)) + + +## v0.0.21 (2013-08-07) + +#### :bug: Bug Fix +* [#16](https://github.com/raszi/node-tmp/pull/16) Fix bug where we delete contents of symlinks ([@lightsofapollo](https://github.com/lightsofapollo)) + +#### Committers: 1 +- James Lal ([@lightsofapollo](https://github.com/lightsofapollo)) + + +## v0.0.17 (2013-04-09) + +#### :rocket: Enhancement +* [#9](https://github.com/raszi/node-tmp/pull/9) add recursive remove option ([@oscar-broman](https://github.com/oscar-broman)) + +#### Committers: 1 +- [@oscar-broman](https://github.com/oscar-broman) + + +## v0.0.14 (2012-08-26) + +#### :rocket: Enhancement +* [#5](https://github.com/raszi/node-tmp/pull/5) Export _getTmpName for temporary file name creation ([@joscha](https://github.com/joscha)) + +#### Committers: 1 +- Joscha Feth ([@joscha](https://github.com/joscha)) + + +## Previous Releases < v0.0.14 + +- no information available diff --git a/node_modules/tmp/README.md b/node_modules/tmp/README.md index 859a3d708f..bb20fb7be3 100644 --- a/node_modules/tmp/README.md +++ b/node_modules/tmp/README.md @@ -29,6 +29,8 @@ standard OS temporary directory, then you are free to override that as well. ## An Important Note on Compatibility +See the [CHANGELOG](./CHANGELOG.md) for more information. + ### Version 0.1.0 Since version 0.1.0, all support for node versions < 0.10.0 has been dropped. @@ -48,15 +50,6 @@ dependency to version 0.0.33. For node versions < 0.8 you must limit your node-tmp dependency to versions < 0.0.33. -### Node Versions < 8.12.0 - -The SIGINT handler will not work correctly with versions of NodeJS < 8.12.0. - -### Windows - -Signal handlers for SIGINT will not work. Pressing CTRL-C will leave behind -temporary files and directories. - ## How to install ```bash @@ -72,7 +65,7 @@ Please also check [API docs][4]. Simple temporary file creation, the file will be closed and unlinked on process exit. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); tmp.file(function _tempFileCreated(err, path, fd, cleanupCallback) { if (err) throw err; @@ -92,9 +85,9 @@ tmp.file(function _tempFileCreated(err, path, fd, cleanupCallback) { A synchronous version of the above. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); -var tmpobj = tmp.fileSync(); +const tmpobj = tmp.fileSync(); console.log('File: ', tmpobj.name); console.log('Filedescriptor: ', tmpobj.fd); @@ -115,7 +108,7 @@ Simple temporary directory creation, it will be removed on process exit. If the directory still contains items on process exit, then it won't be removed. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); tmp.dir(function _tempDirCreated(err, path, cleanupCallback) { if (err) throw err; @@ -135,9 +128,9 @@ you can pass the `unsafeCleanup` option when creating it. A synchronous version of the above. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); -var tmpobj = tmp.dirSync(); +const tmpobj = tmp.dirSync(); console.log('Dir: ', tmpobj.name); // Manual cleanup tmpobj.removeCallback(); @@ -153,7 +146,7 @@ It is possible with this library to generate a unique filename in the specified directory. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); tmp.tmpName(function _tempNameGenerated(err, path) { if (err) throw err; @@ -167,9 +160,9 @@ tmp.tmpName(function _tempNameGenerated(err, path) { A synchronous version of the above. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); -var name = tmp.tmpNameSync(); +const name = tmp.tmpNameSync(); console.log('Created temporary filename: ', name); ``` @@ -180,9 +173,9 @@ console.log('Created temporary filename: ', name); Creates a file with mode `0644`, prefix will be `prefix-` and postfix will be `.txt`. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); -tmp.file({ mode: 0644, prefix: 'prefix-', postfix: '.txt' }, function _tempFileCreated(err, path, fd) { +tmp.file({ mode: 0o644, prefix: 'prefix-', postfix: '.txt' }, function _tempFileCreated(err, path, fd) { if (err) throw err; console.log('File: ', path); @@ -195,9 +188,9 @@ tmp.file({ mode: 0644, prefix: 'prefix-', postfix: '.txt' }, function _tempFileC A synchronous version of the above. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); -var tmpobj = tmp.fileSync({ mode: 0644, prefix: 'prefix-', postfix: '.txt' }); +const tmpobj = tmp.fileSync({ mode: 0o644, prefix: 'prefix-', postfix: '.txt' }); console.log('File: ', tmpobj.name); console.log('Filedescriptor: ', tmpobj.fd); ``` @@ -219,7 +212,7 @@ descriptor. Two options control how the descriptor is managed: longer needed. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); tmp.file({ discardDescriptor: true }, function _tempFileCreated(err, path, fd, cleanupCallback) { if (err) throw err; @@ -229,7 +222,7 @@ tmp.file({ discardDescriptor: true }, function _tempFileCreated(err, path, fd, c ``` ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); tmp.file({ detachDescriptor: true }, function _tempFileCreated(err, path, fd, cleanupCallback) { if (err) throw err; @@ -246,9 +239,9 @@ tmp.file({ detachDescriptor: true }, function _tempFileCreated(err, path, fd, cl Creates a directory with mode `0755`, prefix will be `myTmpDir_`. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); -tmp.dir({ mode: 0750, prefix: 'myTmpDir_' }, function _tempDirCreated(err, path) { +tmp.dir({ mode: 0o750, prefix: 'myTmpDir_' }, function _tempDirCreated(err, path) { if (err) throw err; console.log('Dir: ', path); @@ -260,9 +253,9 @@ tmp.dir({ mode: 0750, prefix: 'myTmpDir_' }, function _tempDirCreated(err, path) Again, a synchronous version of the above. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); -var tmpobj = tmp.dirSync({ mode: 0750, prefix: 'myTmpDir_' }); +const tmpobj = tmp.dirSync({ mode: 0750, prefix: 'myTmpDir_' }); console.log('Dir: ', tmpobj.name); ``` @@ -275,7 +268,7 @@ require tmp to create your temporary filesystem object in a different place than default `tmp.tmpdir`. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); tmp.dir({ template: 'tmp-XXXXXX' }, function _tempDirCreated(err, path) { if (err) throw err; @@ -289,9 +282,9 @@ tmp.dir({ template: 'tmp-XXXXXX' }, function _tempDirCreated(err, path) { This will behave similarly to the asynchronous version. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); -var tmpobj = tmp.dirSync({ template: 'tmp-XXXXXX' }); +const tmpobj = tmp.dirSync({ template: 'tmp-XXXXXX' }); console.log('Dir: ', tmpobj.name); ``` @@ -303,9 +296,9 @@ The function accepts all standard options, e.g. `prefix`, `postfix`, `dir`, and You can also leave out the options altogether and just call the function with a callback as first parameter. ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); -var options = {}; +const options = {}; tmp.tmpName(options, function _tempNameGenerated(err, path) { if (err) throw err; @@ -320,19 +313,22 @@ The `tmpNameSync()` function works similarly to `tmpName()`. Again, you can leave out the options altogether and just invoke the function without any parameters. ```javascript -var tmp = require('tmp'); -var options = {}; -var tmpname = tmp.tmpNameSync(options); +const tmp = require('tmp'); +const options = {}; +const tmpname = tmp.tmpNameSync(options); console.log('Created temporary filename: ', tmpname); ``` ## Graceful cleanup -One may want to cleanup the temporary files even when an uncaught exception -occurs. To enforce this, you can call the `setGracefulCleanup()` method: +If graceful cleanup is set, tmp will remove all controlled temporary objects on process exit, otherwise the +temporary objects will remain in place, waiting to be cleaned up on system restart or otherwise scheduled temporary +object removal. + +To enforce this, you can call the `setGracefulCleanup()` method: ```javascript -var tmp = require('tmp'); +const tmp = require('tmp'); tmp.setGracefulCleanup(); ``` @@ -341,15 +337,26 @@ tmp.setGracefulCleanup(); All options are optional :) - * `mode`: the file mode to create with, it fallbacks to `0600` on file creation and `0700` on directory creation - * `prefix`: the optional prefix, fallbacks to `tmp-` if not provided - * `postfix`: the optional postfix, fallbacks to `.tmp` on file creation - * `template`: [`mkstemp`][3] like filename template, no default - * `dir`: the optional temporary directory, fallbacks to system default (guesses from environment) + * `name`: a fixed name that overrides random name generation, the name must be relative and must not contain path segments + * `mode`: the file mode to create with, falls back to `0o600` on file creation and `0o700` on directory creation + * `prefix`: the optional prefix, defaults to `tmp` + * `postfix`: the optional postfix + * `template`: [`mkstemp`][3] like filename template, no default, can be either an absolute or a relative path that resolves + to a relative path of the system's default temporary directory, must include `XXXXXX` once for random name generation, e.g. + 'foo/bar/XXXXXX'. Absolute paths are also fine as long as they are relative to os.tmpdir(). + Any directories along the so specified path must exist, otherwise a ENOENT error will be thrown upon access, + as tmp will not check the availability of the path, nor will it establish the requested path for you. + * `dir`: the optional temporary directory that must be relative to the system's default temporary directory. + absolute paths are fine as long as they point to a location under the system's default temporary directory. + Any directories along the so specified path must exist, otherwise a ENOENT error will be thrown upon access, + as tmp will not check the availability of the path, nor will it establish the requested path for you. + * `tmpdir`: allows you to override the system's root tmp directory * `tries`: how many times should the function try to get a unique filename before giving up, default `3` * `keep`: signals that the temporary file or directory should not be deleted on exit, default is `false` * In order to clean up, you will have to call the provided `cleanupCallback` function manually. * `unsafeCleanup`: recursively removes the created temporary directory, even when it's not empty. default is `false` + * `detachDescriptor`: detaches the file descriptor, caller is responsible for closing the file, tmp will no longer try closing the file during garbage collection + * `discardDescriptor`: discards the file descriptor (closes file, fd is -1), tmp will no longer try closing the file during garbage collection [1]: http://nodejs.org/ [2]: https://www.npmjs.com/browse/depended/tmp diff --git a/node_modules/tmp/lib/tmp.js b/node_modules/tmp/lib/tmp.js index 2bc50abb20..b41c29d4aa 100644 --- a/node_modules/tmp/lib/tmp.js +++ b/node_modules/tmp/lib/tmp.js @@ -13,9 +13,7 @@ const fs = require('fs'); const os = require('os'); const path = require('path'); const crypto = require('crypto'); -const _c = fs.constants && os.constants ? - { fs: fs.constants, os: os.constants } : - process.binding('constants'); +const _c = { fs: fs.constants, os: os.constants }; const rimraf = require('rimraf'); /* @@ -31,127 +29,25 @@ const CREATE_FLAGS = (_c.O_CREAT || _c.fs.O_CREAT) | (_c.O_EXCL || _c.fs.O_EXCL) | (_c.O_RDWR || _c.fs.O_RDWR), + // constants are off on the windows platform and will not match the actual errno codes + IS_WIN32 = os.platform() === 'win32', EBADF = _c.EBADF || _c.os.errno.EBADF, ENOENT = _c.ENOENT || _c.os.errno.ENOENT, - DIR_MODE = 448 /* 0o700 */, - FILE_MODE = 384 /* 0o600 */, + DIR_MODE = 0o700 /* 448 */, + FILE_MODE = 0o600 /* 384 */, EXIT = 'exit', - SIGINT = 'SIGINT', - // this will hold the objects need to be removed on exit - _removeObjects = []; - -var - _gracefulCleanup = false; - -/** - * Random name generator based on crypto. - * Adapted from http://blog.tompawlak.org/how-to-generate-random-values-nodejs-javascript - * - * @param {number} howMany - * @returns {string} the generated random name - * @private - */ -function _randomChars(howMany) { - var - value = [], - rnd = null; - - // make sure that we do not fail because we ran out of entropy - try { - rnd = crypto.randomBytes(howMany); - } catch (e) { - rnd = crypto.pseudoRandomBytes(howMany); - } - - for (var i = 0; i < howMany; i++) { - value.push(RANDOM_CHARS[rnd[i] % RANDOM_CHARS.length]); - } - - return value.join(''); -} - -/** - * Checks whether the `obj` parameter is defined or not. - * - * @param {Object} obj - * @returns {boolean} true if the object is undefined - * @private - */ -function _isUndefined(obj) { - return typeof obj === 'undefined'; -} - -/** - * Parses the function arguments. - * - * This function helps to have optional arguments. - * - * @param {(Options|Function)} options - * @param {Function} callback - * @returns {Array} parsed arguments - * @private - */ -function _parseArguments(options, callback) { - /* istanbul ignore else */ - if (typeof options === 'function') { - return [{}, options]; - } - - /* istanbul ignore else */ - if (_isUndefined(options)) { - return [{}, callback]; - } + _removeObjects = [], - return [options, callback]; -} + // API change in fs.rmdirSync leads to error when passing in a second parameter, e.g. the callback + FN_RMDIR_SYNC = fs.rmdirSync.bind(fs), + FN_RIMRAF_SYNC = rimraf.sync; -/** - * Generates a new temporary name. - * - * @param {Object} opts - * @returns {string} the new random name according to opts - * @private - */ -function _generateTmpName(opts) { - - const tmpDir = _getTmpDir(); - - // fail early on missing tmp dir - if (isBlank(opts.dir) && isBlank(tmpDir)) { - throw new Error('No tmp dir specified'); - } - - /* istanbul ignore else */ - if (!isBlank(opts.name)) { - return path.join(opts.dir || tmpDir, opts.name); - } - - // mkstemps like template - // opts.template has already been guarded in tmpName() below - /* istanbul ignore else */ - if (opts.template) { - var template = opts.template; - // make sure that we prepend the tmp path if none was given - /* istanbul ignore else */ - if (path.basename(template) === template) - template = path.join(opts.dir || tmpDir, template); - return template.replace(TEMPLATE_PATTERN, _randomChars(6)); - } - - // prefix and postfix - const name = [ - (isBlank(opts.prefix) ? 'tmp-' : opts.prefix), - process.pid, - _randomChars(12), - (opts.postfix ? opts.postfix : '') - ].join(''); - - return path.join(opts.dir || tmpDir, name); -} +let + _gracefulCleanup = false; /** * Gets a temporary file name. @@ -160,20 +56,18 @@ function _generateTmpName(opts) { * @param {?tmpNameCallback} callback the callback function */ function tmpName(options, callback) { - var + const args = _parseArguments(options, callback), opts = args[0], - cb = args[1], - tries = !isBlank(opts.name) ? 1 : opts.tries || DEFAULT_TRIES; - - /* istanbul ignore else */ - if (isNaN(tries) || tries < 0) - return cb(new Error('Invalid tries')); + cb = args[1]; - /* istanbul ignore else */ - if (opts.template && !opts.template.match(TEMPLATE_PATTERN)) - return cb(new Error('Invalid template provided')); + try { + _assertAndSanitizeOptions(opts); + } catch (err) { + return cb(err); + } + let tries = opts.tries; (function _getUniqueName() { try { const name = _generateTmpName(opts); @@ -204,19 +98,13 @@ function tmpName(options, callback) { * @throws {Error} if the options are invalid or could not generate a filename */ function tmpNameSync(options) { - var + const args = _parseArguments(options), - opts = args[0], - tries = !isBlank(opts.name) ? 1 : opts.tries || DEFAULT_TRIES; + opts = args[0]; - /* istanbul ignore else */ - if (isNaN(tries) || tries < 0) - throw new Error('Invalid tries'); - - /* istanbul ignore else */ - if (opts.template && !opts.template.match(TEMPLATE_PATTERN)) - throw new Error('Invalid template provided'); + _assertAndSanitizeOptions(opts); + let tries = opts.tries; do { const name = _generateTmpName(opts); try { @@ -232,11 +120,11 @@ function tmpNameSync(options) { /** * Creates and opens a temporary file. * - * @param {(Options|fileCallback)} options the config options or the callback function + * @param {(Options|null|undefined|fileCallback)} options the config options or the callback function or null or undefined * @param {?fileCallback} callback */ function file(options, callback) { - var + const args = _parseArguments(options, callback), opts = args[0], cb = args[1]; @@ -248,34 +136,20 @@ function file(options, callback) { // create and open the file fs.open(name, CREATE_FLAGS, opts.mode || FILE_MODE, function _fileCreated(err, fd) { - /* istanbul ignore else */ + /* istanbu ignore else */ if (err) return cb(err); if (opts.discardDescriptor) { - return fs.close(fd, function _discardCallback(err) { - /* istanbul ignore else */ - if (err) { - // Low probability, and the file exists, so this could be - // ignored. If it isn't we certainly need to unlink the - // file, and if that fails too its error is more - // important. - try { - fs.unlinkSync(name); - } catch (e) { - if (!isENOENT(e)) { - err = e; - } - } - return cb(err); - } - cb(null, name, undefined, _prepareTmpFileRemoveCallback(name, -1, opts)); + return fs.close(fd, function _discardCallback(possibleErr) { + // the chance of getting an error on close here is rather low and might occur in the most edgiest cases only + return cb(possibleErr, name, undefined, _prepareTmpFileRemoveCallback(name, -1, opts, false)); }); + } else { + // detachDescriptor passes the descriptor whereas discardDescriptor closes it, either way, we no longer care + // about the descriptor + const discardOrDetachDescriptor = opts.discardDescriptor || opts.detachDescriptor; + cb(null, name, fd, _prepareTmpFileRemoveCallback(name, discardOrDetachDescriptor ? -1 : fd, opts, false)); } - /* istanbul ignore else */ - if (opts.detachDescriptor) { - return cb(null, name, fd, _prepareTmpFileRemoveCallback(name, -1, opts)); - } - cb(null, name, fd, _prepareTmpFileRemoveCallback(name, fd, opts)); }); }); } @@ -288,7 +162,7 @@ function file(options, callback) { * @throws {Error} if cannot create a file */ function fileSync(options) { - var + const args = _parseArguments(options), opts = args[0]; @@ -304,7 +178,7 @@ function fileSync(options) { return { name: name, fd: fd, - removeCallback: _prepareTmpFileRemoveCallback(name, discardOrDetachDescriptor ? -1 : fd, opts) + removeCallback: _prepareTmpFileRemoveCallback(name, discardOrDetachDescriptor ? -1 : fd, opts, true) }; } @@ -315,7 +189,7 @@ function fileSync(options) { * @param {?dirCallback} callback */ function dir(options, callback) { - var + const args = _parseArguments(options, callback), opts = args[0], cb = args[1]; @@ -330,7 +204,7 @@ function dir(options, callback) { /* istanbul ignore else */ if (err) return cb(err); - cb(null, name, _prepareTmpDirRemoveCallback(name, opts)); + cb(null, name, _prepareTmpDirRemoveCallback(name, opts, false)); }); }); } @@ -343,7 +217,7 @@ function dir(options, callback) { * @throws {Error} if it cannot create a directory */ function dirSync(options) { - var + const args = _parseArguments(options), opts = args[0]; @@ -352,7 +226,7 @@ function dirSync(options) { return { name: name, - removeCallback: _prepareTmpDirRemoveCallback(name, opts) + removeCallback: _prepareTmpDirRemoveCallback(name, opts, true) }; } @@ -365,15 +239,15 @@ function dirSync(options) { */ function _removeFileAsync(fdPath, next) { const _handler = function (err) { - if (err && !isENOENT(err)) { + if (err && !_isENOENT(err)) { // reraise any unanticipated error return next(err); } next(); - } + }; if (0 <= fdPath[0]) - fs.close(fdPath[0], function (err) { + fs.close(fdPath[0], function () { fs.unlink(fdPath[1], _handler); }); else fs.unlink(fdPath[1], _handler); @@ -386,117 +260,104 @@ function _removeFileAsync(fdPath, next) { * @private */ function _removeFileSync(fdPath) { + let rethrownException = null; try { if (0 <= fdPath[0]) fs.closeSync(fdPath[0]); } catch (e) { // reraise any unanticipated error - if (!isEBADF(e) && !isENOENT(e)) throw e; + if (!_isEBADF(e) && !_isENOENT(e)) throw e; } finally { try { fs.unlinkSync(fdPath[1]); } catch (e) { // reraise any unanticipated error - if (!isENOENT(e)) throw e; + if (!_isENOENT(e)) rethrownException = e; } } + if (rethrownException !== null) { + throw rethrownException; + } } /** * Prepares the callback for removal of the temporary file. * + * Returns either a sync callback or a async callback depending on whether + * fileSync or file was called, which is expressed by the sync parameter. + * * @param {string} name the path of the file * @param {number} fd file descriptor * @param {Object} opts - * @returns {fileCallback} + * @param {boolean} sync + * @returns {fileCallback | fileCallbackSync} * @private */ -function _prepareTmpFileRemoveCallback(name, fd, opts) { - const removeCallbackSync = _prepareRemoveCallback(_removeFileSync, [fd, name]); - const removeCallback = _prepareRemoveCallback(_removeFileAsync, [fd, name], removeCallbackSync); +function _prepareTmpFileRemoveCallback(name, fd, opts, sync) { + const removeCallbackSync = _prepareRemoveCallback(_removeFileSync, [fd, name], sync); + const removeCallback = _prepareRemoveCallback(_removeFileAsync, [fd, name], sync, removeCallbackSync); if (!opts.keep) _removeObjects.unshift(removeCallbackSync); - return removeCallback; -} - -/** - * Simple wrapper for rimraf. - * - * @param {string} dirPath - * @param {Function} next - * @private - */ -function _rimrafRemoveDirWrapper(dirPath, next) { - rimraf(dirPath, next); -} - -/** - * Simple wrapper for rimraf.sync. - * - * @param {string} dirPath - * @private - */ -function _rimrafRemoveDirSyncWrapper(dirPath, next) { - try { - return next(null, rimraf.sync(dirPath)); - } catch (err) { - return next(err); - } + return sync ? removeCallbackSync : removeCallback; } /** * Prepares the callback for removal of the temporary directory. * + * Returns either a sync callback or a async callback depending on whether + * tmpFileSync or tmpFile was called, which is expressed by the sync parameter. + * * @param {string} name * @param {Object} opts + * @param {boolean} sync * @returns {Function} the callback * @private */ -function _prepareTmpDirRemoveCallback(name, opts) { - const removeFunction = opts.unsafeCleanup ? _rimrafRemoveDirWrapper : fs.rmdir.bind(fs); - const removeFunctionSync = opts.unsafeCleanup ? _rimrafRemoveDirSyncWrapper : fs.rmdirSync.bind(fs); - const removeCallbackSync = _prepareRemoveCallback(removeFunctionSync, name); - const removeCallback = _prepareRemoveCallback(removeFunction, name, removeCallbackSync); +function _prepareTmpDirRemoveCallback(name, opts, sync) { + const removeFunction = opts.unsafeCleanup ? rimraf : fs.rmdir.bind(fs); + const removeFunctionSync = opts.unsafeCleanup ? FN_RIMRAF_SYNC : FN_RMDIR_SYNC; + const removeCallbackSync = _prepareRemoveCallback(removeFunctionSync, name, sync); + const removeCallback = _prepareRemoveCallback(removeFunction, name, sync, removeCallbackSync); if (!opts.keep) _removeObjects.unshift(removeCallbackSync); - return removeCallback; + return sync ? removeCallbackSync : removeCallback; } /** * Creates a guarded function wrapping the removeFunction call. * + * The cleanup callback is save to be called multiple times. + * Subsequent invocations will be ignored. + * * @param {Function} removeFunction - * @param {Object} arg - * @returns {Function} + * @param {string} fileOrDirName + * @param {boolean} sync + * @param {cleanupCallbackSync?} cleanupCallbackSync + * @returns {cleanupCallback | cleanupCallbackSync} * @private */ -function _prepareRemoveCallback(removeFunction, arg, cleanupCallbackSync) { - var called = false; +function _prepareRemoveCallback(removeFunction, fileOrDirName, sync, cleanupCallbackSync) { + let called = false; + // if sync is true, the next parameter will be ignored return function _cleanupCallback(next) { - next = next || function () {}; + + /* istanbul ignore else */ if (!called) { + // remove cleanupCallback from cache const toRemove = cleanupCallbackSync || _cleanupCallback; const index = _removeObjects.indexOf(toRemove); /* istanbul ignore else */ if (index >= 0) _removeObjects.splice(index, 1); called = true; - // sync? - if (removeFunction.length === 1) { - try { - removeFunction(arg); - return next(null); - } - catch (err) { - // if no next is provided and since we are - // in silent cleanup mode on process exit, - // we will ignore the error - return next(err); - } - } else return removeFunction(arg, next); - } else return next(new Error('cleanup callback has already been called')); + if (sync || removeFunction === FN_RMDIR_SYNC || removeFunction === FN_RIMRAF_SYNC) { + return removeFunction(fileOrDirName); + } else { + return removeFunction(fileOrDirName, next || function() {}); + } + } }; } @@ -521,179 +382,315 @@ function _garbageCollector() { } /** - * Helper for testing against EBADF to compensate changes made to Node 7.x under Windows. + * Random name generator based on crypto. + * Adapted from http://blog.tompawlak.org/how-to-generate-random-values-nodejs-javascript + * + * @param {number} howMany + * @returns {string} the generated random name + * @private */ -function isEBADF(error) { - return isExpectedError(error, -EBADF, 'EBADF'); +function _randomChars(howMany) { + let + value = [], + rnd = null; + + // make sure that we do not fail because we ran out of entropy + try { + rnd = crypto.randomBytes(howMany); + } catch (e) { + rnd = crypto.pseudoRandomBytes(howMany); + } + + for (var i = 0; i < howMany; i++) { + value.push(RANDOM_CHARS[rnd[i] % RANDOM_CHARS.length]); + } + + return value.join(''); } /** - * Helper for testing against ENOENT to compensate changes made to Node 7.x under Windows. + * Helper which determines whether a string s is blank, that is undefined, or empty or null. + * + * @private + * @param {string} s + * @returns {Boolean} true whether the string s is blank, false otherwise */ -function isENOENT(error) { - return isExpectedError(error, -ENOENT, 'ENOENT'); +function _isBlank(s) { + return s === null || _isUndefined(s) || !s.trim(); } /** - * Helper to determine whether the expected error code matches the actual code and errno, - * which will differ between the supported node versions. - * - * - Node >= 7.0: - * error.code {string} - * error.errno {string|number} any numerical value will be negated + * Checks whether the `obj` parameter is defined or not. * - * - Node >= 6.0 < 7.0: - * error.code {string} - * error.errno {number} negated + * @param {Object} obj + * @returns {boolean} true if the object is undefined + * @private + */ +function _isUndefined(obj) { + return typeof obj === 'undefined'; +} + +/** + * Parses the function arguments. * - * - Node >= 4.0 < 6.0: introduces SystemError - * error.code {string} - * error.errno {number} negated + * This function helps to have optional arguments. * - * - Node >= 0.10 < 4.0: - * error.code {number} negated - * error.errno n/a + * @param {(Options|null|undefined|Function)} options + * @param {?Function} callback + * @returns {Array} parsed arguments + * @private */ -function isExpectedError(error, code, errno) { - return error.code === code || error.code === errno; +function _parseArguments(options, callback) { + /* istanbul ignore else */ + if (typeof options === 'function') { + return [{}, options]; + } + + /* istanbul ignore else */ + if (_isUndefined(options)) { + return [{}, callback]; + } + + // copy options so we do not leak the changes we make internally + const actualOptions = {}; + for (const key of Object.getOwnPropertyNames(options)) { + actualOptions[key] = options[key]; + } + + return [actualOptions, callback]; } /** - * Helper which determines whether a string s is blank, that is undefined, or empty or null. + * Generates a new temporary name. * + * @param {Object} opts + * @returns {string} the new random name according to opts * @private - * @param {string} s - * @returns {Boolean} true whether the string s is blank, false otherwise */ -function isBlank(s) { - return s === null || s === undefined || !s.trim(); +function _generateTmpName(opts) { + + const tmpDir = opts.tmpdir; + + /* istanbul ignore else */ + if (!_isUndefined(opts.name)) + return path.join(tmpDir, opts.dir, opts.name); + + /* istanbul ignore else */ + if (!_isUndefined(opts.template)) + return path.join(tmpDir, opts.dir, opts.template).replace(TEMPLATE_PATTERN, _randomChars(6)); + + // prefix and postfix + const name = [ + opts.prefix ? opts.prefix : 'tmp', + '-', + process.pid, + '-', + _randomChars(12), + opts.postfix ? '-' + opts.postfix : '' + ].join(''); + + return path.join(tmpDir, opts.dir, name); } /** - * Sets the graceful cleanup. + * Asserts whether the specified options are valid, also sanitizes options and provides sane defaults for missing + * options. + * + * @param {Options} options + * @private */ -function setGracefulCleanup() { - _gracefulCleanup = true; +function _assertAndSanitizeOptions(options) { + + options.tmpdir = _getTmpDir(options); + + const tmpDir = options.tmpdir; + + /* istanbul ignore else */ + if (!_isUndefined(options.name)) + _assertIsRelative(options.name, 'name', tmpDir); + /* istanbul ignore else */ + if (!_isUndefined(options.dir)) + _assertIsRelative(options.dir, 'dir', tmpDir); + /* istanbul ignore else */ + if (!_isUndefined(options.template)) { + _assertIsRelative(options.template, 'template', tmpDir); + if (!options.template.match(TEMPLATE_PATTERN)) + throw new Error(`Invalid template, found "${options.template}".`); + } + /* istanbul ignore else */ + if (!_isUndefined(options.tries) && isNaN(options.tries) || options.tries < 0) + throw new Error(`Invalid tries, found "${options.tries}".`); + + // if a name was specified we will try once + options.tries = _isUndefined(options.name) ? options.tries || DEFAULT_TRIES : 1; + options.keep = !!options.keep; + options.detachDescriptor = !!options.detachDescriptor; + options.discardDescriptor = !!options.discardDescriptor; + options.unsafeCleanup = !!options.unsafeCleanup; + + // sanitize dir, also keep (multiple) blanks if the user, purportedly sane, requests us to + options.dir = _isUndefined(options.dir) ? '' : path.relative(tmpDir, _resolvePath(options.dir, tmpDir)); + options.template = _isUndefined(options.template) ? undefined : path.relative(tmpDir, _resolvePath(options.template, tmpDir)); + // sanitize further if template is relative to options.dir + options.template = _isBlank(options.template) ? undefined : path.relative(options.dir, options.template); + + // for completeness' sake only, also keep (multiple) blanks if the user, purportedly sane, requests us to + options.name = _isUndefined(options.name) ? undefined : _sanitizeName(options.name); + options.prefix = _isUndefined(options.prefix) ? '' : options.prefix; + options.postfix = _isUndefined(options.postfix) ? '' : options.postfix; } /** - * Returns the currently configured tmp dir from os.tmpdir(). + * Resolve the specified path name in respect to tmpDir. + * + * The specified name might include relative path components, e.g. ../ + * so we need to resolve in order to be sure that is is located inside tmpDir * + * @param name + * @param tmpDir + * @returns {string} * @private - * @returns {string} the currently configured tmp dir */ -function _getTmpDir() { - return os.tmpdir(); +function _resolvePath(name, tmpDir) { + const sanitizedName = _sanitizeName(name); + if (sanitizedName.startsWith(tmpDir)) { + return path.resolve(sanitizedName); + } else { + return path.resolve(path.join(tmpDir, sanitizedName)); + } } /** - * If there are multiple different versions of tmp in place, make sure that - * we recognize the old listeners. + * Sanitize the specified path name by removing all quote characters. * - * @param {Function} listener + * @param name + * @returns {string} * @private - * @returns {Boolean} true whether listener is a legacy listener */ -function _is_legacy_listener(listener) { - return (listener.name === '_exit' || listener.name === '_uncaughtExceptionThrown') - && listener.toString().indexOf('_garbageCollector();') > -1; +function _sanitizeName(name) { + if (_isBlank(name)) { + return name; + } + return name.replace(/["']/g, ''); } /** - * Safely install SIGINT listener. - * - * NOTE: this will only work on OSX and Linux. + * Asserts whether specified name is relative to the specified tmpDir. * + * @param {string} name + * @param {string} option + * @param {string} tmpDir + * @throws {Error} * @private */ -function _safely_install_sigint_listener() { - - const listeners = process.listeners(SIGINT); - const existingListeners = []; - for (let i = 0, length = listeners.length; i < length; i++) { - const lstnr = listeners[i]; - /* istanbul ignore else */ - if (lstnr.name === '_tmp$sigint_listener') { - existingListeners.push(lstnr); - process.removeListener(SIGINT, lstnr); - } +function _assertIsRelative(name, option, tmpDir) { + if (option === 'name') { + // assert that name is not absolute and does not contain a path + if (path.isAbsolute(name)) + throw new Error(`${option} option must not contain an absolute path, found "${name}".`); + // must not fail on valid . or .. or similar such constructs + let basename = path.basename(name); + if (basename === '..' || basename === '.' || basename !== name) + throw new Error(`${option} option must not contain a path, found "${name}".`); } - process.on(SIGINT, function _tmp$sigint_listener(doExit) { - for (let i = 0, length = existingListeners.length; i < length; i++) { - // let the existing listener do the garbage collection (e.g. jest sandbox) - try { - existingListeners[i](false); - } catch (err) { - // ignore - } - } - try { - // force the garbage collector even it is called again in the exit listener - _garbageCollector(); - } finally { - if (!!doExit) { - process.exit(0); - } + else { // if (option === 'dir' || option === 'template') { + // assert that dir or template are relative to tmpDir + if (path.isAbsolute(name) && !name.startsWith(tmpDir)) { + throw new Error(`${option} option must be relative to "${tmpDir}", found "${name}".`); } - }); + let resolvedPath = _resolvePath(name, tmpDir); + if (!resolvedPath.startsWith(tmpDir)) + throw new Error(`${option} option must be relative to "${tmpDir}", found "${resolvedPath}".`); + } } /** - * Safely install process exit listener. + * Helper for testing against EBADF to compensate changes made to Node 7.x under Windows. * * @private */ -function _safely_install_exit_listener() { - const listeners = process.listeners(EXIT); +function _isEBADF(error) { + return _isExpectedError(error, -EBADF, 'EBADF'); +} - // collect any existing listeners - const existingListeners = []; - for (let i = 0, length = listeners.length; i < length; i++) { - const lstnr = listeners[i]; - /* istanbul ignore else */ - // TODO: remove support for legacy listeners once release 1.0.0 is out - if (lstnr.name === '_tmp$safe_listener' || _is_legacy_listener(lstnr)) { - // we must forget about the uncaughtException listener, hopefully it is ours - if (lstnr.name !== '_uncaughtExceptionThrown') { - existingListeners.push(lstnr); - } - process.removeListener(EXIT, lstnr); - } - } - // TODO: what was the data parameter good for? - process.addListener(EXIT, function _tmp$safe_listener(data) { - for (let i = 0, length = existingListeners.length; i < length; i++) { - // let the existing listener do the garbage collection (e.g. jest sandbox) - try { - existingListeners[i](data); - } catch (err) { - // ignore - } - } - _garbageCollector(); - }); +/** + * Helper for testing against ENOENT to compensate changes made to Node 7.x under Windows. + * + * @private + */ +function _isENOENT(error) { + return _isExpectedError(error, -ENOENT, 'ENOENT'); } -_safely_install_exit_listener(); -_safely_install_sigint_listener(); +/** + * Helper to determine whether the expected error code matches the actual code and errno, + * which will differ between the supported node versions. + * + * - Node >= 7.0: + * error.code {string} + * error.errno {number} any numerical value will be negated + * + * CAVEAT + * + * On windows, the errno for EBADF is -4083 but os.constants.errno.EBADF is different and we must assume that ENOENT + * is no different here. + * + * @param {SystemError} error + * @param {number} errno + * @param {string} code + * @private + */ +function _isExpectedError(error, errno, code) { + return IS_WIN32 ? error.code === code : error.code === code && error.errno === errno; +} + +/** + * Sets the graceful cleanup. + * + * If graceful cleanup is set, tmp will remove all controlled temporary objects on process exit, otherwise the + * temporary objects will remain in place, waiting to be cleaned up on system restart or otherwise scheduled temporary + * object removals. + */ +function setGracefulCleanup() { + _gracefulCleanup = true; +} + +/** + * Returns the currently configured tmp dir from os.tmpdir(). + * + * @private + * @param {?Options} options + * @returns {string} the currently configured tmp dir + */ +function _getTmpDir(options) { + return path.resolve(_sanitizeName(options && options.tmpdir || os.tmpdir())); +} + +// Install process exit listener +process.addListener(EXIT, _garbageCollector); /** * Configuration options. * * @typedef {Object} Options + * @property {?boolean} keep the temporary object (file or dir) will not be garbage collected * @property {?number} tries the number of tries before give up the name generation + * @property (?int) mode the access mode, defaults are 0o700 for directories and 0o600 for files * @property {?string} template the "mkstemp" like filename template - * @property {?string} name fix name - * @property {?string} dir the tmp directory to use + * @property {?string} name fixed name relative to tmpdir or the specified dir option + * @property {?string} dir tmp directory relative to the root tmp directory in use * @property {?string} prefix prefix for the generated name * @property {?string} postfix postfix for the generated name + * @property {?string} tmpdir the root tmp directory which overrides the os tmpdir * @property {?boolean} unsafeCleanup recursively removes the created temporary directory, even when it's not empty + * @property {?boolean} detachDescriptor detaches the file descriptor, caller is responsible for closing the file, tmp will no longer try closing the file during garbage collection + * @property {?boolean} discardDescriptor discards the file descriptor (closes file, fd is -1), tmp will no longer try closing the file during garbage collection */ /** * @typedef {Object} FileSyncObject * @property {string} name the name of the file - * @property {string} fd the file descriptor + * @property {string} fd the file descriptor or -1 if the fd has been discarded * @property {fileCallback} removeCallback the callback function to remove the file */ @@ -713,10 +710,18 @@ _safely_install_sigint_listener(); * @callback fileCallback * @param {?Error} err the error object if anything goes wrong * @param {string} name the temporary file name - * @param {number} fd the file descriptor + * @param {number} fd the file descriptor or -1 if the fd had been discarded * @param {cleanupCallback} fn the cleanup callback function */ +/** + * @callback fileCallbackSync + * @param {?Error} err the error object if anything goes wrong + * @param {string} name the temporary file name + * @param {number} fd the file descriptor or -1 if the fd had been discarded + * @param {cleanupCallbackSync} fn the cleanup callback function + */ + /** * @callback dirCallback * @param {?Error} err the error object if anything goes wrong @@ -724,11 +729,24 @@ _safely_install_sigint_listener(); * @param {cleanupCallback} fn the cleanup callback function */ +/** + * @callback dirCallbackSync + * @param {?Error} err the error object if anything goes wrong + * @param {string} name the temporary file name + * @param {cleanupCallbackSync} fn the cleanup callback function + */ + /** * Removes the temporary created file or directory. * * @callback cleanupCallback - * @param {simpleCallback} [next] function to call after entry was removed + * @param {simpleCallback} [next] function to call whenever the tmp object needs to be removed + */ + +/** + * Removes the temporary created file or directory. + * + * @callback cleanupCallbackSync */ /** @@ -740,7 +758,7 @@ _safely_install_sigint_listener(); // exporting all the needed methods -// evaluate os.tmpdir() lazily, mainly for simplifying testing but it also will +// evaluate _getTmpDir() lazily, mainly for simplifying testing but it also will // allow users to reconfigure the temporary directory Object.defineProperty(module.exports, 'tmpdir', { enumerable: true, diff --git a/node_modules/tmp/node_modules/.bin/rimraf b/node_modules/tmp/node_modules/.bin/rimraf deleted file mode 120000 index 4cd49a49dd..0000000000 --- a/node_modules/tmp/node_modules/.bin/rimraf +++ /dev/null @@ -1 +0,0 @@ -../rimraf/bin.js \ No newline at end of file diff --git a/node_modules/tmp/node_modules/rimraf/LICENSE b/node_modules/tmp/node_modules/rimraf/LICENSE deleted file mode 100644 index 19129e315f..0000000000 --- a/node_modules/tmp/node_modules/rimraf/LICENSE +++ /dev/null @@ -1,15 +0,0 @@ -The ISC License - -Copyright (c) Isaac Z. Schlueter and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/node_modules/tmp/node_modules/rimraf/README.md b/node_modules/tmp/node_modules/rimraf/README.md deleted file mode 100644 index 423b8cf854..0000000000 --- a/node_modules/tmp/node_modules/rimraf/README.md +++ /dev/null @@ -1,101 +0,0 @@ -[![Build Status](https://travis-ci.org/isaacs/rimraf.svg?branch=master)](https://travis-ci.org/isaacs/rimraf) [![Dependency Status](https://david-dm.org/isaacs/rimraf.svg)](https://david-dm.org/isaacs/rimraf) [![devDependency Status](https://david-dm.org/isaacs/rimraf/dev-status.svg)](https://david-dm.org/isaacs/rimraf#info=devDependencies) - -The [UNIX command](http://en.wikipedia.org/wiki/Rm_(Unix)) `rm -rf` for node. - -Install with `npm install rimraf`, or just drop rimraf.js somewhere. - -## API - -`rimraf(f, [opts], callback)` - -The first parameter will be interpreted as a globbing pattern for files. If you -want to disable globbing you can do so with `opts.disableGlob` (defaults to -`false`). This might be handy, for instance, if you have filenames that contain -globbing wildcard characters. - -The callback will be called with an error if there is one. Certain -errors are handled for you: - -* Windows: `EBUSY` and `ENOTEMPTY` - rimraf will back off a maximum of - `opts.maxBusyTries` times before giving up, adding 100ms of wait - between each attempt. The default `maxBusyTries` is 3. -* `ENOENT` - If the file doesn't exist, rimraf will return - successfully, since your desired outcome is already the case. -* `EMFILE` - Since `readdir` requires opening a file descriptor, it's - possible to hit `EMFILE` if too many file descriptors are in use. - In the sync case, there's nothing to be done for this. But in the - async case, rimraf will gradually back off with timeouts up to - `opts.emfileWait` ms, which defaults to 1000. - -## options - -* unlink, chmod, stat, lstat, rmdir, readdir, - unlinkSync, chmodSync, statSync, lstatSync, rmdirSync, readdirSync - - In order to use a custom file system library, you can override - specific fs functions on the options object. - - If any of these functions are present on the options object, then - the supplied function will be used instead of the default fs - method. - - Sync methods are only relevant for `rimraf.sync()`, of course. - - For example: - - ```javascript - var myCustomFS = require('some-custom-fs') - - rimraf('some-thing', myCustomFS, callback) - ``` - -* maxBusyTries - - If an `EBUSY`, `ENOTEMPTY`, or `EPERM` error code is encountered - on Windows systems, then rimraf will retry with a linear backoff - wait of 100ms longer on each try. The default maxBusyTries is 3. - - Only relevant for async usage. - -* emfileWait - - If an `EMFILE` error is encountered, then rimraf will retry - repeatedly with a linear backoff of 1ms longer on each try, until - the timeout counter hits this max. The default limit is 1000. - - If you repeatedly encounter `EMFILE` errors, then consider using - [graceful-fs](http://npm.im/graceful-fs) in your program. - - Only relevant for async usage. - -* glob - - Set to `false` to disable [glob](http://npm.im/glob) pattern - matching. - - Set to an object to pass options to the glob module. The default - glob options are `{ nosort: true, silent: true }`. - - Glob version 6 is used in this module. - - Relevant for both sync and async usage. - -* disableGlob - - Set to any non-falsey value to disable globbing entirely. - (Equivalent to setting `glob: false`.) - -## rimraf.sync - -It can remove stuff synchronously, too. But that's not so good. Use -the async API. It's better. - -## CLI - -If installed with `npm install rimraf -g` it can be used as a global -command `rimraf [ ...]` which is useful for cross platform support. - -## mkdirp - -If you need to create a directory recursively, check out -[mkdirp](https://github.com/substack/node-mkdirp). diff --git a/node_modules/tmp/node_modules/rimraf/bin.js b/node_modules/tmp/node_modules/rimraf/bin.js deleted file mode 100755 index 0d1e17be70..0000000000 --- a/node_modules/tmp/node_modules/rimraf/bin.js +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env node - -var rimraf = require('./') - -var help = false -var dashdash = false -var noglob = false -var args = process.argv.slice(2).filter(function(arg) { - if (dashdash) - return !!arg - else if (arg === '--') - dashdash = true - else if (arg === '--no-glob' || arg === '-G') - noglob = true - else if (arg === '--glob' || arg === '-g') - noglob = false - else if (arg.match(/^(-+|\/)(h(elp)?|\?)$/)) - help = true - else - return !!arg -}) - -if (help || args.length === 0) { - // If they didn't ask for help, then this is not a "success" - var log = help ? console.log : console.error - log('Usage: rimraf [ ...]') - log('') - log(' Deletes all files and folders at "path" recursively.') - log('') - log('Options:') - log('') - log(' -h, --help Display this usage info') - log(' -G, --no-glob Do not expand glob patterns in arguments') - log(' -g, --glob Expand glob patterns in arguments (default)') - process.exit(help ? 0 : 1) -} else - go(0) - -function go (n) { - if (n >= args.length) - return - var options = {} - if (noglob) - options = { glob: false } - rimraf(args[n], options, function (er) { - if (er) - throw er - go(n+1) - }) -} diff --git a/node_modules/tmp/node_modules/rimraf/package.json b/node_modules/tmp/node_modules/rimraf/package.json deleted file mode 100644 index d87e8f258d..0000000000 --- a/node_modules/tmp/node_modules/rimraf/package.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "rimraf", - "version": "2.7.1", - "main": "rimraf.js", - "description": "A deep deletion module for node (like `rm -rf`)", - "author": "Isaac Z. Schlueter (http://blog.izs.me/)", - "license": "ISC", - "repository": "git://github.com/isaacs/rimraf.git", - "scripts": { - "preversion": "npm test", - "postversion": "npm publish", - "postpublish": "git push origin --all; git push origin --tags", - "test": "tap test/*.js" - }, - "bin": "./bin.js", - "dependencies": { - "glob": "^7.1.3" - }, - "files": [ - "LICENSE", - "README.md", - "bin.js", - "rimraf.js" - ], - "devDependencies": { - "mkdirp": "^0.5.1", - "tap": "^12.1.1" - } -} \ No newline at end of file diff --git a/node_modules/tmp/node_modules/rimraf/rimraf.js b/node_modules/tmp/node_modules/rimraf/rimraf.js deleted file mode 100644 index a90ad029f3..0000000000 --- a/node_modules/tmp/node_modules/rimraf/rimraf.js +++ /dev/null @@ -1,372 +0,0 @@ -module.exports = rimraf -rimraf.sync = rimrafSync - -var assert = require("assert") -var path = require("path") -var fs = require("fs") -var glob = undefined -try { - glob = require("glob") -} catch (_err) { - // treat glob as optional. -} -var _0666 = parseInt('666', 8) - -var defaultGlobOpts = { - nosort: true, - silent: true -} - -// for EMFILE handling -var timeout = 0 - -var isWindows = (process.platform === "win32") - -function defaults (options) { - var methods = [ - 'unlink', - 'chmod', - 'stat', - 'lstat', - 'rmdir', - 'readdir' - ] - methods.forEach(function(m) { - options[m] = options[m] || fs[m] - m = m + 'Sync' - options[m] = options[m] || fs[m] - }) - - options.maxBusyTries = options.maxBusyTries || 3 - options.emfileWait = options.emfileWait || 1000 - if (options.glob === false) { - options.disableGlob = true - } - if (options.disableGlob !== true && glob === undefined) { - throw Error('glob dependency not found, set `options.disableGlob = true` if intentional') - } - options.disableGlob = options.disableGlob || false - options.glob = options.glob || defaultGlobOpts -} - -function rimraf (p, options, cb) { - if (typeof options === 'function') { - cb = options - options = {} - } - - assert(p, 'rimraf: missing path') - assert.equal(typeof p, 'string', 'rimraf: path should be a string') - assert.equal(typeof cb, 'function', 'rimraf: callback function required') - assert(options, 'rimraf: invalid options argument provided') - assert.equal(typeof options, 'object', 'rimraf: options should be object') - - defaults(options) - - var busyTries = 0 - var errState = null - var n = 0 - - if (options.disableGlob || !glob.hasMagic(p)) - return afterGlob(null, [p]) - - options.lstat(p, function (er, stat) { - if (!er) - return afterGlob(null, [p]) - - glob(p, options.glob, afterGlob) - }) - - function next (er) { - errState = errState || er - if (--n === 0) - cb(errState) - } - - function afterGlob (er, results) { - if (er) - return cb(er) - - n = results.length - if (n === 0) - return cb() - - results.forEach(function (p) { - rimraf_(p, options, function CB (er) { - if (er) { - if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") && - busyTries < options.maxBusyTries) { - busyTries ++ - var time = busyTries * 100 - // try again, with the same exact callback as this one. - return setTimeout(function () { - rimraf_(p, options, CB) - }, time) - } - - // this one won't happen if graceful-fs is used. - if (er.code === "EMFILE" && timeout < options.emfileWait) { - return setTimeout(function () { - rimraf_(p, options, CB) - }, timeout ++) - } - - // already gone - if (er.code === "ENOENT") er = null - } - - timeout = 0 - next(er) - }) - }) - } -} - -// Two possible strategies. -// 1. Assume it's a file. unlink it, then do the dir stuff on EPERM or EISDIR -// 2. Assume it's a directory. readdir, then do the file stuff on ENOTDIR -// -// Both result in an extra syscall when you guess wrong. However, there -// are likely far more normal files in the world than directories. This -// is based on the assumption that a the average number of files per -// directory is >= 1. -// -// If anyone ever complains about this, then I guess the strategy could -// be made configurable somehow. But until then, YAGNI. -function rimraf_ (p, options, cb) { - assert(p) - assert(options) - assert(typeof cb === 'function') - - // sunos lets the root user unlink directories, which is... weird. - // so we have to lstat here and make sure it's not a dir. - options.lstat(p, function (er, st) { - if (er && er.code === "ENOENT") - return cb(null) - - // Windows can EPERM on stat. Life is suffering. - if (er && er.code === "EPERM" && isWindows) - fixWinEPERM(p, options, er, cb) - - if (st && st.isDirectory()) - return rmdir(p, options, er, cb) - - options.unlink(p, function (er) { - if (er) { - if (er.code === "ENOENT") - return cb(null) - if (er.code === "EPERM") - return (isWindows) - ? fixWinEPERM(p, options, er, cb) - : rmdir(p, options, er, cb) - if (er.code === "EISDIR") - return rmdir(p, options, er, cb) - } - return cb(er) - }) - }) -} - -function fixWinEPERM (p, options, er, cb) { - assert(p) - assert(options) - assert(typeof cb === 'function') - if (er) - assert(er instanceof Error) - - options.chmod(p, _0666, function (er2) { - if (er2) - cb(er2.code === "ENOENT" ? null : er) - else - options.stat(p, function(er3, stats) { - if (er3) - cb(er3.code === "ENOENT" ? null : er) - else if (stats.isDirectory()) - rmdir(p, options, er, cb) - else - options.unlink(p, cb) - }) - }) -} - -function fixWinEPERMSync (p, options, er) { - assert(p) - assert(options) - if (er) - assert(er instanceof Error) - - try { - options.chmodSync(p, _0666) - } catch (er2) { - if (er2.code === "ENOENT") - return - else - throw er - } - - try { - var stats = options.statSync(p) - } catch (er3) { - if (er3.code === "ENOENT") - return - else - throw er - } - - if (stats.isDirectory()) - rmdirSync(p, options, er) - else - options.unlinkSync(p) -} - -function rmdir (p, options, originalEr, cb) { - assert(p) - assert(options) - if (originalEr) - assert(originalEr instanceof Error) - assert(typeof cb === 'function') - - // try to rmdir first, and only readdir on ENOTEMPTY or EEXIST (SunOS) - // if we guessed wrong, and it's not a directory, then - // raise the original error. - options.rmdir(p, function (er) { - if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")) - rmkids(p, options, cb) - else if (er && er.code === "ENOTDIR") - cb(originalEr) - else - cb(er) - }) -} - -function rmkids(p, options, cb) { - assert(p) - assert(options) - assert(typeof cb === 'function') - - options.readdir(p, function (er, files) { - if (er) - return cb(er) - var n = files.length - if (n === 0) - return options.rmdir(p, cb) - var errState - files.forEach(function (f) { - rimraf(path.join(p, f), options, function (er) { - if (errState) - return - if (er) - return cb(errState = er) - if (--n === 0) - options.rmdir(p, cb) - }) - }) - }) -} - -// this looks simpler, and is strictly *faster*, but will -// tie up the JavaScript thread and fail on excessively -// deep directory trees. -function rimrafSync (p, options) { - options = options || {} - defaults(options) - - assert(p, 'rimraf: missing path') - assert.equal(typeof p, 'string', 'rimraf: path should be a string') - assert(options, 'rimraf: missing options') - assert.equal(typeof options, 'object', 'rimraf: options should be object') - - var results - - if (options.disableGlob || !glob.hasMagic(p)) { - results = [p] - } else { - try { - options.lstatSync(p) - results = [p] - } catch (er) { - results = glob.sync(p, options.glob) - } - } - - if (!results.length) - return - - for (var i = 0; i < results.length; i++) { - var p = results[i] - - try { - var st = options.lstatSync(p) - } catch (er) { - if (er.code === "ENOENT") - return - - // Windows can EPERM on stat. Life is suffering. - if (er.code === "EPERM" && isWindows) - fixWinEPERMSync(p, options, er) - } - - try { - // sunos lets the root user unlink directories, which is... weird. - if (st && st.isDirectory()) - rmdirSync(p, options, null) - else - options.unlinkSync(p) - } catch (er) { - if (er.code === "ENOENT") - return - if (er.code === "EPERM") - return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er) - if (er.code !== "EISDIR") - throw er - - rmdirSync(p, options, er) - } - } -} - -function rmdirSync (p, options, originalEr) { - assert(p) - assert(options) - if (originalEr) - assert(originalEr instanceof Error) - - try { - options.rmdirSync(p) - } catch (er) { - if (er.code === "ENOENT") - return - if (er.code === "ENOTDIR") - throw originalEr - if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM") - rmkidsSync(p, options) - } -} - -function rmkidsSync (p, options) { - assert(p) - assert(options) - options.readdirSync(p).forEach(function (f) { - rimrafSync(path.join(p, f), options) - }) - - // We only end up here once we got ENOTEMPTY at least once, and - // at this point, we are guaranteed to have removed all the kids. - // So, we know that it won't be ENOENT or ENOTDIR or anything else. - // try really hard to delete stuff on windows, because it has a - // PROFOUNDLY annoying habit of not closing handles promptly when - // files are deleted, resulting in spurious ENOTEMPTY errors. - var retries = isWindows ? 100 : 1 - var i = 0 - do { - var threw = true - try { - var ret = options.rmdirSync(p, options) - threw = false - return ret - } finally { - if (++i < retries && threw) - continue - } - } while (true) -} diff --git a/node_modules/tmp/package.json b/node_modules/tmp/package.json index d43847e467..d98a9108f3 100644 --- a/node_modules/tmp/package.json +++ b/node_modules/tmp/package.json @@ -1,8 +1,11 @@ { "name": "tmp", - "version": "0.1.0", + "version": "0.2.1", "description": "Temporary file and directory creator", "author": "KARASZI István (http://raszi.hu/)", + "contributors": [ + "Carsten Klein (https://github.com/silkentrance)" + ], "keywords": [ "temporary", "tmp", @@ -13,31 +16,43 @@ "tmpfile" ], "license": "MIT", - "repository": "raszi/node-tmp", + "repository": "https://github.com/raszi/node-tmp.git", "homepage": "http://github.com/raszi/node-tmp", "bugs": { "url": "http://github.com/raszi/node-tmp/issues" }, "engines": { - "node": ">=6" + "node": ">=8.17.0" }, "dependencies": { - "rimraf": "^2.6.3" + "rimraf": "^3.0.0" }, "devDependencies": { - "eslint": "^4.19.1", - "eslint-plugin-mocha": "^5.0.0", + "eslint": "^6.3.0", + "eslint-plugin-mocha": "^6.1.1", "istanbul": "^0.4.5", - "mocha": "^5.1.1" + "lerna-changelog": "^1.0.1", + "mocha": "^6.2.0" }, "main": "lib/tmp.js", "files": [ "lib/" ], + "changelog": { + "labels": { + "breaking": ":boom: Breaking Change", + "enhancement": ":rocket: Enhancement", + "bug": ":bug: Bug Fix", + "documentation": ":memo: Documentation", + "internal": ":house: Internal" + }, + "cacheDir": ".changelog" + }, "scripts": { + "changelog": "lerna-changelog", "lint": "eslint lib --env mocha test", "clean": "rm -Rf ./coverage", "test": "npm run clean && istanbul cover ./node_modules/mocha/bin/_mocha --report none --print none --dir ./coverage/json -u exports -R test/*-test.js && istanbul report --root ./coverage/json html && istanbul report text-summary", "doc": "jsdoc -c .jsdoc.json" } -} \ No newline at end of file +} diff --git a/node_modules/to-regex-range/package.json b/node_modules/to-regex-range/package.json index 54d82acdef..4ef194f352 100644 --- a/node_modules/to-regex-range/package.json +++ b/node_modules/to-regex-range/package.json @@ -85,4 +85,4 @@ ] } } -} \ No newline at end of file +} diff --git a/node_modules/tr46/package.json b/node_modules/tr46/package.json index d0936a3668..b6826da1f7 100644 --- a/node_modules/tr46/package.json +++ b/node_modules/tr46/package.json @@ -28,4 +28,4 @@ "mocha": "^2.2.5", "request": "^2.57.0" } -} \ No newline at end of file +} diff --git a/node_modules/tsconfig-paths/package.json b/node_modules/tsconfig-paths/package.json index d9a433a2cf..0a0b49adfd 100644 --- a/node_modules/tsconfig-paths/package.json +++ b/node_modules/tsconfig-paths/package.json @@ -60,4 +60,4 @@ "git add" ] } -} \ No newline at end of file +} diff --git a/node_modules/tslib/package.json b/node_modules/tslib/package.json index 3f9a9bc013..7c5d3da0c8 100644 --- a/node_modules/tslib/package.json +++ b/node_modules/tslib/package.json @@ -34,4 +34,4 @@ }, "./": "./" } -} \ No newline at end of file +} diff --git a/node_modules/tslib/test/validateModuleExportsMatchCommonJS/package.json b/node_modules/tslib/test/validateModuleExportsMatchCommonJS/package.json index 3580cfee9f..166e5095e4 100644 --- a/node_modules/tslib/test/validateModuleExportsMatchCommonJS/package.json +++ b/node_modules/tslib/test/validateModuleExportsMatchCommonJS/package.json @@ -3,4 +3,4 @@ "scripts": { "test": "node index.js" } -} \ No newline at end of file +} diff --git a/node_modules/tsutils/package.json b/node_modules/tsutils/package.json index 9ba8ab31cd..1bd9dbdc10 100644 --- a/node_modules/tsutils/package.json +++ b/node_modules/tsutils/package.json @@ -60,4 +60,4 @@ "engines": { "node": ">= 6" } -} \ No newline at end of file +} diff --git a/node_modules/type-check/package.json b/node_modules/type-check/package.json index 8fbc39b195..2a57ea0643 100644 --- a/node_modules/type-check/package.json +++ b/node_modules/type-check/package.json @@ -36,4 +36,4 @@ "mocha": "^7.1.1", "browserify": "^16.5.1" } -} \ No newline at end of file +} diff --git a/node_modules/type-detect/package.json b/node_modules/type-detect/package.json index 71d9abd195..31623e92b9 100644 --- a/node_modules/type-detect/package.json +++ b/node_modules/type-detect/package.json @@ -99,4 +99,4 @@ "node": ">=4" }, "version": "4.0.8" -} \ No newline at end of file +} diff --git a/node_modules/type-fest/package.json b/node_modules/type-fest/package.json index af7c6379c9..b266a27154 100644 --- a/node_modules/type-fest/package.json +++ b/node_modules/type-fest/package.json @@ -55,4 +55,4 @@ "node/no-unsupported-features/es-builtins": "off" } } -} \ No newline at end of file +} diff --git a/node_modules/typedarray-to-buffer/package.json b/node_modules/typedarray-to-buffer/package.json index 208763783f..5ec5656157 100644 --- a/node_modules/typedarray-to-buffer/package.json +++ b/node_modules/typedarray-to-buffer/package.json @@ -47,4 +47,4 @@ "test-browser-local": "airtap --local -- test/*.js", "test-node": "tape test/*.js" } -} \ No newline at end of file +} diff --git a/node_modules/typescript/package.json b/node_modules/typescript/package.json index 70fbd1eb44..00e9a90a3e 100644 --- a/node_modules/typescript/package.json +++ b/node_modules/typescript/package.json @@ -130,4 +130,4 @@ "volta": { "node": "14.15.5" } -} \ No newline at end of file +} diff --git a/node_modules/unbox-primitive/package.json b/node_modules/unbox-primitive/package.json index 90bcfc2e77..02058f0e79 100644 --- a/node_modules/unbox-primitive/package.json +++ b/node_modules/unbox-primitive/package.json @@ -61,4 +61,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/universal-user-agent/package.json b/node_modules/universal-user-agent/package.json index 242a304dc0..ac3e658ea7 100644 --- a/node_modules/universal-user-agent/package.json +++ b/node_modules/universal-user-agent/package.json @@ -28,4 +28,4 @@ "types": "dist-types/index.d.ts", "main": "dist-node/index.js", "module": "dist-web/index.js" -} \ No newline at end of file +} diff --git a/node_modules/universalify/package.json b/node_modules/universalify/package.json index 21f0e6cc0e..321b192858 100644 --- a/node_modules/universalify/package.json +++ b/node_modules/universalify/package.json @@ -31,4 +31,4 @@ "engines": { "node": ">= 4.0.0" } -} \ No newline at end of file +} diff --git a/node_modules/uri-js/package.json b/node_modules/uri-js/package.json index 8a409cacdf..de95d91aa1 100755 --- a/node_modules/uri-js/package.json +++ b/node_modules/uri-js/package.json @@ -74,4 +74,4 @@ "dependencies": { "punycode": "^2.1.0" } -} \ No newline at end of file +} diff --git a/node_modules/util/package.json b/node_modules/util/package.json index 3ea19135d7..13d19a0f72 100644 --- a/node_modules/util/package.json +++ b/node_modules/util/package.json @@ -32,4 +32,4 @@ "browser": { "./support/isBuffer.js": "./support/isBufferBrowser.js" } -} \ No newline at end of file +} diff --git a/node_modules/uuid/package.json b/node_modules/uuid/package.json index c48ce06fd2..f0ab3711ee 100644 --- a/node_modules/uuid/package.json +++ b/node_modules/uuid/package.json @@ -132,4 +132,4 @@ "postchangelog": "prettier --write CHANGELOG.md" } } -} \ No newline at end of file +} diff --git a/node_modules/v8-compile-cache/package.json b/node_modules/v8-compile-cache/package.json index 78b4df4aa2..f65bd6a736 100644 --- a/node_modules/v8-compile-cache/package.json +++ b/node_modules/v8-compile-cache/package.json @@ -30,4 +30,4 @@ "temp": "^0.8.3", "yarn": "0.20.3" } -} \ No newline at end of file +} diff --git a/node_modules/validate-npm-package-license/package.json b/node_modules/validate-npm-package-license/package.json index 06ebbfc746..9e92af4f44 100644 --- a/node_modules/validate-npm-package-license/package.json +++ b/node_modules/validate-npm-package-license/package.json @@ -25,4 +25,4 @@ "scripts": { "test": "defence README.md | replace-require-self | node" } -} \ No newline at end of file +} diff --git a/node_modules/webidl-conversions/package.json b/node_modules/webidl-conversions/package.json index 80422e41cf..c31bc074cd 100644 --- a/node_modules/webidl-conversions/package.json +++ b/node_modules/webidl-conversions/package.json @@ -20,4 +20,4 @@ "devDependencies": { "mocha": "^1.21.4" } -} \ No newline at end of file +} diff --git a/node_modules/well-known-symbols/package.json b/node_modules/well-known-symbols/package.json index 3506ecbc26..ff2e8cbf80 100644 --- a/node_modules/well-known-symbols/package.json +++ b/node_modules/well-known-symbols/package.json @@ -46,4 +46,4 @@ ] }, "standard-engine": "@novemberborn/as-i-preach" -} \ No newline at end of file +} diff --git a/node_modules/whatwg-url/package.json b/node_modules/whatwg-url/package.json index 5f09d4296f..fce35ae717 100644 --- a/node_modules/whatwg-url/package.json +++ b/node_modules/whatwg-url/package.json @@ -29,4 +29,4 @@ "pretest": "node scripts/get-latest-platform-tests.js && npm run build", "test": "mocha" } -} \ No newline at end of file +} diff --git a/node_modules/which-boxed-primitive/package.json b/node_modules/which-boxed-primitive/package.json index 0cd7bd7873..cfd8735b87 100644 --- a/node_modules/which-boxed-primitive/package.json +++ b/node_modules/which-boxed-primitive/package.json @@ -62,4 +62,4 @@ "backfillLimit": false, "hideCredit": true } -} \ No newline at end of file +} diff --git a/node_modules/which/package.json b/node_modules/which/package.json index 33ce9eed86..97ad7fbabc 100644 --- a/node_modules/which/package.json +++ b/node_modules/which/package.json @@ -40,4 +40,4 @@ "engines": { "node": ">= 8" } -} \ No newline at end of file +} diff --git a/node_modules/word-wrap/package.json b/node_modules/word-wrap/package.json index 675ba69912..6f8f633c47 100644 --- a/node_modules/word-wrap/package.json +++ b/node_modules/word-wrap/package.json @@ -74,4 +74,4 @@ "verb-generate-readme" ] } -} \ No newline at end of file +} diff --git a/node_modules/wrap-ansi/node_modules/ansi-styles/package.json b/node_modules/wrap-ansi/node_modules/ansi-styles/package.json index ec506b2fd5..71ec137ec1 100644 --- a/node_modules/wrap-ansi/node_modules/ansi-styles/package.json +++ b/node_modules/wrap-ansi/node_modules/ansi-styles/package.json @@ -53,4 +53,4 @@ "tsd": "^0.11.0", "xo": "^0.25.3" } -} \ No newline at end of file +} diff --git a/node_modules/wrap-ansi/node_modules/color-convert/package.json b/node_modules/wrap-ansi/node_modules/color-convert/package.json index d169f869b2..6e48000c7c 100644 --- a/node_modules/wrap-ansi/node_modules/color-convert/package.json +++ b/node_modules/wrap-ansi/node_modules/color-convert/package.json @@ -45,4 +45,4 @@ "dependencies": { "color-name": "~1.1.4" } -} \ No newline at end of file +} diff --git a/node_modules/wrap-ansi/node_modules/color-name/package.json b/node_modules/wrap-ansi/node_modules/color-name/package.json index fecb8dcfb6..7acc90285c 100644 --- a/node_modules/wrap-ansi/node_modules/color-name/package.json +++ b/node_modules/wrap-ansi/node_modules/color-name/package.json @@ -25,4 +25,4 @@ "url": "https://github.com/colorjs/color-name/issues" }, "homepage": "https://github.com/colorjs/color-name" -} \ No newline at end of file +} diff --git a/node_modules/wrap-ansi/package.json b/node_modules/wrap-ansi/package.json index 0e9cb08e05..b376704ec3 100644 --- a/node_modules/wrap-ansi/package.json +++ b/node_modules/wrap-ansi/package.json @@ -59,4 +59,4 @@ "nyc": "^15.0.1", "xo": "^0.29.1" } -} \ No newline at end of file +} diff --git a/node_modules/wrappy/package.json b/node_modules/wrappy/package.json index 277d8831b5..1307520467 100644 --- a/node_modules/wrappy/package.json +++ b/node_modules/wrappy/package.json @@ -26,4 +26,4 @@ "url": "https://github.com/npm/wrappy/issues" }, "homepage": "https://github.com/npm/wrappy" -} \ No newline at end of file +} diff --git a/node_modules/write-file-atomic/package.json b/node_modules/write-file-atomic/package.json index 58ff19175c..98a29a0534 100644 --- a/node_modules/write-file-atomic/package.json +++ b/node_modules/write-file-atomic/package.json @@ -45,4 +45,4 @@ "tap": { "100": true } -} \ No newline at end of file +} diff --git a/node_modules/y18n/package.json b/node_modules/y18n/package.json index c92fe0c523..4e5c1ca602 100644 --- a/node_modules/y18n/package.json +++ b/node_modules/y18n/package.json @@ -67,4 +67,4 @@ "build" ] } -} \ No newline at end of file +} diff --git a/node_modules/yallist/package.json b/node_modules/yallist/package.json index 12a38b7bdb..8a083867d7 100644 --- a/node_modules/yallist/package.json +++ b/node_modules/yallist/package.json @@ -26,4 +26,4 @@ }, "author": "Isaac Z. Schlueter (http://blog.izs.me/)", "license": "ISC" -} \ No newline at end of file +} diff --git a/node_modules/yargs-parser/package.json b/node_modules/yargs-parser/package.json index ecd9127d65..c4b03225e9 100644 --- a/node_modules/yargs-parser/package.json +++ b/node_modules/yargs-parser/package.json @@ -85,4 +85,4 @@ "build" ] } -} \ No newline at end of file +} diff --git a/node_modules/yargs/helpers/package.json b/node_modules/yargs/helpers/package.json index c9a4422614..5bbefffbab 100644 --- a/node_modules/yargs/helpers/package.json +++ b/node_modules/yargs/helpers/package.json @@ -1,3 +1,3 @@ { "type": "commonjs" -} \ No newline at end of file +} diff --git a/node_modules/yargs/package.json b/node_modules/yargs/package.json index af9fa41a70..2c69bc76c3 100644 --- a/node_modules/yargs/package.json +++ b/node_modules/yargs/package.json @@ -113,4 +113,4 @@ "engines": { "node": ">=12" } -} \ No newline at end of file +} diff --git a/node_modules/yocto-queue/package.json b/node_modules/yocto-queue/package.json index b361e6ae78..1e1533693b 100644 --- a/node_modules/yocto-queue/package.json +++ b/node_modules/yocto-queue/package.json @@ -43,4 +43,4 @@ "tsd": "^0.17.0", "xo": "^0.44.0" } -} \ No newline at end of file +} diff --git a/node_modules/zlib/package.json b/node_modules/zlib/package.json index 5fa94d1812..4cdcc5855d 100644 --- a/node_modules/zlib/package.json +++ b/node_modules/zlib/package.json @@ -17,4 +17,4 @@ } ], "main": "./lib/zlib" -} \ No newline at end of file +} diff --git a/package-lock.json b/package-lock.json index 94791d4ac8..99ba01ab96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "codeql", - "version": "1.1.3", + "version": "1.1.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "codeql", - "version": "1.1.3", + "version": "1.1.4", "license": "MIT", "dependencies": { - "@actions/artifact": "^0.5.2", + "@actions/artifact": "^1.0.0", "@actions/core": "^1.4.0", "@actions/exec": "^1.1.0", "@actions/github": "^4.0.0", @@ -52,21 +52,20 @@ "eslint-plugin-no-async-foreach": "^0.1.1", "micromatch": "4.0.4", "nock": "^13.1.1", - "removeNPMAbsolutePaths": "2.0.0", + "removeNPMAbsolutePaths": "3.0.0", "sinon": "^13.0.0", "typescript": "^4.4.2" } }, "node_modules/@actions/artifact": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-0.5.2.tgz", - "integrity": "sha512-q/r8WSqyxBJ0ffLCRrtjCBTGnAYqP+ID4yG7f7YSlhrQ4thNg/d+Tq9f1YkLPKX46ZR97OWtGDY+oU/nxcqvLw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-1.0.0.tgz", + "integrity": "sha512-oje+cCiM2maVwoiN+LT9kh2C6UqiTcS1tDKins+nRfckX+C8JJD2kAmzpD5fn/p5Dibjrqk1mtwreAzgNxHrDg==", "dependencies": { "@actions/core": "^1.2.6", "@actions/http-client": "^1.0.11", - "@types/tmp": "^0.1.0", - "tmp": "^0.1.0", - "tmp-promise": "^2.0.2" + "tmp": "^0.2.1", + "tmp-promise": "^3.0.2" } }, "node_modules/@actions/core": { @@ -554,10 +553,6 @@ "@sinonjs/fake-timers": "^7.1.0" } }, - "node_modules/@types/tmp": { - "version": "0.1.0", - "integrity": "sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==" - }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "4.28.5", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.5.tgz", @@ -4414,8 +4409,9 @@ } }, "node_modules/removeNPMAbsolutePaths": { - "version": "2.0.0", - "integrity": "sha512-Hea7U6iJcD0NE/aqBqxBMPKeKaxjqMNyTTajmH2dH9hhafJ9Tem5r4UeJK8+BdE1MK9lqoOYqNM0Sq9rl1OIbQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/removeNPMAbsolutePaths/-/removeNPMAbsolutePaths-3.0.0.tgz", + "integrity": "sha512-g4DIbk+xI8YC1RafmVKaPyMcuQlKZ8N7RQMUvRv+YLHNw1PhyFtjsC6WBaiTCfDKFGQhBaRSc0b0qUjPeCdIdQ==", "dev": true, "bin": { "removeNPMAbsolutePaths": "bin/removeNPMAbsolutePaths" @@ -4986,30 +4982,22 @@ } }, "node_modules/tmp": { - "version": "0.1.0", - "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "dependencies": { - "rimraf": "^2.6.3" + "rimraf": "^3.0.0" }, "engines": { - "node": ">=6" + "node": ">=8.17.0" } }, "node_modules/tmp-promise": { - "version": "2.1.1", - "integrity": "sha512-Z048AOz/w9b6lCbJUpevIJpRpUztENl8zdv1bmAKVHimfqRFl92ROkmT9rp7TVBnrEw2gtMTol/2Cp2S2kJa4Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", + "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", "dependencies": { - "tmp": "0.1.0" - } - }, - "node_modules/tmp/node_modules/rimraf": { - "version": "2.7.1", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" + "tmp": "^0.2.0" } }, "node_modules/to-regex-range": { @@ -5368,15 +5356,14 @@ }, "dependencies": { "@actions/artifact": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-0.5.2.tgz", - "integrity": "sha512-q/r8WSqyxBJ0ffLCRrtjCBTGnAYqP+ID4yG7f7YSlhrQ4thNg/d+Tq9f1YkLPKX46ZR97OWtGDY+oU/nxcqvLw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-1.0.0.tgz", + "integrity": "sha512-oje+cCiM2maVwoiN+LT9kh2C6UqiTcS1tDKins+nRfckX+C8JJD2kAmzpD5fn/p5Dibjrqk1mtwreAzgNxHrDg==", "requires": { "@actions/core": "^1.2.6", "@actions/http-client": "^1.0.11", - "@types/tmp": "^0.1.0", - "tmp": "^0.1.0", - "tmp-promise": "^2.0.2" + "tmp": "^0.2.1", + "tmp-promise": "^3.0.2" } }, "@actions/core": { @@ -5833,10 +5820,6 @@ "@sinonjs/fake-timers": "^7.1.0" } }, - "@types/tmp": { - "version": "0.1.0", - "integrity": "sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==" - }, "@typescript-eslint/eslint-plugin": { "version": "4.28.5", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.5.tgz", @@ -8556,8 +8539,9 @@ "dev": true }, "removeNPMAbsolutePaths": { - "version": "2.0.0", - "integrity": "sha512-Hea7U6iJcD0NE/aqBqxBMPKeKaxjqMNyTTajmH2dH9hhafJ9Tem5r4UeJK8+BdE1MK9lqoOYqNM0Sq9rl1OIbQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/removeNPMAbsolutePaths/-/removeNPMAbsolutePaths-3.0.0.tgz", + "integrity": "sha512-g4DIbk+xI8YC1RafmVKaPyMcuQlKZ8N7RQMUvRv+YLHNw1PhyFtjsC6WBaiTCfDKFGQhBaRSc0b0qUjPeCdIdQ==", "dev": true }, "require-directory": { @@ -8977,26 +8961,19 @@ "dev": true }, "tmp": { - "version": "0.1.0", - "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "requires": { - "rimraf": "^2.6.3" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "requires": { - "glob": "^7.1.3" - } - } + "rimraf": "^3.0.0" } }, "tmp-promise": { - "version": "2.1.1", - "integrity": "sha512-Z048AOz/w9b6lCbJUpevIJpRpUztENl8zdv1bmAKVHimfqRFl92ROkmT9rp7TVBnrEw2gtMTol/2Cp2S2kJa4Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", + "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", "requires": { - "tmp": "0.1.0" + "tmp": "^0.2.0" } }, "to-regex-range": { diff --git a/package.json b/package.json index bb21de1f7f..71a5dc88de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "1.1.3", + "version": "1.1.4", "private": true, "description": "CodeQL action", "scripts": { @@ -22,7 +22,7 @@ }, "license": "MIT", "dependencies": { - "@actions/artifact": "^0.5.2", + "@actions/artifact": "^1.0.0", "@actions/core": "^1.4.0", "@actions/exec": "^1.1.0", "@actions/github": "^4.0.0", @@ -68,7 +68,7 @@ "eslint-plugin-no-async-foreach": "^0.1.1", "micromatch": "4.0.4", "nock": "^13.1.1", - "removeNPMAbsolutePaths": "2.0.0", + "removeNPMAbsolutePaths": "3.0.0", "sinon": "^13.0.0", "typescript": "^4.4.2" }, diff --git a/pr-checks/checks/analyze-ref-input.yml b/pr-checks/checks/analyze-ref-input.yml index 34876f198b..88714c955e 100644 --- a/pr-checks/checks/analyze-ref-input.yml +++ b/pr-checks/checks/analyze-ref-input.yml @@ -1,8 +1,5 @@ name: "Analyze: 'ref' and 'sha' from inputs" description: "Checks that specifying 'ref' and 'sha' as inputs works" -# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of -# `windows-latest`. -os: [ubuntu-latest, macos-latest, windows-2019] steps: - uses: ./../action/init with: diff --git a/pr-checks/checks/go-custom-queries.yml b/pr-checks/checks/go-custom-queries.yml index b0e1cfdd0f..c17b9348a8 100644 --- a/pr-checks/checks/go-custom-queries.yml +++ b/pr-checks/checks/go-custom-queries.yml @@ -1,8 +1,5 @@ name: "Go: Custom queries" description: "Checks that Go works in conjunction with a config file specifying custom queries" -# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of -# `windows-latest`. -os: [ubuntu-latest, macos-latest, windows-2019] steps: - uses: actions/setup-go@v2 with: diff --git a/pr-checks/checks/go-custom-tracing.yml b/pr-checks/checks/go-custom-tracing.yml index 1205dce0b3..d503134925 100644 --- a/pr-checks/checks/go-custom-tracing.yml +++ b/pr-checks/checks/go-custom-tracing.yml @@ -1,8 +1,5 @@ name: "Go: Custom tracing" description: "Checks that Go tracing works" -# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of -# `windows-latest`. -os: [ubuntu-latest, macos-latest, windows-2019] env: CODEQL_EXTRACTOR_GO_BUILD_TRACING: "true" steps: diff --git a/pr-checks/checks/remote-config.yml b/pr-checks/checks/remote-config.yml index 5ee2f6b0e2..68f053a4bc 100644 --- a/pr-checks/checks/remote-config.yml +++ b/pr-checks/checks/remote-config.yml @@ -1,8 +1,5 @@ name: "Remote config file" description: "Checks that specifying packages using only a config file works" -# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of -# `windows-latest`. -os: [ubuntu-latest, macos-latest, windows-2019] steps: - uses: ./../action/init with: diff --git a/pr-checks/checks/upload-ref-sha-input.yml b/pr-checks/checks/upload-ref-sha-input.yml index 717781e650..b04ea977ce 100644 --- a/pr-checks/checks/upload-ref-sha-input.yml +++ b/pr-checks/checks/upload-ref-sha-input.yml @@ -1,8 +1,5 @@ name: "Upload-sarif: 'ref' and 'sha' from inputs" description: "Checks that specifying 'ref' and 'sha' as inputs works" -# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of -# `windows-latest`. -os: [ubuntu-latest, macos-latest, windows-2019] steps: - uses: ./../action/init with: diff --git a/pr-checks/sync.py b/pr-checks/sync.py index 20e8ee5255..481017f022 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -15,7 +15,7 @@ # A nightly build directly from the our private repo, built in the last 24 hours. "nightly-latest" ] -defaultOperatingSystems = ["ubuntu-latest", "macos-latest", "windows-latest"] +defaultOperatingSystems = ["ubuntu-latest", "macos-latest", "windows-2019"] header = """# Warning: This file is generated automatically, and should not be modified. # Instead, please modify the template in the pr-checks directory and run: # pip install ruamel.yaml && python3 sync.py @@ -62,11 +62,26 @@ def writeHeader(checkStream): ] steps.extend(checkSpecification['steps']) + matrix = [] + for version in versions: + for os in operatingSystems: + matrix.append({ + 'os': os, + 'version': version + }) + if (version == 'latest' or version == 'nightly-latest') and os == 'windows-2019': + # New versions of the CLI should also work with Windows Server 2022. + # Once all versions of the CLI that we test against work with Windows Server 2022, + # we should remove this logic and instead just add windows-2022 to the test matrix. + matrix.append({ + 'os': 'windows-2022', + 'version': version + }) + checkJob = { 'strategy': { 'matrix': { - 'version': versions, - 'os': operatingSystems + 'include': matrix } }, 'name': checkSpecification['name'], diff --git a/runner/package-lock.json b/runner/package-lock.json index 4c7bcc0e9f..4e96b176d2 100644 --- a/runner/package-lock.json +++ b/runner/package-lock.json @@ -1,6 +1,6 @@ { "name": "codeql-runner", - "version": "1.1.3", + "version": "1.1.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/runner/package.json b/runner/package.json index d068176d33..16d29040c4 100644 --- a/runner/package.json +++ b/runner/package.json @@ -1,6 +1,6 @@ { "name": "codeql-runner", - "version": "1.1.3", + "version": "1.1.4", "private": true, "description": "CodeQL runner", "scripts": { diff --git a/src/actions-util.ts b/src/actions-util.ts index 2776635672..66b91b15bf 100644 --- a/src/actions-util.ts +++ b/src/actions-util.ts @@ -1,4 +1,5 @@ import * as fs from "fs"; +import * as os from "os"; import * as path from "path"; import * as core from "@actions/core"; @@ -596,6 +597,12 @@ export interface StatusReportBase { cause?: string; /** Stack trace of the failure (or undefined if status is not failure). */ exception?: string; + /** Action runner operating system (context runner.os). */ + runner_os: string; + /** Action runner hardware architecture (context runner.arch). */ + runner_arch: string; + /** Action runner operating system release (x.y.z from os.release()). */ + runner_os_release?: string; } export function getActionsStatus( @@ -643,6 +650,9 @@ export async function createStatusReportBase( workflowStartedAt ); } + const runnerOs = getRequiredEnvParam("RUNNER_OS"); + const runnerArch = getRequiredEnvParam("RUNNER_ARCH"); + // If running locally then the GITHUB_ACTION_REF cannot be trusted as it may be for the previous action // See https://github.com/actions/runner/issues/803 const actionRef = isRunningLocalAction() @@ -662,6 +672,8 @@ export async function createStatusReportBase( started_at: workflowStartedAt, action_started_at: actionStartedAt.toISOString(), status, + runner_os: runnerOs, + runner_arch: runnerArch, }; // Add optional parameters @@ -683,6 +695,9 @@ export async function createStatusReportBase( if (matrix) { statusReport.matrix_vars = matrix; } + if (runnerOs === "Windows" || runnerOs === "macOS") { + statusReport.runner_os_release = os.release(); + } return statusReport; } diff --git a/src/analyze.ts b/src/analyze.ts index 3eb3bd28b3..91f98b63c1 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -423,7 +423,19 @@ export async function runFinalize( delete process.env[sharedEnv.ODASA_TRACER_CONFIGURATION]; } - fs.mkdirSync(outputDir, { recursive: true }); + // After switching to Node16, this entire block can be replaced with `await fs.promises.rm(outputDir, { recursive: true, force: true });`. + try { + await fs.promises.rmdir(outputDir, { + recursive: true, + maxRetries: 5, + retryDelay: 2000, + } as any); + } catch (error: any) { + if (error?.code !== "ENOENT") { + throw error; + } + } + await fs.promises.mkdir(outputDir, { recursive: true }); await finalizeDatabaseCreation(config, threadsFlag, memoryFlag, logger); } diff --git a/src/codeql.ts b/src/codeql.ts index 1a7cece2b5..fb32adf94c 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -4,12 +4,13 @@ import * as path from "path"; import * as toolrunner from "@actions/exec/lib/toolrunner"; import { IHeaders } from "@actions/http-client/interfaces"; import { default as deepEqual } from "fast-deep-equal"; +import * as yaml from "js-yaml"; import { default as queryString } from "query-string"; import * as semver from "semver"; import { isRunningLocalAction, getRelativeScriptPath } from "./actions-util"; import * as api from "./api-client"; -import { PackWithVersion } from "./config-utils"; +import { Config, PackWithVersion } from "./config-utils"; import * as defaults from "./defaults.json"; // Referenced from codeql-action-sync-tool! import { errorMatchers } from "./error-matcher"; import { isTracedLanguage, Language } from "./languages"; @@ -80,8 +81,7 @@ export interface CodeQL { * Run 'codeql database init --db-cluster'. */ databaseInitCluster( - databasePath: string, - languages: Language[], + config: Config, sourceRoot: string, processName: string | undefined, processLevel: number | undefined @@ -220,6 +220,7 @@ const CODEQL_VERSION_GROUP_RULES = "2.5.5"; const CODEQL_VERSION_SARIF_GROUP = "2.5.3"; export const CODEQL_VERSION_COUNTS_LINES = "2.6.2"; const CODEQL_VERSION_CUSTOM_QUERY_HELP = "2.7.1"; +const CODEQL_VERSION_CONFIG_FILES = "2.8.2"; // Versions before 2.8.2 weren't tolerant to unknown properties export const CODEQL_VERSION_ML_POWERED_QUERIES = "2.7.5"; /** @@ -692,26 +693,35 @@ async function getCodeQLForCmd( ]); }, async databaseInitCluster( - databasePath: string, - languages: Language[], + config: Config, sourceRoot: string, processName: string | undefined, processLevel: number | undefined ) { - const extraArgs = languages.map((language) => `--language=${language}`); - if (languages.filter(isTracedLanguage).length > 0) { + const extraArgs = config.languages.map( + (language) => `--language=${language}` + ); + if (config.languages.filter(isTracedLanguage).length > 0) { extraArgs.push("--begin-tracing"); if (processName !== undefined) { extraArgs.push(`--trace-process-name=${processName}`); } else { + // We default to 3 if no other arguments are provided since this was the default + // behaviour of the Runner. Note this path never happens in the CodeQL Action + // because that always passes in a process name. extraArgs.push(`--trace-process-level=${processLevel || 3}`); } } + if (await util.codeQlVersionAbove(codeql, CODEQL_VERSION_CONFIG_FILES)) { + const configLocation = path.resolve(config.tempDir, "user-config.yaml"); + fs.writeFileSync(configLocation, yaml.dump(config.originalUserInput)); + extraArgs.push(`--codescanning-config=${configLocation}`); + } await runTool(cmd, [ "database", "init", "--db-cluster", - databasePath, + config.dbLocation, `--source-root=${sourceRoot}`, ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"]), @@ -864,7 +874,9 @@ async function getCodeQLForCmd( if (extraSearchPath !== undefined) { codeqlArgs.push("--additional-packs", extraSearchPath); } - codeqlArgs.push(querySuitePath); + if (!(await util.codeQlVersionAbove(this, CODEQL_VERSION_CONFIG_FILES))) { + codeqlArgs.push(querySuitePath); + } await runTool(cmd, codeqlArgs); }, async databaseInterpretResults( @@ -899,7 +911,10 @@ async function getCodeQLForCmd( ) { codeqlArgs.push("--sarif-category", automationDetailsId); } - codeqlArgs.push(databasePath, ...querySuitePaths); + codeqlArgs.push(databasePath); + if (!(await util.codeQlVersionAbove(this, CODEQL_VERSION_CONFIG_FILES))) { + codeqlArgs.push(...querySuitePaths); + } // capture stdout, which contains analysis summaries return await runTool(cmd, codeqlArgs); }, diff --git a/src/defaults.json b/src/defaults.json index 1abe669874..890769db93 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,3 +1,3 @@ { - "bundleVersion": "codeql-bundle-20220214" + "bundleVersion": "codeql-bundle-20220224" } diff --git a/src/init-action.ts b/src/init-action.ts index 5ea9d45b1e..0bcf5b1fcb 100644 --- a/src/init-action.ts +++ b/src/init-action.ts @@ -23,7 +23,7 @@ import { installPythonDeps, runInit, } from "./init"; -import { isTracedLanguage, Language } from "./languages"; +import { Language } from "./languages"; import { getActionsLogger } from "./logging"; import { parseRepositoryNwo } from "./repository"; import { @@ -38,7 +38,6 @@ import { getThreadsFlagValue, DEFAULT_DEBUG_ARTIFACT_NAME, DEFAULT_DEBUG_DATABASE_NAME, - checkNotWindows11, getMlPoweredJsQueriesStatus, } from "./util"; @@ -198,11 +197,6 @@ async function run() { logger ); - if (config.languages.some(isTracedLanguage)) { - // We currently do not support tracing on Windows 11 and Windows Server 2022 - checkNotWindows11(); - } - if ( config.languages.includes(Language.python) && getRequiredInput("setup-python-dependencies") === "true" diff --git a/src/init.ts b/src/init.ts index 69a9e8c489..46afbcfe0f 100644 --- a/src/init.ts +++ b/src/init.ts @@ -95,8 +95,7 @@ export async function runInit( if (await codeQlVersionAbove(codeql, CODEQL_VERSION_NEW_TRACING)) { // Init a database cluster await codeql.databaseInitCluster( - config.dbLocation, - config.languages, + config, sourceRoot, processName, processLevel diff --git a/src/util.ts b/src/util.ts index 239938722f..083cbcb00b 100644 --- a/src/util.ts +++ b/src/util.ts @@ -630,14 +630,6 @@ export function isGoodVersion(versionSpec: string) { return !BROKEN_VERSIONS.includes(versionSpec); } -export function checkNotWindows11() { - if (os.platform() === "win32" && semver.gte(os.release(), "10.0.20348")) { - throw new Error( - "Tracing builds with CodeQL is currently not supported on Windows 11 and Windows Server 2022. Please modify your Actions workflow to use an earlier version of Windows for this job, for example by setting `runs-on: windows-2019`." - ); - } -} - /** * The ML-powered JS query pack to add to the analysis if a repo is opted into the ML-powered * queries beta.