@_sh/strapi-plugin-ckeditor 1.1.1 → 1.1.3

package/admin/src/utils/axiosInstance.js

@@ -1,40 +1,40 @@
-/**
- * axios with a custom config.
- */
-
-import axios from 'axios';
-import { auth } from '@strapi/helper-plugin';
-
-const instance = axios.create({
-  baseURL: process.env.STRAPI_ADMIN_BACKEND_URL,
-});
-
-instance.interceptors.request.use(
-  async config => {
-    config.headers = {
-      Authorization: `Bearer ${auth.getToken()}`,
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-    };
-
-    return config;
-  },
-  error => {
-    Promise.reject(error);
-  }
-);
-
-instance.interceptors.response.use(
-  response => response,
-  error => {
-    // whatever you want to do with the error
-    if (error.response?.status === 401) {
-      auth.clearAppStorage();
-      window.location.reload();
-    }
-
-    throw error;
-  }
-);
-
-export default instance;
+/**
+ * axios with a custom config.
+ */
+
+import axios from 'axios';
+import { auth } from '@strapi/helper-plugin';
+
+const instance = axios.create({
+  baseURL: process.env.STRAPI_ADMIN_BACKEND_URL,
+});
+
+instance.interceptors.request.use(
+  async config => {
+    config.headers = {
+      Authorization: `Bearer ${auth.getToken()}`,
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    };
+
+    return config;
+  },
+  error => {
+    Promise.reject(error);
+  }
+);
+
+instance.interceptors.response.use(
+  response => response,
+  error => {
+    // whatever you want to do with the error
+    if (error.response?.status === 401) {
+      auth.clearAppStorage();
+      window.location.reload();
+    }
+
+    throw error;
+  }
+);
+
+export default instance;

package/admin/src/utils/getTrad.js

@@ -1,5 +1,5 @@
-import pluginId from '../pluginId';
-
-const getTrad = id => `${pluginId}.${id}`;
-
-export default getTrad;
+import pluginId from '../pluginId';
+
+const getTrad = id => `${pluginId}.${id}`;
+
+export default getTrad;

package/package.json

@@ -1,50 +1,50 @@
-{
-  "name": "@_sh/strapi-plugin-ckeditor",
-  "version": "1.1.1",
-  "description": "Replaces the default Strapi WYSIWYG editor with a customized buil of CKEditor 5 packed with useful plugins.",
-  "private": false,
-  "keywords": [
-    "strapi",
-    "ckeditor",
-    "ckeditor5",
-    "ckeditor 5",
-    "wysiwyg",
-    "rich text",
-    "editor"
-  ],
-  "strapi": {
-    "icon": "edit",
-    "name": "ckeditor",
-    "displayName": "CKEditor 5",
-    "description": "Replaces the default Strapi WYSIWYG editor with a customized buil of CKEditor 5 packed with useful plugins.",
-    "kind": "plugin"
-  },
-  "files": [
-    "admin",
-    "server",
-    "strapi-admin.js",
-    "strapi-server.js"
-  ],
-  "dependencies": {
-    "@ckeditor/ckeditor5-react": "5.0.0"
-  },
-  "peerDependencies": {
-    "@strapi/strapi": "^4.0.0"
-  },
-  "author": {
-    "name": "nshenderov"
-  },
-  "homepage": "https://market.strapi.io/plugins/@_sh-strapi-plugin-ckeditor",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/nshenderov/strapi-plugin-ckeditor.git"
-  },
-  "scripts": {
-    "test": "echo \"Error: no tests specified\" && exit 1"
-  },
-  "engines": {
-    "node": ">=12.x.x <=16.x.x",
-    "npm": ">=6.0.0"
-  },
-  "license": "MIT"
-}
+{
+  "name": "@_sh/strapi-plugin-ckeditor",
+  "version": "1.1.3",
+  "description": "Replaces the default Strapi WYSIWYG editor with a customized buil of CKEditor 5 packed with useful plugins.",
+  "private": false,
+  "keywords": [
+    "strapi",
+    "ckeditor",
+    "ckeditor5",
+    "ckeditor 5",
+    "wysiwyg",
+    "rich text",
+    "editor"
+  ],
+  "strapi": {
+    "icon": "edit",
+    "name": "ckeditor",
+    "displayName": "CKEditor 5",
+    "description": "Replaces the default Strapi WYSIWYG editor with a customized buil of CKEditor 5 packed with useful plugins.",
+    "kind": "plugin"
+  },
+  "files": [
+    "admin",
+    "server",
+    "strapi-admin.js",
+    "strapi-server.js"
+  ],
+  "dependencies": {
+    "@ckeditor/ckeditor5-react": "^5.0.2"
+  },
+  "peerDependencies": {
+    "@strapi/strapi": "^4.0.0"
+  },
+  "author": {
+    "name": "nshenderov"
+  },
+  "homepage": "https://market.strapi.io/plugins/@_sh-strapi-plugin-ckeditor",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nshenderov/strapi-plugin-ckeditor.git"
+  },
+  "scripts": {
+    "test": "echo \"Error: no tests specified\" && exit 1"
+  },
+  "engines": {
+    "node": ">=14.19.1 <=18.x.x",
+    "npm": ">=6.0.0"
+  },
+  "license": "MIT"
+}

