Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing package bug breaking liveUpdate tasks over https #728

Merged
merged 3 commits into from
Mar 31, 2022
Merged

Fixing package bug breaking liveUpdate tasks over https #728

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48c27a3
Fixing package bug breaking liveUpdate tasks over https
JackUrb Mar 31, 2022
824aace
update lockfile
JackUrb Mar 31, 2022
df7927d
stale package-lock
JackUrb Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions examples/remote_procedure/mnist/webapp/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion examples/remote_procedure/mnist/webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"author": "",
"dependencies": {
"bootstrap": "^4.6.0",
"mephisto-task": "^2.0.0",
"mephisto-task": "^2.0.1",
"rc-slider": "^8.6.3",
"react": "16.13.1",
"react-bootstrap": "^1.6.0",
Expand Down
14 changes: 7 additions & 7 deletions examples/remote_procedure/template/webapp/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion examples/remote_procedure/template/webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"author": "",
"dependencies": {
"bootstrap": "^4.6.0",
"mephisto-task": "^2.0.0",
"mephisto-task": "^2.0.1",
"rc-slider": "^8.6.3",
"react": "16.13.1",
"react-bootstrap": "^1.6.0",
Expand Down
14 changes: 7 additions & 7 deletions examples/static_react_task/webapp/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion examples/static_react_task/webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"author": "",
"dependencies": {
"bootstrap": "^4.3.1",
"mephisto-task": "^2.0.0",
"mephisto-task": "^2.0.1",
"react": "16.13.1",
"react-dom": "16.13.1"
},
Expand Down
2 changes: 1 addition & 1 deletion mephisto/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0
1.0.1
2 changes: 1 addition & 1 deletion mephisto/abstractions/architects/router/build_router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
FLASK_SERVER_SOURCE_ROOT = os.path.join(ROUTER_ROOT_DIR, "flask")
CROWD_SOURCE_PATH = "static/wrap_crowd_source.js"
TASK_CONFIG_PATH = "static/task_config.json"
CURR_MEPHISTO_TASK_VERSION = "2.0.0"
CURR_MEPHISTO_TASK_VERSION = "2.0.1"


def can_build(build_dir: str, task_run: "TaskRun") -> bool:
Expand Down
2 changes: 1 addition & 1 deletion mephisto/abstractions/architects/router/flask/mephisto_flask_blueprint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

# Constants

CURR_MEPHISTO_TASK_VERSION = "2.0.0"
CURR_MEPHISTO_TASK_VERSION = "2.0.1"

PACKET_TYPE_ALIVE = "alive"
PACKET_TYPE_SUBMIT_ONBOARDING = "submit_onboarding"
Expand Down
2 changes: 1 addition & 1 deletion mephisto/abstractions/architects/router/node/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"use strict";

const DEBUG = false;
const CURR_MEPHISTO_TASK_VERSION = "2.0.0";
const CURR_MEPHISTO_TASK_VERSION = "2.0.1";

// TODO add some testing to launch this server and communicate with it

Expand Down
67 changes: 24 additions & 43 deletions mephisto/abstractions/blueprints/parlai_chat/webapp/package-lock.json
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions mephisto/abstractions/blueprints/parlai_chat/webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"author": "",
"dependencies": {
"bootstrap": "^4.3.1",
"bootstrap-chat": "^2.0.0",
"mephisto-task": "^2.0.0",
"bootstrap-chat": "^2.0.1",
"mephisto-task": "^2.0.1",
"rc-slider": "^8.6.3",
"react": "16.13.1",
"react-bootstrap": "^0.32.4",
Expand All @@ -35,7 +35,7 @@
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-react-hooks": "^2.5.1",
"eslint-plugin-react-hooks": "^4.3.0",
"style-loader": "^1.1.3",
"url-loader": "^4.1.0",
"webpack": "^5.68.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/bootstrap-chat/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-chat",
"version": "2.0.0",
"version": "2.0.1",
"description": "",
"main": "build/bundle.js",
"scripts": {
Expand Down Expand Up @@ -29,7 +29,7 @@
"eslint-plugin-jsx-a11y": "6.x",
"eslint-plugin-react": "7.x",
"eslint-plugin-react-hooks": "2.x",
"mephisto-task": "^2.0.0",
"mephisto-task": "^2.0.1",
"react": "16.13.1",
"react-dom": "16.13.1",
"style-loader": "^1.1.3",
Expand All @@ -38,7 +38,7 @@
"webpack-cli": "^4.9.0"
},
"peerDependencies": {
"mephisto-task": "^2.0.0",
"mephisto-task": "^2.0.1",
"react": "16.13.1",
"react-dom": "16.13.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/mephisto-task/build/bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/mephisto-task/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mephisto-task",
"version": "2.0.0",
"version": "2.0.1",
"description": "",
"main": "build/bundle.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/mephisto-task/src/socket_handler.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ function useMephistoSocket({
let browserUrl = window.location;

// Inherit socket protocol from web address protocol
let socketProtocol = browserUrl.protocol == "https:" ? "wws://" : "ws://";
let socketProtocol = browserUrl.protocol == "https:" ? "wss://" : "ws://";
let socketUrl =
socketProtocol + browserUrl.hostname + ":" + browserUrl.port;
socket.current = new WebSocket(socketUrl);
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "mephisto"
version = "1.0.0"
version = "1.0.1"
description = ""
authors = ["Jack Urbanek <[email protected]>"]

Expand Down
Loading