Skip to content

Commit 64b0e97

Browse files
CopilotQilongTang
andauthored
Resolve merge conflicts: bump node-forge 1.3.1 → 1.3.2 onto current master (#100)
* Initial plan * Resolve merge conflicts: rebase onto master with node-forge 1.3.2 Co-authored-by: QilongTang <3942418+QilongTang@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: QilongTang <3942418+QilongTang@users.noreply.github.com>
1 parent db86d0b commit 64b0e97

2 files changed

Lines changed: 66 additions & 84 deletions

File tree

package-lock.json

Lines changed: 64 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dynamods/splash-screen",
3-
"version": "1.0.30",
3+
"version": "1.0.31",
44
"description": "Splash Screen maintained by Dynamo Team@Autodesk",
55
"author": "Autodesk Inc.",
66
"license": "MIT",
@@ -33,7 +33,7 @@
3333
"lic_direct": "npx @adsk/adsk-npm-license-puller --path . --app-name 'splash-screen' --verbose --about-box ./license_output/about-box_direct.html --about-box-type desktop --year $(date \"+%Y\") --paos ./license_output/paos_direct.csv",
3434
"lic_transitive": "npx @adsk/adsk-npm-license-puller --path . --app-name 'splash-screen' --verbose --about-box ./license_output/about-box_transitive.html --about-box-type desktop --transitive --year $(date \"+%Y\") --paos ./license_output/paos_transitive.csv",
3535
"generate_license": "npm run lic_direct && npm run lic_transitive",
36-
"test:unit": "NODE_ENV=test jest tests/App.test.js",
36+
"test:unit": "NODE_ENV=test jest tests/App.test.js tests/Toast.test.js",
3737
"test:e2e": "playwright test tests/e2e.test.js",
3838
"eject": "react-scripts eject"
3939
},

0 commit comments

Comments
 (0)