mirror of
https://github.com/bitwarden/browser
synced 2026-01-05 10:03:21 +00:00
Merged with master and fixed conflicts
This commit is contained in:
gbubemismith
97
package.json
97
package.json
@@ -21,11 +21,11 @@
|
||||
"test": "jest",
|
||||
"test:watch": "jest --clearCache && jest --watch",
|
||||
"test:watch:all": "jest --watchAll",
|
||||
"test:types": "for p in libs/**/tsconfig.spec.json; do echo \"Typechecking $p\"; tsc --noEmit --project $p; done",
|
||||
"test:types": "node ./scripts/test-types.js",
|
||||
"docs:json": "compodoc -p ./tsconfig.json -e json -d .",
|
||||
"storybook": "npm run docs:json && start-storybook -p 6006",
|
||||
"build-storybook": "npm run docs:json && build-storybook",
|
||||
"chromatic": "chromatic --exit-zero-on-changes"
|
||||
"storybook": "ng run components:storybook",
|
||||
"build-storybook": "ng run components:build-storybook",
|
||||
"build-storybook:ci": "ng run components:build-storybook --webpack-stats-json"
|
||||
},
|
||||
"workspaces": [
|
||||
"apps/*",
|
||||
@@ -40,52 +40,51 @@
|
||||
"@angular/cli": "15.2.8",
|
||||
"@angular/compiler-cli": "15.2.9",
|
||||
"@angular/elements": "15.2.9",
|
||||
"@compodoc/compodoc": "1.1.19",
|
||||
"@compodoc/compodoc": "1.1.21",
|
||||
"@electron/notarize": "1.2.3",
|
||||
"@electron/rebuild": "3.2.13",
|
||||
"@fluffy-spoon/substitute": "1.208.0",
|
||||
"@ngtools/webpack": "15.2.8",
|
||||
"@storybook/addon-a11y": "6.5.16",
|
||||
"@storybook/addon-actions": "6.5.16",
|
||||
"@storybook/addon-essentials": "6.5.16",
|
||||
"@storybook/addon-links": "6.5.16",
|
||||
"@storybook/angular": "6.5.16",
|
||||
"@storybook/builder-webpack5": "6.5.16",
|
||||
"@storybook/manager-webpack5": "6.5.16",
|
||||
"@storybook/addon-a11y": "7.0.18",
|
||||
"@storybook/addon-actions": "7.0.18",
|
||||
"@storybook/addon-essentials": "7.0.18",
|
||||
"@storybook/addon-links": "7.0.18",
|
||||
"@storybook/angular": "7.0.18",
|
||||
"@types/argon2-browser": "1.18.1",
|
||||
"@types/chrome": "0.0.235",
|
||||
"@types/chrome": "0.0.237",
|
||||
"@types/duo_web_sdk": "2.7.1",
|
||||
"@types/firefox-webext-browser": "82.0.1",
|
||||
"@types/firefox-webext-browser": "111.0.1",
|
||||
"@types/inquirer": "8.2.6",
|
||||
"@types/jest": "27.5.2",
|
||||
"@types/jest": "29.5.2",
|
||||
"@types/jquery": "3.5.16",
|
||||
"@types/jsdom": "21.1.1",
|
||||
"@types/koa": "2.13.6",
|
||||
"@types/koa__multer": "2.0.4",
|
||||
"@types/koa__router": "8.0.11",
|
||||
"@types/koa__router": "12.0.0",
|
||||
"@types/koa-bodyparser": "4.3.7",
|
||||
"@types/koa-json": "2.0.20",
|
||||
"@types/lowdb": "1.0.11",
|
||||
"@types/lunr": "2.3.4",
|
||||
"@types/node": "18.16.9",
|
||||
"@types/node-fetch": "2.6.3",
|
||||
"@types/node": "18.16.16",
|
||||
"@types/node-fetch": "2.6.4",
|
||||
"@types/node-forge": "1.3.2",
|
||||
"@types/node-ipc": "9.2.0",
|
||||
"@types/papaparse": "5.3.7",
|
||||
"@types/proper-lockfile": "4.1.2",
|
||||
"@types/react": "16.14.42",
|
||||
"@types/retry": "0.12.2",
|
||||
"@types/zxcvbn": "4.4.1",
|
||||
"@typescript-eslint/eslint-plugin": "5.59.5",
|
||||
"@typescript-eslint/parser": "5.59.5",
|
||||
"@typescript-eslint/eslint-plugin": "5.59.8",
|
||||
"@typescript-eslint/parser": "5.59.8",
|
||||
"autoprefixer": "10.4.14",
|
||||
"base64-loader": "1.0.0",
|
||||
"buffer": "6.0.3",
|
||||
"chromatic": "6.17.4",
|
||||
"chromatic": "6.18.0",
|
||||
"clean-webpack-plugin": "4.0.0",
|
||||
"concurrently": "8.0.1",
|
||||
"concurrently": "8.1.0",
|
||||
"copy-webpack-plugin": "11.0.0",
|
||||
"cross-env": "7.0.3",
|
||||
"css-loader": "6.7.3",
|
||||
"css-loader": "6.8.1",
|
||||
"del": "6.1.1",
|
||||
"electron": "24.1.1",
|
||||
"electron-builder": "^23.6.0",
|
||||
@@ -93,13 +92,13 @@
|
||||
"electron-reload": "2.0.0-alpha.1",
|
||||
"electron-store": "8.1.0",
|
||||
"electron-updater": "5.3.0",
|
||||
"eslint": "8.40.0",
|
||||
"eslint": "8.42.0",
|
||||
"eslint-config-prettier": "8.8.0",
|
||||
"eslint-import-resolver-typescript": "2.7.1",
|
||||
"eslint-import-resolver-typescript": "3.5.5",
|
||||
"eslint-plugin-import": "2.27.5",
|
||||
"eslint-plugin-rxjs": "5.0.3",
|
||||
"eslint-plugin-rxjs-angular": "2.0.1",
|
||||
"eslint-plugin-tailwindcss": "3.11.0",
|
||||
"eslint-plugin-tailwindcss": "3.12.1",
|
||||
"gulp": "4.0.2",
|
||||
"gulp-filter": "7.0.0",
|
||||
"gulp-if": "3.0.0",
|
||||
@@ -110,36 +109,38 @@
|
||||
"html-webpack-injector": "1.1.4",
|
||||
"html-webpack-plugin": "5.5.1",
|
||||
"husky": "8.0.3",
|
||||
"jest-junit": "15.0.0",
|
||||
"jest-mock-extended": "2.0.9",
|
||||
"jest-preset-angular": "12.2.6",
|
||||
"jest-junit": "16.0.0",
|
||||
"jest-mock-extended": "3.0.4",
|
||||
"jest-preset-angular": "13.1.1",
|
||||
"lint-staged": "13.2.2",
|
||||
"mini-css-extract-plugin": "2.7.5",
|
||||
"mini-css-extract-plugin": "2.7.6",
|
||||
"node-ipc": "9.2.1",
|
||||
"pkg": "5.8.1",
|
||||
"postcss": "8.4.23",
|
||||
"postcss-loader": "7.3.0",
|
||||
"postcss": "8.4.24",
|
||||
"postcss-loader": "7.3.2",
|
||||
"prettier": "2.8.8",
|
||||
"prettier-plugin-tailwindcss": "0.2.8",
|
||||
"prettier-plugin-tailwindcss": "0.3.0",
|
||||
"process": "0.11.10",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0",
|
||||
"regedit": "^3.0.3",
|
||||
"rimraf": "3.0.2",
|
||||
"remark-gfm": "3.0.1",
|
||||
"rimraf": "5.0.1",
|
||||
"sass": "1.62.1",
|
||||
"sass-loader": "13.2.2",
|
||||
"storybook-addon-designs": "6.3.1",
|
||||
"style-loader": "3.3.2",
|
||||
"sass-loader": "13.3.1",
|
||||
"storybook": "7.0.18",
|
||||
"style-loader": "3.3.3",
|
||||
"tailwindcss": "3.3.2",
|
||||
"tapable": "1.1.3",
|
||||
"ts-jest": "28.0.8",
|
||||
"ts-loader": "9.4.2",
|
||||
"tsconfig-paths-webpack-plugin": "3.5.2",
|
||||
"ts-jest": "29.1.0",
|
||||
"ts-loader": "9.4.3",
|
||||
"tsconfig-paths-webpack-plugin": "4.0.1",
|
||||
"type-fest": "2.19.0",
|
||||
"typescript": "4.9.5",
|
||||
"url": "0.11.0",
|
||||
"util": "0.12.5",
|
||||
"wait-on": "7.0.1",
|
||||
"webpack": "5.82.1",
|
||||
"webpack-cli": "4.10.0",
|
||||
"webpack": "5.85.0",
|
||||
"webpack-cli": "5.1.3",
|
||||
"webpack-dev-server": "4.15.0",
|
||||
"webpack-node-externals": "3.0.0"
|
||||
},
|
||||
@@ -154,7 +155,7 @@
|
||||
"@angular/platform-browser-dynamic": "15.2.9",
|
||||
"@angular/router": "15.2.9",
|
||||
"@koa/multer": "3.0.2",
|
||||
"@koa/router": "10.1.1",
|
||||
"@koa/router": "12.0.0",
|
||||
"@microsoft/signalr": "6.0.16",
|
||||
"@microsoft/signalr-protocol-msgpack": "6.0.16",
|
||||
"@ng-select/ng-select": "10.0.4",
|
||||
@@ -162,7 +163,7 @@
|
||||
"argon2-browser": "1.18.0",
|
||||
"big-integer": "1.6.51",
|
||||
"bootstrap": "4.6.0",
|
||||
"braintree-web-drop-in": "1.37.0",
|
||||
"braintree-web-drop-in": "1.38.0",
|
||||
"bufferutil": "4.0.7",
|
||||
"cbor-redux": "^0.4.0",
|
||||
"chalk": "4.1.2",
|
||||
@@ -174,7 +175,7 @@
|
||||
"https-proxy-agent": "5.0.1",
|
||||
"inquirer": "8.2.5",
|
||||
"jquery": "3.7.0",
|
||||
"jsdom": "16.7.0",
|
||||
"jsdom": "22.1.0",
|
||||
"jszip": "3.10.1",
|
||||
"koa": "2.14.2",
|
||||
"koa-bodyparser": "4.4.0",
|
||||
@@ -201,11 +202,13 @@
|
||||
},
|
||||
"overrides": {
|
||||
"tailwindcss": "$tailwindcss",
|
||||
"react": "18.2.0",
|
||||
"@storybook/angular": {
|
||||
"zone.js": "0.12.0"
|
||||
}
|
||||
},
|
||||
"resolutions": {
|
||||
"@types/react": "16.14.42"
|
||||
},
|
||||
"lint-staged": {
|
||||
"*": "prettier --cache --ignore-unknown --write",
|
||||
"*.ts": "eslint --cache --cache-strategy content --fix"
|
||||
|
||||
Reference in New Issue
Block a user