@qavajs/create 1.0.1 → 2.1.0

package/CHANGELOG.MD

@@ -8,6 +8,12 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 :beetle: - bugfix
 :x: - deprecation
 
+## [2.1.0]
+- :rocket: removed yarn-install dependency
+
+## [2.0.0]
+- :rocket: release v2
+
 ## [1.0.0]
 - :rocket: release
 

package/lib/deps.js

@@ -3,20 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.additionalModules = exports.modules = exports.format = exports.steps = void 0;
 exports.default = [
     '@cucumber/cucumber',
-    '@qavajs/memory',
-    '@qavajs/cli',
-    '@qavajs/validation'
+    '@qavajs/core@2'
 ];
 exports.steps = [
-    { module: 'playwright', packageName: '@qavajs/steps-playwright', version: '1' },
-    { module: 'wdio', packageName: '@qavajs/steps-wdio', version: '1' },
-    { module: 'api', packageName: '@qavajs/steps-api', version: '1' },
-    { module: 'files', packageName: '@qavajs/steps-files', version: '1' },
-    { module: 'sql', packageName: '@qavajs/steps-sql', version: '1' },
-    { module: 'accessibility', packageName: '@qavajs/steps-accessibility', version: '1' },
-    { module: 'lighthouse', packageName: '@qavajs/steps-lighthouse', version: '1' },
-    { module: 'visual testing', packageName: '@qavajs/steps-visual-testing', version: '1' },
-    { module: 'memory', packageName: '@qavajs/steps-memory', version: '1' }
+    { module: 'playwright', packageName: '@qavajs/steps-playwright', version: '2' },
+    { module: 'wdio', packageName: '@qavajs/steps-wdio', version: '2' },
+    { module: 'api', packageName: '@qavajs/steps-api', version: '2' },
+    { module: 'files', packageName: '@qavajs/steps-files', version: '2' },
+    { module: 'sql', packageName: '@qavajs/steps-sql', version: '2' },
+    { module: 'accessibility', packageName: '@qavajs/steps-accessibility', version: '2' },
+    { module: 'lighthouse', packageName: '@qavajs/steps-lighthouse', version: '2' },
+    { module: 'visual testing', packageName: '@qavajs/steps-visual-testing', version: '2' }
 ];
 exports.format = [
     { module: 'report portal', packageName: '@qavajs/format-report-portal', out: 'report/rp.out' },

package/lib/install.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -31,15 +41,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = install;
 const promises_1 = require("node:fs/promises");
 const fs_extra_1 = require("fs-extra");
 const node_path_1 = require("node:path");
-const yarn_install_1 = __importDefault(require("yarn-install"));
+const node_child_process_1 = require("node:child_process");
+function installModules({ deps, cwd }) {
+    const modules = deps.join(' ');
+    (0, node_child_process_1.execSync)(`npm install ${modules}`, { cwd });
+}
 const deps_1 = __importStar(require("./deps"));
 const ejs_1 = require("ejs");
 const prompts_1 = require("@inquirer/prompts");
@@ -92,7 +103,7 @@ function install() {
                 choices: packs(deps_1.additionalModules)
             })
         };
-        const stepsPackages = [...packages(['memory'], deps_1.steps), ...packages(answers.steps, deps_1.steps)];
+        const stepsPackages = ['@qavajs/steps-memory@2', ...packages(answers.steps, deps_1.steps)];
         const formatPackages = packages(answers.formats, deps_1.format);
         const modulePackages = packages(answers.modules, deps_1.modules);
         const additionalPackages = packages(answers.additionalModules, deps_1.additionalModules);
