Merge pull request #6973 from topcoder-platform/develop

PROD DEPLOY - PROD-4372
topcoder-platform · Mar 21, 2024 · 94b5fa2 · 94b5fa2
2 parents 496d3c6 + 24db7ac
commit 94b5fa2
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 10 deletions.
diff --git a/__tests__/shared/components/ProfilePage/BadgesModal/__snapshots__/index.jsx.snap b/__tests__/shared/components/ProfilePage/BadgesModal/__snapshots__/index.jsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders achievements correctly 1`] = `
-<ThemedModal
+<ThemedBaseModal
   composeAdhocTheme="deeply"
   composeContextTheme="softly"
   mapThemrProps={[Function]}
@@ -318,5 +318,5 @@ exports[`renders achievements correctly 1`] = `
       />
     </div>
   </aside>
-</ThemedModal>
+</ThemedBaseModal>
 `;
diff --git a/...ponents/ProfilePage/Stats/SubTrackChallengeView/GalleryModal/__snapshots__/index.jsx.snap b/...ponents/ProfilePage/Stats/SubTrackChallengeView/GalleryModal/__snapshots__/index.jsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders gallery modal 1`] = `
-<ThemedModal
+<ThemedBaseModal
   composeAdhocTheme="deeply"
   composeContextTheme="softly"
   mapThemrProps={[Function]}
@@ -124,5 +124,5 @@ exports[`renders gallery modal 1`] = `
       />
     </div>
   </div>
-</ThemedModal>
+</ThemedBaseModal>
 `;
diff --git a/__tests__/shared/components/tc-communities/__snapshots__/JoinCommunity.jsx.snap b/__tests__/shared/components/tc-communities/__snapshots__/JoinCommunity.jsx.snap
@@ -110,7 +110,7 @@ exports[`Matches shallow shapshot 4`] = `
   >
     Join Community
   </ThemedButton>
-  <ThemedModal
+  <ThemedBaseModal
     composeAdhocTheme="deeply"
     composeContextTheme="softly"
     mapThemrProps={[Function]}
@@ -151,7 +151,7 @@ exports[`Matches shallow shapshot 4`] = `
     >
       Return to the Community
     </ThemedButton>
-  </ThemedModal>
+  </ThemedBaseModal>
 </div>
 `;
 

diff --git a/config/webpack/development.js b/config/webpack/development.js
@@ -13,6 +13,7 @@ const standardDevelopmentConfig = configFactory({
     main: './src/client',
   },
   publicPath: '/api/cdn/public/static-assets',
+  crossOriginLoading: 'anonymous',
 });
 
 const jsxRule = standardDevelopmentConfig.module.rules.find(rule => rule.loader === 'babel-loader');

diff --git a/config/webpack/production.js b/config/webpack/production.js
@@ -20,6 +20,7 @@ const standardDevelopmentConfig = configFactory({
   },
   keepBuildInfo: Boolean(global.KEEP_BUILD_INFO),
   publicPath,
+  crossOriginLoading: 'anonymous',
 });
 
 const jsxRule = standardDevelopmentConfig.module.rules.find(rule => rule.loader === 'babel-loader');

diff --git a/config/webpack/qa.js b/config/webpack/qa.js
@@ -25,6 +25,7 @@ const standardDevelopmentConfig = configFactory({
   },
   keepBuildInfo: Boolean(global.KEEP_BUILD_INFO),
   publicPath,
+  crossOriginLoading: 'anonymous',
 });
 
 const jsxRule = standardDevelopmentConfig.module.rules.find(rule => rule.loader === 'babel-loader');

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -166,7 +166,7 @@
     "tc-ui": "^1.0.12",
     "topcoder-react-lib": "1.2.14",
     "topcoder-react-ui-kit": "2.0.1",
-    "topcoder-react-utils": "0.7.8",
+    "topcoder-react-utils": "github:topcoder-platform/topcoder-react-utils#v0.9.5",
     "turndown": "^4.0.2",
     "uninav-react": "git+https://github.com/topcoder-platform/uninav-react.git#0.0.2",
     "url-parse": "^1.4.1",