Ver Fonte

Move entrypoints into an admin subfolder

This allows us to have entrypoints compiling to other apps besides wagtailadmin.
Matt Westcott há 4 anos atrás
pai
commit
a2ff3e1252
29 ficheiros alterados com 43 adições e 39 exclusões
  1. 0 0
      client/src/entrypoints/admin/blocks/list.js
  2. 0 0
      client/src/entrypoints/admin/blocks/sequence.js
  3. 0 0
      client/src/entrypoints/admin/blocks/stream.js
  4. 0 0
      client/src/entrypoints/admin/blocks/struct.js
  5. 0 0
      client/src/entrypoints/admin/core.js
  6. 0 0
      client/src/entrypoints/admin/date-time-chooser.js
  7. 1 1
      client/src/entrypoints/admin/draftail.js
  8. 0 0
      client/src/entrypoints/admin/draftail.test.js
  9. 0 0
      client/src/entrypoints/admin/expanding_formset.js
  10. 0 0
      client/src/entrypoints/admin/filtered-select.js
  11. 0 0
      client/src/entrypoints/admin/hallo-bootstrap.js
  12. 0 0
      client/src/entrypoints/admin/hallo-plugins/hallo-hr.js
  13. 0 0
      client/src/entrypoints/admin/hallo-plugins/hallo-requireparagraphs.js
  14. 0 0
      client/src/entrypoints/admin/hallo-plugins/hallo-wagtaillink.js
  15. 0 0
      client/src/entrypoints/admin/lock-unlock-action.js
  16. 0 0
      client/src/entrypoints/admin/modal-workflow.js
  17. 0 0
      client/src/entrypoints/admin/page-chooser-modal.js
  18. 0 0
      client/src/entrypoints/admin/page-chooser.js
  19. 0 0
      client/src/entrypoints/admin/page-editor.js
  20. 2 2
      client/src/entrypoints/admin/page-editor.test.js
  21. 0 0
      client/src/entrypoints/admin/privacy-switch.js
  22. 0 0
      client/src/entrypoints/admin/task-chooser-modal.js
  23. 0 0
      client/src/entrypoints/admin/task-chooser.js
  24. 0 0
      client/src/entrypoints/admin/userbar.js
  25. 1 1
      client/src/entrypoints/admin/wagtailadmin.js
  26. 2 2
      client/src/entrypoints/admin/wagtailadmin.test.js
  27. 0 0
      client/src/entrypoints/admin/workflow-action.js
  28. 0 0
      client/src/entrypoints/admin/workflow-status.js
  29. 37 33
      client/webpack.config.js

+ 0 - 0
client/src/entrypoints/blocks/list.js → client/src/entrypoints/admin/blocks/list.js


+ 0 - 0
client/src/entrypoints/blocks/sequence.js → client/src/entrypoints/admin/blocks/sequence.js


+ 0 - 0
client/src/entrypoints/blocks/stream.js → client/src/entrypoints/admin/blocks/stream.js


+ 0 - 0
client/src/entrypoints/blocks/struct.js → client/src/entrypoints/admin/blocks/struct.js


+ 0 - 0
client/src/entrypoints/core.js → client/src/entrypoints/admin/core.js


+ 0 - 0
client/src/entrypoints/date-time-chooser.js → client/src/entrypoints/admin/date-time-chooser.js


+ 1 - 1
client/src/entrypoints/draftail.js → client/src/entrypoints/admin/draftail.js

