@atlaskit/editor-card-provider 3.2.0 → 3.3.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-card-provider
 
+## 3.3.0
+
+### Minor Changes
+
+- [#75659](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75659) [`28d133564298`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/28d133564298) - Removed duplicated version of environment.ts in editor-card-provider package and all usages were replaced with the corresponding type/function from linking-common.
+
 ## 3.2.0
 
 ### Minor Changes

package/dist/cjs/provider.js

@@ -18,7 +18,6 @@ var _dataloader = _interopRequireDefault(require("dataloader"));
 var _linkingCommon = require("@atlaskit/linking-common");
 var _linkExtractors = require("@atlaskit/link-extractors");
 var _transformer = require("./transformer");
-var _environments = require("./environments");
 var _linkProvider = require("@atlaskit/link-provider");
 var api = _interopRequireWildcard(require("./api"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -65,8 +64,8 @@ var EditorCardProvider = exports.EditorCardProvider = /*#__PURE__*/function () {
   function EditorCardProvider(envKey, baseUrlOverride) {
     var _this = this;
     (0, _classCallCheck2.default)(this, EditorCardProvider);
-    this.baseUrl = baseUrlOverride || (0, _environments.getBaseUrl)(envKey);
-    this.resolverUrl = (0, _environments.getResolverUrl)(envKey, baseUrlOverride);
+    this.baseUrl = baseUrlOverride || (0, _linkingCommon.getBaseUrl)(envKey);
+    this.resolverUrl = (0, _linkingCommon.getResolverUrl)(envKey, baseUrlOverride);
     this.transformer = new _transformer.Transformer();
     this.requestHeaders = {
       Origin: this.baseUrl

package/dist/es2019/provider.js

@@ -5,7 +5,7 @@ import DataLoader from 'dataloader';
 import { getStatus } from '@atlaskit/linking-common';
 import { extractPreview } from '@atlaskit/link-extractors';
 import { Transformer } from './transformer';
-import { getBaseUrl, getResolverUrl } from './environments';
+import { getBaseUrl, getResolverUrl } from '@atlaskit/linking-common';
 import { CardClient } from '@atlaskit/link-provider';
 import * as api from './api';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';

package/dist/esm/provider.js

@@ -14,7 +14,7 @@ import DataLoader from 'dataloader';
 import { getStatus } from '@atlaskit/linking-common';
 import { extractPreview } from '@atlaskit/link-extractors';
 import { Transformer } from './transformer';
-import { getBaseUrl, getResolverUrl } from './environments';
+import { getBaseUrl, getResolverUrl } from '@atlaskit/linking-common';
 import { CardClient } from '@atlaskit/link-provider';
 import * as api from './api';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';

package/dist/types/provider.d.ts

@@ -1,7 +1,7 @@
 import 'setimmediate';
 import { CardAdf, CardAppearance, DatasourceAdf } from '@atlaskit/linking-common';
 import { CardProvider } from './types';
-import { EnvironmentsKeys } from './environments';
+import { EnvironmentsKeys } from '@atlaskit/linking-common';
 export declare class EditorCardProvider implements CardProvider {
     private baseUrl;
     private resolverUrl;

package/dist/types-ts4.5/provider.d.ts

@@ -1,7 +1,7 @@
 import 'setimmediate';
 import { CardAdf, CardAppearance, DatasourceAdf } from '@atlaskit/linking-common';
 import { CardProvider } from './types';
-import { EnvironmentsKeys } from './environments';
+import { EnvironmentsKeys } from '@atlaskit/linking-common';
 export declare class EditorCardProvider implements CardProvider {
     private baseUrl;
     private resolverUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-card-provider",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Contains the EditorCardProvider, for determining smart card behaviour in the editor.",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",

package/dist/cjs/environments.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getResolverUrl = exports.getBaseUrl = exports.default = exports.BaseUrls = void 0;
-// NOTE: This is copied from @atlaskit/link-provider.
-// This should be moved into @atlaskit/linking-common, to be done in
-// https://product-fabric.atlassian.net/browse/EDM-6042
-var devBaseUrl = 'https://api-private.dev.atlassian.com';
-var stgBaseUrl = 'https://pug.jira-dev.com/gateway/api';
-var prodBaseUrl = 'https://api-private.atlassian.com';
-var BaseUrls = exports.BaseUrls = {
-  dev: devBaseUrl,
-  development: devBaseUrl,
-  stg: stgBaseUrl,
-  staging: stgBaseUrl,
-  prd: prodBaseUrl,
-  prod: prodBaseUrl,
-  production: prodBaseUrl
-};
-var getBaseUrl = exports.getBaseUrl = function getBaseUrl(envKey) {
-  // If an environment is provided, then use Stargate.
-  if (envKey) {
-    return envKey in BaseUrls ? BaseUrls[envKey] : prodBaseUrl;
-  }
-
-  // Otherwise, use the current origin of the page.
-  return typeof window.location !== 'undefined' ? window.location.origin : '';
-};
-var getResolverUrl = exports.getResolverUrl = function getResolverUrl(envKey, baseUrlOverride) {
-  // If an environment is provided, then use Stargate directly for requests.
-  if (envKey || baseUrlOverride) {
-    var baseUrl = baseUrlOverride || getBaseUrl(envKey);
-    return "".concat(baseUrl, "/object-resolver");
-  } else {
-    // Otherwise, we fallback to using the Edge Proxy to access Stargate,
-    // which fixes some cookie issues with strict Browser policies.
-    return '/gateway/api/object-resolver';
-  }
-};
-var _default = exports.default = BaseUrls;

package/dist/es2019/environments.js

@@ -1,36 +0,0 @@
-// NOTE: This is copied from @atlaskit/link-provider.
-// This should be moved into @atlaskit/linking-common, to be done in
-// https://product-fabric.atlassian.net/browse/EDM-6042
-const devBaseUrl = 'https://api-private.dev.atlassian.com';
-const stgBaseUrl = 'https://pug.jira-dev.com/gateway/api';
-const prodBaseUrl = 'https://api-private.atlassian.com';
-export const BaseUrls = {
-  dev: devBaseUrl,
-  development: devBaseUrl,
-  stg: stgBaseUrl,
-  staging: stgBaseUrl,
-  prd: prodBaseUrl,
-  prod: prodBaseUrl,
-  production: prodBaseUrl
-};
-export const getBaseUrl = envKey => {
-  // If an environment is provided, then use Stargate.
-  if (envKey) {
-    return envKey in BaseUrls ? BaseUrls[envKey] : prodBaseUrl;
-  }
-
-  // Otherwise, use the current origin of the page.
-  return typeof window.location !== 'undefined' ? window.location.origin : '';
-};
-export const getResolverUrl = (envKey, baseUrlOverride) => {
-  // If an environment is provided, then use Stargate directly for requests.
-  if (envKey || baseUrlOverride) {
-    const baseUrl = baseUrlOverride || getBaseUrl(envKey);
-    return `${baseUrl}/object-resolver`;
-  } else {
-    // Otherwise, we fallback to using the Edge Proxy to access Stargate,
-    // which fixes some cookie issues with strict Browser policies.
-    return '/gateway/api/object-resolver';
-  }
-};
-export default BaseUrls;

package/dist/esm/environments.js

@@ -1,36 +0,0 @@
-// NOTE: This is copied from @atlaskit/link-provider.
-// This should be moved into @atlaskit/linking-common, to be done in
-// https://product-fabric.atlassian.net/browse/EDM-6042
-var devBaseUrl = 'https://api-private.dev.atlassian.com';
-var stgBaseUrl = 'https://pug.jira-dev.com/gateway/api';
-var prodBaseUrl = 'https://api-private.atlassian.com';
-export var BaseUrls = {
-  dev: devBaseUrl,
-  development: devBaseUrl,
-  stg: stgBaseUrl,
-  staging: stgBaseUrl,
-  prd: prodBaseUrl,
-  prod: prodBaseUrl,
-  production: prodBaseUrl
-};
-export var getBaseUrl = function getBaseUrl(envKey) {
-  // If an environment is provided, then use Stargate.
-  if (envKey) {
-    return envKey in BaseUrls ? BaseUrls[envKey] : prodBaseUrl;
-  }
-
-  // Otherwise, use the current origin of the page.
-  return typeof window.location !== 'undefined' ? window.location.origin : '';
-};
-export var getResolverUrl = function getResolverUrl(envKey, baseUrlOverride) {
-  // If an environment is provided, then use Stargate directly for requests.
-  if (envKey || baseUrlOverride) {
-    var baseUrl = baseUrlOverride || getBaseUrl(envKey);
-    return "".concat(baseUrl, "/object-resolver");
-  } else {
-    // Otherwise, we fallback to using the Edge Proxy to access Stargate,
-    // which fixes some cookie issues with strict Browser policies.
-    return '/gateway/api/object-resolver';
-  }
-};
-export default BaseUrls;

package/dist/types/environments.d.ts

@@ -1,13 +0,0 @@
-export type EnvironmentsKeys = keyof typeof BaseUrls;
-export declare const BaseUrls: {
-    dev: string;
-    development: string;
-    stg: string;
-    staging: string;
-    prd: string;
-    prod: string;
-    production: string;
-};
-export declare const getBaseUrl: (envKey?: keyof typeof BaseUrls) => string;
-export declare const getResolverUrl: (envKey?: EnvironmentsKeys, baseUrlOverride?: string) => string;
-export default BaseUrls;

package/dist/types-ts4.5/environments.d.ts

@@ -1,13 +0,0 @@
-export type EnvironmentsKeys = keyof typeof BaseUrls;
-export declare const BaseUrls: {
-    dev: string;
-    development: string;
-    stg: string;
-    staging: string;
-    prd: string;
-    prod: string;
-    production: string;
-};
-export declare const getBaseUrl: (envKey?: keyof typeof BaseUrls) => string;
-export declare const getResolverUrl: (envKey?: EnvironmentsKeys, baseUrlOverride?: string) => string;
-export default BaseUrls;