Skip to content

Commit 76144e5

Browse files
authored
Merge branch 'master' into mod/tor/inlineImageIssue
2 parents 67353f6 + e29e3db commit 76144e5

File tree

171 files changed

+9150
-8936
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+9150
-8936
lines changed

.prettierrc.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// Prettier config options: https://prettier.io/docs/en/options.html
22
// Shared front-end config: https://git.pega.io/projects/FE/repos/configs/browse/packages/prettier-config/index.json
33

4-
const pegaPrettierConfig = require('@pega/prettier-config');
5-
64
module.exports = {
7-
...pegaPrettierConfig,
8-
printWidth: 150
5+
plugins: ['@pega/prettier-config'],
6+
printWidth: 150,
7+
singleQuote: true,
8+
trailingComma: 'none',
9+
arrowParens: 'avoid'
910
};

angular.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@
8787
"input": "./node_modules/@pega/constellationjs/dist/",
8888
"output": "./constellation/prerequisite"
8989
},
90+
{
91+
"glob": "*.*",
92+
"input": "./node_modules/@pega/constellationjs/dist/js",
93+
"output": "./constellation/prerequisite/js"
94+
},
9095
{
9196
"glob": "*.*",
9297
"input": "./projects/angular-test-app/src/assets/",

0 commit comments

Comments
 (0)