Skip to content

Commit

Permalink
Merge pull request #150 from no23reason/uuid7
Browse files Browse the repository at this point in the history
build(deps): upgrade uuid to v7
  • Loading branch information
no23reason authored Feb 25, 2020
2 parents b686df2 + 0b92e25 commit 0ed1443
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
"semantic-release": "semantic-release"
},
"dependencies": {
"uuid": "^3.2.1",
"uuid": "^7.0.0",
"xmlbuilder": "^14.0.0"
},
"devDependencies": {
"@jest/test-result": "^25.1.0",
"@types/jest": "^25.1.1",
"@types/mkdirp": "^1.0.0",
"@types/uuid": "^3.4.3",
"@types/uuid": "^3.4.7",
"@types/xml2js": "^0.4.2",
"@typescript-eslint/eslint-plugin": "^2.21.0",
"@typescript-eslint/parser": "^2.21.0",
Expand Down
14 changes: 7 additions & 7 deletions src/trx-generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
TestResult,
} from "@jest/test-result";
import * as path from "path";
import * as uuid from "uuid";
import { v4 as uuidv4 } from "uuid";
import { create as createXmlBuilder, XMLElement } from "xmlbuilder";

import {
Expand Down Expand Up @@ -58,7 +58,7 @@ const renderTestRun = (
userName?: string,
): void => {
builder
.att("id", uuid.v4())
.att("id", uuidv4())
.att(
"name",
`${userName}@${computerName} ${new Date(
Expand All @@ -73,7 +73,7 @@ const renderTestSettings = (parentNode: XMLElement): void => {
parentNode
.ele("TestSettings")
.att("name", "Jest test run")
.att("id", uuid.v4());
.att("id", uuidv4());
};

const renderTimes = (
Expand Down Expand Up @@ -153,8 +153,8 @@ const renderTestSuiteResult = (

if (testSuiteResult.testResults && testSuiteResult.testResults.length) {
testSuiteResult.testResults.forEach((testResult, index) => {
const testId = uuid.v4();
const executionId = uuid.v4();
const testId = uuidv4();
const executionId = uuidv4();
const fullTestName = getFullTestName(testResult);

// UnitTest
Expand Down Expand Up @@ -220,8 +220,8 @@ const renderTestSuiteResult = (
} else if (testSuiteResult.failureMessage) {
// For suites that failed to run, we will generate a test result that documents the failure.
// This occurs when there is a failure compiling/loading the suite, not when a test in the suite fails.
const testId = uuid.v4();
const executionId = uuid.v4();
const testId = uuidv4();
const executionId = uuidv4();
const fullTestName = path.basename(testSuiteResult.testFilePath);
const time = new Date().toISOString();

Expand Down
9 changes: 7 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==

"@types/uuid@^3.4.3":
"@types/uuid@^3.4.7":
version "3.4.7"
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.7.tgz#51d42247473bc00e38cc8dfaf70d936842a36c03"
integrity sha512-C2j2FWgQkF1ru12SjZJyMaTPxs/f6n90+5G5qNakBxKXjTBc/YTSelHh4Pz1HUDwxFXD9WvpQhOGCDC+/Y4mIQ==
Expand Down Expand Up @@ -7067,11 +7067,16 @@ util.promisify@^1.0.0:
define-properties "^1.1.2"
object.getownpropertydescriptors "^2.0.3"

uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3:
uuid@^3.3.2, uuid@^3.3.3:
version "3.4.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==

uuid@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.0.tgz#1833d4b9ce50b732bfaa271f9cb74e974d303c79"
integrity sha512-LNUrNsXdI/fUsypJbWM8Jt4DgQdFAZh41p9C7WE9Cn+CULOEkoG2lgQyH68v3wnIy5K3fN4jdSt270K6IFA3MQ==

v8-compile-cache@^2.0.3:
version "2.1.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
Expand Down

0 comments on commit 0ed1443

Please sign in to comment.