Merge branch 'support/apply-nextjs-2' into support/omit-editor-any

packages/app/package.json

@@ -37,7 +37,7 @@
     "lint": "run-p lint:*",
     "test": "cross-env NODE_ENV=test jest --passWithNoTests -- ",
     "test:ci": "cross-env NODE_ENV=test jest",
-    "prelint:eslint": "yarn resources:plugin",
+    "// prelint:eslint": "yarn resources:plugin",
     "prelint:swagger2openapi": "yarn openapi:v3",
     "reg:run": "reg-suit run",
     "//// misc": "",

packages/app/src/components/InstallerForm.jsx

@@ -34,10 +34,6 @@ class InstallerForm extends React.Component {
       .then((res) => { return this.setState({ isValidUserName: res.data.valid }) });
   }
 
-  changeLanguage(meta) {
-    i18next.changeLanguage(meta.id);
-  }
-
   submitHandler() {
     if (this.state.isSubmittingDisabled) {
       return;
@@ -100,7 +96,7 @@ class InstallerForm extends React.Component {
                           data-testid={`dropdownLanguageMenu-${locale}`}
                           className="dropdown-item"
                           type="button"
-                          onClick={() => { this.changeLanguage(locale) }}
+                          onClick={() => { i18next.changeLanguage(meta.id) }}
                         >
                           {fixedT('meta.display_name')}
                         </button>

packages/app/src/components/PageEditor.tsx

@@ -399,8 +399,6 @@ const PageEditor = (props: Props): JSX.Element => {
     return <></>;
   }
 
-  // const config = props.appContainer.getConfig();
-  // const isUploadable = config.upload.image || config.upload.file;
   const isUploadable = isUploadableImage || isUploadableFile;