Skip to content

Commit bb77912

Browse files
authored
chore: don't include babel compiled files in webpack bundles (microsoft#9491)
1 parent e5a3c9b commit bb77912

File tree

10 files changed

+17
-16
lines changed

10 files changed

+17
-16
lines changed

babel.config.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"@babel/plugin-transform-modules-commonjs"
1313
],
1414
"ignore": [
15-
"**/*.d.ts",
16-
"packages/playwright-core/src/injected/**/*"
15+
"**/*.d.ts"
1716
]
1817
}

package-lock.json

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/playwright-core/src/server/supplements/recorder/recorderApp.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class RecorderApp extends EventEmitter {
5959
await this._page._setServerRequestInterceptor(async route => {
6060
if (route.request().url().startsWith('https://playwright/')) {
6161
const uri = route.request().url().substring('https://playwright/'.length);
62-
const file = require.resolve('../../../web/recorder/' + uri);
62+
const file = require.resolve('../../../webpack/recorder/' + uri);
6363
const buffer = await fs.promises.readFile(file);
6464
await route.fulfill({
6565
status: 200,

packages/playwright-core/src/server/trace/viewer/traceViewer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export async function showTraceViewer(traceUrl: string, browserName: string, hea
3838

3939
server.routePrefix('/', (request, response) => {
4040
const relativePath = new URL('http://localhost' + request.url!).pathname;
41-
const absolutePath = path.join(__dirname, '..', '..', '..', 'web', 'traceViewer', ...relativePath.split('/'));
41+
const absolutePath = path.join(__dirname, '..', '..', '..', 'webpack', 'traceViewer', ...relativePath.split('/'));
4242
return server.serveFile(response, absolutePath);
4343
});
4444

packages/playwright-core/src/web/htmlReport/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
output: {
1616
globalObject: 'self',
1717
filename: '[name].bundle.js',
18-
path: path.resolve(__dirname, '../../../lib/web/htmlReport')
18+
path: path.resolve(__dirname, '../../../lib/webpack/htmlReport')
1919
},
2020
module: {
2121
rules: [

packages/playwright-core/src/web/recorder/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
output: {
1616
globalObject: 'self',
1717
filename: '[name].bundle.js',
18-
path: path.resolve(__dirname, '../../../lib/web/recorder')
18+
path: path.resolve(__dirname, '../../../lib/webpack/recorder')
1919
},
2020
module: {
2121
rules: [

packages/playwright-core/src/web/traceViewer/webpack-sw.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = {
1313
output: {
1414
globalObject: 'self',
1515
filename: '[name].bundle.js',
16-
path: path.resolve(__dirname, '../../../lib/web/traceViewer')
16+
path: path.resolve(__dirname, '../../../lib/webpack/traceViewer')
1717
},
1818
module: {
1919
rules: [

packages/playwright-core/src/web/traceViewer/webpack.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
output: {
1616
globalObject: 'self',
1717
filename: '[name].bundle.js',
18-
path: path.resolve(__dirname, '../../../lib/web/traceViewer')
18+
path: path.resolve(__dirname, '../../../lib/webpack/traceViewer')
1919
},
2020
module: {
2121
rules: [
@@ -45,7 +45,7 @@ module.exports = {
4545
patterns: [
4646
{
4747
from: path.resolve(__dirname, '../../../../../node_modules/@zip.js/zip.js/dist/zip-no-worker-inflate.min.js'),
48-
to: path.resolve(__dirname, '../../../lib/web/traceViewer/zip.min.js')
48+
to: 'zip.min.js'
4949
},
5050
],
5151
}),

packages/playwright-test/src/reporters/html.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ class HtmlBuilder {
151151
fs.mkdirSync(this._dataFolder, { recursive: true });
152152

153153
// Copy app.
154-
const appFolder = path.join(require.resolve('playwright-core'), '..', 'lib', 'web', 'htmlReport');
154+
const appFolder = path.join(require.resolve('playwright-core'), '..', 'lib', 'webpack', 'htmlReport');
155155
for (const file of fs.readdirSync(appFolder))
156156
fs.copyFileSync(path.join(appFolder, file), path.join(this._reportFolder, file));
157157

158158
// Copy trace viewer.
159-
const traceViewerFolder = path.join(require.resolve('playwright-core'), '..', 'lib', 'web', 'traceViewer');
159+
const traceViewerFolder = path.join(require.resolve('playwright-core'), '..', 'lib', 'webpack', 'traceViewer');
160160
const traceViewerTargetFolder = path.join(this._reportFolder, 'trace');
161161
fs.mkdirSync(traceViewerTargetFolder, { recursive: true });
162162
// TODO (#9471): remove file filter when the babel build is fixed.

utils/build/build.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,13 @@ for (const packageDir of packages) {
143143
continue;
144144
steps.push({
145145
command: 'npx',
146-
args: ['babel', ...(watchMode ? ['-w', '--source-maps'] : []), '--extensions', '.ts', '--out-dir', path.join(packageDir, 'lib'), path.join(packageDir, 'src')],
146+
args: [
147+
'babel',
148+
...(watchMode ? ['-w', '--source-maps'] : []),
149+
'--extensions', '.ts',
150+
'--out-dir', path.join(packageDir, 'lib'),
151+
'--ignore', 'packages/playwright-core/src/server/injected/**/*',
152+
path.join(packageDir, 'src')],
147153
shell: true,
148154
});
149155
}

0 commit comments

Comments
 (0)