Skip to content

Commit c85fb00

Browse files
Move Protocol Defs to Common (#6167)
In attempt to improve our back compact guarantees and reduce the need to publish unchanged packages we are going to move a number of packages to the common folder. The chain of packages starts with protocol-definitions.
1 parent d8d06cc commit c85fb00

File tree

39 files changed

+3549
-17
lines changed

39 files changed

+3549
-17
lines changed

server/routerlicious/packages/protocol-definitions/api-extractor.json renamed to common/lib/protocol-definitions/api-extractor.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"extends": "@fluidframework/build-common/api-extractor-common-report.json",
44
"apiReport": {
55
"enabled": true,
6-
"reportFolder": "<projectFolder>/../../api-report/"
6+
"reportFolder": "<projectFolder>../api-report/"
77
},
88
"docModel": {
99
"enabled": true,
10-
"apiJsonFilePath": "<projectFolder>/../../_api-extractor-temp/doc-models/<unscopedPackageName>.api.json"
10+
"apiJsonFilePath": "<projectFolder>..//../../_api-extractor-temp/doc-models/<unscopedPackageName>.api.json"
1111
}
1212
}

common/lib/protocol-definitions/package-lock.json

Lines changed: 3517 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/routerlicious/packages/protocol-definitions/package.json renamed to common/lib/protocol-definitions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"scripts": {
1414
"build": "concurrently npm:build:compile npm:lint && npm run build:docs",
1515
"build:compile": "concurrently npm:tsc npm:build:esnext",
16-
"build:docs": "api-extractor run --local && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../_api-extractor-temp/",
16+
"build:docs": "api-extractor run --local && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
1717
"build:esnext": "tsc --project ./tsconfig.esnext.json",
1818
"build:full": "npm run build",
1919
"build:full:compile": "npm run build:compile",

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
"repoPackages": {
129129
"build": "common/build",
130130
"common-def": "common/lib/common-definitions",
131+
"protocol-def": "common/lib/protocol-definitions",
131132
"common-utils": "common/lib/common-utils",
132133
"server": "server/routerlicious",
133134
"client": {

server/routerlicious/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ COPY lerna.json .
2525
COPY lerna-package-lock.json .
2626

2727
COPY packages/gitresources/package*.json packages/gitresources/
28-
COPY packages/protocol-definitions/package*.json packages/protocol-definitions/
2928
COPY packages/kafka-orderer/package*.json packages/kafka-orderer/
3029
COPY packages/lambdas-driver/package*.json packages/lambdas-driver/
3130
COPY packages/lambdas/package*.json packages/lambdas/

server/routerlicious/lerna-package-lock.json

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/routerlicious/packages/kafka-orderer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"tsfmt:fix": "tsfmt --replace"
2424
},
2525
"dependencies": {
26-
"@fluidframework/protocol-definitions": "^0.1025.0",
26+
"@fluidframework/protocol-definitions": "^0.1024.0",
2727
"@fluidframework/server-services-core": "^0.1025.0",
2828
"@types/node": "^12.19.0"
2929
},

server/routerlicious/packages/lambdas/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@fluidframework/common-utils": "^0.30.0-0",
5151
"@fluidframework/gitresources": "^0.1025.0",
5252
"@fluidframework/protocol-base": "^0.1025.0",
53-
"@fluidframework/protocol-definitions": "^0.1025.0",
53+
"@fluidframework/protocol-definitions": "^0.1024.0",
5454
"@fluidframework/server-services-client": "^0.1025.0",
5555
"@fluidframework/server-services-core": "^0.1025.0",
5656
"@types/semver": "^6.0.1",

server/routerlicious/packages/local-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
},
5454
"dependencies": {
5555
"@fluidframework/common-utils": "^0.30.0-0",
56-
"@fluidframework/protocol-definitions": "^0.1025.0",
56+
"@fluidframework/protocol-definitions": "^0.1024.0",
5757
"@fluidframework/server-lambdas": "^0.1025.0",
5858
"@fluidframework/server-memory-orderer": "^0.1025.0",
5959
"@fluidframework/server-services-client": "^0.1025.0",

server/routerlicious/packages/memory-orderer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"dependencies": {
5454
"@fluidframework/common-utils": "^0.30.0-0",
5555
"@fluidframework/protocol-base": "^0.1025.0",
56-
"@fluidframework/protocol-definitions": "^0.1025.0",
56+
"@fluidframework/protocol-definitions": "^0.1024.0",
5757
"@fluidframework/server-lambdas": "^0.1025.0",
5858
"@fluidframework/server-services-client": "^0.1025.0",
5959
"@fluidframework/server-services-core": "^0.1025.0",

server/routerlicious/packages/protocol-base/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"dependencies": {
5757
"@fluidframework/common-utils": "^0.30.0-0",
5858
"@fluidframework/gitresources": "^0.1025.0",
59-
"@fluidframework/protocol-definitions": "^0.1025.0",
59+
"@fluidframework/protocol-definitions": "^0.1024.0",
6060
"assert": "^2.0.0",
6161
"lodash": "^4.17.21"
6262
},

server/routerlicious/packages/routerlicious-base/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"dependencies": {
4949
"@fluidframework/common-utils": "^0.30.0-0",
5050
"@fluidframework/gitresources": "^0.1025.0",
51-
"@fluidframework/protocol-definitions": "^0.1025.0",
51+
"@fluidframework/protocol-definitions": "^0.1024.0",
5252
"@fluidframework/server-kafka-orderer": "^0.1025.0",
5353
"@fluidframework/server-lambdas": "^0.1025.0",
5454
"@fluidframework/server-lambdas-driver": "^0.1025.0",

server/routerlicious/packages/routerlicious/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"dependencies": {
4242
"@fluidframework/common-utils": "^0.30.0-0",
4343
"@fluidframework/gitresources": "^0.1025.0",
44-
"@fluidframework/protocol-definitions": "^0.1025.0",
44+
"@fluidframework/protocol-definitions": "^0.1024.0",
4545
"@fluidframework/server-kafka-orderer": "^0.1025.0",
4646
"@fluidframework/server-lambdas": "^0.1025.0",
4747
"@fluidframework/server-lambdas-driver": "^0.1025.0",

server/routerlicious/packages/services-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@fluidframework/common-utils": "^0.30.0-0",
5555
"@fluidframework/gitresources": "^0.1025.0",
5656
"@fluidframework/protocol-base": "^0.1025.0",
57-
"@fluidframework/protocol-definitions": "^0.1025.0",
57+
"@fluidframework/protocol-definitions": "^0.1024.0",
5858
"@types/node": "^12.19.0",
5959
"axios": "^0.21.1",
6060
"debug": "^4.1.1",

server/routerlicious/packages/services-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"dependencies": {
2727
"@fluidframework/common-utils": "^0.30.0-0",
2828
"@fluidframework/gitresources": "^0.1025.0",
29-
"@fluidframework/protocol-definitions": "^0.1025.0",
29+
"@fluidframework/protocol-definitions": "^0.1024.0",
3030
"@fluidframework/server-services-client": "^0.1025.0",
3131
"@types/nconf": "^0.10.0",
3232
"@types/node": "^12.19.0",

server/routerlicious/packages/services-shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@fluidframework/common-utils": "^0.30.0-0",
2828
"@fluidframework/gitresources": "^0.1025.0",
2929
"@fluidframework/protocol-base": "^0.1025.0",
30-
"@fluidframework/protocol-definitions": "^0.1025.0",
30+
"@fluidframework/protocol-definitions": "^0.1024.0",
3131
"@fluidframework/server-services-client": "^0.1025.0",
3232
"@fluidframework/server-services-core": "^0.1025.0",
3333
"debug": "^4.1.1",

server/routerlicious/packages/services-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"temp-directory": "nyc/.nyc_output"
4848
},
4949
"dependencies": {
50-
"@fluidframework/protocol-definitions": "^0.1025.0",
50+
"@fluidframework/protocol-definitions": "^0.1024.0",
5151
"@fluidframework/server-services-client": "^0.1025.0",
5252
"@fluidframework/server-services-core": "^0.1025.0",
5353
"debug": "^4.1.1",

server/routerlicious/packages/services/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"dependencies": {
4949
"@fluidframework/common-utils": "^0.30.0-0",
50-
"@fluidframework/protocol-definitions": "^0.1025.0",
50+
"@fluidframework/protocol-definitions": "^0.1024.0",
5151
"@fluidframework/server-services-client": "^0.1025.0",
5252
"@fluidframework/server-services-core": "^0.1025.0",
5353
"@fluidframework/server-services-ordering-kafkanode": "^0.1025.0",

server/routerlicious/packages/test-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@fluidframework/common-utils": "^0.30.0-0",
5050
"@fluidframework/gitresources": "^0.1025.0",
5151
"@fluidframework/protocol-base": "^0.1025.0",
52-
"@fluidframework/protocol-definitions": "^0.1025.0",
52+
"@fluidframework/protocol-definitions": "^0.1024.0",
5353
"@fluidframework/server-services-client": "^0.1025.0",
5454
"@fluidframework/server-services-core": "^0.1025.0",
5555
"debug": "^4.1.1",

0 commit comments

Comments
 (0)