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

feat: allow absolute ctTemplateDir (#26526)

Browse source
This commit is contained in:
Tmk 2023-08-22 00:30:56 +08:00 committed by GitHub
parent ba4c242a82
commit fbe3ef92e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
packages/playwright-ct-core/src/vitePlugin.ts
View file

@ -62,10 +62,10 @@ export function createPlugin(
const use = config.projects[0].use as CtConfig; const use = config.projects[0].use as CtConfig;
const port = use.ctPort || 3100; const port = use.ctPort || 3100;
const viteConfig = typeof use.ctViteConfig === 'function' ? await use.ctViteConfig() : (use.ctViteConfig || {}); const viteConfig = typeof use.ctViteConfig === 'function' ? await use.ctViteConfig() : (use.ctViteConfig || {});
const relativeTemplateDir = use.ctTemplateDir || 'playwright'; const templateDirConfig = use.ctTemplateDir || 'playwright';
const rootDir = viteConfig.root || configDir; const rootDir = viteConfig.root || configDir;
const templateDir = path.join(rootDir, relativeTemplateDir); const templateDir = path.resolve(rootDir, templateDirConfig);
const outDir = viteConfig?.build?.outDir || (use.ctCacheDir ? path.resolve(rootDir, use.ctCacheDir) : path.resolve(templateDir, '.cache')); const outDir = viteConfig?.build?.outDir || (use.ctCacheDir ? path.resolve(rootDir, use.ctCacheDir) : path.resolve(templateDir, '.cache'));
const buildInfoFile = path.join(outDir, 'metainfo.json'); const buildInfoFile = path.join(outDir, 'metainfo.json');
@ -131,7 +131,7 @@ export function createPlugin(
// But only add out own plugin when we actually build / transform. // But only add out own plugin when we actually build / transform.
if (sourcesDirty) if (sourcesDirty)
viteConfig.plugins.push(vitePlugin(registerSource, relativeTemplateDir, buildInfo, componentRegistry)); viteConfig.plugins.push(vitePlugin(registerSource, templateDir, buildInfo, componentRegistry));
viteConfig.configFile = viteConfig.configFile || false; viteConfig.configFile = viteConfig.configFile || false;
viteConfig.define = viteConfig.define || {}; viteConfig.define = viteConfig.define || {};
viteConfig.define.__VUE_PROD_DEVTOOLS__ = true; viteConfig.define.__VUE_PROD_DEVTOOLS__ = true;
@ -153,7 +153,8 @@ export function createPlugin(
if (sourcesDirty) { if (sourcesDirty) {
await build(viteConfig); await build(viteConfig);
await fs.promises.rename(`${outDir}/${relativeTemplateDir}/index.html`, `${outDir}/index.html`); const relativeTemplateDir = path.relative(rootDir, templateDir);
await fs.promises.rename(path.resolve(outDir, relativeTemplateDir, 'index.html'), `${outDir}/index.html`);
} }
if (hasNewTests || hasNewComponents || sourcesDirty) if (hasNewTests || hasNewComponents || sourcesDirty)
@ -279,7 +280,7 @@ async function parseTestFile(testFile: string): Promise<ComponentInfo[]> {
return result; return result;
} }
function vitePlugin(registerSource: string, relativeTemplateDir: string, buildInfo: BuildInfo, componentRegistry: ComponentRegistry): Plugin { function vitePlugin(registerSource: string, templateDir: string, buildInfo: BuildInfo, componentRegistry: ComponentRegistry): Plugin {
buildInfo.sources = {}; buildInfo.sources = {};
let moduleResolver: ResolveFn; let moduleResolver: ResolveFn;
return { return {
@ -307,10 +308,10 @@ function vitePlugin(registerSource: string, relativeTemplateDir: string, buildIn
return { code, map: { mappings: '' } }; return { code, map: { mappings: '' } };
} }
const indexTs = path.join(relativeTemplateDir, 'index.ts'); const indexTs = path.join(templateDir, 'index.ts');
const indexTsx = path.join(relativeTemplateDir, 'index.tsx'); const indexTsx = path.join(templateDir, 'index.tsx');
const indexJs = path.join(relativeTemplateDir, 'index.js'); const indexJs = path.join(templateDir, 'index.js');
const indexJsx = path.join(relativeTemplateDir, 'index.jsx'); const indexJsx = path.join(templateDir, 'index.jsx');
const idResolved = path.resolve(id); const idResolved = path.resolve(id);
if (!idResolved.endsWith(indexTs) && !idResolved.endsWith(indexTsx) && !idResolved.endsWith(indexJs) && !idResolved.endsWith(indexJsx)) if (!idResolved.endsWith(indexTs) && !idResolved.endsWith(indexTsx) && !idResolved.endsWith(indexJs) && !idResolved.endsWith(indexJsx))
return; return;