@nx/playwright 22.7.0-beta.1 → 22.7.0-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "22.7.0-beta.1",
+  "version": "22.7.0-beta.11",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -22,7 +22,7 @@
     "Front-end"
   ],
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "types": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -34,14 +34,14 @@
     "directory": "packages/playwright"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-beta.1",
-    "@nx/eslint": "22.7.0-beta.1",
-    "@nx/js": "22.7.0-beta.1",
+    "@nx/devkit": "22.7.0-beta.11",
+    "@nx/eslint": "22.7.0-beta.11",
+    "@nx/js": "22.7.0-beta.11",
     "tslib": "^2.3.0",
     "minimatch": "10.2.4"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.1"
+    "nx": "22.7.0-beta.11"
   },
   "peerDependencies": {
     "@playwright/test": "^1.36.0"
@@ -68,6 +68,5 @@
   },
   "nx-migrations": {
     "migrations": "./migrations.json"
-  },
-  "types": "./index.d.ts"
+  }
 }

package/src/executors/merge-reports/merge-reports.impl.js

@@ -60,7 +60,7 @@ async function mergeReportsExecutor(options, context) {
         cwd: projectRoot,
         stdio: 'inherit',
         shell: true,
-        windowsHide: false,
+        windowsHide: true,
     });
     if (result.error) {
         devkit_1.output.error({

package/src/executors/playwright/playwright.impl.js

@@ -17,7 +17,7 @@ async function playwrightExecutor(options, context) {
         (0, child_process_1.execSync)(`${pmc.exec} playwright install`, {
             cwd: devkit_1.workspaceRoot,
             stdio: 'inherit',
-            windowsHide: false,
+            windowsHide: true,
         });
     }
     const args = createArgs(options);

package/src/generators/configuration/configuration.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const prompt_1 = require("@nx/devkit/src/generators/prompt");
@@ -11,7 +12,7 @@ const package_manager_workspaces_1 = require("@nx/js/src/utils/package-manager-w
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const child_process_1 = require("child_process");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const add_linter_1 = require("../../utils/add-linter");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
@@ -216,7 +217,7 @@ function getBrowsersInstallTask() {
         const pmc = (0, devkit_1.getPackageManagerCommand)();
         (0, child_process_1.execSync)(`${pmc.exec} playwright install`, {
             cwd: devkit_1.workspaceRoot,
-            windowsHide: false,
+            windowsHide: true,
         });
     };
 }

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/playwright/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAiBpB,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAWD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,uBAAuB,CAqB9D,CAAC;AAEF,eAAO,MAAM,aAAa,wCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/playwright/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAepB,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAWD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,uBAAuB,CAwB9D,CAAC;AAEF,eAAO,MAAM,aAAa,wCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -14,7 +14,6 @@ const cache_directory_1 = require("nx/src/utils/cache-directory");
 const plugin_cache_utils_1 = require("nx/src/utils/plugin-cache-utils");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
 const reporters_1 = require("../utils/reporters");
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 const playwrightConfigGlob = '**/playwright.config.{js,ts,cjs,cts,mjs,mts}';
 exports.createNodes = [
     playwrightConfigGlob,
@@ -22,8 +21,9 @@ exports.createNodes = [
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `playwright-${optionsHash}.hash`);
         const pluginCache = new plugin_cache_utils_1.PluginCache(cachePath);
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, pluginCache), configFilePaths, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, pluginCache, pmc), configFilePaths, options, context);
         }
         finally {
             pluginCache.writeToDisk(cachePath);
@@ -31,7 +31,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, pluginCache) {
+async function createNodesInternal(configFilePath, options, context, pluginCache, pmc) {
     const projectRoot = (0, node_path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot));
@@ -45,7 +45,7 @@ async function createNodesInternal(configFilePath, options, context, pluginCache
         CI: process.env.CI,
     }, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
     if (!pluginCache.has(hash)) {
-        pluginCache.set(hash, await buildPlaywrightTargets(configFilePath, projectRoot, normalizedOptions, context));
+        pluginCache.set(hash, await buildPlaywrightTargets(configFilePath, projectRoot, normalizedOptions, context, pmc));
     }
     const { targets, metadata } = pluginCache.get(hash);
     return {
@@ -58,7 +58,7 @@ async function createNodesInternal(configFilePath, options, context, pluginCache
         },
     };
 }
