diff --git a/package-lock.json b/package-lock.json index 054b4583c..0853e7aab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -211,6 +211,7 @@ }, "local_dependencies/@azure/cosmos": { "version": "4.0.1-beta.3", + "extraneous": true, "license": "MIT", "dependencies": { "@azure/abort-controller": "^1.0.0", @@ -231,11 +232,6 @@ "node": ">=18.0.0" } }, - "local_dependencies/@azure/cosmos/node_modules/tslib": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" - }, "local_dependencies/cosmos": { "name": "@azure/cosmos", "version": "4.0.1-beta.3", @@ -480,6 +476,12 @@ "node": ">=0.10.0" } }, + "node_modules/@azure/cosmos/node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" + }, "node_modules/@azure/identity": { "version": "1.5.2", "license": "MIT", diff --git a/package.json b/package.json index ce8626e27..b692f5c6c 100644 --- a/package.json +++ b/package.json @@ -205,7 +205,7 @@ "build:dataExplorer:ci": "npm run build:ci", "build": "npm run format:check && npm run lint && npm run compile && npm run compile:strict && npm run pack:prod && npm run copyToConsumers", "build:ci": "npm run format:check && npm run lint && npm run compile && npm run compile:strict && npm run pack:fast", - "build:proxy": "npm run format:check && npm run lint && npm run compile && npm run compile:strict && npm run pack:prod && npm run copyToProxy", + "build:proxy": "npm run compile && npm run compile:strict && npm run pack:prod && npm run copyToProxy", "pack:prod": "webpack --mode production", "pack:fast": "webpack --mode development --progress", "copyToConsumers": "node copyToConsumers", diff --git a/utils/local-proxy/index.js b/utils/local-proxy/index.js index f33b3fe23..e87bf37bc 100644 --- a/utils/local-proxy/index.js +++ b/utils/local-proxy/index.js @@ -28,6 +28,10 @@ app.get("/_ready", (_, res) => { } }); +app.get("config.json", (_, res) => { + res.json({ EMULATOR_ENDPOINT: conf.EMULATOR_ENDPOINT }); +}); + const bypass = (req, res) => { if (req.method === "OPTIONS") { res.statusCode = 200; diff --git a/webpack.config.js b/webpack.config.js index ecb9758b8..02d6217a6 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -134,16 +134,17 @@ module.exports = function (_env = {}, argv = {}) { chunks: ["terminal"], }), //todo - dynamically include apis - ishttps ? - new HtmlWebpackPlugin({ - filename: "quickstart.html", - template: "src/quickstart-sql-only.html", - chunks: ["quickstart"], - }) : new HtmlWebpackPlugin({ - filename: "quickstart.html", - template: "src/quickstart-sql-only-http.html", - chunks: ["quickstart"], - }), + ishttps + ? new HtmlWebpackPlugin({ + filename: "quickstart.html", + template: "src/quickstart-sql-only.html", + chunks: ["quickstart"], + }) + : new HtmlWebpackPlugin({ + filename: "quickstart.html", + template: "src/quickstart-sql-only-http.html", + chunks: ["quickstart"], + }), new HtmlWebpackPlugin({ filename: "index.html", template: "src/index.html", @@ -200,10 +201,12 @@ module.exports = function (_env = {}, argv = {}) { new EnvironmentPlugin(envVars), ]; - if(process.env.EXPLORER_CONFIG_PATH) { - plugins.push(new CopyWebpackPlugin({ - patterns: [{ from: process.env.EXPLORER_CONFIG_PATH, to: "config.json" }] - })); + if (process.env.EXPLORER_CONFIG_PATH) { + plugins.push( + new CopyWebpackPlugin({ + patterns: [{ from: process.env.EXPLORER_CONFIG_PATH, to: "config.json" }], + }), + ); } if (argv.analyze) {