@atlaskit/editor-plugin-code-block-advanced 6.2.15 → 6.2.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/afm-cc/tsconfig.json +8 -1
  3. package/afm-jira/tsconfig.json +8 -1
  4. package/afm-products/tsconfig.json +8 -1
  5. package/dist/cjs/nodeviews/codeBlockNodeWithToDOMFixed.js +1 -1
  6. package/dist/cjs/ui/theme.js +2 -2
  7. package/dist/es2019/nodeviews/codeBlockNodeWithToDOMFixed.js +1 -1
  8. package/dist/es2019/ui/theme.js +2 -2
  9. package/dist/esm/nodeviews/codeBlockNodeWithToDOMFixed.js +1 -1
  10. package/dist/esm/ui/theme.js +2 -2
  11. package/package.json +9 -9
  12. package/src/nodeviews/codeBlockNodeWithToDOMFixed.ts +3 -2
  13. package/src/ui/theme.ts +6 -4
  14. package/tsconfig.app.json +6 -0
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/editor-plugin-code-block-advanced
2
2
 
3
+ ## 6.2.17
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 6.2.16
10
+
11
+ ### Patch Changes
12
+
13
+ - [`53aef9589ca55`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/53aef9589ca55) -
14
+ [EDITOR-3786] Make sure that for any check of `cc_editor_ai_content_mode` &&
15
+ `platform_editor_content_mode_button_mvp` in the code we are also checking
16
+ `confluence_compact_text_format`
17
+ - Updated dependencies
18
+
3
19
  ## 6.2.15
4
20
 
5
21
  ### Patch Changes
package/afm-cc/tsconfig.json CHANGED
@@ -4,7 +4,8 @@
4
4
  "target": "es5",
5
5
  "outDir": "../../../../../confluence/tsDist/@atlaskit__editor-plugin-code-block-advanced",
6
6
  "rootDir": "../",
7
- "composite": true
7
+ "composite": true,
8
+ "noCheck": true
8
9
  },
9
10
  "include": [
10
11
  "../src/**/*.ts",
@@ -22,6 +23,9 @@
22
23
  "../src/**/stories/**/*"
23
24
  ],
24
25
  "references": [
26
+ {
27
+ "path": "../../adf-schema/afm-cc/tsconfig.json"
28
+ },
25
29
  {
26
30
  "path": "../../editor-plugin-code-block/afm-cc/tsconfig.json"
27
31
  },
@@ -37,6 +41,9 @@
37
41
  {
38
42
  "path": "../../editor-plugin-selection-marker/afm-cc/tsconfig.json"
39
43
  },
44
+ {
45
+ "path": "../../editor-prosemirror/afm-cc/tsconfig.json"
46
+ },
40
47
  {
41
48
  "path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
42
49
  },
package/afm-jira/tsconfig.json CHANGED
@@ -4,7 +4,8 @@
4
4
  "target": "es5",
5
5
  "outDir": "../../../../../jira/tsDist/@atlaskit__editor-plugin-code-block-advanced/app",
6
6
  "rootDir": "../",
7
- "composite": true
7
+ "composite": true,
8
+ "noCheck": true
8
9
  },
9
10
  "include": [
10
11
  "../src/**/*.ts",
@@ -22,6 +23,9 @@
22
23
  "../src/**/stories/**/*"
23
24
  ],
24
25
  "references": [
26
+ {
27
+ "path": "../../adf-schema/afm-jira/tsconfig.json"
28
+ },
25
29
  {
26
30
  "path": "../../editor-plugin-code-block/afm-jira/tsconfig.json"
27
31
  },
@@ -37,6 +41,9 @@
37
41
  {
38
42
  "path": "../../editor-plugin-selection-marker/afm-jira/tsconfig.json"
39
43
  },
44
+ {
45
+ "path": "../../editor-prosemirror/afm-jira/tsconfig.json"
46
+ },
40
47
  {
41
48
  "path": "../../../platform/feature-flags/afm-jira/tsconfig.json"
42
49
  },
package/afm-products/tsconfig.json CHANGED
@@ -4,7 +4,8 @@
4
4
  "target": "es5",
5
5
  "outDir": "../../../../../tsDist/@atlaskit__editor-plugin-code-block-advanced/app",
6
6
  "rootDir": "../",
7
- "composite": true
7
+ "composite": true,
8
+ "noCheck": true
8
9
  },