-async function buildPlaywrightTargets(configFilePath, projectRoot, options, context) {
+async function buildPlaywrightTargets(configFilePath, projectRoot, options, context, pmc) {
     // Playwright forbids importing the `@playwright/test` module twice. This would affect running the tests,
     // but we're just reading the config so let's delete the variable they are using to detect this.
     // See: https://github.com/microsoft/playwright/pull/11218/files
@@ -99,7 +99,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
         cache: true,
         inputs: [
             ...('production' in namedInputs
-                ? ['default', '^{projectRoot}/tsconfig*.json', '^production']
+                ? ['default', '^production', '^{projectRoot}/tsconfig*.json']
                 : ['default', '^default']),
             { externalDependencies: ['@playwright/test'] },
         ],
@@ -116,7 +116,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
             cache: true,
             inputs: [
                 ...('production' in namedInputs
-                    ? ['default', '^{projectRoot}/tsconfig*.json', '^production']
+                    ? ['default', '^production', '^{projectRoot}/tsconfig*.json']
                     : ['default', '^default']),
                 { externalDependencies: ['@playwright/test'] },
             ],
@@ -160,7 +160,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
                     env: getAtomizedTaskEnvVars(reporterOutputs, outputSubfolder),
                 },
                 outputs: getAtomizedTaskOutputs(testOutput, reporterOutputs, context.workspaceRoot, projectRoot, outputSubfolder),
-                command: `${baseTargetConfig.command} ${relativeSpecFilePath} --output=${(0, node_path_1.join)(testOutput, outputSubfolder)}`,
+                command: `${baseTargetConfig.command} ${relativeSpecFilePath} --output=${(0, devkit_1.joinPathFragments)(testOutput, outputSubfolder)}`,
                 metadata: {
                     technologies: ['playwright'],
                     description: `Runs Playwright Tests in ${relativeSpecFilePath} in CI`,
@@ -219,7 +219,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
             inputs: ciBaseTargetConfig.inputs,
             outputs: Array.from(mergeReportsTargetOutputs),
             options: {
-                config: node_path_1.posix.relative(projectRoot, configFilePath),
+                config: (0, devkit_1.normalizePath)((0, node_path_1.relative)(projectRoot, configFilePath)),
                 expectedSuites: dependsOn.length,
             },
             metadata: {
@@ -306,9 +306,9 @@ function getAtomizedTaskOutputs(testOutput, reporterOutputs, workspaceRoot, proj
 function addSubfolderToOutput(output, subfolder) {
     const parts = (0, node_path_1.parse)(output);
     if (parts.ext !== '') {
-        return (0, node_path_1.join)(parts.dir, subfolder, parts.base);
+        return (0, devkit_1.joinPathFragments)(parts.dir, subfolder, parts.base);
     }
-    return (0, node_path_1.join)(output, subfolder);
+    return (0, devkit_1.joinPathFragments)(output, subfolder);
 }
 function getWebserverCommandTasks(playwrightConfig) {
     if (!playwrightConfig.webServer) {
@@ -395,6 +395,6 @@ function getAtomizedTaskEnvVars(reporterOutputs, outputSubfolder) {
 function normalizeAtomizedTaskBlobReportOutput(output, subfolder) {
     // set unique name for the blob report file
     return output.endsWith('.zip')
-        ? (0, node_path_1.join)((0, node_path_1.dirname)(output), `${subfolder}.zip`)
-        : (0, node_path_1.join)(output, `${subfolder}.zip`);
+        ? (0, devkit_1.joinPathFragments)((0, node_path_1.dirname)(output), `${subfolder}.zip`)
+        : (0, devkit_1.joinPathFragments)(output, `${subfolder}.zip`);
 }

package/src/utils/add-linter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-linter.d.ts","sourceRoot":"","sources":["../../../../../packages/playwright/src/utils/add-linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAwB,MAAM,YAAY,CAAC;AAatE,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb;;QAEI;IACJ,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAiF5B"}
+{"version":3,"file":"add-linter.d.ts","sourceRoot":"","sources":["../../../../../packages/playwright/src/utils/add-linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAwB,MAAM,YAAY,CAAC;AAatE,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb;;QAEI;IACJ,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAmF5B"}

package/src/utils/add-linter.js

@@ -35,7 +35,12 @@ async function addLinterToPlaywrightProject(tree, options) {
     if ((0, eslint_file_1.isEslintConfigSupported)(tree, projectConfig.root) ||
         (0, eslint_file_1.isEslintConfigSupported)(tree)) {
         if ((0, flat_config_1.useFlatConfig)(tree)) {
-            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, projectConfig.root, 'flat/recommended', 'playwright', 'eslint-plugin-playwright', false, false);
+            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, projectConfig.root, 'flat/recommended', {
+                moduleName: 'playwright',
+                moduleImportPath: 'eslint-plugin-playwright',
+                spread: false,
+                insertAtTheEnd: false,
+            });
             (0, eslint_file_1.addOverrideToLintConfig)(tree, projectConfig.root, {
                 files: ['*.ts', '*.js'],
                 rules: {},

package/project.json

@@ -1,58 +0,0 @@
-{
-    "name": "playwright",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/playwright",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "outputs": ["{workspaceRoot}/dist/packages/playwright/README.md"],
-            "commands": ["node ./scripts/copy-readme.js playwright"]
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    {
-                        "input": "packages/playwright",
-                        "glob": "**/files/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/playwright",
-                        "glob": "**/files/**/.gitkeep",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/playwright",
-                        "glob": "**/*.json",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/playwright",
-                        "glob": "**/*.js",
-                        "ignore": ["**/jest.config.js"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/playwright",
-                        "glob": "**/*.d.ts",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/playwright",
-                        "glob": "PLUGIN.md",
-                        "output": "/"
-                    },
-                    {
-                        "input": "",
-                        "glob": "LICENSE",
-                        "output": "/"
-                    }
-                ]
-            }
-        }
-    },
-    "tags": []
-}