@atlaskit/editor-plugin-text-formatting 1.2.0 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 1.2.2
+
+### Patch Changes
+
+- [#78224](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78224) [`6b4c9dd4ad34`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6b4c9dd4ad34) - ED-22219: adf-schema updated to 35.5.2
+- Updated dependencies
+
+## 1.2.1
+
+### Patch Changes
+
+- [#75482](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75482) [`18b5a6fb910a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/18b5a6fb910a) - # MAJOR CHANGE to `@atlaskit/prosemirror-input-rules` package.
+
+  ## WHY?
+
+  Removing editor-common dependencies from prosemirror-input-rules package.
+
+  This makes it easier for editor updates because it simplifies our dependency graph.
+
+  ## WHAT and HOW?
+
+  These are no longer available via `@atlaskit/prosemirror-input-rules` but are available from `@atlaskit/editor-common/types`:
+
+  - InputRuleWrapper
+  - InputRuleHandler
+  - OnHandlerApply
+  - createRule
+
+  These have changed from a `SafePlugin` to a `SafePluginSpec`. In order to update your code you need to instantiate a `SafePlugin` (ie. `new SafePlugin(createPlugin( ... ))`).
+
+  `SafePlugin` exists in `@atlaskit/editor-common/safe-plugin`.
+
+  - createPlugin
+  - createInputRulePlugin
+
+- Updated dependencies
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/cjs/pm-plugins/input-rule.js

@@ -18,6 +18,7 @@ var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/w
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _mark = require("@atlaskit/editor-common/mark");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _ValidCombinations;
@@ -179,8 +180,8 @@ function getStrongInputRules(schema, editorAnalyticsAPI) {
     }
   }, editorAnalyticsAPI);
   // **string** or __strong__ should bold the text
-  var doubleUnderscoreRule = (0, _prosemirrorInputRules.createRule)(strongRegex1, addMark(schema.marks.strong, schema, ValidAutoformatChars.STRONG));
-  var doubleAsterixRule = (0, _prosemirrorInputRules.createRule)(strongRegex2, addMark(schema.marks.strong, schema, ValidAutoformatChars.STRONG_MARKDOWN));
+  var doubleUnderscoreRule = (0, _utils.createRule)(strongRegex1, addMark(schema.marks.strong, schema, ValidAutoformatChars.STRONG));
+  var doubleAsterixRule = (0, _utils.createRule)(strongRegex2, addMark(schema.marks.strong, schema, ValidAutoformatChars.STRONG_MARKDOWN));
   return [ruleWithStrongAnalytics(doubleUnderscoreRule), ruleWithStrongAnalytics(doubleAsterixRule)];
 }
 
@@ -200,8 +201,8 @@ function getItalicInputRules(schema, editorAnalyticsAPI) {
       inputMethod: _analytics.INPUT_METHOD.FORMATTING
     }
   }, editorAnalyticsAPI);
-  var underscoreRule = (0, _prosemirrorInputRules.createRule)(italicRegex1, addMark(schema.marks.em, schema, ValidAutoformatChars.ITALIC));
-  var asterixRule = (0, _prosemirrorInputRules.createRule)(italicRegex2, addMark(schema.marks.em, schema, ValidAutoformatChars.ITALIC_MARKDOWN));
+  var underscoreRule = (0, _utils.createRule)(italicRegex1, addMark(schema.marks.em, schema, ValidAutoformatChars.ITALIC));
+  var asterixRule = (0, _utils.createRule)(italicRegex2, addMark(schema.marks.em, schema, ValidAutoformatChars.ITALIC_MARKDOWN));
   return [ruleWithItalicAnalytics(underscoreRule), ruleWithItalicAnalytics(asterixRule)];
 }
 
@@ -221,7 +222,7 @@ function getStrikeInputRules(schema, editorAnalyticsAPI) {
       inputMethod: _analytics.INPUT_METHOD.FORMATTING
     }
   }, editorAnalyticsAPI);
-  var doubleTildeRule = (0, _prosemirrorInputRules.createRule)(strikeRegex, addMark(schema.marks.strike, schema, ValidAutoformatChars.STRIKE));
+  var doubleTildeRule = (0, _utils.createRule)(strikeRegex, addMark(schema.marks.strike, schema, ValidAutoformatChars.STRIKE));
   return [ruleWithStrikeAnalytics(doubleTildeRule)];
 }
 
