From 9d3513ab13818730e48e7baaffaec6d7a0ef8388 Mon Sep 17 00:00:00 2001 From: Joel Einbinder Date: Wed, 13 Oct 2021 17:33:44 -0400 Subject: [PATCH] chore(create-playwright): some nits (#9133) --- packages/create-playwright/.npmignore | 13 +++++++------ packages/create-playwright/assets/.eslintrc.js | 9 +++++---- .../create-playwright/assets/playwright.config.js | 4 ++-- packages/create-playwright/package-lock.json | 1 - packages/create-playwright/src/index.ts | 4 ++-- packages/create-playwright/src/utils.ts | 8 -------- 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/packages/create-playwright/.npmignore b/packages/create-playwright/.npmignore index 582525f08c..74580322cc 100644 --- a/packages/create-playwright/.npmignore +++ b/packages/create-playwright/.npmignore @@ -1,8 +1,9 @@ +# This ignores everything by default, except for package.json and LICENSE and README.md. +# See https://docs.npmjs.com/misc/developers +**/* + !/lib/**/* -/node_modules/ -/test-results/ -/src/**/* -/tests/**/* -/playwright.config.ts -/tsconfig.json +!index.js + +!/assets/**/* /assets/.eslintrc.js diff --git a/packages/create-playwright/assets/.eslintrc.js b/packages/create-playwright/assets/.eslintrc.js index ee85124e0c..0c5d0c2b11 100644 --- a/packages/create-playwright/assets/.eslintrc.js +++ b/packages/create-playwright/assets/.eslintrc.js @@ -1,6 +1,7 @@ +// Example files here do not need the copyright notice. module.exports = { - "extends": "../../../.eslintrc.js", - "rules": { - "notice/notice": 0 - } + 'extends': '../../../.eslintrc.js', + 'rules': { + 'notice/notice': 0 + } }; diff --git a/packages/create-playwright/assets/playwright.config.js b/packages/create-playwright/assets/playwright.config.js index 011c63d191..3e7e1a7eb5 100644 --- a/packages/create-playwright/assets/playwright.config.js +++ b/packages/create-playwright/assets/playwright.config.js @@ -1,10 +1,10 @@ // @ts-check const { devices } = require('@playwright/test'); -const path = require('path') +const path = require('path'); /** * @see https://playwright.dev/docs/test-configuration - * @type{import('@playwright/test').PlaywrightTestConfig} + * @type {import('@playwright/test').PlaywrightTestConfig} */ const config = { // Timeout per test diff --git a/packages/create-playwright/package-lock.json b/packages/create-playwright/package-lock.json index 799a38dbf0..b8f67b4249 100644 --- a/packages/create-playwright/package-lock.json +++ b/packages/create-playwright/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "create-playwright", "version": "0.1.7", "license": "MIT", "bin": { diff --git a/packages/create-playwright/src/index.ts b/packages/create-playwright/src/index.ts index d74e2aac60..91359f429d 100755 --- a/packages/create-playwright/src/index.ts +++ b/packages/create-playwright/src/index.ts @@ -19,7 +19,7 @@ import fs from 'fs'; import { prompt } from 'enquirer'; import colors from 'ansi-colors'; -import { executeCommands, createFiles, determinePackageManager, executeTemplate, determineRootDir, Command, languagetoFileExtension } from './utils'; +import { executeCommands, createFiles, determinePackageManager, executeTemplate, Command, languagetoFileExtension } from './utils'; export type PromptOptions = { testDir: string, @@ -189,7 +189,7 @@ export function commandToRunTests(packageManager: 'npm' | 'yarn', args?: string) } (async () => { - const rootDir = determineRootDir(); + const rootDir = path.resolve(process.cwd(), process.argv[2] || ''); const generator = new Generator(rootDir); await generator.run(); })().catch(error => { diff --git a/packages/create-playwright/src/utils.ts b/packages/create-playwright/src/utils.ts index dc7842d9a7..89171bc847 100644 --- a/packages/create-playwright/src/utils.ts +++ b/packages/create-playwright/src/utils.ts @@ -55,14 +55,6 @@ export async function createFiles(rootDir: string, files: Map, f } } -export function determineRootDir() { - const givenPath = process.argv[2]; - if (givenPath) - return path.isAbsolute(givenPath) ? process.argv[2] : path.join(process.cwd(), process.argv[2]); - - return process.cwd(); -} - export function determinePackageManager(rootDir: string): 'yarn' | 'npm' { if (fs.existsSync(path.join(rootDir, 'yarn.lock'))) return 'yarn';