From b5a4e231d7da4bbb6ba8214d3dc6a7f0545c2419 Mon Sep 17 00:00:00 2001 From: Abhinav Jha Date: Fri, 17 Apr 2020 10:29:43 +0530 Subject: [PATCH] Remove tinymce external dependency --- app/client/craco.build.config.js | 26 ++++++++++--------- app/client/package.json | 5 ++-- app/client/public/index.html | 1 - .../designSystems/appsmith/ChartComponent.tsx | 1 - .../appsmith/RichTextEditorComponent.tsx | 4 +-- app/client/src/index.tsx | 12 ++++----- app/client/src/widgets/ChartWidget.tsx | 2 +- .../src/widgets/RichTextEditorWidget.tsx | 4 ++- app/client/src/widgets/TableWidget.tsx | 2 +- app/client/yarn.lock | 5 +--- 10 files changed, 28 insertions(+), 34 deletions(-) diff --git a/app/client/craco.build.config.js b/app/client/craco.build.config.js index f20adf3bd2..f8526e92ca 100644 --- a/app/client/craco.build.config.js +++ b/app/client/craco.build.config.js @@ -1,22 +1,24 @@ /* eslint-disable @typescript-eslint/no-var-requires */ -const SentryWebpackPlugin = require('@sentry/webpack-plugin'); -const merge = require('webpack-merge'); -const common = require('./craco.common.config.js'); +const SentryWebpackPlugin = require("@sentry/webpack-plugin"); +const merge = require("webpack-merge"); +const common = require("./craco.common.config.js"); -const env = process.env.REACT_APP_ENVIRONMENT +const env = process.env.REACT_APP_ENVIRONMENT; -const plugins = [] +const plugins = []; -if(env === "PRODUCTION" || env === "STAGING") { - plugins.push(new SentryWebpackPlugin({ - include: 'build', - ignore: ['node_modules', 'webpack.config.js'], - release: process.env.REACT_APP_SENTRY_RELEASE - })) +if (env === "PRODUCTION" || env === "STAGING") { + plugins.push( + new SentryWebpackPlugin({ + include: "build", + ignore: ["node_modules", "webpack.config.js"], + release: process.env.REACT_APP_SENTRY_RELEASE, + }), + ); } module.exports = merge(common, { webpack: { - plugins: plugins + plugins: plugins, }, }); diff --git a/app/client/package.json b/app/client/package.json index 3ecf59140a..1e284b1ccb 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -95,7 +95,6 @@ "shallowequal": "^1.1.0", "styled-components": "^4.1.3", "tinycolor2": "^1.4.1", - "tinymce": "^5.2.0", "toposort": "^2.0.2", "ts-loader": "^6.0.4", "typescript": "^3.6.3", @@ -165,9 +164,9 @@ "react-test-renderer": "^16.11.0", "redux-devtools": "^3.5.0", "redux-devtools-extension": "^2.13.8", + "source-map-explorer": "^2.4.2", "storybook-addon-designs": "^5.1.1", - "webpack-merge": "^4.2.2", - "source-map-explorer": "^2.4.2" + "webpack-merge": "^4.2.2" }, "husky": { "hooks": { diff --git a/app/client/public/index.html b/app/client/public/index.html index 24a0973d06..73698b02c1 100755 --- a/app/client/public/index.html +++ b/app/client/public/index.html @@ -3,7 +3,6 @@ - diff --git a/app/client/src/components/designSystems/appsmith/ChartComponent.tsx b/app/client/src/components/designSystems/appsmith/ChartComponent.tsx index c476318a62..9174cb5ca9 100644 --- a/app/client/src/components/designSystems/appsmith/ChartComponent.tsx +++ b/app/client/src/components/designSystems/appsmith/ChartComponent.tsx @@ -196,7 +196,6 @@ class ChartComponent extends React.Component { dataFormat: "json", dataSource: dataSource, }; - console.log("chartConfig", chartConfig); this.chartInstance = new FusionCharts(chartConfig); }; diff --git a/app/client/src/components/designSystems/appsmith/RichTextEditorComponent.tsx b/app/client/src/components/designSystems/appsmith/RichTextEditorComponent.tsx index 0eb86a0f75..83a1cbe223 100644 --- a/app/client/src/components/designSystems/appsmith/RichTextEditorComponent.tsx +++ b/app/client/src/components/designSystems/appsmith/RichTextEditorComponent.tsx @@ -1,9 +1,6 @@ import React from "react"; import { Editor } from "@tinymce/tinymce-react"; import styled from "styled-components"; -require("tinymce/tinymce"); -require("tinymce/themes/silver"); - const StyledRTEditor = styled.div` && { width: 100%; @@ -28,6 +25,7 @@ export const RichtextEditorComponent = ( return ( ; -const App = lazy(() => import("./App")); +const App = lazy(() => + import(/* webpackChunkName: "appsmith",webpackPrefetch: 10 */ "./App"), +); const UserAuth = lazy(() => import(/* webpackChunkName: "auth",webpackPrefetch: 5 */ "./pages/UserAuth"), ); @@ -41,9 +43,7 @@ const Applications = lazy(() => ), ); const PageNotFound = lazy(() => - import( - /* webpackChunkName: "404",webpackPrefetch: true */ "./pages/common/PageNotFound" - ), + import(/* webpackChunkName: "404"*/ "./pages/common/PageNotFound"), ); const AppViewer = lazy(() => import( @@ -51,9 +51,7 @@ const AppViewer = lazy(() => ), ); const Organization = lazy(() => - import( - /* webpackChunkName: "orgs",webpackPrefetch: 1 */ "./pages/organization" - ), + import(/* webpackChunkName: "orgs" */ "./pages/organization"), ); const Users = lazy(() => import(/* webpackPrefetch: true */ "./pages/users")); appInitializer(); diff --git a/app/client/src/widgets/ChartWidget.tsx b/app/client/src/widgets/ChartWidget.tsx index 4972f4e030..2b980b79c0 100644 --- a/app/client/src/widgets/ChartWidget.tsx +++ b/app/client/src/widgets/ChartWidget.tsx @@ -8,7 +8,7 @@ import Skeleton from "components/utils/Skeleton"; const ChartComponent = lazy(() => import( - /* webpackPrefetch: true */ "components/designSystems/appsmith/ChartComponent" + /* webpackPrefetch: true, webpackChunkName: "charts" */ "components/designSystems/appsmith/ChartComponent" ), ); diff --git a/app/client/src/widgets/RichTextEditorWidget.tsx b/app/client/src/widgets/RichTextEditorWidget.tsx index 940d5737e8..ab142e9151 100644 --- a/app/client/src/widgets/RichTextEditorWidget.tsx +++ b/app/client/src/widgets/RichTextEditorWidget.tsx @@ -8,7 +8,9 @@ import { TriggerPropertiesMap } from "utils/WidgetFactory"; import Skeleton from "components/utils/Skeleton"; const RichtextEditorComponent = lazy(() => - import("components/designSystems/appsmith/RichTextEditorComponent"), + import( + /* webpackChunkName: "rte",webpackPrefetch: 2 */ "components/designSystems/appsmith/RichTextEditorComponent" + ), ); class RichTextEditorWidget extends BaseWidget< diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx index d2c75b7ff3..92d6ae0ede 100644 --- a/app/client/src/widgets/TableWidget.tsx +++ b/app/client/src/widgets/TableWidget.tsx @@ -17,7 +17,7 @@ import Skeleton from "components/utils/Skeleton"; const TableComponent = lazy(() => import( - /* webpackPrefetch: true */ "components/designSystems/syncfusion/TableComponent" + /* webpackPrefetch: true, webpackChunkName: "table" */ "components/designSystems/syncfusion/TableComponent" ), ); diff --git a/app/client/yarn.lock b/app/client/yarn.lock index cd6512cf8e..0ee3b2fda6 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -2157,6 +2157,7 @@ "@tinymce/tinymce-react@^3.5.0": version "3.5.0" resolved "https://registry.yarnpkg.com/@tinymce/tinymce-react/-/tinymce-react-3.5.0.tgz#5017be56aeab1077f09d3f74a386883e5524a33f" + integrity sha512-sZPerYmSWQcdk7F9KEvCC3/kPNZ9Bb+dk8rS0RoYyYql/gqgNpLpycC+CC/KhgT0wDaYuRoCcdV1DVZGam+oOg== dependencies: prop-types "^15.6.2" @@ -13544,10 +13545,6 @@ tinycolor2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8" -tinymce@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.2.0.tgz#e838640f61c8a936317bc27a5d2e16c297df3418" - tmp@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"