INT-3365: Update dependencies

CHANGELOG.md

@@ -6,10 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-## 2.2.0 - 2025-07-31
+## 2.2.0 - 2025-10-16
+
+### Fixed
+- Editor initialization failure handling. #INT-3365
 
 ### Changed
-- Set the default cloudChannel to 8
+- Set the default cloudChannel to 8. #INT-3357
 
 ## 2.1.0 - 2023-03-27
 

eslint.config.mjs

@@ -0,0 +1,53 @@
+// eslint.config.js
+import { defineConfig } from 'eslint/config';
+import tinymceEslintPlugin from '@tinymce/eslint-plugin';
+import js from '@eslint/js';
+
+export default defineConfig([
+  {
+    files: [
+      "**/*.ts"
+    ],
+    plugins: {
+        "@tinymce": tinymceEslintPlugin
+    },
+    extends: [ '@tinymce/standard' ],
+    languageOptions: {
+      parserOptions: {
+        sourceType: "module",
+        project: [
+            "./tsconfig.json"
+        ]
+      },
+    },
+    rules: {}
+  },
+  {
+    files: [
+      "rollup.config.js",
+      "src/**/*.js"
+    ],
+    plugins: { js },
+    env: {
+      es6: true,
+      node: true,
+      browser: true
+    },
+    extends: [ "js/recommended" ],
+    parser: "espree",
+    languageOptions: {
+      parserOptions: {
+        ecmaVersion: 2020,
+        sourceType: "module"
+      }
+    },
+    rules: {
+      "indent": [ "error", 2, { "SwitchCase": 1 } ],
+      "no-shadow": "error",
+      "no-unused-vars": [ "error", { "argsIgnorePattern": "^_" } ],
+      "object-curly-spacing": [ "error", "always", { "arraysInObjects": false, "objectsInObjects": false } ],
+      "quotes": [ "error", "single" ],
+      "semi": "error"
+    }
+  }
+]);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinymce/tinymce-jquery",
-  "version": "2.2.0-rc",
+  "version": "2.2.0",
   "description": "Official TinyMCE integration for jQuery",
   "main": "dist/tinymce-jquery.js",
   "files": [
@@ -29,8 +29,8 @@
   "devDependencies": {
     "@babel/core": "^7.21.3",
     "@ephox/agar": "^7.4.1",
-    "@ephox/bedrock-client": "^15.0.0",
-    "@ephox/bedrock-server": "^15.0.2",
+    "@ephox/bedrock-client": "^14.0.0",
+    "@ephox/bedrock-server": "^14.0.0",
     "@ephox/katamari": "^9.1.5",
     "@ephox/mcagar": "^8.3.2",
     "@ephox/sand": "^6.0.9",
@@ -47,7 +47,7 @@
     "@storybook/storybook-deployer": "^2.8.16",
     "@storybook/testing-library": "^0.0.13",
     "@tinymce/beehive-flow": "^0.19.0",
-    "@tinymce/eslint-plugin": "^2.2.1",
+    "@tinymce/eslint-plugin": "^3.0.0",
     "@types/jquery": "^3.5.16",
     "@types/react": "^17.0.0",
     "babel-loader": "^8.3.0",
@@ -57,7 +57,7 @@
     "rollup": "^3.20.2",
     "tinymce": "^8.0.1",
     "tslib": "^2.5.0",
-    "typescript": "~4.8.3",
+    "typescript": "^5.9.3",
     "webpack": "^5.9.0"
   },
   "dependencies": {},

src/main/ts/Integration.ts

@@ -128,8 +128,10 @@ const tinymceFn = function (this: JQuery<HTMLElement>, settings?: RawEditorExten
           selector: undefined,
           target: elm,
           init_instance_callback: initInstanceCallback
+        }).catch((err) => {
+          /* eslint-disable-next-line no-console */
+          console.error('TinyMCE init failed', err);
         });
