|
42 | 42 | "test": "jest --coverage --collectCoverageFrom=src/*.{js}" |
43 | 43 | }, |
44 | 44 | "dependencies": { |
| 45 | +<<<<<<< before updating |
45 | 46 | "@jupyterlab/application": "^4.4.4", |
46 | 47 | "@jupyterlab/apputils": "^4.5.7", |
47 | 48 | "@jupyterlab/notebook": "^4.4.9", |
48 | 49 | "@jupyterlab/services": "^7.4.4", |
| 50 | +======= |
| 51 | + "@jupyterlab/application": "^4.4.9", |
| 52 | + "@jupyterlab/apputils": "^4.5.9", |
| 53 | + "@jupyterlab/notebook": "^4.4.9", |
| 54 | + "@jupyterlab/services": "^7.4.9", |
| 55 | +>>>>>>> after updating |
49 | 56 | "@lumino/disposable": "^2.1.4" |
50 | 57 | }, |
51 | 58 | "devDependencies": { |
|
54 | 61 | "@babel/eslint-parser": "^7.28.4", |
55 | 62 | "@babel/preset-env": "^7.28.3", |
56 | 63 | "@jupyterlab/builder": "^4.4.9", |
| 64 | +<<<<<<< before updating |
57 | 65 | "babel-jest": "^30.1.2", |
| 66 | +======= |
| 67 | + "babel-jest": "^30.2.0", |
| 68 | +>>>>>>> after updating |
58 | 69 | "cpy-cli": "^6.0.0", |
59 | 70 | "eslint": "^8.57.1", |
60 | 71 | "eslint-config-airbnb": "^19.0.4", |
|
65 | 76 | "eslint-plugin-json": "^3.1.0", |
66 | 77 | "eslint-plugin-prettier": "^5.5.4", |
67 | 78 | "isomorphic-fetch": "^3.0.0", |
| 79 | +<<<<<<< before updating |
68 | 80 | "jest": "^30.0.0", |
| 81 | +======= |
| 82 | + "jest": "^30.2.0", |
| 83 | +>>>>>>> after updating |
69 | 84 | "jest-environment-jsdom": "^30.2.0", |
70 | 85 | "jest-junit": "^16.0.0", |
71 | 86 | "jest-transform-css": "^6.0.3", |
|
0 commit comments