ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-22 01:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Scott Bell 2024-09-17 16:45:43 +02:00
commit ee612a6b5a
3 changed files with 21 additions and 19 deletions

31
package-lock.json generated

@ -1,12 +1,12 @@
{
"name": "openmct",
"version": "4.0.0-next",
"version": "4.1.0-next",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "openmct",
"version": "4.0.0-next",
"version": "4.1.0-next",
"license": "Apache-2.0",
"workspaces": [
"e2e"
@ -63,7 +63,7 @@
"location-bar": "3.0.1",
"lodash": "4.17.21",
"marked": "12.0.0",
"mathjs": "13.0.3",
"mathjs": "13.1.1",
"mini-css-extract-plugin": "2.7.6",
"moment": "2.30.1",
"moment-duration-format": "2.3.2",
@ -99,7 +99,7 @@
},
"e2e": {
"name": "openmct-e2e",
"version": "4.0.0-next",
"version": "4.1.0-next",
"license": "Apache-2.0",
"devDependencies": {
"@axe-core/playwright": "4.8.5",
@ -645,9 +645,9 @@
}
},
"node_modules/@babel/runtime": {
"version": "7.24.8",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz",
"integrity": "sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==",
"version": "7.25.6",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
"integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
"dev": true,
"dependencies": {
"regenerator-runtime": "^0.14.0"
@ -2810,9 +2810,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001655",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
"integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
"version": "1.0.30001660",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
"integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
"dev": true,
"funding": [
{
@ -2827,7 +2827,8 @@
"type": "github",
"url": "https://github.com/sponsors/ai"
}
]
],
"license": "CC-BY-4.0"
},
"node_modules/chalk": {
"version": "2.4.2",
@ -7814,12 +7815,12 @@
}
},
"node_modules/mathjs": {
"version": "13.0.3",
"resolved": "https://registry.npmjs.org/mathjs/-/mathjs-13.0.3.tgz",
"integrity": "sha512-GpP9OW6swA5POZXvgpc/1FYkAr8lKgV04QHS1tIU60klFfplVCYaNzn6qy0vSp0hAQQN7shcx9CeB507dlLujA==",
"version": "13.1.1",
"resolved": "https://registry.npmjs.org/mathjs/-/mathjs-13.1.1.tgz",
"integrity": "sha512-duaSAy7m4F+QtP1Dyv8MX2XuxcqpNDDlGly0SdVTCqpAmwdOFWilDdQKbLdo9RfD6IDNMOdo9tIsEaTXkconlQ==",
"dev": true,
"dependencies": {
"@babel/runtime": "^7.24.8",
"@babel/runtime": "^7.25.4",
"complex.js": "^2.1.1",
"decimal.js": "^10.4.3",
"escape-latex": "^1.2.0",

2
package.json

@ -66,7 +66,7 @@
"location-bar": "3.0.1",
"lodash": "4.17.21",
"marked": "12.0.0",
"mathjs": "13.0.3",
"mathjs": "13.1.1",
"mini-css-extract-plugin": "2.7.6",
"moment": "2.30.1",
"moment-duration-format": "2.3.2",

7
tsconfig.json

@ -4,6 +4,7 @@
*/
{
"compilerOptions": {
"target": "ES6",
"baseUrl": "./",
"allowJs": true,
"checkJs": false,
@ -14,14 +15,14 @@
"esModuleInterop": true,
"noImplicitOverride": true,
"noImplicitAny": false,
"outFile": "dist/types/index.d.ts"
"outFile": "dist/types/index.d.ts",
"module": "NodeNext",
"moduleResolution": "NodeNext"
},
"include": [
"src/api/**/*.js"
],
"exclude": [
"node_modules",
"dist",
"**/*Spec.js"
]
}