@@ -4,7 +4,7 @@ import draftail, {
   Document,
   ImageBlock,
   EmbedBlock,
-} from '../components/Draftail/index';
+} from '../../components/Draftail/index';
 
 /**
  * Entry point loaded when the Draftail editor is in use.

+ 0 - 0
client/src/entrypoints/draftail.test.js → client/src/entrypoints/admin/draftail.test.js


+ 0 - 0
client/src/entrypoints/expanding_formset.js → client/src/entrypoints/admin/expanding_formset.js


+ 0 - 0
client/src/entrypoints/filtered-select.js → client/src/entrypoints/admin/filtered-select.js


+ 0 - 0
client/src/entrypoints/hallo-bootstrap.js → client/src/entrypoints/admin/hallo-bootstrap.js


+ 0 - 0
client/src/entrypoints/hallo-plugins/hallo-hr.js → client/src/entrypoints/admin/hallo-plugins/hallo-hr.js


+ 0 - 0
client/src/entrypoints/hallo-plugins/hallo-requireparagraphs.js → client/src/entrypoints/admin/hallo-plugins/hallo-requireparagraphs.js


+ 0 - 0
client/src/entrypoints/hallo-plugins/hallo-wagtaillink.js → client/src/entrypoints/admin/hallo-plugins/hallo-wagtaillink.js


+ 0 - 0
client/src/entrypoints/lock-unlock-action.js → client/src/entrypoints/admin/lock-unlock-action.js


+ 0 - 0
client/src/entrypoints/modal-workflow.js → client/src/entrypoints/admin/modal-workflow.js


+ 0 - 0
client/src/entrypoints/page-chooser-modal.js → client/src/entrypoints/admin/page-chooser-modal.js


+ 0 - 0
client/src/entrypoints/page-chooser.js → client/src/entrypoints/admin/page-chooser.js


+ 0 - 0
client/src/entrypoints/page-editor.js → client/src/entrypoints/admin/page-editor.js


+ 2 - 2
client/src/entrypoints/page-editor.test.js → client/src/entrypoints/admin/page-editor.test.js

@@ -1,6 +1,6 @@
-window.$ = require('../../../wagtail/admin/static_src/wagtailadmin/js/vendor/jquery-3.5.1.min');
+window.$ = require('../../../../wagtail/admin/static_src/wagtailadmin/js/vendor/jquery-3.5.1.min');
 // eslint-disable-next-line no-unused-expressions
-require('../../../wagtail/admin/static_src/wagtailadmin/js/vendor/urlify').default;
+require('../../../../wagtail/admin/static_src/wagtailadmin/js/vendor/urlify').default;
 
 const cleanForSlug = require('./page-editor').cleanForSlug;
 

+ 0 - 0
client/src/entrypoints/privacy-switch.js → client/src/entrypoints/admin/privacy-switch.js


+ 0 - 0
client/src/entrypoints/task-chooser-modal.js → client/src/entrypoints/admin/task-chooser-modal.js


+ 0 - 0
client/src/entrypoints/task-chooser.js → client/src/entrypoints/admin/task-chooser.js


+ 0 - 0
client/src/entrypoints/userbar.js → client/src/entrypoints/admin/userbar.js


+ 1 - 1
client/src/entrypoints/wagtailadmin.js → client/src/entrypoints/admin/wagtailadmin.js

@@ -9,7 +9,7 @@ import {
   initSkipLink,
   initIE11Warning,
   initUpgradeNotification,
-} from '..';
+} from '../..';
 
 if (process.env.NODE_ENV === 'development') {
   // Run react-axe in development only, so it does not affect performance

+ 2 - 2
client/src/entrypoints/wagtailadmin.test.js → client/src/entrypoints/admin/wagtailadmin.test.js

@@ -1,6 +1,6 @@
-jest.mock('..');
+jest.mock('../..');
 
-const wagtail = require('..');
+const wagtail = require('../..');
 
 document.addEventListener = jest.fn();
 

+ 0 - 0
client/src/entrypoints/workflow-action.js → client/src/entrypoints/admin/workflow-action.js


+ 0 - 0
client/src/entrypoints/workflow-status.js → client/src/entrypoints/admin/workflow-status.js


+ 37 - 33
client/webpack.config.js

@@ -13,41 +13,45 @@ const exposedDependencies = {
 };
 
 module.exports = function exports() {
-  const entrypoints = [
-    'blocks/list',
-    'blocks/sequence',
-    'blocks/stream',
-    'blocks/struct',
-    'core',
-    'date-time-chooser',
-    'draftail',
-    'expanding_formset',
-    'filtered-select',
-    'hallo-bootstrap',
-    'hallo-plugins/hallo-hr',
-    'hallo-plugins/hallo-requireparagraphs',
-    'hallo-plugins/hallo-wagtaillink',
-    'lock-unlock-action',
-    'modal-workflow',
-    'page-chooser-modal',
-    'page-chooser',
-    'page-editor',
-    'privacy-switch',
-    'task-chooser-modal',
-    'task-chooser',
-    'userbar',
-    'wagtailadmin',
-    'workflow-action',
-    'workflow-status',
-  ];
+  const entrypoints = {
+    admin: [
+      'blocks/list',
+      'blocks/sequence',
+      'blocks/stream',
+      'blocks/struct',
+      'core',
+      'date-time-chooser',
+      'draftail',
+      'expanding_formset',
+      'filtered-select',
+      'hallo-bootstrap',
+      'hallo-plugins/hallo-hr',
+      'hallo-plugins/hallo-requireparagraphs',
+      'hallo-plugins/hallo-wagtaillink',
+      'lock-unlock-action',
+      'modal-workflow',
+      'page-chooser-modal',
+      'page-chooser',
+      'page-editor',
+      'privacy-switch',
+      'task-chooser-modal',
+      'task-chooser',
+      'userbar',
+      'wagtailadmin',
+      'workflow-action',
+      'workflow-status',
+    ],
+  };
 
   const entry = {};
-  entrypoints.forEach(moduleName => {
-    entry[getOutputPath('admin', moduleName)] = [
-      './client/src/utils/polyfills.js',
-      `./client/src/entrypoints/${moduleName}.js`,
-    ];
-  });
+  for (const [appName, moduleNames] of Object.entries(entrypoints)) {
+    moduleNames.forEach(moduleName => {
+      entry[getOutputPath(appName, moduleName)] = [
+        './client/src/utils/polyfills.js',
+        `./client/src/entrypoints/${appName}/${moduleName}.js`,
+      ];
+    });
+  }
 
   return {
     entry: entry,