diff --git a/https.js b/https.js new file mode 100644 index 0000000000000000000000000000000000000000..257800d88c41f5ba8996f336a32014e69da428b6 --- /dev/null +++ b/https.js @@ -0,0 +1,6 @@ +const fs = require("fs"); + +module.exports = { + cert: fs.readFileSync("/home/ubuntu/fullchain.pem"), + key: fs.readFileSync("/home/ubuntu/privkey.pem"), +}; diff --git a/package.json b/package.json index 391833c247c531783ff1fc3accfde91c63444faf..f8bfd556c449bf7566e84a2477d97a91e0622362 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "license": "MPL-2.0", "scripts": { "start": "npm run dev", - "dev": "webpack-dev-server --https --host 0.0.0.0 --useLocalIp --open --config webpack.dev.js", + "dev": "webpack-dev-server --port 8000 --host 0.0.0.0 --useLocalIp --open --config webpack.dev.js", "build": "cross-env NODE_ENV='production' webpack --config webpack.prod.js", "prettier": "prettier --write src/**/*.js" }, @@ -17,7 +17,7 @@ "extract-text-webpack-plugin": "^3.0.2", "material-design-lite": "^1.3.0", "minijanus": "^0.1.6", - "naf-janus-adapter": "^0.1.10", + "naf-janus-adapter": "https://github.com/mozilla/naf-janus-adapter#codec-detect", "networked-aframe": "https://github.com/netpro2k/networked-aframe#bugfix/chrome/audio", "nipplejs": "^0.6.7", "query-string": "^5.0.1", diff --git a/webpack.dev.js b/webpack.dev.js index a2c0f17bc3b88063beefe7e51e20f8b36bd7411a..78064bd08ebb1d50de8649a349581994d1138f70 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -2,12 +2,17 @@ const path = require("path"); const merge = require("webpack-merge"); const common = require("./webpack.common"); const WriteFilePlugin = require("write-file-webpack-plugin"); +const fs = require("fs"); module.exports = merge(common, { devtool: "inline-source-map", devServer: { contentBase: path.resolve(__dirname, "public"), - disableHostCheck: true + disableHostCheck: true, + https: { + cert: fs.readFileSync("/home/ubuntu/fullchain.pem"), + key: fs.readFileSync("/home/ubuntu/privkey.pem") + } }, plugins: [new WriteFilePlugin()] }); diff --git a/yarn.lock b/yarn.lock index 8ad070c0c2b05c4915b46dbc82ce6b23ce1cb307..43c58652365303a18a3fafa10657e63fad0697b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1316,6 +1316,10 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" +codec-detect@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/codec-detect/-/codec-detect-1.3.0.tgz#eb4e132d6fd9bf6c26c84adce77dea7db31eec8d" + color-convert@^1.3.0, color-convert@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" @@ -3790,10 +3794,11 @@ mv@^2.1.1: ncp "~2.0.0" rimraf "~2.4.0" -naf-janus-adapter@^0.1.10: - version "0.1.10" - resolved "https://registry.yarnpkg.com/naf-janus-adapter/-/naf-janus-adapter-0.1.10.tgz#322d5eeccefc5078da7e4355537d739bbb167794" +"naf-janus-adapter@https://github.com/mozilla/naf-janus-adapter#codec-detect": + version "0.2.0" + resolved "https://github.com/mozilla/naf-janus-adapter#8be73043ae55358acfacdecdeea3fab1908c4788" dependencies: + codec-detect "^1.3.0" debug "^3.1.0" minijanus "^0.1.6"