Skip to content

Commit

Permalink
Merge branch 'main' into 8820
Browse files Browse the repository at this point in the history
  • Loading branch information
mohan-mu authored Sep 6, 2024
2 parents 4eebb14 + 6ead1e6 commit 6f2311a
Show file tree
Hide file tree
Showing 936 changed files with 3,234 additions and 2,550 deletions.
11 changes: 10 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,16 @@
"**/addon-commerce/utils/get-currency-symbol.ts",
"**/demo-playwright/stubs"
],
"ignoreWords": ["preid", "Quarterpounder", "tuilabel", "fontawesome", "fortawesome", "svgs", "contentalign"],
"ignoreWords": [
"preid",
"Quarterpounder",
"tuilabel",
"fontawesome",
"fortawesome",
"svgs",
"contentalign",
"sber"
],
"ignoreRegExpList": ["\\(https?://.*?\\)", "\\/{1}.+\\/{1}", "\\%2F.+", "\\%2C.+", "\\ɵ.+", "\\ыва.+"],
"overrides": [
{
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ tmp/
*.iml
*/tmp
.rpt2_cache
.vscode
quality-check
.DS_Store
dist
Expand Down
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["angular.ng-template"]
}
12 changes: 12 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "nx serve",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: start",
"url": "http://localhost:3333/"
}
]
}
23 changes: 23 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "start",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
}
]
}
1 change: 1 addition & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"useLightClient": false,
"namedInputs": {
"sharedGlobals": [
"{workspaceRoot}/project/testing/**/*.ts",
"{workspaceRoot}/nx.json",
"{workspaceRoot}/package-lock.json",
"{workspaceRoot}/tsconfig.*.json",
Expand Down
Loading

0 comments on commit 6f2311a

Please sign in to comment.