fix: revert service worker as it conflict with webviews

CodinGame · Mar 8, 2024 · 01d8d53 · 01d8d53
1 parent 7864fdc
commit 01d8d53
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 94 deletions.
diff --git a/demo/coi-serviceworker.js b/demo/coi-serviceworker.js
diff --git a/demo/index.html b/demo/index.html
@@ -6,7 +6,6 @@
     <title>monaco-vscode-api demo</title>
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
     <script type="module" src="/src/loader.ts"></script>
-    <script async defer src="coi-serviceworker.js"></script>
   </head>
   <body>
   </body>

diff --git a/demo/package.json b/demo/package.json
@@ -23,8 +23,7 @@
     "@types/ws": "^8.5.10",
     "ts-node": "^10.9.2",
     "typescript": "~5.3.3",
-    "vite": "~5.1.5",
-    "vite-plugin-static-copy": "^1.0.1"
+    "vite": "~5.1.5"
   },
   "dependencies": {
     "@codingame/monaco-vscode-accessibility-service-override": "file:../dist/service-override-accessibility",

diff --git a/demo/vite.config.ts b/demo/vite.config.ts
@@ -1,6 +1,5 @@
 import { defineConfig } from 'vite'
 import importMetaUrlPlugin from '@codingame/esbuild-import-meta-url-plugin'
-import { viteStaticCopy } from 'vite-plugin-static-copy'
 import * as fs from 'fs'
 import path from 'path'
 import pkg from './package.json' assert { type: 'json' }
@@ -11,14 +10,19 @@ export default defineConfig({
     target: 'esnext'
   },
   plugins: [
-    viteStaticCopy({
-      targets: [
-        {
-          src: 'coi-serviceworker.js',
-          dest: './'
-        }
-      ]
-    }),
+    {
+      // For the *-language-features extensions which use SharedArrayBuffer
+      name: 'configure-response-headers',
+      apply: 'serve',
+      configureServer: server => {
+        server.middlewares.use((_req, res, next) => {
+          res.setHeader('Cross-Origin-Embedder-Policy', 'credentialless')
+          res.setHeader('Cross-Origin-Opener-Policy', 'same-origin')
+          res.setHeader('Cross-Origin-Resource-Policy', 'cross-origin')
+          next()
+        })
+      }
+    },
     {
       name: 'force-prevent-transform-assets',
       apply: 'serve',

diff --git a/demo/vite.github-page.config.ts b/demo/vite.github-page.config.ts
@@ -1,5 +1,4 @@
 import { defineConfig } from 'vite'
-import { viteStaticCopy } from 'vite-plugin-static-copy'
 import pkg from './package.json' assert { type: 'json' }
 
 const localDependencies = Object.entries(pkg.dependencies).filter(([, version]) => version.startsWith('file:../')).map(([name]) => name)
@@ -11,16 +10,6 @@ export default defineConfig({
   worker: {
     format: 'es'
   },
-  plugins: [
-    viteStaticCopy({
-      targets: [
-        {
-          src: 'coi-serviceworker.js',
-          dest: './'
-        }
-      ]
-    })
-  ],
   base: 'https://codingame.github.io/monaco-vscode-api',
   resolve: {
     dedupe: ['vscode', ...localDependencies]