-
       }); // this.each
 
       if (initCount === this.length) {

src/stories/Editor.stories.ts

@@ -20,7 +20,10 @@ const Template: Story<RawEditorExtendedSettings> = (args) => {
 
   const addTinyMCE = () => {
     $(mountNode).after(`<div id="tiny${mount}"><p>The quick brown fox jumps over the lazy dog.</p></div>`);
-    $(`div#tiny${mount}`).tinymce(args);
+    $(`div#tiny${mount}`).tinymce(args).catch((err) => {
+      /* eslint-disable-next-line no-console */
+      console.error('TinyMCE init failed', err);
+    });
   };
 
   const removeTinyMCE = () => {

src/test/ts/browser/JqAppendTest.ts

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable @tinymce/prefer-fun */
+
 import { Assertions } from '@ephox/agar';
 import { context, describe, it } from '@ephox/bedrock-client';
 import { setupIntegration } from '../../../main/ts/Integration';

src/test/ts/browser/JqAttrTest.ts

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable @tinymce/prefer-fun */
+
 import { Assertions } from '@ephox/agar';
 import { context, describe, it } from '@ephox/bedrock-client';
 import { setupIntegration } from '../../../main/ts/Integration';

src/test/ts/browser/JqEmptyTest.ts

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable @tinymce/prefer-fun */
+
 import { ApproxStructure, Assertions } from '@ephox/agar';
 import { context, describe, it } from '@ephox/bedrock-client';
 import { SugarElement } from '@ephox/sugar';

src/test/ts/browser/JqHtmlTest.ts

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable @tinymce/prefer-fun */
+
 import { Assertions } from '@ephox/agar';
 import { context, describe, it } from '@ephox/bedrock-client';
 import { setupIntegration } from '../../../main/ts/Integration';

src/test/ts/browser/JqPrependTest.ts

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable @tinymce/prefer-fun */
+
 import { Assertions } from '@ephox/agar';
 import { context, describe, it } from '@ephox/bedrock-client';
 import { setupIntegration } from '../../../main/ts/Integration';

src/test/ts/browser/JqRemoveTest.ts

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable @tinymce/prefer-fun */
+
 import { ApproxStructure, Assertions } from '@ephox/agar';
 import { context, describe, it } from '@ephox/bedrock-client';
 import { SugarElement } from '@ephox/sugar';

src/test/ts/browser/JqTextTest.ts

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable @tinymce/prefer-fun */
+
 import { Assertions } from '@ephox/agar';
 import { context, describe, it } from '@ephox/bedrock-client';
 import { setupIntegration } from '../../../main/ts/Integration';

src/test/ts/browser/JqValTest.ts

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable @tinymce/prefer-fun */
+
 import { Assertions } from '@ephox/agar';
 import { context, describe, it } from '@ephox/bedrock-client';
 import { setupIntegration } from '../../../main/ts/Integration';

src/test/ts/browser/LoadTest.ts

@@ -28,6 +28,9 @@ UnitTest.asynctest('LoadTest', (success, failure) => {
           editorInstance = editor;
           seenInit.set(true);
         }
+      }).catch((err) => {
+        /* eslint-disable-next-line no-console */
+        console.error('TinyMCE init failed', err);
       });
     }),
     Waiter.sTryUntilPredicate('Waiting for editor setup', () => seenSetup.get()),

src/test/ts/browser/OriginalTest.ts

@@ -33,6 +33,9 @@ UnitTest.asynctest('browser.tinymce.core.JqueryIntegrationTest', (success, failu
             done();
           }
         }
+      }).catch((err) => {
+        /* eslint-disable-next-line no-console */
+        console.error('TinyMCE init failed', err);
       });
     });
   });
@@ -95,12 +98,18 @@ UnitTest.asynctest('browser.tinymce.core.JqueryIntegrationTest', (success, failu
   suite.test('applyPatch is only called once', () => {
     const options = {};
 
-    $('#elm1').tinymce(options);
+    $('#elm1').tinymce(options).catch((err) => {
+      /* eslint-disable-next-line no-console */
+      console.error('TinyMCE init failed', err);
+    });
 
     // eslint-disable-next-line @typescript-eslint/unbound-method
     const oldValFn = $.fn.val;
 
-    $('#elm2').tinymce(options);
+    $('#elm2').tinymce(options).catch((err) => {
+      /* eslint-disable-next-line no-console */
+      console.error('TinyMCE init failed', err);
+    });
 
     // eslint-disable-next-line @typescript-eslint/unbound-method
     LegacyUnit.equal($.fn.val, oldValFn);