Skip to content

Commit

Permalink
Merge branch 'main' into 707-context-menus
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
  • Loading branch information
tombogle committed Feb 28, 2024
2 parents d0103c0 + 3064f73 commit a8a739a
Show file tree
Hide file tree
Showing 9 changed files with 2,949 additions and 2,961 deletions.
248 changes: 124 additions & 124 deletions lib/platform-bible-react/dist/index.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/platform-bible-react/dist/index.cjs.map

Large diffs are not rendered by default.

4,590 changes: 2,280 additions & 2,310 deletions lib/platform-bible-react/dist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/platform-bible-react/dist/index.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/platform-bible-react/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/platform-bible-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts",
"test": "jest --silent"
},
"peerDependencies": {},
"peerDependencies": {},
"dependencies": {
"async-mutex": "^0.4.1"
},
Expand Down
1,004 changes: 510 additions & 494 deletions package-lock.json

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,16 @@
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@faker-js/faker": "^8.3.1",
"@mui/icons-material": "^5.15.6",
"@mui/material": "^5.15.6",
"@sillsdev/scripture": "^1.4.0",
"@mui/icons-material": "^5.15.10",
"@mui/material": "^5.15.10",
"@sillsdev/scripture": "^1.4.3",
"@tanstack/react-table": "^8.11.7",
"ajv": "^8.12.0",
"chalk": "^4.1.2",
"chokidar": "^3.5.3",
"chokidar": "^3.6.0",
"electron-debug": "^3.2.0",
"electron-log": "^5.0.3",
"electron-updater": "^6.1.7",
"electron-updater": "^6.1.8",
"electron-window-state": "^5.0.3",
"fast-equals": "^5.0.1",
"graphql": "^16.8.1",
Expand All @@ -120,11 +120,11 @@
"react": "^18.2.0",
"react-data-grid": "^7.0.0-beta.34",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.3",
"react-router-dom": "^6.22.1",
"ws": "^8.16.0"
},
"devDependencies": {
"@babel/preset-env": "^7.23.8",
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@electron/notarize": "^2.2.1",
Expand All @@ -140,30 +140,30 @@
"@storybook/testing-library": "^0.2.0",
"@svgr/webpack": "^8.1.0",
"@teamsupercell/typings-for-css-modules-loader": "^2.5.2",
"@testing-library/jest-dom": "^6.3.0",
"@testing-library/react": "^14.1.2",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@types/electron-devtools-installer": "^2.2.5",
"@types/jest": "^29.5.11",
"@types/node": "^20.11.6",
"@types/jest": "^29.5.12",
"@types/node": "^20.11.20",
"@types/node-localstorage": "^1.3.3",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@types/react": "^18.2.57",
"@types/react-dom": "^18.2.19",
"@types/react-test-renderer": "^18.0.7",
"@types/source-map-support": "^0.5.10",
"@types/terser-webpack-plugin": "^5.2.0",
"@types/webpack-bundle-analyzer": "^4.6.3",
"@types/webpack-bundle-analyzer": "^4.7.0",
"@types/ws": "^8.5.10",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"@typescript-eslint/parser": "^6.19.1",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"browserslist-config-erb": "^0.0.3",
"concurrently": "^8.2.2",
"core-js": "^3.35.1",
"core-js": "3.35.1",
"cross-env": "^7.0.3",
"css-loader": "^6.9.1",
"css-loader": "^6.10.0",
"css-minimizer-webpack-plugin": "^6.0.0",
"detect-port": "^1.5.1",
"electron": "^27.3.0",
"electron-builder": "^24.9.1",
"electron": "^27.3.3",
"electron-builder": "^24.12.0",
"electron-devtools-installer": "^3.2.0",
"electronmon": "^2.0.2",
"eslint": "^8.56.0",
Expand All @@ -173,7 +173,7 @@
"eslint-import-resolver-webpack": "^0.13.8",
"eslint-plugin-compat": "^4.2.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.6.3",
"eslint-plugin-jest": "^27.9.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-no-null": "^1.0.2",
"eslint-plugin-no-type-assertion": "^1.3.0",
Expand All @@ -189,21 +189,21 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^13.3.0",
"mini-css-extract-plugin": "^2.7.7",
"mini-css-extract-plugin": "^2.8.0",
"node-loader": "^2.0.0",
"nodemon": "^3.0.3",
"nodemon": "^3.1.0",
"patch-package": "^7.0.2",
"prettier": "^3.2.4",
"prettier": "^3.2.5",
"prettier-plugin-jsdoc": "^1.3.0",
"react-refresh": "^0.14.0",
"react-test-renderer": "^18.2.0",
"rimraf": "^5.0.5",
"run-script-os": "^1.1.6",
"sass": "^1.70.0",
"sass-loader": "^14.0.0",
"sass": "^1.71.1",
"sass-loader": "^14.1.1",
"storybook": "^7.4.0",
"style-loader": "^3.3.4",
"stylelint": "^16.2.0",
"stylelint": "^16.2.1",
"stylelint-config-recommended": "^14.0.0",
"stylelint-config-sass-guidelines": "^11.0.0",
"terser-webpack-plugin": "^5.3.10",
Expand All @@ -214,10 +214,10 @@
"tsconfig-paths": "^4.2.0",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"tsx": "^4.7.1",
"typedoc": "^0.25.7",
"typedoc": "^0.25.8",
"typescript": "^5.3.3",
"url-loader": "^4.1.1",
"webpack": "^5.90.0",
"webpack": "^5.90.3",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1",
Expand Down
2 changes: 2 additions & 0 deletions src/extension-host/services/extension.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Uri } from '@shared/data/file-system.model';
import { getModuleSimilarApiMessage } from '@shared/utils/util';
import Module from 'module';
import * as SillsdevScripture from '@sillsdev/scripture';
import * as platformBibleUtils from 'platform-bible-utils';
import logger from '@shared/services/logger.service';
import { getCommandLineArgumentsGroup, COMMAND_LINE_ARGS } from '@node/utils/command-line.util';
import { setExtensionUris } from '@extension-host/services/extension-storage.service';
Expand Down Expand Up @@ -619,6 +620,7 @@ async function activateExtensions(extensions: ExtensionInfo[]): Promise<ActiveEx
// Allow the extension to import papi and some other things
if (moduleName === '@papi/backend') return papi;
if (moduleName === '@sillsdev/scripture') return SillsdevScripture;
if (moduleName === 'platform-bible-utils') return platformBibleUtils;

// Figure out if we are doing the import for the extension file in activateExtension
const extensionFile = extensionsWithCheck.find(
Expand Down

0 comments on commit a8a739a

Please sign in to comment.