Skip to content

Commit 8ae4fe3

Browse files
tylerbutlerscottn12markfields
authored
build: Make 'prettier -w .' work from the root (#15759)
Related to #15758. This PR adds new prettier scripts to run on the whole repo. I also updated the prettierignore files to ignore additional files. The `prettier --write .` command should also now work from the root of any release group. --------- Co-authored-by: Scott Norton <[email protected]> Co-authored-by: Mark Fields <[email protected]>
1 parent 56390d0 commit 8ae4fe3

File tree

102 files changed

+7449
-5921
lines changed

Some content is hidden

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

102 files changed

+7449
-5921
lines changed

‎.changeset/wild-items-beam.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@fluidframework/telemetry-utils": major
3+
---
4+
5+
The internal logger interface used when instrumenting the code now supports logging a flat object,
6+
which will be JSON.stringified before being sent to the host's base logger.
7+
This is technically a breaking change but based on typical logger configuration, should not require any changes to accommodate.

‎.devcontainer/docker-compose.yml

+133-133
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,141 @@
1-
version: '3.4'
1+
version: "3.4"
22
services:
3-
development:
4-
# Uncomment the next line to use a non-root user. On Linux, this will prevent
5-
# new files getting created as root, but you may need to update the USER_UID
6-
# and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
7-
user: node
3+
development:
4+
# Uncomment the next line to use a non-root user. On Linux, this will prevent
5+
# new files getting created as root, but you may need to update the USER_UID
6+
# and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
7+
user: node
88

9-
# Using a Dockerfile is optional, but included for completeness.
10-
build:
11-
context: .
12-
dockerfile: Dockerfile
9+
# Using a Dockerfile is optional, but included for completeness.
10+
build:
11+
context: .
12+
dockerfile: Dockerfile
1313

14-
# Uncomment to expose one or more ports
15-
ports:
16-
- "8080:8080"
14+
# Uncomment to expose one or more ports
15+
ports:
16+
- "8080:8080"
1717

18-
volumes:
19-
# This is where VS Code should expect to find your project's source code
20-
# and the value of "workspaceFolder" in .devcontainer/devcontainer.json
21-
- ..:/workspace
22-
# Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker-compose for details.
23-
- /var/run/docker.sock:/var/run/docker.sock
18+
volumes:
19+
# This is where VS Code should expect to find your project's source code
20+
# and the value of "workspaceFolder" in .devcontainer/devcontainer.json
21+
- ..:/workspace
22+
# Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker-compose for details.
23+
- /var/run/docker.sock:/var/run/docker.sock
2424

25-
# Overrides default command so things don't shut down after the process ends.
26-
command: sleep infinity
27-
gateway:
28-
image: prague.azurecr.io/prague:12579
29-
ports:
30-
- "3000:3000"
31-
command: node ../gateway/dist/www.js
32-
environment:
33-
- DEBUG=fluid:*
34-
- NODE_ENV=development
35-
- IS_FLUID_SERVER=true
36-
- login__microsoft__clientId
37-
- login__microsoft__secret
38-
- login__accounts
39-
restart: always
40-
alfred:
41-
image: prague.azurecr.io/prague:12579
42-
ports:
43-
- "3003:3000"
44-
command: node dist/alfred/www.js
45-
environment:
46-
- DEBUG=fluid:*
47-
- NODE_ENV=development
48-
- IS_FLUID_SERVER=true
49-
restart: always
50-
deli:
51-
image: prague.azurecr.io/prague:12579
52-
command: node dist/kafka-service/index.js deli /usr/src/server/packages/server/routerlicious/dist/deli/index.js
53-
environment:
54-
- DEBUG=fluid:*
55-
- NODE_ENV=development
56-
- IS_FLUID_SERVER=true
57-
restart: always
58-
scriptorium:
59-
image: prague.azurecr.io/prague:12579
60-
command: node dist/kafka-service/index.js scriptorium /usr/src/server/packages/server/routerlicious/dist/scriptorium/index.js
61-
environment:
62-
- DEBUG=fluid:*
63-
- NODE_ENV=development
64-
- IS_FLUID_SERVER=true
65-
restart: always
66-
broadcaster:
67-
image: prague.azurecr.io/prague:12579
68-
command: node dist/kafka-service/index.js broadcaster /usr/src/server/packages/server/routerlicious/dist/broadcaster/index.js
69-
environment:
70-
- DEBUG=fluid:*
71-
- NODE_ENV=development
72-
- IS_FLUID_SERVER=true
73-
restart: always
74-
scribe:
75-
image: prague.azurecr.io/prague:12579
76-
command: node dist/kafka-service/index.js scribe /usr/src/server/packages/server/routerlicious/dist/scribe/index.js
77-
environment:
78-
- DEBUG=fluid:*
79-
- NODE_ENV=development
80-
- IS_FLUID_SERVER=true
81-
restart: always
82-
riddler:
83-
image: prague.azurecr.io/prague:12579
84-
ports:
85-
- "5000:5000"
86-
command: node dist/riddler/www.js
87-
environment:
88-
- DEBUG=fluid:*
89-
- NODE_ENV=development
90-
- IS_FLUID_SERVER=true
91-
restart: always
92-
historian:
93-
image: prague.azurecr.io/historian:5109
94-
ports:
95-
- "3001:3000"
96-
environment:
97-
- DEBUG=fluid:*
98-
- NODE_ENV=development
99-
- IS_FLUID_SERVER=true
100-
restart: always
101-
gitrest:
102-
image: prague.azurecr.io/gitrest:4048
103-
environment:
104-
- DEBUG=fluid:*
105-
- NODE_ENV=development
106-
- IS_FLUID_SERVER=true
107-
volumes:
108-
- git:/home/node/documents
109-
restart: always
110-
git:
111-
image: prague.azurecr.io/gitssh:654
112-
ports:
113-
- "3022:22"
114-
volumes:
115-
- git:/home/git
116-
restart: always
117-
zookeeper:
118-
image: wurstmeister/zookeeper:latest
119-
ports:
120-
- "2181:2181"
121-
restart: always
122-
kafka:
123-
image: wurstmeister/kafka:2.11-1.1.1
124-
ports:
125-
- "9092:9092"
126-
environment:
127-
KAFKA_ADVERTISED_HOST_NAME: "kafka"
128-
KAFKA_ADVERTISED_PORT: "9092"
129-
KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'false'
130-
KAFKA_CREATE_TOPICS: "deltas:8:1,rawdeltas:8:1,testtopic:8:1,deltas2:8:1,rawdeltas2:8:1"
131-
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
132-
restart: always
133-
redis:
134-
image: "redis:alpine"
135-
mongodb:
136-
image: "mongo:3.4.3"
137-
rabbitmq:
138-
image: "rabbitmq:alpine"
25+
# Overrides default command so things don't shut down after the process ends.
26+
command: sleep infinity
27+
gateway:
28+
image: prague.azurecr.io/prague:12579
29+
ports:
30+
- "3000:3000"
31+
command: node ../gateway/dist/www.js
32+
environment:
33+
- DEBUG=fluid:*
34+
- NODE_ENV=development
35+
- IS_FLUID_SERVER=true
36+
- login__microsoft__clientId
37+
- login__microsoft__secret
38+
- login__accounts
39+
restart: always
40+
alfred:
41+
image: prague.azurecr.io/prague:12579
42+
ports:
43+
- "3003:3000"
44+
command: node dist/alfred/www.js
45+
environment:
46+
- DEBUG=fluid:*
47+
- NODE_ENV=development
48+
- IS_FLUID_SERVER=true
49+
restart: always
50+
deli:
51+
image: prague.azurecr.io/prague:12579
52+
command: node dist/kafka-service/index.js deli /usr/src/server/packages/server/routerlicious/dist/deli/index.js
53+
environment:
54+
- DEBUG=fluid:*
55+
- NODE_ENV=development
56+
- IS_FLUID_SERVER=true
57+
restart: always
58+
scriptorium:
59+
image: prague.azurecr.io/prague:12579
60+
command: node dist/kafka-service/index.js scriptorium /usr/src/server/packages/server/routerlicious/dist/scriptorium/index.js
61+
environment:
62+
- DEBUG=fluid:*
63+
- NODE_ENV=development
64+
- IS_FLUID_SERVER=true
65+
restart: always
66+
broadcaster:
67+
image: prague.azurecr.io/prague:12579
68+
command: node dist/kafka-service/index.js broadcaster /usr/src/server/packages/server/routerlicious/dist/broadcaster/index.js
69+
environment:
70+
- DEBUG=fluid:*
71+
- NODE_ENV=development
72+
- IS_FLUID_SERVER=true
73+
restart: always
74+
scribe:
75+
image: prague.azurecr.io/prague:12579
76+
command: node dist/kafka-service/index.js scribe /usr/src/server/packages/server/routerlicious/dist/scribe/index.js
77+
environment:
78+
- DEBUG=fluid:*
79+
- NODE_ENV=development
80+
- IS_FLUID_SERVER=true
81+
restart: always
82+
riddler:
83+
image: prague.azurecr.io/prague:12579
84+
ports:
85+
- "5000:5000"
86+
command: node dist/riddler/www.js
87+
environment:
88+
- DEBUG=fluid:*
89+
- NODE_ENV=development
90+
- IS_FLUID_SERVER=true
91+
restart: always
92+
historian:
93+
image: prague.azurecr.io/historian:5109
94+
ports:
95+
- "3001:3000"
96+
environment:
97+
- DEBUG=fluid:*
98+
- NODE_ENV=development
99+
- IS_FLUID_SERVER=true
100+
restart: always
101+
gitrest:
102+
image: prague.azurecr.io/gitrest:4048
103+
environment:
104+
- DEBUG=fluid:*
105+
- NODE_ENV=development
106+
- IS_FLUID_SERVER=true
107+
volumes:
108+
- git:/home/node/documents
109+
restart: always
110+
git:
111+
image: prague.azurecr.io/gitssh:654
112+
ports:
113+
- "3022:22"
114+
volumes:
115+
- git:/home/git
116+
restart: always
117+
zookeeper:
118+
image: wurstmeister/zookeeper:latest
119+
ports:
120+
- "2181:2181"
121+
restart: always
122+
kafka:
123+
image: wurstmeister/kafka:2.11-1.1.1
124+
ports:
125+
- "9092:9092"
126+
environment:
127+
KAFKA_ADVERTISED_HOST_NAME: "kafka"
128+
KAFKA_ADVERTISED_PORT: "9092"
129+
KAFKA_AUTO_CREATE_TOPICS_ENABLE: "false"
130+
KAFKA_CREATE_TOPICS: "deltas:8:1,rawdeltas:8:1,testtopic:8:1,deltas2:8:1,rawdeltas2:8:1"
131+
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
132+
restart: always
133+
redis:
134+
image: "redis:alpine"
135+
mongodb:
136+
image: "mongo:3.4.3"
137+
rabbitmq:
138+
image: "rabbitmq:alpine"
139139
volumes:
140140
git:
141141
driver: local

‎.github/ISSUE_TEMPLATE/api_deprecation.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
11
---
22
name: Deprecated API
33
about: Track the cleanup of a deprecated API
4-
title: ''
5-
labels: 'api deprecation'
6-
assignees: ''
7-
4+
title: ""
5+
labels: "api deprecation"
6+
assignees: ""
87
---
98

109
## Deprecated API
10+
1111
<!-- Describe the API along with its associated classes, interfaces, packages, etc. -->
1212

1313
**Context**
14+
1415
<!-- An explanation of why this API should be deprecated and ultimately removed -->
1516

1617
**Approach**
18+
1719
<!-- An explanation of the intended replacement/solution -->
1820

1921
**Dependencies**
22+
2023
<!-- Indicate if there is any other work that must be completed first -->
2124

2225
**Compatibility Concerns**
26+
2327
<!-- List any compatibility concerns such as persistent data, loader compatibility (LTS), or runtime compatibility (N-1) -->
2428

2529
**Phases**
30+
2631
<!-- Layout a clear plan listing each step necessary to complete the cleanup -->
2732

2833
**Expected Timeline**
34+
2935
<!-- When you expect this API will be fully removed. If possible give a release version -->
3036

3137
**Open Questions**
38+
3239
<!-- List any unknowns that need to be addressed before removing the API -->
3340

3441
<!-- Reminder: Assign this issue to somebody, if you are unsure who, assign it to yourself -->

‎.github/ISSUE_TEMPLATE/bug_report.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ''
5-
labels: 'bug'
6-
assignees: ''
7-
4+
title: ""
5+
labels: "bug"
6+
assignees: ""
87
---
98

109
## Describe the bug
10+
1111
<!-- A clear and concise description of what the bug is. -->
1212
<!-- If applicable, add screenshots or screen recordings to help explain your problem. -->
1313

1414
### To Reproduce
15+
1516
Steps to reproduce the behavior:
17+
1618
1. Go to '...'
1719
2. Click on '....'
1820
3. Scroll down to '....'
1921
4. See error
2022

2123
### Expected behavior
24+
2225
<!--A clear and concise description of what you expected to happen.-->
2326

2427
### Logs
25-
<!-- If applicable, please share logs or Session IDs -->
26-
2728

29+
<!-- If applicable, please share logs or Session IDs -->
2830

2931
<!-- By filing an Issue, you are expected to comply with the Code of Conduct: https://github.com/microsoft/FluidFramework/blob/main/CODE_OF_CONDUCT.md -->
3032

0 commit comments

Comments
 (0)