Merge pull request #3415 from torgeirsk/fix-webpack-nonce-cra

use window.__webpack_nonce__ to avoid overwriting by react-scripts
styled-components · Mar 10, 2021 · 6151662 · 6151662
2 parents c14b039 + 15b0796
commit 6151662
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packages/benchmarks/src/implementations/styled-components-v4/styled-components-v4.esm.js b/packages/benchmarks/src/implementations/styled-components-v4/styled-components-v4.esm.js
diff --git a/packages/styled-components/src/utils/nonce.js b/packages/styled-components/src/utils/nonce.js
@@ -1,10 +1,10 @@
 // @flow
 /* eslint-disable camelcase, no-undef */
 
-declare var __webpack_nonce__: string;
+declare var window: { __webpack_nonce__: string };
 
 const getNonce = () => {
-  return typeof __webpack_nonce__ !== 'undefined' ? __webpack_nonce__ : null;
+  return typeof window.__webpack_nonce__ !== 'undefined' ? window.__webpack_nonce__ : null;
 };
 
 export default getNonce;
diff --git a/scripts/jest/config.main.js b/scripts/jest/config.main.js
@@ -7,4 +7,7 @@ module.exports = Object.assign({}, baseConfig, {
   setupFiles: ['raf/polyfill', '<rootDir>/src/test/globals.js'],
   setupFilesAfterEnv: ['<rootDir>/test-utils/setupTestFramework.js'],
   testPathIgnorePatterns: ['<rootDir>/src/native', '<rootDir>/src/primitives'],
+  globals: {
+    window: { __webpack_nonce__: 'test' },
+  },
 });