Skip to content

Commit

Permalink
Merge pull request #41 from wso2/upgrade_18
Browse files Browse the repository at this point in the history
Upgrade to work with node v18
  • Loading branch information
pavinduLakshan authored Mar 12, 2024
2 parents 180a8fb + 8803c72 commit 6481639
Show file tree
Hide file tree
Showing 7 changed files with 3,265 additions and 1,948 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/pr-builder.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
# Copyright (c) 2021-2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 Inc. licenses this file to you under the Apache License,
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
# in compliance with the License.
# You may obtain a copy of the License at
Expand All @@ -26,12 +26,11 @@ on:

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [12.x]
node-version: [18.x]

steps:
- name: Checkout
Expand Down
5,156 changes: 3,250 additions & 1,906 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
"prebuild": "npm run clean"
},
"devDependencies": {
"@types/node": "^13.9.2",
"@typescript-eslint/eslint-plugin": "^2.19.2",
"@typescript-eslint/parser": "^2.19.2",
"cypress": "^5.2.0",
"eslint": "^7.4.0",
"eslint-plugin-cypress": "^2.11.1",
"@types/node": "^20.11.17",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"cypress": "^13.6.4",
"eslint": "^8.56.0",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-import": "^2.29.1",
"rimraf": "^3.0.2",
"run-script-os": "^1.0.7",
"typescript": "^4.0.2"
"rimraf": "^5.0.5",
"run-script-os": "^1.1.6",
"typescript": "^5.3.3"
},
"repository": {
"type": "git",
Expand Down
12 changes: 0 additions & 12 deletions pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,12 @@
## Approach
> Describe how you are implementing the solutions. Include an animated GIF or screenshot if the change affects the UI (email documentation@wso2.com to review all UI text). Include a link to a Markdown file or Google doc if the feature write-up is too long to paste here.
## User stories
> Summary of user stories addressed by this change>
## Release note
> Brief description of the new feature or bug fix as it will appear in the release notes
## Documentation
> Link(s) to product documentation that addresses the changes of this PR. If no doc impact, enter “N/A” plus brief explanation of why there’s no doc impact
## Training
> Link to the PR for changes to the training content in https://github.com/wso2/WSO2-Training, if applicable
## Certification
> Type “Sent” when you have provided new/updated certification questions, plus four answers for each question (correct answer highlighted in bold), based on this change. Certification questions/answers should be sent to certification@wso2.com and NOT pasted in this PR. If there is no impact on certification exams, type “N/A” and explain why.
## Marketing
> Link to drafts of marketing content that will describe and promote this feature, including product page changes, technical articles, blog posts, videos, etc., if applicable
## Automation tests
- Unit tests
> Code coverage information
Expand Down
4 changes: 2 additions & 2 deletions src/ui/commands/dom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { CommonUtils } from "../utils";
* @returns {Cypress.CanReturnChainable}
*/
Cypress.Commands.add("dataTestId", (value: string, options?: Partial<Cypress.Loggable & Cypress.Timeoutable
& Cypress.Withinable & Cypress.Shadow>): Cypress.CanReturnChainable => {
& Cypress.Withinable & Cypress.Shadow>): Cypress.Chainable => {

return cy.get(CommonUtils.resolveDataTestId(value), options);
});
Expand All @@ -50,7 +50,7 @@ Cypress.Commands.add("dataTestId", (value: string, options?: Partial<Cypress.Log
* @returns {Cypress.CanReturnChainable}
*/
Cypress.Commands.add("dataComponentId", (value: string, options?: Partial<Cypress.Loggable & Cypress.Timeoutable
& Cypress.Withinable & Cypress.Shadow>): Cypress.CanReturnChainable => {
& Cypress.Withinable & Cypress.Shadow>): Cypress.Chainable => {

return cy.get(CommonUtils.resolveDataTestId(value), options);
});
11 changes: 0 additions & 11 deletions src/ui/utils/cookie-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

/// <reference types="cypress" />

import { ServerConstants } from "../constants";

/**
* Class containing cookie related utils.
*/
Expand All @@ -38,15 +36,6 @@ export class CookieUtils {
Cypress.Cookies.debug(CookieUtils.debug);
}

/**
* Preserves all session related cookies.
*/
public static preserveAllSessionCookies(): void {
for (const cookie of ServerConstants.SESSION_COOKIES) {
Cypress.Cookies.preserveOnce(cookie);
}
}

/**
* Removes all the cookies.
*/
Expand Down
5 changes: 1 addition & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"resolveJsonModule": true,
"rootDir": "src",
"sourceMap": true,
"suppressImplicitAnyIndexErrors": true,
"target": "es5",
"types": [
"cypress",
Expand All @@ -26,7 +25,5 @@
"exclude": [
"node_modules"
],
"include": [
"src"
]
"include": ["**/*.ts"]
}

0 comments on commit 6481639

Please sign in to comment.