Merge pull request #12331 from kialam/fix-worker-json-404

Allow worker files to be loaded as blob objects.
ansible · Jun 7, 2022 · 309178e · 309178e
2 parents 76ffdbb + 48b3a43
commit 309178e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/awx/ui/public/index.html b/awx/ui/public/index.html
@@ -24,7 +24,7 @@
       </script>
       <meta
         http-equiv="Content-Security-Policy"
-        content="default-src 'self'; connect-src 'self' ws: wss:; style-src 'self' 'unsafe-inline'; script-src 'self' 'nonce-{{ csp_nonce }}' *.pendo.io https://d3js.org; img-src 'self' *.pendo.io data:; worker-src 'self';"
+        content="default-src 'self'; connect-src 'self' ws: wss:; style-src 'self' 'unsafe-inline'; script-src 'self' 'nonce-{{ csp_nonce }}' *.pendo.io https://d3js.org; img-src 'self' *.pendo.io data:; worker-src 'self' blob: ;"
       />
       <link rel="shortcut icon" href="{% static 'media/favicon.ico' %}" />
     <% } else { %>

diff --git a/awx/ui/src/components/CodeEditor/CodeEditor.js b/awx/ui/src/components/CodeEditor/CodeEditor.js
@@ -1,6 +1,5 @@
 import React, { useEffect, useRef, useCallback } from 'react';
 import { oneOf, bool, number, string, func, oneOfType } from 'prop-types';
-import { config } from 'ace-builds';
 
 import ReactAce from 'react-ace';
 import 'ace-builds/src-noconflict/mode-json';
@@ -13,8 +12,6 @@ import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import debounce from 'util/debounce';
 
-config.set('loadWorkerFromBlob', false);
-
 const LINE_HEIGHT = 24;
 const PADDING = 12;