Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: remove old webpack folder structure (#26560)

Browse source
This commit is contained in:
Marcin Strzyz 2023-08-19 16:16:44 -07:00 committed by GitHub
parent 09bb866333
commit 192b697488
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/html-reporter/bundle.js
View file

@ -45,7 +45,7 @@ export function bundle() {
}, },
closeBundle: () => { closeBundle: () => {
if (existsSync(path.join(config.build.outDir, 'index.html'))) { if (existsSync(path.join(config.build.outDir, 'index.html'))) {
const targetDir = path.join(__dirname, '..', 'playwright-core', 'lib', 'webpack', 'htmlReport'); const targetDir = path.join(__dirname, '..', 'playwright-core', 'lib', 'vite', 'htmlReport');
fs.mkdirSync(targetDir, { recursive: true }); fs.mkdirSync(targetDir, { recursive: true });
fs.copyFileSync( fs.copyFileSync(
path.join(config.build.outDir, 'index.html'), path.join(config.build.outDir, 'index.html'),

2
packages/playwright-core/src/server/recorder/recorderApp.ts
View file

@ -85,7 +85,7 @@ export class RecorderApp extends EventEmitter implements IRecorderApp {
return false; return false;
const uri = route.request().url().substring('https://playwright/'.length); const uri = route.request().url().substring('https://playwright/'.length);
const file = require.resolve('../../webpack/recorder/' + uri); const file = require.resolve('../../vite/recorder/' + uri);
fs.promises.readFile(file).then(buffer => { fs.promises.readFile(file).then(buffer => {
route.fulfill({ route.fulfill({
requestUrl: route.request().url(), requestUrl: route.request().url(),

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

@ -81,7 +81,7 @@ async function startTraceViewerServer(traceUrls: string[], options?: OpenTraceVi
return false; return false;
} }
} }
const absolutePath = path.join(__dirname, '..', '..', '..', 'webpack', 'traceViewer', ...relativePath.split('/')); const absolutePath = path.join(__dirname, '..', '..', '..', 'vite', 'traceViewer', ...relativePath.split('/'));
return server.serveFile(request, response, absolutePath); return server.serveFile(request, response, absolutePath);
}); });

4
packages/playwright-test/src/reporters/html.ts
View file

@ -287,12 +287,12 @@ class HtmlBuilder {
this._addDataFile('report.json', htmlReport); this._addDataFile('report.json', htmlReport);
// Copy app. // Copy app.
const appFolder = path.join(require.resolve('playwright-core'), '..', 'lib', 'webpack', 'htmlReport'); const appFolder = path.join(require.resolve('playwright-core'), '..', 'lib', 'vite', 'htmlReport');
await copyFileAndMakeWritable(path.join(appFolder, 'index.html'), path.join(this._reportFolder, 'index.html')); await copyFileAndMakeWritable(path.join(appFolder, 'index.html'), path.join(this._reportFolder, 'index.html'));
// Copy trace viewer. // Copy trace viewer.
if (this._hasTraces) { if (this._hasTraces) {
const traceViewerFolder = path.join(require.resolve('playwright-core'), '..', 'lib', 'webpack', 'traceViewer'); const traceViewerFolder = path.join(require.resolve('playwright-core'), '..', 'lib', 'vite', 'traceViewer');
const traceViewerTargetFolder = path.join(this._reportFolder, 'trace'); const traceViewerTargetFolder = path.join(this._reportFolder, 'trace');
const traceViewerAssetsTargetFolder = path.join(traceViewerTargetFolder, 'assets'); const traceViewerAssetsTargetFolder = path.join(traceViewerTargetFolder, 'assets');
fs.mkdirSync(traceViewerAssetsTargetFolder, { recursive: true }); fs.mkdirSync(traceViewerAssetsTargetFolder, { recursive: true });

2
packages/recorder/vite.config.ts
View file

@ -31,7 +31,7 @@ export default defineConfig({
}, },
}, },
build: { build: {
outDir: path.resolve(__dirname, '../playwright-core/lib/webpack/recorder'), outDir: path.resolve(__dirname, '../playwright-core/lib/vite/recorder'),
emptyOutDir: true, emptyOutDir: true,
rollupOptions: { rollupOptions: {
output: { output: {

2
packages/trace-viewer/vite.config.ts
View file

@ -38,7 +38,7 @@ export default defineConfig({
}, },
}, },
build: { build: {
outDir: path.resolve(__dirname, '../playwright-core/lib/webpack/traceViewer'), outDir: path.resolve(__dirname, '../playwright-core/lib/vite/traceViewer'),
// Output dir is shared with vite.sw.config.ts, clearing it here is racy. // Output dir is shared with vite.sw.config.ts, clearing it here is racy.
emptyOutDir: false, emptyOutDir: false,
rollupOptions: { rollupOptions: {

2
packages/trace-viewer/vite.sw.config.ts
View file

@ -37,7 +37,7 @@ export default defineConfig({
}, },
}, },
build: { build: {
outDir: path.resolve(__dirname, '../playwright-core/lib/webpack/traceViewer'), outDir: path.resolve(__dirname, '../playwright-core/lib/vite/traceViewer'),
// Output dir is shared with vite.config.ts, clearing it here is racy. // Output dir is shared with vite.config.ts, clearing it here is racy.
emptyOutDir: false, emptyOutDir: false,
rollupOptions: { rollupOptions: {

2
utils/build/build.js
View file

@ -348,7 +348,7 @@ copyFiles.push({
files: 'packages/playwright-core/src/**/*.js', files: 'packages/playwright-core/src/**/*.js',
from: 'packages/playwright-core/src', from: 'packages/playwright-core/src',
to: 'packages/playwright-core/lib', to: 'packages/playwright-core/lib',
ignored: ['**/.eslintrc.js', '**/webpack*.config.js', '**/injected/**/*'] ignored: ['**/.eslintrc.js', '**/injected/**/*']
}); });
// Sometimes we require JSON files that babel ignores. // Sometimes we require JSON files that babel ignores.

6
utils/build/deploy-trace-viewer.sh
View file

@ -35,7 +35,7 @@ git clone "https://${GH_SERVICE_ACCOUNT_TOKEN}@github.com/microsoft/trace.playwr
if [[ "${RELEASE_CHANNEL}" == "--stable" ]]; then if [[ "${RELEASE_CHANNEL}" == "--stable" ]]; then
rm -rf trace.playwright.dev/docs/ rm -rf trace.playwright.dev/docs/
mkdir trace.playwright.dev/docs/ mkdir trace.playwright.dev/docs/
cp -r packages/playwright-core/lib/webpack/traceViewer/* trace.playwright.dev/docs/ cp -r packages/playwright-core/lib/vite/traceViewer/* trace.playwright.dev/docs/
# Restore CNAME, beta/ & next/ branches. # Restore CNAME, beta/ & next/ branches.
cd trace.playwright.dev/ cd trace.playwright.dev/
@ -47,11 +47,11 @@ if [[ "${RELEASE_CHANNEL}" == "--stable" ]]; then
echo "Updated stable version" echo "Updated stable version"
elif [[ "${RELEASE_CHANNEL}" == "--canary" ]]; then elif [[ "${RELEASE_CHANNEL}" == "--canary" ]]; then
rm -rf trace.playwright.dev/docs/next/ rm -rf trace.playwright.dev/docs/next/
cp -r packages/playwright-core/lib/webpack/traceViewer/ trace.playwright.dev/docs/next/ cp -r packages/playwright-core/lib/vite/traceViewer/ trace.playwright.dev/docs/next/
echo "Updated canary version" echo "Updated canary version"
elif [[ "${RELEASE_CHANNEL}" == "--beta" ]]; then elif [[ "${RELEASE_CHANNEL}" == "--beta" ]]; then
rm -rf trace.playwright.dev/docs/beta/ rm -rf trace.playwright.dev/docs/beta/
cp -r packages/playwright-core/lib/webpack/traceViewer/ trace.playwright.dev/docs/beta/ cp -r packages/playwright-core/lib/vite/traceViewer/ trace.playwright.dev/docs/beta/
echo "Updated beta version" echo "Updated beta version"
else else
echo "ERROR: unknown environment - ${RELEASE_CHANNEL}" echo "ERROR: unknown environment - ${RELEASE_CHANNEL}"