Skip to content

Commit

Permalink
Merge branch 'master' into angular-11
Browse files Browse the repository at this point in the history
  • Loading branch information
cheehongw authored Jul 16, 2023
2 parents 449d9f0 + a1a8814 commit 27ef801
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 19 deletions.
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# .npmrc
engine-strict=true
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"name": "CATcher",
"version": "3.4.7",
"main": "main.js",
"engines": {
"node": ">=14.0.0"
},
"scripts": {
"ng": "ng",
"build:staging": "npm run codegen:gql && ng build --c staging --base-href=https://catcher-org.github.io/CATcher-staging/",
Expand Down Expand Up @@ -69,7 +72,7 @@
"@graphql-codegen/typescript-operations": "^1.18.4",
"@graphql-codegen/typescript-resolvers": "^1.20.0",
"@octokit/graphql-schema": "^8.24.0",
"@playwright/test": "^1.32.1",
"@playwright/test": "~1.33",
"@types/dompurify": "^2.3.1",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "2.0.8",
Expand All @@ -81,11 +84,11 @@
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~6.4.2",
"karma-chrome-launcher": "~3.1.0",
"karma-chrome-launcher": "^3.1.1",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-firefox-launcher": "^2.1.1",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"karma-jasmine-html-reporter": "^1.7.0",
"npm-run-all": "4.1.5",
"prettier": "2.2.1",
"pretty-quick": "^3.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,4 @@
</button>
</md-header>
</md-task-list>
<md-mention>
<button matTooltip="Mention a user" mat-icon-button color="accent">
<mat-icon>alternate_email</mat-icon>
</button>
</md-mention>
<md-ref>
<button matTooltip="Reference an issue, pull request or discussion" mat-icon-button color="accent">
<mat-icon>message</mat-icon>
</button>
</md-ref>
</markdown-toolbar>
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ describe('CommentEditor', () => {
'md-unordered-list',
'md-ordered-list',
'md-task-list',
'md-mention',
'md-ref'
];

it('should render a formatting toolbar', () => {
Expand Down Expand Up @@ -92,8 +90,6 @@ describe('CommentEditor', () => {
'md-unordered-list': '- ',
'md-ordered-list': '1. ',
'md-task-list': `- [ ] `,
'md-mention': '@',
'md-ref': '#'
};

// simulate each button being clicked and check that the markups added to the text
Expand Down Expand Up @@ -133,8 +129,6 @@ describe('CommentEditor', () => {
'md-unordered-list': `- ${highlightedText}`,
'md-ordered-list': `1. ${highlightedText}`,
'md-task-list': `- [ ] ${highlightedText}`,
'md-mention': `@${highlightedText}`,
'md-ref': `#${highlightedText}`
};

// simulate each button being clicked and check that the markups added to the text
Expand Down

0 comments on commit 27ef801

Please sign in to comment.