@@ -123,7 +134,7 @@ function install() {
         const configTemplate = yield (0, promises_1.readFile)((0, node_path_1.resolve)(__dirname, '../templates/config.ejs'), 'utf-8');
         const configEjs = (0, ejs_1.compile)(configTemplate);
         const stepDefinitionGlob = `step_definition/*.${isTypescript ? 'ts' : 'js'}`;
-        const stepsPackagesGlobs = [...requireGlob(['memory'], deps_1.steps), ...requireGlob(answers.steps, deps_1.steps)];
+        const stepsPackagesGlobs = ['node_modules/@qavajs/steps-memory/index.js', ...requireGlob(answers.steps, deps_1.steps)];
         const config = configEjs({
             steps: JSON.stringify([...stepsPackagesGlobs, stepDefinitionGlob]),
             moduleSystem: answers.moduleSystem,
@@ -192,10 +203,9 @@ function install() {
         ];
         console.log('installing packages...');
         console.log(modulesToInstall);
-        (0, yarn_install_1.default)({
+        installModules({
             deps: modulesToInstall,
-            cwd: process.cwd(),
-            respectNpm5: true
+            cwd: process.cwd()
         });
         console.log('test script:');
         console.log(`npx qavajs --config config.${isTypescript ? 'ts' : 'js'}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qavajs/create",
-  "version": "1.0.1",
+  "version": "2.1.0",
   "description": "initializer of @qavajs project",
   "main": "index.js",
   "scripts": {
@@ -20,17 +20,16 @@
   "author": "Alexandr Galichenko",
   "license": "MIT",
   "dependencies": {
-    "@inquirer/prompts": "^7.0.1",
+    "@inquirer/prompts": "^7.2.3",
     "ejs": "^3.1.10",
-    "fs-extra": "^11.2.0",
-    "typescript": "^5.6.3",
-    "yarn-install": "^1.0.0"
+    "fs-extra": "^11.3.0",
+    "typescript": "^5.7.3"
   },
   "devDependencies": {
     "@types/ejs": "^3.1.5",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.8.2",
-    "@vitest/coverage-v8": "^2.1.4",
-    "vitest": "^2.1.4"
+    "@types/node": "^22.10.7",
+    "@vitest/coverage-v8": "^3.0.1",
+    "vitest": "^3.0.1"
   }
 }

package/src/deps.ts

@@ -1,27 +1,24 @@
 export default [
     '@cucumber/cucumber',
-    '@qavajs/memory',
-    '@qavajs/cli',
-    '@qavajs/validation'
+    '@qavajs/core@2'
 ]
 
 export type ModuleDefinition = {
     module: string,
     packageName: string,
     out?: string,
-    version?: string
+    version?: string,
 }
 
 export const steps: Array<ModuleDefinition> = [
-    { module: 'playwright', packageName: '@qavajs/steps-playwright', version: '1' },
-    { module: 'wdio', packageName: '@qavajs/steps-wdio', version: '1' },
-    { module: 'api', packageName: '@qavajs/steps-api', version: '1' },
-    { module: 'files', packageName: '@qavajs/steps-files', version: '1' },
-    { module: 'sql', packageName: '@qavajs/steps-sql', version: '1' },
-    { module: 'accessibility', packageName: '@qavajs/steps-accessibility', version: '1' },
-    { module: 'lighthouse', packageName: '@qavajs/steps-lighthouse', version: '1' },
-    { module: 'visual testing', packageName: '@qavajs/steps-visual-testing', version: '1' },
-    { module: 'memory', packageName: '@qavajs/steps-memory', version: '1' }
+    { module: 'playwright', packageName: '@qavajs/steps-playwright', version: '2' },
+    { module: 'wdio', packageName: '@qavajs/steps-wdio', version: '2' },
+    { module: 'api', packageName: '@qavajs/steps-api', version: '2' },
+    { module: 'files', packageName: '@qavajs/steps-files', version: '2' },
+    { module: 'sql', packageName: '@qavajs/steps-sql', version: '2' },
+    { module: 'accessibility', packageName: '@qavajs/steps-accessibility', version: '2' },
+    { module: 'lighthouse', packageName: '@qavajs/steps-lighthouse', version: '2'},
+    { module: 'visual testing', packageName: '@qavajs/steps-visual-testing', version: '2' }
 ]
 
 export const format: Array<ModuleDefinition> = [

package/src/install.ts

@@ -1,7 +1,13 @@
 import { readFile, writeFile } from 'node:fs/promises';
 import { ensureDir } from 'fs-extra';
 import { resolve } from 'node:path';
-import yarnInstall from 'yarn-install';
+import { execSync } from 'node:child_process';
+
+function installModules({ deps, cwd }: { deps: any[], cwd: string }) {
+    const modules = deps.join(' ');
+    execSync(`npm install ${modules}`, { cwd });
+}
+
 import deps, { steps, format, modules, additionalModules, ModuleDefinition } from './deps';
 import { compile } from 'ejs';
 import { select, checkbox } from '@inquirer/prompts';
@@ -56,7 +62,7 @@ export default async function install(): Promise<void> {
         })
     };
 
-    const stepsPackages: Array<string> = [...packages(['memory'], steps), ...packages(answers.steps, steps)];
+    const stepsPackages: Array<string> = ['@qavajs/steps-memory@2', ...packages(answers.steps, steps)];
     const formatPackages: Array<string> = packages(answers.formats, format);
     const modulePackages: Array<string> = packages(answers.modules, modules);
     const additionalPackages: Array<string> = packages(answers.additionalModules, additionalModules);
@@ -102,7 +108,7 @@ export default async function install(): Promise<void> {
     );
     const configEjs = compile(configTemplate);
     const stepDefinitionGlob = `step_definition/*.${isTypescript ? 'ts' : 'js'}`;
-    const stepsPackagesGlobs = [...requireGlob(['memory'], steps), ...requireGlob(answers.steps, steps)];
+    const stepsPackagesGlobs = ['node_modules/@qavajs/steps-memory/index.js', ...requireGlob(answers.steps, steps)];
     const config = configEjs({
         steps: JSON.stringify([...stepsPackagesGlobs, stepDefinitionGlob]),
         moduleSystem: answers.moduleSystem,
@@ -197,10 +203,9 @@ export default async function install(): Promise<void> {
     console.log('installing packages...');
     console.log(modulesToInstall);
 
-    yarnInstall({
+    installModules({
         deps: modulesToInstall,
-        cwd: process.cwd(),
-        respectNpm5: true
+        cwd: process.cwd()
     });
 
     console.log('test script:');

package/templates/po.ejs

@@ -1,9 +1,9 @@
 <% if (moduleSystem === 'ES Modules' || moduleSystem === 'Typescript') {-%>
-<%-'import { $, $$, Component } from "'-%><%-poModule%>";
+<%-'import { locator } from "'-%><%-poModule%>";
 <%} else {-%>
-<%-'const { $, $$, Component } = require('%>"<%-poModule%>");
+<%-'const { locator } = require('%>"<%-poModule%>");
 <%}%>
 <% if (moduleSystem === 'ES Modules' || moduleSystem === 'Typescript') {-%><%-'export default '%><%} else {%><%-'module.exports = '%><%}%>class App {
-  Body = $("body");
-  GetStartedButton = $("a.button[href='/docs/intro']");
+  Body = locator("body");
+  GetStartedButton = locator("a.button[href='/docs/intro']");
 }

package/src/@types/yarn-install.d.ts

@@ -1,17 +0,0 @@
-declare module 'yarn-install' {
-    export default function yarnInstall(
-        params: {
-            deps: string[]
-            cwd?: string
-            registry?: string
-            dev?: boolean
-            global?: boolean
-            remove?: boolean
-            production?: boolean
-            respectNpm5?: boolean
-        }
-    ): {
-        stderr: string
-        status: number
-    }
-}