Skip to content

Commit 61075ec

Browse files
fix browserFS version cache
1 parent 2738e80 commit 61075ec

File tree

9 files changed

+20
-8
lines changed

9 files changed

+20
-8
lines changed

packages/app/config/build.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ const staticAssets = [
2929
from: 'packages/app/static',
3030
to: 'static',
3131
},
32+
{
33+
from: isDev
34+
? 'standalone-packages/codesandbox-browserfs/build'
35+
: 'standalone-packages/codesandbox-browserfs/dist',
36+
to: 'static/browserfs7',
37+
},
38+
// For caching purposes
3239
{
3340
from: isDev
3441
? 'standalone-packages/codesandbox-browserfs/build'

packages/app/src/app/components/CodeEditor/Monaco/workers/linter/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Linter from 'eslint/lib/linter';
33
import monkeypatch from './monkeypatch-babel-eslint';
44

55
self.importScripts(
6-
`${process.env.CODESANDBOX_HOST}/static/browserfs6/browserfs.min.js`
6+
`${process.env.CODESANDBOX_HOST}/static/browserfs7/browserfs.min.js`
77
);
88

99
/* eslint-disable global-require */

packages/app/src/app/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</script>
4949
<!-- End Google Tag Manager -->
5050
<!-- <script async src="//cdn.headwayapp.co/widget.js"></script> -->
51-
<script src="<%= webpackConfig.output.publicPath %>static/browserfs6/browserfs<%=process.env.NODE_ENV
51+
<script src="<%= webpackConfig.output.publicPath %>static/browserfs7/browserfs<%=process.env.NODE_ENV
5252
=== 'development' ? '' : '.min'%>.js"
5353
type="text/javascript"></script>
5454

packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/global.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable global-require */
22
import { EventEmitter } from 'events';
3+
34
import requirePolyfills from '@codesandbox/common/lib/load-dynamic-polyfills';
45

56
const ctx: any = self as any;
@@ -20,7 +21,7 @@ export const initializePolyfills = () => {
2021

2122
export const loadBrowserFS = () => {
2223
ctx.importScripts(
23-
`${process.env.CODESANDBOX_HOST}/static/browserfs6/browserfs.min.js`
24+
`${process.env.CODESANDBOX_HOST}/static/browserfs7/browserfs.min.js`
2425
);
2526
};
2627

packages/app/src/app/overmind/effects/vscode/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,11 +439,11 @@ export class VSCodeEffect {
439439
{ SyncDescriptor },
440440
{ IInstantiationService },
441441
{ IExtensionEnablementService },
442+
{ IContextViewService },
442443
] = [
443444
r('vs/workbench/services/editor/common/editorService'),
444445
r('vs/editor/browser/services/codeEditorService'),
445446
r('vs/workbench/services/textfile/common/textfiles'),
446-
447447
r('vs/workbench/services/editor/common/editorGroupsService'),
448448
r('vs/platform/statusbar/common/statusbar'),
449449
r('vs/workbench/services/extensions/common/extensions'),
@@ -456,6 +456,7 @@ export class VSCodeEffect {
456456
r('vs/platform/instantiation/common/descriptors'),
457457
r('vs/platform/instantiation/common/instantiation'),
458458
r('vs/platform/extensionManagement/common/extensionManagement'),
459+
r('vs/platform/contextview/browser/contextView'),
459460
];
460461

461462
const { serviceCollection } = await new Promise<any>(resolve => {
@@ -497,6 +498,9 @@ export class VSCodeEffect {
497498
const codeEditorService = accessor.get(ICodeEditorService);
498499
const textFileService = accessor.get(ITextFileService);
499500
const editorService = accessor.get(IEditorService);
501+
const contextViewService = accessor.get(IContextViewService);
502+
503+
contextViewService.setContainer(container);
500504

501505
this.editorApi = {
502506
openFile(path) {

packages/app/src/embed/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</script>
3939
<!-- End Google Tag Manager -->
4040

41-
<script src="<%= webpackConfig.output.publicPath %>static/browserfs6/browserfs<%=process.env.NODE_ENV
41+
<script src="<%= webpackConfig.output.publicPath %>static/browserfs7/browserfs<%=process.env.NODE_ENV
4242
=== 'development' ? '' : '.min'%>.js"
4343
type="text/javascript"></script>
4444

packages/app/src/sandbox/eval/transpilers/babel/worker/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import loadPolyfills from '@codesandbox/common/lib/load-dynamic-polyfills';
33
require('app/config/polyfills');
44

55
self.importScripts(
6-
`${process.env.CODESANDBOX_HOST}/static/browserfs6/browserfs.min.js`
6+
`${process.env.CODESANDBOX_HOST}/static/browserfs7/browserfs.min.js`
77
);
88

99
self.process = self.BrowserFS.BFSRequire('process');

packages/app/src/sandbox/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Sandbox - CodeSandbox</title>
88
<link rel="manifest" href="/manifest.json">
99
<link rel="shortcut icon" href="/favicon.ico">
10-
<script src="<%= webpackConfig.output.publicPath %>static/browserfs6/browserfs.min.js"
10+
<script src="<%= webpackConfig.output.publicPath %>static/browserfs7/browserfs.min.js"
1111
type="text/javascript"></script>
1212

1313
<script>

standalone-packages/monaco-typescript/src/tsWorker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ declare global {
4040
// @ts-ignore
4141
const oldamd = self.define.amd;
4242
(self as any).define.amd = null;
43-
(self as any).importScripts(`/static/browserfs6/browserfs.min.js`);
43+
(self as any).importScripts(`/static/browserfs7/browserfs.min.js`);
4444
(self as any).define.amd = oldamd;
4545

4646
(self as any).BrowserFS = BrowserFS;

0 commit comments

Comments
 (0)