Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Support buildstack changes for other modules #1446

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/dist/js/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/dist/js/vendor.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions client/src/bundles/vendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import 'expose-loader?exposes=classnames!classnames';
import 'expose-loader?exposes=DeepFreezeStrict!deep-freeze-strict';
import 'expose-loader?exposes=React!react';
import 'expose-loader?exposes=ReactDom!react-dom';
import 'expose-loader?exposes=ReactDomClient!react-dom/client';
import 'expose-loader?exposes=ReactRouterDom!react-router-dom';
import 'expose-loader?exposes=Reactstrap!reactstrap';
import 'expose-loader?exposes=IsomorphicFetch!isomorphic-fetch';
Expand All @@ -26,12 +27,16 @@ import 'expose-loader?exposes=ReduxThunk!redux-thunk';
import 'expose-loader?exposes=ReduxForm!redux-form';
import 'expose-loader?exposes=qs!qs';
import 'expose-loader?exposes=ReactSelect!react-select';
import 'expose-loader?exposes=ReactSelectAsync!react-select/async';
import 'expose-loader?exposes=ReactSelectAsyncCreatable!react-select/async-creatable';
import 'expose-loader?exposes=ReactSelectCreatable!react-select/creatable';
import 'expose-loader?exposes=ReactDND!react-dnd';
import 'expose-loader?exposes=ReactDNDHtml5Backend!react-dnd-html5-backend';
import 'expose-loader?exposes=Page!page.js';
import 'expose-loader?exposes=validator!validator';
// @apollo/client needs virtual.js to help expose it correctly - see https://github.com/webpack-contrib/expose-loader/issues/188
import 'virtual.js!=!expose-loader?exposes=ApolloClient!@apollo/client';
import 'virtual.js!=!expose-loader?exposes=ApolloClientReactHoc!@apollo/client/react/hoc';
import 'expose-loader?exposes=GraphQLTag!graphql-tag';
import 'expose-loader?exposes=GraphQLFragments!graphql-fragments';
import 'expose-loader?exposes=NodeUrl!url';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@ import { CacheProvider } from '@emotion/react';
* the default react-select styling
*/
function EmotionCssCacheProvider({ children }) {
const cache = React.useMemo(
() => createCache({
key: 'react-select',
insertionPoint: document.querySelector('title'),
}),
[]
);
if (!window.ssReactSelectCache) {
window.ssReactSelectCache = React.useMemo(
() => createCache({
key: 'react-select',
insertionPoint: document.querySelector('title'),
}),
[]
);
}

return <CacheProvider value={cache}>{children}</CacheProvider>;
return <CacheProvider value={window.ssReactSelectCache}>{children}</CacheProvider>;
}

export default EmotionCssCacheProvider;
1 change: 0 additions & 1 deletion client/src/legacy/AddToCampaignForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import i18n from 'i18n';
import jQuery from 'jquery';
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import { loadComponent } from 'lib/Injector';

Expand Down
1 change: 0 additions & 1 deletion client/src/legacy/GridField.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import $ from 'jquery';
import i18n from 'i18n';
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import Search from 'components/Search/Search.js';
import { schemaMerge } from 'lib/schemaFieldValues';
Expand Down
1 change: 0 additions & 1 deletion client/src/legacy/LeftAndMain.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/
import $ from 'jquery';
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import IframeDialog from 'components/IframeDialog/IframeDialog';
import Search from 'components/Search/Search';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* global window */
import jQuery from 'jquery';
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import { schemaMerge } from 'lib/schemaFieldValues';
import { MULTI_EMPTY_VALUE } from 'components/TreeDropdownField/TreeDropdownField';
Expand Down
1 change: 0 additions & 1 deletion client/src/legacy/UsedOnTable/UsedOnTableEntwine.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* global window */
import jQuery from 'jquery';
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import { schemaMerge } from 'lib/schemaFieldValues';
import { loadComponent } from 'lib/Injector';
Expand Down