From 81089a7ec40add96908a0fbafa440df6ea0001b6 Mon Sep 17 00:00:00 2001 From: Daniel Lautzenheiser Date: Fri, 14 May 2021 10:57:50 -0400 Subject: [PATCH 1/3] If main.css exists, pass path down to bootstrap plugin --- src/base.config.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/base.config.ts b/src/base.config.ts index 37a7f380..7ac22abc 100644 --- a/src/base.config.ts +++ b/src/base.config.ts @@ -498,6 +498,7 @@ export default function webpackConfigFactory(args: any): webpack.Configuration { args.locale && new CldrPlugin(), new webpack.DefinePlugin({ __MAIN_ENTRY: JSON.stringify(mainEntryPath), + __MAIN_CSS_PATH: JSON.stringify(existsSync(mainCssPath) ? mainCssPath : null), __DOJO_SCOPE: `'${libraryName}'` }), !isExperimentalSpeed && @@ -515,6 +516,7 @@ export default function webpackConfigFactory(args: any): webpack.Configuration { !singleBundle && new BootstrapPlugin({ entryPath: mainEntryPath, + cssPath: existsSync(mainCssPath) ? mainCssPath : null, shimModules: [ { module: '@dojo/framework/shim/IntersectionObserver', From ce777f83585217d8fc8ad06ff1c799c0b325fb35 Mon Sep 17 00:00:00 2001 From: Daniel Lautzenheiser Date: Fri, 14 May 2021 10:58:19 -0400 Subject: [PATCH 2/3] Ignore .vscode path --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 02ec2176..e15813b4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ npm-debug.log yarn.lock /test-app/package-lock.json /test-app/.dojorc +.vscode/ From 347f0b53925faac9d46d164b0b522f190358ef36 Mon Sep 17 00:00:00 2001 From: Daniel Lautzenheiser Date: Thu, 20 May 2021 10:17:35 -0400 Subject: [PATCH 3/3] Remove main.css from bootstrap module --- src/base.config.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/base.config.ts b/src/base.config.ts index 7ac22abc..c9c64f3d 100644 --- a/src/base.config.ts +++ b/src/base.config.ts @@ -245,7 +245,6 @@ export default function webpackConfigFactory(args: any): webpack.Configuration { staticOnly.push('build-elide'); entry = { [bootstrapEntry]: removeEmpty([ - existsSync(mainCssPath) ? mainCssPath : null, '@dojo/framework/shim/Promise', '@dojo/webpack-contrib/bootstrap-plugin/async' ])