Skip to content
This repository has been archived by the owner on Jan 22, 2024. It is now read-only.

Commit

Permalink
updating to use latest blueprint and to only target more recent brows…
Browse files Browse the repository at this point in the history
…ers in our nwb config
  • Loading branch information
tnrich committed Feb 26, 2021
1 parent 37cac41 commit 5353e68
Show file tree
Hide file tree
Showing 6 changed files with 895 additions and 1,552 deletions.
18 changes: 12 additions & 6 deletions nwb.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@ module.exports = {
// esModules: console.log("commentMeBackOut") || false,
// cjs: console.log("commentMeBackOut") || false
},
...(process.env.WITH_COVERAGE && {
babel: {
babel: {
runtime: false,
env: {
targets: "defaults, not IE 11"
},
...(process.env.WITH_COVERAGE && {
plugins: ["istanbul"]
}
}),
})
},

webpack: {
aliases: {
// **** You can comment one or more of these in to override an npm module with a local module. *****
Expand All @@ -27,10 +32,11 @@ module.exports = {
// "bio-parsers":
// console.log("comment me back out!") ||
// path.join("../ve-sequence-parsers/src/parsers/"),
// "teselagen-react-components": //downgrade to nwb @ 0.24.5 to get this to work for now
//downgrade to nwb @ 0.24.5 to get this to work for now
// "teselagen-react-components":
// console.log("comment me back out!") ||
// path.join(__dirname, "../teselagen-react-components/src/"),

//don't comment this out!
react: path.join(__dirname, "node_modules/react"),
// "../teselagen-react-components/node_modules/@blueprintjs/core/": path.join(
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"version": "auto-changelog -p && git add CHANGELOG.md"
},
"dependencies": {
"@blueprintjs/core": "^3.38.2",
"@blueprintjs/datetime": "^3.20.4",
"@blueprintjs/select": "^3.15.4",
"@blueprintjs/core": "^3.39.0",
"@blueprintjs/datetime": "^3.20.5",
"@blueprintjs/select": "^3.15.5",
"@risingstack/react-easy-state": "^6.3.0",
"@teselagen/react-list": "^0.8.18",
"axios": "^0.21.1",
Expand Down Expand Up @@ -63,7 +63,7 @@
"redux-thunk": "2.3.0",
"reselect": "^4.0.0",
"shortid": "^2.2.16",
"teselagen-react-components": "^29.4.13",
"teselagen-react-components": "^30.0.0",
"tg-react-reflex": "^2.0.10",
"typeface-ubuntu-mono": "^0.0.54",
"use-local-storage-state": "^9.0.2",
Expand All @@ -87,7 +87,7 @@
"husky": "^4.3.8",
"in-publish": "^2.0.1",
"lint-staged": "10.5.4",
"nwb": "0.24.5",
"nwb": "0.25.2",
"prettier": "2.2.1",
"react": "^16.10.2",
"react-addons-perf": "^15.4.2",
Expand Down
2 changes: 1 addition & 1 deletion src/AlignmentView/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ try {
e
);
}
// @HotkeysTarget

class AlignmentView extends React.Component {
constructor(props) {
super(props);
Expand Down
4 changes: 2 additions & 2 deletions src/Editor/CommandHotkeyHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ class CommandHotkeyHandler extends React.Component {
super(props);
const commands = getCommands(this);
// Don't bind clipboard shortcuts (use native ones directly)
["cut", "copy", "paste"].forEach(cmdId => delete commands[cmdId]);
["cut", "copy", "paste"].forEach((cmdId) => delete commands[cmdId]);
this.hotkeyDefs = getCommandHotkeys(commands);
this.handlers = getCommandHotkeyHandlers(commands);

this.Handler = withHotkeys(this.hotkeyDefs, this.handlers)();
this.Handler = withHotkeys(this.hotkeyDefs, this.handlers);
}

render() {
Expand Down
10 changes: 6 additions & 4 deletions src/commands/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1277,10 +1277,12 @@ const commandDefs = {
shouldDismissPopover: false
},
...(props.allPartTags
? {
cmd: "filterPartsByTagCmd",
shouldDismissPopover: false
}
? [
{
cmd: "filterPartsByTagCmd",
shouldDismissPopover: false
}
]
: [])
];
}
Expand Down
Loading

0 comments on commit 5353e68

Please sign in to comment.