Skip to content

Commit 53818cc

Browse files
jonathanKingstonmuodov
jonathanKingston
and
muodov
authored
Introduce Prettier (#1198)
* Prettier js files only * Run prettier * Add trailingComma * Add prettier package and lint * Disable formatting rules * Run rules * Fix web-compat lint rules and add back template string checking * Rerun * Run from npx * Fix some merge errors * Update lint config * Apply prettier on remaining files * Apply prettier after merge * Do not run prettier on generated files * Fix a test and pin to a tagged version of eslint-config * Fix prettier on windows * Enforce semicolons * Add semicolons (prettier) * Ignore .vscode --------- Co-authored-by: Maxim Tsoy <[email protected]>
1 parent 443a70a commit 53818cc

File tree

370 files changed

+18465
-18363
lines changed

Some content is hidden

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

370 files changed

+18465
-18363
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
src/locales/** linguist-generated
22
src/types/* text eol=lf
3+
* text=auto eol=lf

‎.github/dependabot.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "npm"
4-
directory: "/"
5-
schedule:
6-
interval: "daily"
7-
target-branch: "main"
8-
open-pull-requests-limit: 20
9-
labels:
10-
- "dependencies"
11-
groups:
12-
eslint:
13-
patterns:
14-
- "eslint*"
15-
- "@typescript-eslint*"
16-
stylelint:
17-
patterns:
18-
- "stylelint*"
19-
typescript:
20-
patterns:
21-
- "typedoc"
22-
- "typescript"
23-
- "@types/*"
24-
- "@typescript-eslint*"
25-
rollup:
26-
patterns:
27-
- "@rollup/*"
28-
- "rollup-*"
29-
- "rollup"
30-
- package-ecosystem: "github-actions"
31-
directory: "/"
32-
schedule:
33-
interval: "weekly"
34-
target-branch: "main"
35-
labels:
36-
- "dependencies"
3+
- package-ecosystem: 'npm'
4+
directory: '/'
5+
schedule:
6+
interval: 'daily'
7+
target-branch: 'main'
8+
open-pull-requests-limit: 20
9+
labels:
10+
- 'dependencies'
11+
groups:
12+
eslint:
13+
patterns:
14+
- 'eslint*'
15+
- '@typescript-eslint*'
16+
stylelint:
17+
patterns:
18+
- 'stylelint*'
19+
typescript:
20+
patterns:
21+
- 'typedoc'
22+
- 'typescript'
23+
- '@types/*'
24+
- '@typescript-eslint*'
25+
rollup:
26+
patterns:
27+
- '@rollup/*'
28+
- 'rollup-*'
29+
- 'rollup'
30+
- package-ecosystem: 'github-actions'
31+
directory: '/'
32+
schedule:
33+
interval: 'weekly'
34+
target-branch: 'main'
35+
labels:
36+
- 'dependencies'

‎.github/scripts/diff-directories.js‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,124 @@
1-
import fs from 'fs'
2-
import path from 'path'
1+
import fs from 'fs';
2+
import path from 'path';
33

4-
function readFilesRecursively (directory) {
5-
const filenames = fs.readdirSync(directory)
6-
const files = {}
4+
function readFilesRecursively(directory) {
5+
const filenames = fs.readdirSync(directory);
6+
const files = {};
77

88
filenames.forEach((filename) => {
9-
const filePath = path.join(directory, filename)
10-
const fileStats = fs.statSync(filePath)
9+
const filePath = path.join(directory, filename);
10+
const fileStats = fs.statSync(filePath);
1111

1212
if (fileStats.isDirectory()) {
13-
const nestedFiles = readFilesRecursively(filePath)
13+
const nestedFiles = readFilesRecursively(filePath);
1414
for (const [nestedFilePath, nestedFileContent] of Object.entries(nestedFiles)) {
15-
files[path.join(filename, nestedFilePath)] = nestedFileContent
15+
files[path.join(filename, nestedFilePath)] = nestedFileContent;
1616
}
1717
} else {
18-
files[filename] = fs.readFileSync(filePath, 'utf-8')
18+
files[filename] = fs.readFileSync(filePath, 'utf-8');
1919
}
20-
})
20+
});
2121

22-
return files
22+
return files;
2323
}
2424

25-
function upperCaseFirstLetter (string) {
26-
return string.charAt(0).toUpperCase() + string.slice(1)
25+
function upperCaseFirstLetter(string) {
26+
return string.charAt(0).toUpperCase() + string.slice(1);
2727
}
2828

29-
function displayDiffs (dir1Files, dir2Files, isOpen) {
30-
const rollupGrouping = {}
29+
function displayDiffs(dir1Files, dir2Files, isOpen) {
30+
const rollupGrouping = {};
3131
/**
3232
* Rolls up multiple files with the same diff into a single entry
33-
* @param {string} fileName
34-
* @param {string} string
33+
* @param {string} fileName
34+
* @param {string} string
3535
* @param {string} [summary]
3636
*/
3737
function add(fileName, string, summary = undefined) {
3838
if (summary === undefined) {
39-
summary = string
39+
summary = string;
4040
}
4141
if (!(summary in rollupGrouping)) {
42-
rollupGrouping[summary] = { files: [] }
42+
rollupGrouping[summary] = { files: [] };
4343
}
44-
rollupGrouping[summary].files.push(fileName)
45-
rollupGrouping[summary].string = string
44+
rollupGrouping[summary].files.push(fileName);
45+
rollupGrouping[summary].string = string;
4646
}
4747
for (const [filePath, fileContent] of Object.entries(dir1Files)) {
48-
let diffOut = ''
49-
let compareOut
48+
let diffOut = '';
49+
let compareOut;
5050
if (filePath in dir2Files) {
51-
const fileOut = fileContent
52-
const file2Out = dir2Files[filePath]
53-
delete dir2Files[filePath]
51+
const fileOut = fileContent;
52+
const file2Out = dir2Files[filePath];
53+
delete dir2Files[filePath];
5454
if (fileOut === file2Out) {
55-
continue
55+
continue;
5656
} else {
57-
compareOut = filePath.split('/')[0]
58-
diffOut = `File has changed`
57+
compareOut = filePath.split('/')[0];
58+
diffOut = `File has changed`;
5959
}
6060
} else {
61-
diffOut = '❌ File only exists in old changeset'
62-
compareOut = 'Removed Files'
61+
diffOut = '❌ File only exists in old changeset';
62+
compareOut = 'Removed Files';
6363
}
64-
add(filePath, diffOut, compareOut)
64+
add(filePath, diffOut, compareOut);
6565
}
6666

6767
for (const filePath of Object.keys(dir2Files)) {
68-
add(filePath, '❌ File only exists in new changeset', 'New Files')
68+
add(filePath, '❌ File only exists in new changeset', 'New Files');
6969
}
70-
const outString = Object.keys(rollupGrouping).map(key => {
71-
const rollup = rollupGrouping[key]
72-
let outString = `
73-
`
74-
const title = key
75-
if (rollup.files.length) {
76-
for (const file of rollup.files) {
77-
outString += `- ${file}\n`
70+
const outString = Object.keys(rollupGrouping)
71+
.map((key) => {
72+
const rollup = rollupGrouping[key];
73+
let outString = `
74+
`;
75+
const title = key;
76+
if (rollup.files.length) {
77+
for (const file of rollup.files) {
78+
outString += `- ${file}\n`;
79+
}
7880
}
79-
}
80-
outString += '\n\n' + rollup.string
81-
return renderDetails(title, outString, isOpen)
82-
}).join('\n')
83-
return outString
81+
outString += '\n\n' + rollup.string;
82+
return renderDetails(title, outString, isOpen);
83+
})
84+
.join('\n');
85+
return outString;
8486
}
8587

86-
function renderDetails (section, text, isOpen) {
88+
function renderDetails(section, text, isOpen) {
8789
if (section === 'dist') {
88-
section = 'apple'
90+
section = 'apple';
8991
}
90-
const open = section !== 'integration' ? 'open' : ''
92+
const open = section !== 'integration' ? 'open' : '';
9193
return `<details ${open}>
9294
<summary>${upperCaseFirstLetter(section)}</summary>
9395
${text}
94-
</details>`
96+
</details>`;
9597
}
9698

9799
if (process.argv.length !== 4) {
98-
console.error('Usage: node diff_directories.js <directory1> <directory2>')
99-
process.exit(1)
100+
console.error('Usage: node diff_directories.js <directory1> <directory2>');
101+
process.exit(1);
100102
}
101103

102-
const dir1 = process.argv[2]
103-
const dir2 = process.argv[3]
104+
const dir1 = process.argv[2];
105+
const dir2 = process.argv[3];
104106

105-
const sections = {
106-
}
107-
function sortFiles (dirFiles, dirName) {
107+
const sections = {};
108+
function sortFiles(dirFiles, dirName) {
108109
for (const [filePath, fileContent] of Object.entries(dirFiles)) {
109-
sections[dirName] = sections[dirName] || {}
110-
sections[dirName][filePath] = fileContent
110+
sections[dirName] = sections[dirName] || {};
111+
sections[dirName][filePath] = fileContent;
111112
}
112113
}
113114

114-
const buildDir = '/build'
115-
const sourcesOutput = '/Sources/ContentScopeScripts/'
116-
sortFiles(readFilesRecursively(dir1 + buildDir), 'dir1')
117-
sortFiles(readFilesRecursively(dir2 + buildDir), 'dir2')
118-
sortFiles(readFilesRecursively(dir1 + sourcesOutput), 'dir1')
119-
sortFiles(readFilesRecursively(dir2 + sourcesOutput), 'dir2')
120-
115+
const buildDir = '/build';
116+
const sourcesOutput = '/Sources/ContentScopeScripts/';
117+
sortFiles(readFilesRecursively(dir1 + buildDir), 'dir1');
118+
sortFiles(readFilesRecursively(dir2 + buildDir), 'dir2');
119+
sortFiles(readFilesRecursively(dir1 + sourcesOutput), 'dir1');
120+
sortFiles(readFilesRecursively(dir2 + sourcesOutput), 'dir2');
121121

122122
// console.log(Object.keys(files))
123-
const fileOut = displayDiffs(sections.dir1, sections.dir2, true)
124-
console.log(fileOut)
123+
const fileOut = displayDiffs(sections.dir1, sections.dir2, true);
124+
console.log(fileOut);

‎.github/workflows/asana.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
name: 'asana sync'
22
on:
3-
pull_request_review:
4-
pull_request_target:
5-
types:
6-
- opened
7-
- edited
8-
- closed
9-
- reopened
10-
- synchronize
11-
- review_requested
3+
pull_request_review:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- edited
8+
- closed
9+
- reopened
10+
- synchronize
11+
- review_requested
1212

1313
jobs:
14-
sync:
15-
runs-on: ubuntu-latest
16-
steps:
17-
- uses: actions/checkout@v4
18-
- uses: sammacbeth/action-asana-sync@v6
19-
with:
20-
ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
21-
ASANA_WORKSPACE_ID: ${{ secrets.ASANA_WORKSPACE_ID }}
22-
ASANA_PROJECT_ID: '1208598406046969'
23-
USER_MAP: ${{ vars.USER_MAP }}
14+
sync:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: sammacbeth/action-asana-sync@v6
19+
with:
20+
ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
21+
ASANA_WORKSPACE_ID: ${{ secrets.ASANA_WORKSPACE_ID }}
22+
ASANA_PROJECT_ID: '1208598406046969'
23+
USER_MAP: ${{ vars.USER_MAP }}

0 commit comments

Comments
 (0)