Compare commits

..

1 Commits

Author SHA1 Message Date
Zachary Foster
ce485d2354 Fix Cassandra Endpoint URLs by adding trailing slash in construction (#235) 2020-09-28 14:58:47 -05:00
3 changed files with 7 additions and 19 deletions

View File

@@ -307,7 +307,7 @@ export class CassandraAPIDataClient extends TableDataClient {
authType === AuthType.EncryptedToken authType === AuthType.EncryptedToken
? Constants.CassandraBackend.guestQueryApi ? Constants.CassandraBackend.guestQueryApi
: Constants.CassandraBackend.queryApi; : Constants.CassandraBackend.queryApi;
$.ajax(`${collection.container.extensionEndpoint()}${apiEndpoint}`, { $.ajax(`${collection.container.extensionEndpoint()}/${apiEndpoint}`, {
type: "POST", type: "POST",
data: { data: {
accountName: collection && collection.container.databaseAccount && collection.container.databaseAccount().name, accountName: collection && collection.container.databaseAccount && collection.container.databaseAccount().name,
@@ -558,7 +558,7 @@ export class CassandraAPIDataClient extends TableDataClient {
authType === AuthType.EncryptedToken authType === AuthType.EncryptedToken
? Constants.CassandraBackend.guestKeysApi ? Constants.CassandraBackend.guestKeysApi
: Constants.CassandraBackend.keysApi; : Constants.CassandraBackend.keysApi;
let endpoint = `${collection.container.extensionEndpoint()}${apiEndpoint}`; let endpoint = `${collection.container.extensionEndpoint()}/${apiEndpoint}`;
const deferred = Q.defer<CassandraTableKeys>(); const deferred = Q.defer<CassandraTableKeys>();
$.ajax(endpoint, { $.ajax(endpoint, {
type: "POST", type: "POST",
@@ -613,7 +613,7 @@ export class CassandraAPIDataClient extends TableDataClient {
authType === AuthType.EncryptedToken authType === AuthType.EncryptedToken
? Constants.CassandraBackend.guestSchemaApi ? Constants.CassandraBackend.guestSchemaApi
: Constants.CassandraBackend.schemaApi; : Constants.CassandraBackend.schemaApi;
let endpoint = `${collection.container.extensionEndpoint()}${apiEndpoint}`; let endpoint = `${collection.container.extensionEndpoint()}/${apiEndpoint}`;
const deferred = Q.defer<CassandraTableKey[]>(); const deferred = Q.defer<CassandraTableKey[]>();
$.ajax(endpoint, { $.ajax(endpoint, {
type: "POST", type: "POST",
@@ -667,7 +667,7 @@ export class CassandraAPIDataClient extends TableDataClient {
authType === AuthType.EncryptedToken authType === AuthType.EncryptedToken
? Constants.CassandraBackend.guestCreateOrDeleteApi ? Constants.CassandraBackend.guestCreateOrDeleteApi
: Constants.CassandraBackend.createOrDeleteApi; : Constants.CassandraBackend.createOrDeleteApi;
$.ajax(`${explorer.extensionEndpoint()}${apiEndpoint}`, { $.ajax(`${explorer.extensionEndpoint()}/${apiEndpoint}`, {
type: "POST", type: "POST",
data: { data: {
accountName: explorer.databaseAccount() && explorer.databaseAccount().name, accountName: explorer.databaseAccount() && explorer.databaseAccount().name,

View File

@@ -1,7 +1,7 @@
{ {
"compilerOptions": { "compilerOptions": {
"allowJs": true, "allowJs": true,
"sourceMap": true, "sourceMap": false,
"noImplicitAny": true, "noImplicitAny": true,
"noImplicitReturns": true, "noImplicitReturns": true,
"noFallthroughCasesInSwitch": true, "noFallthroughCasesInSwitch": true,

View File

@@ -11,7 +11,6 @@ const childProcess = require("child_process");
const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPlugin; const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
const TerserPlugin = require("terser-webpack-plugin"); const TerserPlugin = require("terser-webpack-plugin");
const isCI = require("is-ci"); const isCI = require("is-ci");
const webpack = require("webpack");
const gitSha = childProcess.execSync("git rev-parse HEAD").toString("utf8"); const gitSha = childProcess.execSync("git rev-parse HEAD").toString("utf8");
@@ -105,15 +104,6 @@ module.exports = function(env = {}, argv = {}) {
envVars.NODE_ENV = "development"; envVars.NODE_ENV = "development";
} }
const sourceMapPlugin =
mode === "development"
? new webpack.EvalSourceMapDevToolPlugin({})
: new webpack.SourceMapDevToolPlugin({
// test: [".js", ".mjs", ".css", ".ts", ".tsx"],
filename: "[name].js.map",
exclude: [/vendor/]
});
const plugins = [ const plugins = [
new CleanWebpackPlugin(["dist"]), new CleanWebpackPlugin(["dist"]),
new CreateFileWebpack({ new CreateFileWebpack({
@@ -174,9 +164,7 @@ module.exports = function(env = {}, argv = {}) {
new CopyWebpackPlugin({ new CopyWebpackPlugin({
patterns: [{ from: "DataExplorer.nuspec" }, { from: "web.config" }, { from: "quickstart/*.zip" }] patterns: [{ from: "DataExplorer.nuspec" }, { from: "web.config" }, { from: "quickstart/*.zip" }]
}), }),
new EnvironmentPlugin(envVars), new EnvironmentPlugin(envVars)
new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }),
sourceMapPlugin
]; ];
if (argv.analyze) { if (argv.analyze) {
@@ -206,6 +194,7 @@ module.exports = function(env = {}, argv = {}) {
filename: "[name].[chunkhash:6].js", filename: "[name].[chunkhash:6].js",
path: path.resolve(__dirname, "dist") path: path.resolve(__dirname, "dist")
}, },
devtool: mode === "development" ? "cheap-eval-source-map" : "source-map",
plugins, plugins,
module: { module: {
rules rules
@@ -217,7 +206,6 @@ module.exports = function(env = {}, argv = {}) {
minimize: mode === "production" ? true : false, minimize: mode === "production" ? true : false,
minimizer: [ minimizer: [
new TerserPlugin({ new TerserPlugin({
sourceMap: true,
cache: ".cache/terser", cache: ".cache/terser",
terserOptions: { terserOptions: {
// These options increase our initial bundle size by ~5% but the builds are significantly faster and won't run out of memory // These options increase our initial bundle size by ~5% but the builds are significantly faster and won't run out of memory