9
10
  "include": [
10
11
  "../src/**/*.ts",
@@ -22,6 +23,9 @@
22
23
  "../src/**/stories/**/*"
23
24
  ],
24
25
  "references": [
26
+ {
27
+ "path": "../../adf-schema/afm-products/tsconfig.json"
28
+ },
25
29
  {
26
30
  "path": "../../editor-plugin-code-block/afm-products/tsconfig.json"
27
31
  },
@@ -37,6 +41,9 @@
37
41
  {
38
42
  "path": "../../editor-plugin-selection-marker/afm-products/tsconfig.json"
39
43
  },
44
+ {
45
+ "path": "../../editor-prosemirror/afm-products/tsconfig.json"
46
+ },
40
47
  {
41
48
  "path": "../../../platform/feature-flags/afm-products/tsconfig.json"
42
49
  },
package/dist/cjs/nodeviews/codeBlockNodeWithToDOMFixed.js CHANGED
@@ -22,7 +22,7 @@ var codeBlockClassNames = {
22
22
  };
23
23
  var MATCH_NEWLINES = new RegExp('\n', 'gu');
24
24
  var getFontSize = function getFontSize() {
25
- return (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
25
+ return (0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) || (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
26
26
  };
27
27
 
28
28
  // Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
package/dist/cjs/ui/theme.js CHANGED
@@ -8,10 +8,10 @@ var _view = require("@codemirror/view");
8
8
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
9
9
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
10
10
  var getLineHeight = function getLineHeight() {
11
- return (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? '1.5em' : '1.5rem';
11
+ return (0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) || (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? '1.5em' : '1.5rem';
12
12
  };
13
13
  var getFontSize = function getFontSize() {
14
- return (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
14
+ return (0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) || (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
15
15
  };
16
16
  var cmTheme = exports.cmTheme = _view.EditorView.theme({
17
17
  '&': {
package/dist/es2019/nodeviews/codeBlockNodeWithToDOMFixed.js CHANGED
@@ -11,7 +11,7 @@ const codeBlockClassNames = {
11
11
  content: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
12
12
  };
13
13
  const MATCH_NEWLINES = new RegExp('\n', 'gu');
14
- const getFontSize = () => expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
14
+ const getFontSize = () => expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
15
15
 
16
16
  // Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
17
17
  const toDOM = (node, formattedAriaLabel, config) => {
package/dist/es2019/ui/theme.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import { EditorView as CodeMirror } from '@codemirror/view';
2
2
  import { fg } from '@atlaskit/platform-feature-flags';
3
3
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
4
- const getLineHeight = () => expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '1.5em' : '1.5rem';
5
- const getFontSize = () => expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
4
+ const getLineHeight = () => expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '1.5em' : '1.5rem';
5
+ const getFontSize = () => expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
6
6
  export const cmTheme = CodeMirror.theme({
7
7
  '&': {
8
8
  backgroundColor: "var(--ds-background-neutral, #0515240F)",
package/dist/esm/nodeviews/codeBlockNodeWithToDOMFixed.js CHANGED
@@ -15,7 +15,7 @@ var codeBlockClassNames = {
15
15
  };
16
16
  var MATCH_NEWLINES = new RegExp('\n', 'gu');
17
17
  var getFontSize = function getFontSize() {
18
- return expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
18
+ return expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
19
19
  };
20
20
 
21
21
  // Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
package/dist/esm/ui/theme.js CHANGED
@@ -2,10 +2,10 @@ import { EditorView as CodeMirror } from '@codemirror/view';
2
2
  import { fg } from '@atlaskit/platform-feature-flags';
3
3
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
4
4
  var getLineHeight = function getLineHeight() {
5
- return expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '1.5em' : '1.5rem';
5
+ return expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '1.5em' : '1.5rem';
6
6
  };
7
7
  var getFontSize = function getFontSize() {
8
- return expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
8
+ return expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
9
9
  };
10
10
  export var cmTheme = CodeMirror.theme({
11
11
  '&': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-code-block-advanced",
3
- "version": "6.2.15",
3
+ "version": "6.2.17",
4
4
  "description": "CodeBlockAdvanced plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -28,17 +28,17 @@
28
28
  "sideEffects": false,
29
29
  "atlaskit:src": "src/index.ts",
30
30
  "dependencies": {
31
- "@atlaskit/adf-schema": "^51.5.1",
31
+ "@atlaskit/adf-schema": "^51.5.0",
32
32
  "@atlaskit/editor-plugin-code-block": "^8.1.0",
33
33
  "@atlaskit/editor-plugin-editor-disabled": "^6.1.0",
34
- "@atlaskit/editor-plugin-find-replace": "^6.1.0",
34
+ "@atlaskit/editor-plugin-find-replace": "^6.2.0",
35
35
  "@atlaskit/editor-plugin-selection": "^6.1.0",
36
- "@atlaskit/editor-plugin-selection-marker": "^6.2.0",
37
- "@atlaskit/editor-prosemirror": "7.0.0",
36
+ "@atlaskit/editor-plugin-selection-marker": "^6.3.0",
37
+ "@atlaskit/editor-prosemirror": "^7.2.0",
38
38
  "@atlaskit/platform-feature-flags": "^1.1.0",
39
39
  "@atlaskit/prosemirror-history": "^0.2.0",
40
- "@atlaskit/tmp-editor-statsig": "^15.0.0",
41
- "@atlaskit/tokens": "^8.4.0",
40
+ "@atlaskit/tmp-editor-statsig": "^16.0.0",
41
+ "@atlaskit/tokens": "^8.6.0",
42
42
  "@babel/runtime": "^7.0.0",
43
43
  "@codemirror/autocomplete": "6.18.4",
44
44
  "@codemirror/commands": "6.7.1",
@@ -54,12 +54,12 @@
54
54
  "codemirror-lang-elixir": "4.0.0"
55
55
  },
56
56
  "peerDependencies": {
57
- "@atlaskit/editor-common": "^110.40.0",
57
+ "@atlaskit/editor-common": "^110.46.0",
58
58
  "react": "^18.2.0",
59
59
  "react-intl-next": "npm:react-intl@^5.18.1"
60
60
  },
61
61
  "devDependencies": {
62
- "@atlaskit/code": "^17.3.0"
62
+ "@atlaskit/code": "^17.4.0"
63
63
  },
64
64
  "techstack": {
65
65
  "@atlassian/frontend": {
package/src/nodeviews/codeBlockNodeWithToDOMFixed.ts CHANGED
@@ -21,8 +21,9 @@ const codeBlockClassNames = {
21
21
  const MATCH_NEWLINES = new RegExp('\n', 'gu');
22
22
 
23
23
  const getFontSize = () =>
24
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
25
- fg('platform_editor_content_mode_button_mvp')
24
+ expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
25
+ (expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
26
+ fg('platform_editor_content_mode_button_mvp'))
26
27
  ? '0.875em'
27
28
  : '0.875rem';
28
29
 
package/src/ui/theme.ts CHANGED
@@ -5,14 +5,16 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
5
5
  import { token } from '@atlaskit/tokens';
6
6
 
7
7
  const getLineHeight = () =>
8
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
9
- fg('platform_editor_content_mode_button_mvp')
8
+ expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
9
+ (expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
10
+ fg('platform_editor_content_mode_button_mvp'))
10
11
  ? '1.5em'
11
12
  : '1.5rem';
12
13
 
13
14
  const getFontSize = () =>
14
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
15
- fg('platform_editor_content_mode_button_mvp')
15
+ expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
16
+ (expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
17
+ fg('platform_editor_content_mode_button_mvp'))
16
18
  ? '0.875em'
17
19
  : '0.875rem';
18
20
 
package/tsconfig.app.json CHANGED
@@ -31,6 +31,9 @@
31
31
  "outDir": "../../../tsDist/@atlaskit__editor-plugin-code-block-advanced/app"
32
32
  },
33
33
  "references": [
34
+ {
35
+ "path": "../adf-schema/tsconfig.app.json"
36
+ },
34
37
  {
35
38
  "path": "../../design-system/code/tsconfig.app.json"
36
39
  },
@@ -52,6 +55,9 @@
52
55
  {
53
56
  "path": "../editor-plugin-selection-marker/tsconfig.app.json"
54
57
  },
58
+ {
59
+ "path": "../editor-prosemirror/tsconfig.app.json"
60
+ },
55
61
  {
56
62
  "path": "../../platform/feature-flags/tsconfig.app.json"
57
63
  },