package/server/controllers/config.js

@@ -1,15 +1,21 @@
-'use strict';
-
-module.exports = {
-  getConfig: async (ctx) => {
-    const { configKey } = ctx.params;
-    if(configKey === 'uploadcfg'){
-      const uploadConfig = await strapi.plugin('ckeditor').service('config').getUploadConfig('upload').getSettings();
-      ctx.send(uploadConfig);
-    }else{
-      const config = await strapi.plugin('ckeditor').service('config').getConfig(configKey);
-      ctx.send(config);
-    }
-    
-  },
+'use strict';
+
+module.exports = {
+  getConfig: async (ctx) => {
+    const { configKey } = ctx.params;
+    if(configKey === 'uploadcfg'){
+      const uploadConfig = await strapi.plugin('ckeditor').service('config').getUploadConfig('upload').getSettings();
+      ctx.send(uploadConfig);
+    }else{
+      const config = await strapi.plugin('ckeditor').service('config').getConfig(configKey);
+      ctx.send(config);
+    }
+
+  },
+
+  getEditorConfigScript: async (ctx) => {
+    const config = await strapi.plugin('ckeditor').service('config').getEditorConfigScript();
+    ctx.type = 'application/javascript';
+    ctx.send(config);
+  }
 };

package/server/controllers/index.js

@@ -1,7 +1,7 @@
-'use strict';
-
-const config = require('./config');
-
-module.exports = {
-  config
-};
+'use strict';
+
+const config = require('./config');
+
+module.exports = {
+  config
+};

package/server/index.js

@@ -1,25 +1,13 @@
-'use strict';
-
-const register = require('./register');
-const bootstrap = require('./bootstrap');
-const destroy = require('./destroy');
-const config = require('./config');
-const contentTypes = require('./content-types');
-const controllers = require('./controllers');
-const routes = require('./routes');
-const middlewares = require('./middlewares');
-const policies = require('./policies');
-const services = require('./services');
-
-module.exports = {
-  register,
-  bootstrap,
-  destroy,
-  config,
-  controllers,
-  routes,
-  services,
-  contentTypes,
-  policies,
-  middlewares,
-};
+'use strict';
+
+const register = require('./register');
+const controllers = require('./controllers');
+const routes = require('./routes');
+const services = require('./services');
+
+module.exports = {
+  register,
+  controllers,
+  routes,
+  services,
+};

package/server/register.js

@@ -1,5 +1,5 @@
-'use strict';
-
-module.exports = ({ strapi }) => {
-  // registeration phase
-};
+'use strict';
+
+module.exports = ({ strapi }) => {
+  // registeration phase
+};

package/server/routes/index.js

@@ -1,8 +1,16 @@
-module.exports = [
-  {
-    method: 'GET',
-    path: '/config/:configKey',
-    handler: 'config.getConfig',
-    config: { policies: [] },
-  }
-];
+module.exports = [
+    {
+        method: 'GET',
+        path: '/config/:configKey',
+        handler: 'config.getConfig',
+        config: {policies: []},
+    },
+    {
+        method: 'GET',
+        path: '/editor-config-script.js',
+        handler: 'config.getEditorConfigScript',
+        config: {
+            auth: false // Assume CKEditor config is not sensitive. We can't send a JWT token in a static script tag.
+        },
+    }
+];

package/server/services/config.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const fs = require("fs");
+
 /**
  * config.js configuration service
  */
@@ -9,6 +11,16 @@ module.exports = ({ strapi }) => {
     getConfig(key = 'editor') {
       return strapi.plugin('ckeditor').config(key) ?? {};
     },
+    getEditorConfigScript() {
+      const appDir = process.cwd();
+      const isTSProject = fs.existsSync(`${appDir}/dist`);
+      const jsDir = isTSProject ? `${appDir}/dist` : appDir;
+
+      const filename = `${jsDir}/config/ckeditor.js`;
+      return fs.existsSync(filename)
+        ? fs.readFileSync(filename)
+        : 'globalThis.ckEditorConfig = null' // empty script tag causes no problems
+    },
     getUploadConfig(name) {
       return strapi.plugin('upload').service(name) ?? {};
     },

package/server/services/index.js

@@ -1,7 +1,7 @@
-'use strict';
-
-const config = require('./config');
-
-module.exports = {
-  config
-};
+'use strict';
+
+const config = require('./config');
+
+module.exports = {
+  config
+};

package/strapi-admin.js

@@ -1,3 +1,3 @@
-'use strict';
-
-module.exports = require('./admin/src').default;
+'use strict';
+
+module.exports = require('./admin/src').default;

package/strapi-server.js

@@ -1,3 +1,3 @@
-'use strict';
-
-module.exports = require('./server');
+'use strict';
+
+module.exports = require('./server');

package/server/bootstrap.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = ({ strapi }) => {
-  // bootstrap phase
-};

package/server/config/index.js

@@ -1,6 +0,0 @@
-'use strict';
-
-module.exports = {
-  default: {},
-  validator() {},
-};

package/server/content-types/index.js

@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = {};

package/server/destroy.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = ({ strapi }) => {
-  // destroy phase
-};

package/server/middlewares/index.js

@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = {};

package/server/policies/index.js

@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = {};