Change config and imports to es modules and update framework7

apps/common/mobile/lib/controller/Themes.js

@@ -1,5 +1,5 @@
 import { Dom7 } from 'framework7'
-import { LocalStorage } from "../../utils/LocalStorage";
+import { LocalStorage } from "../../utils/LocalStorage.mjs";
 
 class ThemesController {
     constructor() {

apps/common/mobile/lib/controller/collaboration/Collaboration.jsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import { f7 } from 'framework7-react';
 import {observer, inject} from "mobx-react"
-import { LocalStorage } from '../../../utils/LocalStorage';
+import { LocalStorage } from '../../../utils/LocalStorage.mjs';
 import { withTranslation } from 'react-i18next';
 
 class CollaborationController extends Component {

apps/common/mobile/lib/controller/collaboration/Comments.jsx

@@ -3,7 +3,7 @@ import { inject, observer } from "mobx-react";
 import { f7 } from 'framework7-react';
 import {Device} from '../../../../../common/mobile/utils/device';
 import { withTranslation} from 'react-i18next';
-import { LocalStorage } from '../../../utils/LocalStorage';
+import { LocalStorage } from '../../../utils/LocalStorage.mjs';
 
 import {AddComment, EditComment, AddReply, EditReply, ViewComments, ViewCurrentComments} from '../../view/collaboration/Comments';
 

apps/common/mobile/lib/controller/collaboration/Review.jsx

@@ -4,7 +4,7 @@ import {observer, inject} from "mobx-react"
 import { withTranslation } from 'react-i18next';
 
 import {PageReview, PageReviewChange} from "../../view/collaboration/Review";
-import {LocalStorage} from "../../../utils/LocalStorage";
+import {LocalStorage} from "../../../utils/LocalStorage.mjs";
 
 class InitReview extends Component {
     constructor(props){

apps/documenteditor/mobile/src/app.js

@@ -3,7 +3,8 @@ import React, { Suspense } from 'react';
 import { createRoot } from 'react-dom/client';
 
 // Import Framework7
-import Framework7 from 'framework7/lite-bundle';
+// framework7/lite-bundle
+import Framework7 from 'framework7';
 import { Dom7 } from 'framework7';
 window.$$ = Dom7;
 
@@ -22,13 +23,13 @@ import('./less/app.less');
 
 // Import App Component
 
-import App from './view/app';
+import App from './view/app.jsx';
 import { I18nextProvider } from 'react-i18next';
-import i18n from './lib/i18n';
+import i18n from './lib/i18n.js';
 
-import { Provider } from 'mobx-react'
+import { Provider } from 'mobx-react';
-import { stores } from './store/mainStore'
+import { stores } from './store/mainStore.js';
-import { LocalStorage } from '../../../common/mobile/utils/LocalStorage';
+// import { LocalStorage } from '../../../common/mobile/utils/LocalStorage';
 
 const container = document.getElementById('app');
 const root = createRoot(container); 

apps/documenteditor/mobile/src/controller/ContextMenu.jsx

@@ -2,7 +2,7 @@ import React, { useContext } from 'react';
 import { f7 } from 'framework7-react';
 import { inject, observer } from "mobx-react";
 import { withTranslation} from 'react-i18next';
-import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage';
+import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage.mjs';
 
 import ContextMenuController from '../../../../common/mobile/lib/controller/ContextMenu';
 import { idContextMenuElement } from '../../../../common/mobile/lib/view/ContextMenu';

apps/documenteditor/mobile/src/controller/Main.jsx

@@ -3,7 +3,7 @@ import React, {Component, Fragment} from 'react';
 import {inject} from "mobx-react";
 import { f7 } from "framework7-react";
 import { withTranslation } from 'react-i18next';
-import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage';
+import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage.mjs';
 import CollaborationController from '../../../../common/mobile/lib/controller/collaboration/Collaboration.jsx';
 import {InitReviewController as ReviewController} from '../../../../common/mobile/lib/controller/collaboration/Review.jsx';
 import { onAdvancedOptions } from './settings/Download.jsx';

apps/documenteditor/mobile/src/controller/Toolbar.jsx

@@ -3,7 +3,7 @@ import { inject, observer } from 'mobx-react';
 import { f7 } from 'framework7-react';
 import { useTranslation } from 'react-i18next';
 import ToolbarView from "../view/Toolbar";
-import {LocalStorage} from "../../../../common/mobile/utils/LocalStorage";
+import {LocalStorage} from "../../../../common/mobile/utils/LocalStorage.mjs";
 
 const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'storeFocusObjects', 'storeToolbarSettings','storeDocumentInfo')(observer(props => {
     const {t} = useTranslation();

apps/documenteditor/mobile/src/controller/settings/ApplicationSettings.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import { ApplicationSettings } from "../../view/settings/ApplicationSettings";
-import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage';
+import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage.mjs';
 import {observer, inject} from "mobx-react";
 import { Themes } from '../../../../../common/mobile/lib/controller/Themes.js';
 

apps/documenteditor/mobile/src/controller/settings/Settings.jsx

@@ -5,7 +5,7 @@ import { observer, inject } from "mobx-react";
 import {Device} from '../../../../../common/mobile/utils/device';
 
 import SettingsView from "../../view/settings/Settings";
-import {LocalStorage} from "../../../../../common/mobile/utils/LocalStorage";
+import {LocalStorage} from "../../../../../common/mobile/utils/LocalStorage.mjs";
 
 const Settings = props => {
     useEffect(() => {

apps/documenteditor/mobile/src/store/appOptions.js

@@ -1,5 +1,5 @@
 import {makeObservable, action, observable} from 'mobx';
-import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage';
+import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage.mjs';
 
 export class storeAppOptions {
     constructor() {

apps/documenteditor/mobile/src/store/applicationSettings.js

@@ -1,5 +1,5 @@
 import {makeObservable, action, observable} from 'mobx';
-import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage';
+import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage.mjs';
 
 export class storeApplicationSettings {
     constructor() {

apps/documenteditor/mobile/src/view/edit/EditText.jsx

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 import {Device} from '../../../../../common/mobile/utils/device';
 import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx';
 import HighlightColorPalette from '../../../../../common/mobile/lib/component/HighlightColorPalette.jsx';
-import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage';
+import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage.mjs';
 
 const PageFonts = props => {
     const isAndroid = Device.android;

vendor/framework7-react/babel.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+const config = {
   presets: [
     '@babel/preset-react',
     ['@babel/preset-env', {
@@ -12,3 +12,5 @@ module.exports = {
     ['@babel/plugin-proposal-class-properties',{'loose':false}],
   ],
 };
+
+export default config;

vendor/framework7-react/build/build.js

@@ -1,6 +1,6 @@
-const webpack = require('webpack');
+import webpack from 'webpack';
-const rm = require('rimraf');
+import rm from 'rimraf';
-const config = require('./webpack.config.js');
+import config from "./webpack.config.js";
 
 const env = process.env.NODE_ENV || 'development';
 const target = process.env.TARGET || 'web';

vendor/framework7-react/build/webpack.config.js

@@ -1,15 +1,14 @@
-const webpack = require('webpack');
+import webpack from 'webpack';
-const CopyWebpackPlugin = require('copy-webpack-plugin');
+import CopyWebpackPlugin from 'copy-webpack-plugin';
-const HtmlWebpackPlugin = require('html-webpack-plugin');
+import HtmlWebpackPlugin from 'html-webpack-plugin';
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+import MiniCssExtractPlugin from "mini-css-extract-plugin";
+import CssMinimizerPlugin from "css-minimizer-webpack-plugin";
+import TerserPlugin from "terser-webpack-plugin";
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from "url";
 
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
-const TerserPlugin = require('terser-webpack-plugin');
-const WorkboxPlugin = require('workbox-webpack-plugin');
-const fs = require('fs')
-
-const path = require('path');
 
 function resolvePath(dir) {
   return path.join(__dirname, '..', dir);
@@ -22,7 +21,7 @@ const editor = process.env.TARGET_EDITOR == 'cell' ? 'spreadsheeteditor' :
 const targetPatch = process.env.TARGET_EDITOR || 'word';
 const addonPath = process.env.ADDON_ENV || 'path';
 
-module.exports = {
+const config = {
   mode: env,
   entry: {
     app: `../../apps/${editor}/mobile/src/app.js`,
@@ -260,4 +259,6 @@ module.exports = {
                         //resource.request = `../../../${addonPath}/patch.jsx` : resource
     ),
   ],
-};
+};
+
+export default config;

vendor/framework7-react/package.json

@@ -18,6 +18,7 @@
     "build-slide": "cross-env NODE_ENV=development TARGET_EDITOR=slide node ./build/build.js",
     "build-cell": "cross-env NODE_ENV=development TARGET_EDITOR=cell node ./build/build.js"
   },
+  "type": "module",
   "browserslist": [
     "Android >= 7",
     "IOS >= 11",
@@ -28,9 +29,9 @@
   ],
   "dependencies": {
     "dom7": "^3.0.0",
-    "framework7": "^6.0.4",
+    "framework7": "^7.0.8",
     "framework7-icons": "^3.0.1",
-    "framework7-react": "^6.0.4",
+    "framework7-react": "^7.0.8",
     "i18next": "^21.8.9",
     "i18next-fetch-backend": "^5.0.0",
     "postcss": "^8.4.12",
@@ -40,7 +41,8 @@
     "react-i18next": "^11.8.5",
     "react-transition-group": "^4.4.5",
     "swiper": "^8.2.4",
-    "template7": "^1.4.2"
+    "template7": "^1.4.2",
+    "url": "^0.11.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",