Skip to content

Commit

Permalink
Merge branch 'main' into 722-hamburger-menus-on-webviews
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/platform-bible-react/dist/index.cjs
#	lib/platform-bible-react/dist/index.cjs.map
#	lib/platform-bible-react/dist/index.js
#	lib/platform-bible-react/dist/index.js.map
  • Loading branch information
tombogle committed Apr 9, 2024
2 parents 1e418b0 + 2876053 commit ac21794
Show file tree
Hide file tree
Showing 30 changed files with 21,216 additions and 119,357 deletions.
22,501 changes: 17,848 additions & 4,653 deletions extensions/package-lock.json

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions extensions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,42 +43,43 @@
"platform-bible-utils": "file:../lib/platform-bible-utils"
},
"devDependencies": {
"@emotion/react": "^11.11.3",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@mui/material": "^5.15.6",
"@swc/core": "^1.4.2",
"@types/node": "^20.11.19",
"@types/react": "^18.2.57",
"@types/react-dom": "^18.2.19",
"@mui/material": "^5.15.10",
"@swc/core": "^1.4.11",
"@types/node": "^20.12.2",
"@types/react": "^18.2.73",
"@types/react-dom": "^18.2.23",
"@types/webpack": "^5.28.5",
"@typescript-eslint/parser": "^6.21.0",
"concurrently": "^8.2.2",
"copy-webpack-plugin": "^12.0.2",
"cross-env": "^7.0.3",
"css-loader": "^6.10.0",
"escape-string-regexp": "^5.0.0",
"glob": "^10.3.10",
"glob": "^10.3.12",
"papi-dts": "file:../lib/papi-dts",
"platform-bible-react": "file:../lib/platform-bible-react",
"prettier": "^3.2.5",
"prettier-plugin-jsdoc": "^1.3.0",
"replace-in-file": "^7.1.0",
"sass": "^1.71.1",
"sass": "^1.72.0",
"sass-loader": "^14.1.1",
"stylelint": "^16.2.1",
"stylelint": "^16.3.1",
"stylelint-config-recommended": "^14.0.0",
"stylelint-config-sass-guidelines": "^11.0.0",
"stylelint-config-sass-guidelines": "^11.1.0",
"swc-loader": "^0.2.6",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"tsx": "^4.7.1",
"typescript": "^5.3.3",
"webpack": "^5.90.3",
"webpack": "^5.91.0",
"webpack-cli": "^5.1.4",
"webpack-merge": "^5.10.0",
"zip-folder-promise": "^1.2.0"
},
"workspaces": ["src/*"],
"volta": {
"extends": "../package.json"
}
Expand Down
Loading

0 comments on commit ac21794

Please sign in to comment.