Revert "#4145 - implement popup versions of ketcher and routing (#6455)"

This reverts commit e974a52.

Author: tanas80

demo/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@testing-library/jest-dom": "^5.16.2",
-    "@testing-library/react": "^15.0.7",
+    "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^13.5.0",
     "@types/jest": "^27.4.1",
     "@types/node": "^16.11.26",

example/config/webpack.config.js

@@ -6,7 +6,6 @@ const {
   addWebpackResolve,
 } = require('customize-cra');
 const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 const HtmlReplaceWebpackPlugin = require('html-replace-webpack-plugin');
 const GitRevisionPlugin = require('git-revision-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
@@ -40,51 +39,6 @@ module.exports = override(
       },
     ]),
   ),
-  addWebpackPlugin(
-    new CopyPlugin({
-      patterns: [
-        // {
-        //   from: '../node_modules/ketcher-standalone/**/*.wasm',
-        //   to: '[name][ext]',
-        // },
-        {
-          from: 'serve.json',
-          to: '.',
-        },
-      ],
-    }),
-  ),
-  (config) => {
-    config.plugins = config.plugins.filter(
-      (plugin) => !(plugin instanceof HtmlWebpackPlugin),
-    );
-    config.plugins.push(
-      new HtmlWebpackPlugin({
-        filename: 'index.html',
-        template: 'public/index.html',
-        chunks: ['main'],
-        inject: true,
-      }),
-      new HtmlWebpackPlugin({
-        filename: 'popup.html',
-        template: 'public/popup.html',
-        chunks: ['popup'],
-        inject: true,
-      }),
-      new HtmlWebpackPlugin({
-        filename: 'duo.html',
-        template: 'public/duo.html',
-        chunks: ['duo'],
-        inject: true,
-      }),
-    );
-    config.entry = {
-      main: './src/index.tsx',
-      popup: './src/popupIndex.tsx',
-      duo: './src/duoIndex.tsx',
-    };
-    return config;
-  },
 );
 
 module.exports.envVariables = envVariables;

example/package.json

@@ -30,8 +30,8 @@
     "test:prettier": "prettier --check \"./**/*.{js,ts,jsx,tsx,json}\"",
     "prettier:write": "prettier --write \"./**/*.{js,jsx,json,ts,tsx}\"",
     "stylelint:fix": "stylelint \"./**/*.{css,less}\" --formatter verbose --fix",
-    "serve:remote": "serve dist/remote -c serve.json -p 4001",
-    "serve:standalone": "serve dist/standalone -c serve.json -p 4002",
+    "serve:remote": "serve -s dist/remote -l 4001",
+    "serve:standalone": "serve -s dist/standalone -l 4002",
     "eject": "react-scripts eject"
   },
   "dependencies": {
@@ -65,11 +65,12 @@
     "prettier": "^2.5.1",
     "react-app-rewired": "^2.2.1",
     "react-scripts": "^5.0.1",
-    "serve": "^14.2.4",
+    "serve": "^13.0.2",
     "shx": "^0.3.3",
     "source-map-loader": "^3.0.1",
+    "stylelint": "13.13.1",
     "typescript": "^4.5.2",
-    "vite": "^4.5.5",
+    "vite": "^4.5.6",
     "vite-plugin-commonjs": "^0.10.4",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-raw": "^1.0.3",

example/public/duo.html

@@ -2,8 +2,11 @@ import 'ketcher-react/dist/index.css';
 
 import { useState } from 'react';
 import { ButtonsConfig, Editor, InfoModal } from 'ketcher-react';
-import { Ketcher } from 'ketcher-core';
-import { getStructServiceProvider } from './utils';
+import {
+  Ketcher,
+  RemoteStructServiceProvider,
+  StructServiceProvider,
+} from 'ketcher-core';
 
 const getHiddenButtonsConfig = (): ButtonsConfig => {
   const searchParams = new URLSearchParams(window.location.search);
@@ -18,7 +21,19 @@ const getHiddenButtonsConfig = (): ButtonsConfig => {
   }, {});
 };
 
-const structServiceProvider = getStructServiceProvider();
+let structServiceProvider: StructServiceProvider =
+  new RemoteStructServiceProvider(
+    process.env.API_PATH || process.env.REACT_APP_API_PATH,
+  );
+
+if (process.env.MODE === 'standalone') {
+  const {
+    StandaloneStructServiceProvider,
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+  } = require('ketcher-standalone');
+  structServiceProvider =
+    new StandaloneStructServiceProvider() as StructServiceProvider;
+}
 
 const App = () => {
   const hiddenButtonsConfig = getHiddenButtonsConfig();