@@ -241,7 +242,7 @@ function getCodeInputRules(schema, editorAnalyticsAPI) {
       inputMethod: _analytics.INPUT_METHOD.FORMATTING
     }
   }, editorAnalyticsAPI);
-  var backTickRule = (0, _prosemirrorInputRules.createRule)(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE));
+  var backTickRule = (0, _utils.createRule)(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE));
   return [ruleWithCodeAnalytics(backTickRule)];
 }
 function inputRulePlugin(schema, editorAnalyticsAPI) {
@@ -259,7 +260,7 @@ function inputRulePlugin(schema, editorAnalyticsAPI) {
     rules.push.apply(rules, (0, _toConsumableArray2.default)(getCodeInputRules(schema, editorAnalyticsAPI)));
   }
   if (rules.length !== 0) {
-    return (0, _prosemirrorInputRules.createPlugin)('text-formatting', rules);
+    return new _safePlugin.SafePlugin((0, _prosemirrorInputRules.createPlugin)('text-formatting', rules));
   }
   return;
 }

package/dist/cjs/pm-plugins/smart-input-rule.js

@@ -9,6 +9,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
@@ -38,7 +39,7 @@ function replaceTextUsingCaptureGroup(text) {
   };
 }
 function createReplacementRule(to, from) {
-  return (0, _prosemirrorInputRules.createRule)(from, replaceTextUsingCaptureGroup(to));
+  return (0, _utils.createRule)(from, replaceTextUsingCaptureGroup(to));
 }
 
 /**
@@ -64,7 +65,7 @@ function createReplacementRules(replMap, replacementRuleWithAnalytics) {
 function createSingleQuotesRules() {
   return [
   // wrapped text
-  (0, _prosemirrorInputRules.createRule)(/(\s|^)'(\S+.*\S+)'$/, function (state, match, start, end) {
+  (0, _utils.createRule)(/(\s|^)'(\S+.*\S+)'$/, function (state, match, start, end) {
     var OPEN_SMART_QUOTE_CHAR = '‘';
     var CLOSED_SMART_QUOTE_CHAR = '’';
     var _match2 = (0, _slicedToArray2.default)(match, 3),
@@ -171,5 +172,5 @@ function getPunctuationRules(editorAnalyticsAPI) {
   })));
 }
 var _default = exports.default = function _default(editorAnalyticsAPI) {
-  return (0, _prosemirrorInputRules.createPlugin)('text-formatting:smart-input', [].concat((0, _toConsumableArray2.default)(getProductRules(editorAnalyticsAPI)), (0, _toConsumableArray2.default)(getSymbolRules(editorAnalyticsAPI)), (0, _toConsumableArray2.default)(getPunctuationRules(editorAnalyticsAPI))));
+  return new _safePlugin.SafePlugin((0, _prosemirrorInputRules.createPlugin)('text-formatting:smart-input', [].concat((0, _toConsumableArray2.default)(getProductRules(editorAnalyticsAPI)), (0, _toConsumableArray2.default)(getSymbolRules(editorAnalyticsAPI)), (0, _toConsumableArray2.default)(getPunctuationRules(editorAnalyticsAPI)))));
 };

package/dist/es2019/pm-plugins/input-rule.js

@@ -1,7 +1,8 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { transformSmartCharsMentionsAndEmojis } from '@atlaskit/editor-common/mark';
-import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
-import { createPlugin, createRule, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
+import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
   ValidAutoformatChars["STRIKE"] = "~~";
@@ -235,7 +236,7 @@ export function inputRulePlugin(schema, editorAnalyticsAPI) {
     rules.push(...getCodeInputRules(schema, editorAnalyticsAPI));
   }
   if (rules.length !== 0) {
-    return createPlugin('text-formatting', rules);
+    return new SafePlugin(createPlugin('text-formatting', rules));
   }
   return;
 }

package/dist/es2019/pm-plugins/smart-input-rule.js

@@ -1,7 +1,8 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, PUNC, SYMBOL } from '@atlaskit/editor-common/analytics';
-import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { createPlugin, createRule } from '@atlaskit/prosemirror-input-rules';
+import { createPlugin } from '@atlaskit/prosemirror-input-rules';
 
 /**
  * Creates an InputRuleHandler that will match on a regular expression of the
@@ -152,4 +153,4 @@ function getPunctuationRules(editorAnalyticsAPI) {
   const singleQuoteRules = createSingleQuotesRules();
   return [...dashEllipsisRules, ...doubleQuoteRules, ...singleQuoteRules.map(rule => punctuationRuleWithAnalytics(PUNC.QUOTE_SINGLE)(rule))];
 }
-export default (editorAnalyticsAPI => createPlugin('text-formatting:smart-input', [...getProductRules(editorAnalyticsAPI), ...getSymbolRules(editorAnalyticsAPI), ...getPunctuationRules(editorAnalyticsAPI)]));
+export default (editorAnalyticsAPI => new SafePlugin(createPlugin('text-formatting:smart-input', [...getProductRules(editorAnalyticsAPI), ...getSymbolRules(editorAnalyticsAPI), ...getPunctuationRules(editorAnalyticsAPI)])));

package/dist/esm/pm-plugins/input-rule.js

@@ -12,8 +12,9 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { transformSmartCharsMentionsAndEmojis } from '@atlaskit/editor-common/mark';
-import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
-import { createPlugin, createRule, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
+import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
   ValidAutoformatChars["STRIKE"] = "~~";
@@ -250,7 +251,7 @@ export function inputRulePlugin(schema, editorAnalyticsAPI) {
     rules.push.apply(rules, _toConsumableArray(getCodeInputRules(schema, editorAnalyticsAPI)));
   }
   if (rules.length !== 0) {
-    return createPlugin('text-formatting', rules);
+    return new SafePlugin(createPlugin('text-formatting', rules));
   }
   return;
 }

package/dist/esm/pm-plugins/smart-input-rule.js

@@ -2,9 +2,10 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, PUNC, SYMBOL } from '@atlaskit/editor-common/analytics';
-import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { createPlugin, createRule } from '@atlaskit/prosemirror-input-rules';
+import { createPlugin } from '@atlaskit/prosemirror-input-rules';
 
 /**
  * Creates an InputRuleHandler that will match on a regular expression of the
@@ -165,5 +166,5 @@ function getPunctuationRules(editorAnalyticsAPI) {
   })));
 }
 export default (function (editorAnalyticsAPI) {
-  return createPlugin('text-formatting:smart-input', [].concat(_toConsumableArray(getProductRules(editorAnalyticsAPI)), _toConsumableArray(getSymbolRules(editorAnalyticsAPI)), _toConsumableArray(getPunctuationRules(editorAnalyticsAPI))));
+  return new SafePlugin(createPlugin('text-formatting:smart-input', [].concat(_toConsumableArray(getProductRules(editorAnalyticsAPI)), _toConsumableArray(getSymbolRules(editorAnalyticsAPI)), _toConsumableArray(getPunctuationRules(editorAnalyticsAPI)))));
 });

package/dist/types/pm-plugins/input-rule.d.ts

@@ -1,5 +1,5 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 declare enum ValidAutoformatChars {
     STRONG = "__",

package/dist/types/pm-plugins/smart-input-rule.d.ts

@@ -1,3 +1,4 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-declare const _default: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => import("@atlaskit/editor-common/safe-plugin").SafePlugin<any>;
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+declare const _default: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => SafePlugin<any>;
 export default _default;

package/dist/types-ts4.5/pm-plugins/input-rule.d.ts

@@ -1,5 +1,5 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 declare enum ValidAutoformatChars {
     STRONG = "__",

package/dist/types-ts4.5/pm-plugins/smart-input-rule.d.ts

@@ -1,3 +1,4 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-declare const _default: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => import("@atlaskit/editor-common/safe-plugin").SafePlugin<any>;
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+declare const _default: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => SafePlugin<any>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-text-formatting",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Text-formatting plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -32,14 +32,14 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.5.1",
-    "@atlaskit/editor-common": "^78.3.0",
+    "@atlaskit/adf-schema": "^35.5.2",
+    "@atlaskit/editor-common": "^78.10.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/editor-tables": "^2.5.0",
-    "@atlaskit/icon": "^22.0.0",
-    "@atlaskit/prosemirror-input-rules": "^2.4.0",
+    "@atlaskit/icon": "^22.1.0",
+    "@atlaskit/prosemirror-input-rules": "^3.0.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "react-intl-next": "npm:react-intl@^5.18.1"