Skip to content

Commit b656b55

Browse files
committed
feat: only use ShadomDOM closed mode in production mode
1 parent c63b9ff commit b656b55

File tree

4 files changed

+49
-9
lines changed

4 files changed

+49
-9
lines changed

dumber/gulpfile.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,15 @@ function buildHtml(src) {
116116
.pipe(au2({defaultShadowOptions: {mode: 'open'}}));
117117
// @endif
118118
// @if shadow-dom-closed
119-
.pipe(au2({defaultShadowOptions: {mode: 'closed'}}));
119+
// Only use 'closed' mode in production build.
120+
// 'open' mode is needed for running tests.
121+
.pipe(au2({defaultShadowOptions: {mode: isProduction ? 'closed' : 'open'}}));
120122
// @endif
121123
// @if css-module
122124
.pipe(au2({useCSSModule: true}));
123125
// @endif
124126
// @if !shadow-dom-open && !shadow-dom-closed && !css-module
125-
.pipe(au2()); // inject aurelia conventions
127+
.pipe(au2());
126128
// @endif
127129
}
128130

e2e-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const skeletons = [
8484
'webpack babel shadow-dom-open app-min cypress',
8585
'webpack babel css-module app-min cypress',
8686
'webpack typescript app-min cypress',
87-
'webpack typescript shadow-dom-open app-min cypress',
87+
'webpack typescript shadow-dom-closed app-min cypress',
8888
'webpack typescript css-module app-min cypress',
8989

9090
// 'parcel babel app-min cypress',
@@ -95,7 +95,7 @@ const skeletons = [
9595
// 'fuse-box typescript app-min cypress',
9696

9797
'dumber babel app-min cypress',
98-
'dumber babel shadow-dom-open app-min cypress',
98+
'dumber babel shadow-dom-closed app-min cypress',
9999
// 'dumber babel css-module app-min cypress',
100100
'dumber typescript app-min cypress',
101101
'dumber typescript shadow-dom-open app-min cypress',

webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
},
2121
"scripts": {
2222
"start": "webpack-dev-server",
23-
"build": "rimraf dist && webpack",
23+
"build": "rimraf dist && webpack --mode=production",
2424
}
2525
}

webpack/webpack.config.js

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,16 @@ module.exports = function(env, { mode }) {
3232
{ test: /\.css$/i, use: ["style-loader", "css-loader"] },
3333
// @endif
3434
// @if css-module
35-
{ test: /\.css$/i, use: ["style-loader", { loader: "css-loader", options: { modules: true } }] },
35+
{
36+
test: /\.css$/i,
37+
use: [
38+
"style-loader",
39+
{
40+
loader: "css-loader",
41+
options: { modules: true }
42+
}
43+
]
44+
},
3645
// @endif
3746
// @if babel
3847
{ test: /\.js$/i, use: ['babel-loader', '@aurelia/webpack-loader'], exclude: /node_modules/ },
@@ -41,13 +50,42 @@ module.exports = function(env, { mode }) {
4150
{ test: /\.ts$/i, use: ['ts-loader', '@aurelia/webpack-loader'], exclude: /node_modules/ },
4251
// @endif
4352
// @if shadow-dom-open
44-
{ test: /\.html$/i, use: { loader: '@aurelia/webpack-loader', options: { defaultShadowOptions: { mode: 'open' } } }, exclude: /node_modules/ }
53+
{
54+
test: /\.html$/i,
55+
use: {
56+
loader: '@aurelia/webpack-loader',
57+
options: {
58+
defaultShadowOptions: { mode: 'open' }
59+
}
60+
},
61+
exclude: /node_modules/
62+
}
4563
// @endif
4664
// @if shadow-dom-closed
47-
{ test: /\.html$/i, use: { loader: '@aurelia/webpack-loader', options: { defaultShadowOptions: { mode: 'closed' } } }, exclude: /node_modules/ }
65+
{
66+
test: /\.html$/i,
67+
use: {
68+
loader: '@aurelia/webpack-loader',
69+
options: {
70+
defaultShadowOptions: {
71+
// Only use 'closed' mode in production build.
72+
// 'open' mode is needed for running tests.
73+
mode: production ? 'closed' : 'open'
74+
}
75+
}
76+
},
77+
exclude: /node_modules/
78+
}
4879
// @endif
4980
// @if css-module
50-
{ test: /\.html$/i, use: { loader: '@aurelia/webpack-loader', options: { useCSSModule: true } }, exclude: /node_modules/ }
81+
{
82+
test: /\.html$/i,
83+
use: {
84+
loader: '@aurelia/webpack-loader',
85+
options: { useCSSModule: true }
86+
},
87+
exclude: /node_modules/
88+
}
5189
// @endif
5290
// @if !shadow-dom-open && !shadow-dom-closed && !css-module
5391
{ test: /\.html$/i, use: '@aurelia/webpack-loader', exclude: /node_modules/ }

0 commit comments

Comments
 (0)