chore: Fix merge conflicts

.env

@@ -30,7 +30,6 @@ USER_INFO_COOKIE_NAME=''
 ENABLE_ACCESSIBILITY_PAGE=false
 ENABLE_PROGRESS_GRAPH_SETTINGS=false
 ENABLE_TEAM_TYPE_SETTING=false
-ENABLE_NEW_EDITOR_PAGES=true
 ENABLE_UNIT_PAGE=false
 ENABLE_ASSETS_PAGE=false
 ENABLE_VIDEO_UPLOAD_PAGE_LINK_IN_CONTENT_DROPDOWN=false

.env.development

@@ -32,7 +32,6 @@ USER_INFO_COOKIE_NAME='edx-user-info'
 ENABLE_ACCESSIBILITY_PAGE=false
 ENABLE_PROGRESS_GRAPH_SETTINGS=false
 ENABLE_TEAM_TYPE_SETTING=false
-ENABLE_NEW_EDITOR_PAGES=true
 ENABLE_UNIT_PAGE=false
 ENABLE_ASSETS_PAGE=false
 ENABLE_VIDEO_UPLOAD_PAGE_LINK_IN_CONTENT_DROPDOWN=true

.env.test

@@ -28,7 +28,6 @@ SUPPORT_URL='https://support.edx.org'
 USER_INFO_COOKIE_NAME='edx-user-info'
 ENABLE_PROGRESS_GRAPH_SETTINGS=false
 ENABLE_TEAM_TYPE_SETTING=false
-ENABLE_NEW_EDITOR_PAGES=true
 ENABLE_UNIT_PAGE=true
 ENABLE_ASSETS_PAGE=false
 ENABLE_VIDEO_UPLOAD_PAGE_LINK_IN_CONTENT_DROPDOWN=true

.eslintignore

@@ -1,4 +1,6 @@
 coverage/*
 dist/
 node_modules/
-jest.config.js
+jest.config.js
+env.config.jsx
+example.env.config.jsx

.gitignore

@@ -26,3 +26,6 @@ temp/babel-plugin-react-intl
 
 # Messages .json files fetched by atlas
 src/i18n/messages/
+
+# environment js config
+env.config.jsx

README.rst

@@ -140,13 +140,6 @@ Requirements
   * ``new_core_editors.use_new_video_editor``: must be enabled for the new Video Xblock editor to be used in Studio
   * ``new_core_editors.use_new_problem_editor``: must be enabled for the new Problem Xblock editor to be used in Studio
 
-Configuration
--------------
-
-In additional to the standard settings, the following local configuration item is required:
-
-* ``ENABLE_NEW_EDITOR_PAGES``: must be enabled in order to actually present the new XBlock editors (on by default)
-
 Feature Description
 -------------------
 

example.env.config.jsx

@@ -0,0 +1,24 @@
+import WholeCourseTranslation from '@edx/course-app-translation-plugin';
+import { PLUGIN_OPERATIONS, DIRECT_PLUGIN } from '@openedx/frontend-plugin-framework';
+
+// Load environment variables from .env file
+const config = {
+  ...process.env,
+  pluginSlots: {
+    additional_course_plugin: {
+      plugins: [
+        {
+          op: PLUGIN_OPERATIONS.Insert,
+          widget: {
+            id: 'whole-course-translation-plugin',
+            type: DIRECT_PLUGIN,
+            priority: 1,
+            RenderWidget: WholeCourseTranslation,
+          },
+        },
+      ],
+    },
+  },
+};
+
+export default config;