Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove tinymce external dependency

Browse Source
This commit is contained in:
Abhinav Jha 2020-04-17 10:29:43 +05:30
parent 8fc9c68782
commit b5a4e231d7
10 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/client/craco.build.config.js
View File

@ -1,22 +1,24 @@
/* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-var-requires */
const SentryWebpackPlugin = require('@sentry/webpack-plugin'); const SentryWebpackPlugin = require("@sentry/webpack-plugin");
const merge = require('webpack-merge'); const merge = require("webpack-merge");
const common = require('./craco.common.config.js'); 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") { if (env === "PRODUCTION" || env === "STAGING") {
plugins.push(new SentryWebpackPlugin({ plugins.push(
include: 'build', new SentryWebpackPlugin({
ignore: ['node_modules', 'webpack.config.js'], include: "build",
release: process.env.REACT_APP_SENTRY_RELEASE ignore: ["node_modules", "webpack.config.js"],
})) release: process.env.REACT_APP_SENTRY_RELEASE,
}),
);
} }
module.exports = merge(common, { module.exports = merge(common, {
webpack: { webpack: {
plugins: plugins plugins: plugins,
}, },
}); });

5
app/client/package.json
View File

@ -95,7 +95,6 @@
"shallowequal": "^1.1.0", "shallowequal": "^1.1.0",
"styled-components": "^4.1.3", "styled-components": "^4.1.3",
"tinycolor2": "^1.4.1", "tinycolor2": "^1.4.1",
"tinymce": "^5.2.0",
"toposort": "^2.0.2", "toposort": "^2.0.2",
"ts-loader": "^6.0.4", "ts-loader": "^6.0.4",
"typescript": "^3.6.3", "typescript": "^3.6.3",
@ -165,9 +164,9 @@
"react-test-renderer": "^16.11.0", "react-test-renderer": "^16.11.0",
"redux-devtools": "^3.5.0", "redux-devtools": "^3.5.0",
"redux-devtools-extension": "^2.13.8", "redux-devtools-extension": "^2.13.8",
"source-map-explorer": "^2.4.2",
"storybook-addon-designs": "^5.1.1", "storybook-addon-designs": "^5.1.1",
"webpack-merge": "^4.2.2", "webpack-merge": "^4.2.2"
"source-map-explorer": "^2.4.2"
}, },
"husky": { "husky": {
"hooks": { "hooks": {

1
app/client/public/index.html
View File

@ -3,7 +3,6 @@
<head> <head>
<script rel="prefetch" type="text/javascript" src="/shims/realms-shim.umd.min.js"></script> <script rel="prefetch" type="text/javascript" src="/shims/realms-shim.umd.min.js"></script>
<script rel="prefetch" type="text/javascript" src="/tinymce/tinymce.min.js"></script>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" /> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />

1
app/client/src/components/designSystems/appsmith/ChartComponent.tsx
View File

@ -196,7 +196,6 @@ class ChartComponent extends React.Component<ChartComponentProps> {
dataFormat: "json", dataFormat: "json",
dataSource: dataSource, dataSource: dataSource,
}; };
console.log("chartConfig", chartConfig);
this.chartInstance = new FusionCharts(chartConfig); this.chartInstance = new FusionCharts(chartConfig);
}; };

4
app/client/src/components/designSystems/appsmith/RichTextEditorComponent.tsx
View File

@ -1,9 +1,6 @@
import React from "react"; import React from "react";
import { Editor } from "@tinymce/tinymce-react"; import { Editor } from "@tinymce/tinymce-react";
import styled from "styled-components"; import styled from "styled-components";
require("tinymce/tinymce");
require("tinymce/themes/silver");
const StyledRTEditor = styled.div` const StyledRTEditor = styled.div`
&& { && {
width: 100%; width: 100%;
@ -28,6 +25,7 @@ export const RichtextEditorComponent = (
return ( return (
<StyledRTEditor> <StyledRTEditor>
<Editor <Editor
apiKey="joninoujfadq0q38n0us4tu89d2pawl1jxk4q09vcvxyfqrl"
value={props.defaultValue} value={props.defaultValue}
disabled={props.isDisabled} disabled={props.isDisabled}
init={{ init={{

12
app/client/src/index.tsx
View File

@ -28,7 +28,9 @@ import {
} from "constants/routes"; } from "constants/routes";
const loadingIndicator = <Loader />; const loadingIndicator = <Loader />;
const App = lazy(() => import("./App")); const App = lazy(() =>
import(/* webpackChunkName: "appsmith",webpackPrefetch: 10 */ "./App"),
);
const UserAuth = lazy(() => const UserAuth = lazy(() =>
import(/* webpackChunkName: "auth",webpackPrefetch: 5 */ "./pages/UserAuth"), import(/* webpackChunkName: "auth",webpackPrefetch: 5 */ "./pages/UserAuth"),
); );
@ -41,9 +43,7 @@ const Applications = lazy(() =>
), ),
); );
const PageNotFound = lazy(() => const PageNotFound = lazy(() =>
import( import(/* webpackChunkName: "404"*/ "./pages/common/PageNotFound"),
/* webpackChunkName: "404",webpackPrefetch: true */ "./pages/common/PageNotFound"
),
); );
const AppViewer = lazy(() => const AppViewer = lazy(() =>
import( import(
@ -51,9 +51,7 @@ const AppViewer = lazy(() =>
), ),
); );
const Organization = lazy(() => const Organization = lazy(() =>
import( import(/* webpackChunkName: "orgs" */ "./pages/organization"),
/* webpackChunkName: "orgs",webpackPrefetch: 1 */ "./pages/organization"
),
); );
const Users = lazy(() => import(/* webpackPrefetch: true */ "./pages/users")); const Users = lazy(() => import(/* webpackPrefetch: true */ "./pages/users"));
appInitializer(); appInitializer();

2
app/client/src/widgets/ChartWidget.tsx
View File

@ -8,7 +8,7 @@ import Skeleton from "components/utils/Skeleton";
const ChartComponent = lazy(() => const ChartComponent = lazy(() =>
import( import(
/* webpackPrefetch: true */ "components/designSystems/appsmith/ChartComponent" /* webpackPrefetch: true, webpackChunkName: "charts" */ "components/designSystems/appsmith/ChartComponent"
), ),
); );

4
app/client/src/widgets/RichTextEditorWidget.tsx
View File

@ -8,7 +8,9 @@ import { TriggerPropertiesMap } from "utils/WidgetFactory";
import Skeleton from "components/utils/Skeleton"; import Skeleton from "components/utils/Skeleton";
const RichtextEditorComponent = lazy(() => const RichtextEditorComponent = lazy(() =>
import("components/designSystems/appsmith/RichTextEditorComponent"), import(
/* webpackChunkName: "rte",webpackPrefetch: 2 */ "components/designSystems/appsmith/RichTextEditorComponent"
),
); );
class RichTextEditorWidget extends BaseWidget< class RichTextEditorWidget extends BaseWidget<

2
app/client/src/widgets/TableWidget.tsx
View File

@ -17,7 +17,7 @@ import Skeleton from "components/utils/Skeleton";
const TableComponent = lazy(() => const TableComponent = lazy(() =>
import( import(
/* webpackPrefetch: true */ "components/designSystems/syncfusion/TableComponent" /* webpackPrefetch: true, webpackChunkName: "table" */ "components/designSystems/syncfusion/TableComponent"
), ),
); );

5
app/client/yarn.lock
View File

@ -2157,6 +2157,7 @@
"@tinymce/tinymce-react@^3.5.0": "@tinymce/tinymce-react@^3.5.0":
version "3.5.0" version "3.5.0"
resolved "https://registry.yarnpkg.com/@tinymce/tinymce-react/-/tinymce-react-3.5.0.tgz#5017be56aeab1077f09d3f74a386883e5524a33f" 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: dependencies:
prop-types "^15.6.2" prop-types "^15.6.2"
@ -13544,10 +13545,6 @@ tinycolor2@^1.4.1:
version "1.4.1" version "1.4.1"
resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8" 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: tmp@0.1.0:
version "0.1.0" version "0.1.0"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"