Revert "Merge pull request #7509 from betagouv/US/fix-dynamic-imports-on-ff-60-69"

This reverts commit 8e13015e85, reversing
changes made to 3a16905d79.
This commit is contained in:
Paul Chavard 2022-06-30 09:34:08 +02:00
parent 8e13015e85
commit 4844f27404
6 changed files with 49 additions and 49 deletions

View file

@ -1,10 +1,11 @@
import { Controller } from '@hotwired/stimulus';
import { toggle, delegate } from '@utils';
import Chartkick from 'chartkick';
import Highcharts from 'highcharts';
export class ChartkickController extends Controller {
async connect() {
const Highcharts = await import('highcharts');
const Chartkick = await import('chartkick');
Chartkick.use(Highcharts);
const reflow = (nextChartId?: string) =>
nextChartId && Chartkick.charts[nextChartId]?.getChartObject()?.reflow();

View file

@ -1,38 +1,24 @@
import { Controller } from '@hotwired/stimulus';
import React from 'react';
import React, { lazy, Suspense, FunctionComponent } from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
import invariant from 'tiny-invariant';
type Props = Record<string, unknown>;
type Loader = () => Promise<{ default: FunctionComponent<Props> }>;
const componentsRegistry = new Map<string, FunctionComponent<Props>>();
const components = import.meta.glob('../components/*.tsx');
const componentsRegistry = new Map();
import ComboAdresseSearch from '../components/ComboAdresseSearch';
import ComboAnnuaireEducationSearch from '../components/ComboAnnuaireEducationSearch';
import ComboCommunesSearch from '../components/ComboCommunesSearch';
import ComboDepartementsSearch from '../components/ComboDepartementsSearch';
import ComboMultiple from '../components/ComboMultiple';
import ComboMultipleDropdownList from '../components/ComboMultipleDropdownList';
import ComboPaysSearch from '../components/ComboPaysSearch';
import ComboRegionsSearch from '../components/ComboRegionsSearch';
import ComboSearch from '../components/ComboSearch';
import MapEditor from '../components/MapEditor';
import MapReader from '../components/MapReader';
componentsRegistry.set('ComboAdresseSearch', ComboAdresseSearch);
componentsRegistry.set(
'ComboAnnuaireEducationSearch',
ComboAnnuaireEducationSearch
);
componentsRegistry.set('ComboCommunesSearch', ComboCommunesSearch);
componentsRegistry.set('ComboDepartementsSearch', ComboDepartementsSearch);
componentsRegistry.set('ComboMultiple', ComboMultiple);
componentsRegistry.set('ComboMultipleDropdownList', ComboMultipleDropdownList);
componentsRegistry.set('ComboPaysSearch', ComboPaysSearch);
componentsRegistry.set('ComboRegionsSearch', ComboRegionsSearch);
componentsRegistry.set('ComboSearch', ComboSearch);
componentsRegistry.set('MapEditor', MapEditor);
componentsRegistry.set('MapReader', MapReader);
for (const [path, loader] of Object.entries(components)) {
const [filename] = path.split('/').reverse();
const componentClassName = filename.replace(/\.(ts|tsx)$/, '');
console.debug(
`Registered lazy default export for "${componentClassName}" component`
);
componentsRegistry.set(
componentClassName,
LoadableComponent(loader as Loader)
);
}
// Initialize React components when their markup appears into the DOM.
//
@ -68,7 +54,19 @@ export class ReactController extends Controller {
render(<Component {...props} />, node);
}
private getComponent(componentName: string) {
private getComponent(componentName: string): FunctionComponent<Props> | null {
return componentsRegistry.get(componentName) ?? null;
}
}
const Spinner = () => <div className="spinner left" />;
function LoadableComponent(loader: Loader): FunctionComponent<Props> {
const LazyComponent = lazy(loader);
const Component: FunctionComponent<Props> = (props: Props) => (
<Suspense fallback={<Spinner />}>
<LazyComponent {...props} />
</Suspense>
);
return Component;
}

View file

@ -1,5 +1,8 @@
import { Controller } from '@hotwired/stimulus';
import 'trix';
import '@rails/actiontext';
export class TrixController extends Controller {}
export class TrixController extends Controller {
connect() {
import('trix');
import('@rails/actiontext');
}
}

View file

@ -68,5 +68,5 @@ Turbo.session.drive = false;
// Expose globals
window.DS = window.DS || DS;
import '../shared/track/matomo';
import '../shared/track/sentry';
import('../shared/track/matomo');
import('../shared/track/sentry');

View file

@ -1,15 +1,4 @@
import './polyfills/dataset';
import 'core-js/stable';
import 'regenerator-runtime/runtime';
import 'dom4';
import 'intersection-observer';
import 'whatwg-fetch';
import '@webcomponents/custom-elements';
import '@webcomponents/template';
import '@stimulus/polyfills';
import 'formdata-polyfill';
import 'event-target-polyfill';
import 'yet-another-abortcontroller-polyfill';
// IE 11 has no baseURI (required by turbo)
if (document.baseURI == undefined) {

View file

@ -44,7 +44,16 @@ if (shouldBuildLegacy()) {
export default defineConfig({
resolve: { alias: { '@utils': '/shared/utils.ts' } },
build: {
sourcemap: true
sourcemap: true,
rollupOptions: {
output: {
manualChunks(id) {
if (id.match('maplibre') || id.match('mapbox')) {
return 'maplibre';
}
}
}
}
},
plugins
});