From 10dd22100d4a706aee491c87d93f9003be3ae82f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:45:01 +0000 Subject: [PATCH 01/10] chore(deps-dev): bump ts-morph from 3.1.3 to 19.0.0 Bumps [ts-morph](https://github.com/dsherret/ts-morph) from 3.1.3 to 19.0.0. - [Release notes](https://github.com/dsherret/ts-morph/releases) - [Commits](https://github.com/dsherret/ts-morph/compare/3.1.3...19.0.0) --- updated-dependencies: - dependency-name: ts-morph dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40ea0ab95..32226a5b4 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "sinon": "^15.2.0", "sinon-chai": "^3.7.0", "testcafe": "^3.0.1", - "ts-morph": "^3.1.3", + "ts-morph": "^19.0.0", "ts-node": "^10.9.1", "tsd-jsdoc": "^2.5.0", "typedoc": "^0.24.8", From ee49bcd04b3120df8694c3237128a83a586729a6 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Tue, 29 Aug 2023 09:45:19 +0200 Subject: [PATCH 02/10] fix: increase timeout a bit --- test/runner/definitions_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runner/definitions_test.js b/test/runner/definitions_test.js index 170f2b499..019d73ab5 100644 --- a/test/runner/definitions_test.js +++ b/test/runner/definitions_test.js @@ -18,7 +18,7 @@ const pathToTypings = path.resolve(pathToRootOfProject, 'typings'); chai.use(chaiSubset); describe('Definitions', function () { - this.timeout(20000); + this.timeout(30000); this.retries(4); before(() => { execSync('npm run def', { cwd: pathToRootOfProject }); From e6f3e5ab3a39e97641e5f04562c945f7b93f4802 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Tue, 29 Aug 2023 09:55:48 +0200 Subject: [PATCH 03/10] bump node version --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82f006b8b..ef02ee604 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,11 +11,11 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 From 1c3bf77e44d9cee8b241a325b000898ab1f1906b Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Tue, 5 Sep 2023 11:23:04 +0200 Subject: [PATCH 04/10] fix: UTs --- test/runner/definitions_test.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/runner/definitions_test.js b/test/runner/definitions_test.js index 019d73ab5..6da8c19c7 100644 --- a/test/runner/definitions_test.js +++ b/test/runner/definitions_test.js @@ -39,7 +39,7 @@ describe('Definitions', function () { types.should.be.valid; const definitionsFile = types.getSourceFileOrThrow(pathOfJSDocDefinitions); - const index = definitionsFile.getNamespaceOrThrow('CodeceptJS').getNamespaceOrThrow('index').getStructure(); + const index = definitionsFile.getModule('CodeceptJS').getModule('index').getStructure(); index.statements.should.containSubset([ { declarations: [{ name: 'recorder', type: 'CodeceptJS.recorder' }] }, { declarations: [{ name: 'event', type: 'typeof CodeceptJS.event' }] }, @@ -61,7 +61,7 @@ describe('Definitions', function () { types.should.be.valid; const definitionFile = types.getSourceFileOrThrow(`${codecept_dir}/steps.d.ts`); - const extend = getExtends(definitionFile.getNamespaceOrThrow('CodeceptJS').getInterfaceOrThrow('I')); + const extend = getExtends(definitionFile.getModule('CodeceptJS').getInterfaceOrThrow('I')); extend.should.containSubset([{ methods: [{ name: 'amInPath', @@ -115,7 +115,7 @@ describe('Definitions', function () { returnType: undefined, kind: StructureKind.Method, }]); - const I = getExtends(definitionsFile.getNamespaceOrThrow('CodeceptJS').getInterfaceOrThrow('I')); + const I = getExtends(definitionsFile.getModule('CodeceptJS').getInterfaceOrThrow('I')); I.should.containSubset([{ methods: [{ name: 'openDir', @@ -184,7 +184,7 @@ describe('Definitions', function () { types.should.be.valid; const definitionsFile = types.getSourceFileOrThrow(`${codecept_dir}/steps.d.ts`); - const CallbackOrder = definitionsFile.getNamespaceOrThrow('CodeceptJS').getInterfaceOrThrow('SupportObject').getStructure(); + const CallbackOrder = definitionsFile.getModule('CodeceptJS').getInterfaceOrThrow('SupportObject').getStructure(); CallbackOrder.properties.should.containSubset([ { name: 'I', type: 'I' }, { name: 'MyPage', type: 'MyPage' }, @@ -201,7 +201,7 @@ describe('Definitions', function () { types.should.be.valid; const definitionFile = types.getSourceFileOrThrow(`${codecept_dir}/steps.d.ts`); - const extend = getExtends(definitionFile.getNamespaceOrThrow('CodeceptJS').getInterfaceOrThrow('I')); + const extend = getExtends(definitionFile.getModule('CodeceptJS').getInterfaceOrThrow('I')); extend.should.containSubset([{ methods: [{ name: 'amInPath', @@ -282,7 +282,7 @@ function typesFrom(sourceFile) { tsConfigFilePath: path.join(pathToRootOfProject, 'tsconfig.json'), resolutionHost, }); - project.addExistingSourceFile(sourceFile); + project.addSourceFileAtPath(sourceFile); project.resolveSourceFileDependencies(); return project; } From 4a9d2f8dc384e9eff33d16179d1670137455de35 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Tue, 5 Sep 2023 11:41:25 +0200 Subject: [PATCH 05/10] try mac --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ef02ee604..1204bdc41 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,11 +11,11 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: macos-13 strategy: matrix: - node-version: [18.x] + node-version: [16.x] steps: - uses: actions/checkout@v3 From e51c292bda24ac25cc0c79deab0b40fa64fd053c Mon Sep 17 00:00:00 2001 From: KobeNguyenT <7845001+kobenguyent@users.noreply.github.com> Date: Tue, 5 Sep 2023 11:49:20 +0200 Subject: [PATCH 06/10] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1204bdc41..ef02ee604 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,11 +11,11 @@ on: jobs: build: - runs-on: macos-13 + runs-on: ubuntu-22.04 strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 From d4866bfb69d70287d1fb5e27700126eb38c34953 Mon Sep 17 00:00:00 2001 From: KobeNguyenT <7845001+kobenguyent@users.noreply.github.com> Date: Tue, 5 Sep 2023 13:21:42 +0200 Subject: [PATCH 07/10] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ef02ee604..f127898ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - node-version: [18.x] + node-version: [20.x] steps: - uses: actions/checkout@v3 From c48d345843ac4d2934b6fa5e28eabc0eaa989212 Mon Sep 17 00:00:00 2001 From: KobeNguyenT <7845001+kobenguyent@users.noreply.github.com> Date: Tue, 5 Sep 2023 13:36:48 +0200 Subject: [PATCH 08/10] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f127898ef..025eeb280 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - - run: npm install --legacy-peer-deps + - run: npm install env: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: true PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true From 842cfe2f6fac51006b78156fa05d599fea273ee5 Mon Sep 17 00:00:00 2001 From: KobeNguyenT <7845001+kobenguyent@users.noreply.github.com> Date: Tue, 5 Sep 2023 13:42:40 +0200 Subject: [PATCH 09/10] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 025eeb280..3bbd42e6e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - - run: npm install + - run: npm i --force env: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: true PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true From f4f8416a7b4c37bcbea471120d3ed795ed4c97f2 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Sat, 16 Sep 2023 14:11:45 +0200 Subject: [PATCH 10/10] fixed lib version --- package.json | 168 +++++++++++++++++++++++++-------------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/package.json b/package.json index 8ec07319d..1bff03935 100644 --- a/package.json +++ b/package.json @@ -59,93 +59,93 @@ "prepare": "husky install" }, "dependencies": { - "@codeceptjs/configure": "^0.10.0", - "@codeceptjs/helper": "^2.0.1", - "@cucumber/cucumber-expressions": "^16", - "@cucumber/gherkin": "^26", - "@cucumber/messages": "^22.0.0", - "@xmldom/xmldom": "^0.8.10", - "acorn": "^8.10.0", - "arrify": "^2.0.1", - "axios": "^1.3.3", - "chai": "^4.3.6", - "chai-deep-match": "^1.2.1", - "chalk": "^4.1.2", - "commander": "^11.0.0", - "cross-spawn": "^7.0.3", - "css-to-xpath": "^0.1.0", - "envinfo": "^7.8.1", - "escape-string-regexp": "^4.0.0", - "figures": "^3.2.0", - "fn-args": "^4.0.0", - "fs-extra": "^8.1.0", - "glob": "^6.0.1", - "html-minifier": "^4.0.0", - "inquirer": "^6.5.2", - "joi": "^17.6.0", - "js-beautify": "^1.14.0", - "lodash.clonedeep": "^4.5.0", - "lodash.merge": "^4.6.2", - "mkdirp": "^1.0.4", - "mocha": "^10.2.0", - "ms": "^2.1.3", - "openai": "^3.2.1", - "ora-classic": "^5.4.2", - "parse-function": "^5.6.4", - "parse5": "^7.1.2", - "promise-retry": "^1.1.1", - "resq": "^1.10.2", - "sprintf-js": "^1.1.1", - "uuid": "^9.0" + "@codeceptjs/configure": "0.10.0", + "@codeceptjs/helper": "2.0.1", + "@cucumber/cucumber-expressions": "16", + "@cucumber/gherkin": "26", + "@cucumber/messages": "22.0.0", + "@xmldom/xmldom": "0.8.10", + "acorn": "8.10.0", + "arrify": "2.0.1", + "axios": "1.3.3", + "chai": "4.3.6", + "chai-deep-match": "1.2.1", + "chalk": "4.1.2", + "commander": "11.0.0", + "cross-spawn": "7.0.3", + "css-to-xpath": "0.1.0", + "envinfo": "7.8.1", + "escape-string-regexp": "4.0.0", + "figures": "3.2.0", + "fn-args": "4.0.0", + "fs-extra": "8.1.0", + "glob": "6.0.1", + "html-minifier": "4.0.0", + "inquirer": "6.5.2", + "joi": "17.6.0", + "js-beautify": "1.14.0", + "lodash.clonedeep": "4.5.0", + "lodash.merge": "4.6.2", + "mkdirp": "1.0.4", + "mocha": "10.2.0", + "ms": "2.1.3", + "openai": "3.2.1", + "ora-classic": "5.4.2", + "parse-function": "5.6.4", + "parse5": "7.1.2", + "promise-retry": "1.1.1", + "resq": "1.10.2", + "sprintf-js": "1.1.1", + "uuid": "9.0" }, "devDependencies": { - "@codeceptjs/detox-helper": "^1.0.2", - "@codeceptjs/mock-request": "^0.3.1", - "@faker-js/faker": "^7.6.0", - "@pollyjs/adapter-puppeteer": "^6.0.5", - "@pollyjs/core": "^5.1.0", - "@types/inquirer": "^9.0.3", - "@types/node": "^20.4.4", - "@wdio/sauce-service": "^8.3.8", - "@wdio/selenium-standalone-service": "^8.3.2", - "@wdio/utils": "^8.3.0", + "@codeceptjs/detox-helper": "1.0.2", + "@codeceptjs/mock-request": "0.3.1", + "@faker-js/faker": "7.6.0", + "@pollyjs/adapter-puppeteer": "6.0.5", + "@pollyjs/core": "5.1.0", + "@types/inquirer": "9.0.3", + "@types/node": "20.4.4", + "@wdio/sauce-service": "8.3.8", + "@wdio/selenium-standalone-service": "8.3.2", + "@wdio/utils": "8.3.0", "apollo-server-express": "2.25.3", - "chai-as-promised": "^7.1.1", - "chai-subset": "^1.6.0", - "contributor-faces": "^1.0.3", - "documentation": "^12.3.0", - "dtslint": "^4.1.6", - "electron": "^26.1.0", - "eslint": "^8.45.0", - "eslint-config-airbnb-base": "^15.0.0", - "eslint-plugin-import": "^2.25.4", - "eslint-plugin-mocha": "^6.3.0", - "expect": "^29.6.2", - "express": "^4.17.2", - "graphql": "^14.6.0", - "husky": "^8.0.1", - "inquirer-test": "^2.0.1", - "jsdoc": "^3.6.10", - "jsdoc-typeof-plugin": "^1.0.0", - "json-server": "^0.10.1", - "playwright": "^1.35.1", - "puppeteer": "^21.1.1", - "qrcode-terminal": "^0.12.0", - "rosie": "^2.1.0", - "runok": "^0.9.2", - "sinon": "^15.2.0", - "sinon-chai": "^3.7.0", - "testcafe": "^3.0.1", - "ts-morph": "^19.0.0", - "ts-node": "^10.9.1", - "tsd-jsdoc": "^2.5.0", - "typedoc": "^0.24.8", - "typedoc-plugin-markdown": "^3.13.4", - "typescript": "^5.1.6", - "wdio-docker-service": "^1.5.0", - "webdriverio": "^8.3.8", - "xml2js": "^0.6.0", - "xmldom": "^0.6.0", + "chai-as-promised": "7.1.1", + "chai-subset": "1.6.0", + "contributor-faces": "1.0.3", + "documentation": "12.3.0", + "dtslint": "4.1.6", + "electron": "26.1.0", + "eslint": "8.45.0", + "eslint-config-airbnb-base": "15.0.0", + "eslint-plugin-import": "2.25.4", + "eslint-plugin-mocha": "6.3.0", + "expect": "29.6.2", + "express": "4.17.2", + "graphql": "14.6.0", + "husky": "8.0.1", + "inquirer-test": "2.0.1", + "jsdoc": "3.6.10", + "jsdoc-typeof-plugin": "1.0.0", + "json-server": "0.10.1", + "playwright": "1.35.1", + "puppeteer": "21.1.1", + "qrcode-terminal": "0.12.0", + "rosie": "2.1.0", + "runok": "0.9.2", + "sinon": "15.2.0", + "sinon-chai": "3.7.0", + "testcafe": "3.0.1", + "ts-morph": "19.0.0", + "ts-node": "10.9.1", + "tsd-jsdoc": "2.5.0", + "typedoc": "0.24.8", + "typedoc-plugin-markdown": "3.13.4", + "typescript": "5.1.6", + "wdio-docker-service": "1.5.0", + "webdriverio": "8.3.8", + "xml2js": "0.6.0", + "xmldom": "0.6.0", "xpath": "0.0.33" }, "engines": {