Skip to content

Commit

Permalink
Fixes to compilation of web bundle (#14660)
Browse files Browse the repository at this point in the history
* Do not minify desktop

* Fixes

* Fix compiling web

* Fixs

* Misc

* Fix

* wip

* Fixes

* Misc

* Revert unnecessary change

* Oops

* Revert changes
  • Loading branch information
DonJayamanne authored Nov 3, 2023
1 parent ed3a9af commit 27d1b75
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions build/esbuild/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ function createConfig(
bundle: true,
external,
alias,
format: target === 'desktop' ? 'cjs' : 'esm',
format: target === 'desktop' || source.endsWith('extension.web.ts') ? 'cjs' : 'esm',
metafile: isDevbuild && !isWatchMode,
define:
target === 'desktop'
Expand Down Expand Up @@ -253,7 +253,8 @@ async function buildAll() {
...[isWatchMode ? getLessBuilders(true) : []],
build(
path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'ipywidgets', 'kernel', 'index.ts'),
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'ipywidgetsKernel', 'ipywidgetsKernel.js')
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'ipywidgetsKernel', 'ipywidgetsKernel.js'),
{ target: 'web', watch: isWatchMode }
),
build(
path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'ipywidgets', 'renderer', 'index.ts'),
Expand All @@ -264,33 +265,39 @@ async function buildAll() {
'webview-side',
'ipywidgetsRenderer',
'ipywidgetsRenderer.js'
)
),
{ target: 'web', watch: isWatchMode }
),
build(
path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'variable-view', 'index.tsx'),
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'viewers', 'variableView.js')
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'viewers', 'variableView.js'),
{ target: 'web', watch: isWatchMode }
),
build(
path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'plot', 'index.tsx'),
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'viewers', 'plotViewer.js')
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'viewers', 'plotViewer.js'),
{ target: 'web', watch: isWatchMode }
),
build(
path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'data-explorer', 'index.tsx'),
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'viewers', 'dataExplorer.js')
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'viewers', 'dataExplorer.js'),
{ target: 'web', watch: isWatchMode }
),
,
isDevbuild
? build(
path.join(extensionFolder, 'src', 'test', 'datascience', 'widgets', 'rendererUtils.ts'),
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'widgetTester', 'widgetTester.js')
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'widgetTester', 'widgetTester.js'),
{ target: 'web', watch: isWatchMode }
)
: Promise.resolve(),
,
bundleConfig === 'desktop'
? Promise.resolve()
: build(
path.join(extensionFolder, 'src', 'extension.web.ts'),
path.join(extensionFolder, 'dist', 'extension.web.bundle.js')
path.join(extensionFolder, 'dist', 'extension.web.bundle.js'),
{ target: 'web', watch: isWatchMode }
),
bundleConfig === 'web'
? Promise.resolve()
Expand Down

0 comments on commit 27d1b75

Please sign in to comment.