Skip to content

Commit

Permalink
Move Tinylicious to Server-release group (#17766)
Browse files Browse the repository at this point in the history
#### Description


[5812](https://dev.azure.com/fluidframework/internal/_workitems/edit/5812/)


This PR moves `tinylicious` package to the server release group (inside
the `routerlicious` package).

#### Related PR

#16381

---------

Co-authored-by: Alex Villarreal <[email protected]>
  • Loading branch information
jikim-msft and alexvy86 authored Oct 31, 2023
1 parent e5c2291 commit 3d8c453
Show file tree
Hide file tree
Showing 83 changed files with 2,100 additions and 6,083 deletions.
8 changes: 4 additions & 4 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@
},
{
"label": "Start tinylicious",
"detail": "Starts the tinylicious server from the /server/tinylicious folder. Run the 'Stop tinylicious' task to stop it.",
"detail": "Starts the tinylicious server from the /server/routerlicious/packages/tinylicious folder. Run the 'Stop tinylicious' task to stop it.",
"type": "process",
"command": "npm",
"args": ["run", "start"],
"group": "none",
"options": {
"cwd": "${workspaceRoot}/server/tinylicious",
"cwd": "${workspaceRoot}/server/routerlicious/packages/tinylicious",
},
"problemMatcher": [],
},
{
"label": "Stop tinylicious",
"detail": "Stops the tinylicious server from the /server/tinylicious folder.",
"detail": "Stops the tinylicious server from the /server/routerlicious/packages/tinylicious folder.",
"type": "process",
"command": "npm",
"args": ["run", "stop"],
"group": "none",
"options": {
"cwd": "${workspaceRoot}/server/tinylicious",
"cwd": "${workspaceRoot}/server/routerlicious/packages/tinylicious",
},
"problemMatcher": [],
},
Expand Down
2 changes: 1 addition & 1 deletion PACKAGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ The dependencies between layers are enforced by the layer-check command._

| Packages | Layer Dependencies |
| --- | --- |
| - [tinylicious](/server/tinylicious)</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp; | - [Common-Definitions](#Common-Definitions)</br>- [Protocol-Definitions](#Protocol-Definitions)</br>- [Common-Utils](#Common-Utils)</br>- [Protocol-Utils](#Protocol-Utils)</br>- [Server-Shared-Utils](#Server-Shared-Utils)</br>- [Server-Libs](#Server-Libs) |
| - [tinylicious](/server/routerlicious/packages/tinylicious)</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp; | - [Common-Definitions](#Common-Definitions)</br>- [Protocol-Definitions](#Protocol-Definitions)</br>- [Common-Utils](#Common-Utils)</br>- [Protocol-Utils](#Protocol-Utils)</br>- [Server-Shared-Utils](#Server-Shared-Utils)</br>- [Server-Libs](#Server-Libs) |

### Azure-Service

Expand Down
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,17 @@ _This will use an in-memory implementation of the Fluid server to sync between t
_This will run the local Fluid server implementation we call "Tinylicious", so you can sync between multiple browser
instances._

First, start Tinylicious by running these commands from `/server/tinylicious`:
First, start Tinylicious by running these commands from `/server/routerlicious/`:

```shell
npm install
npm run build
npm run start
pnpm install
```

Then these commands from `/server/routerlicious/packages/tinylicious`:

```shell
pnpm run build
pnpm run start
```

Then:
Expand Down
2 changes: 1 addition & 1 deletion azure/packages/external-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ the value in the root SharedDirectory. The Fluid Container is defined in contain

This implementation demonstrates plugging that Container into a standalone application, rather than using the
`webpack-fluid-loader` environment that most of our packages use. This implementation relies on
[Tinylicious](/server/tinylicious), so there are a few extra steps to get started. We bring our own view that we will
[Tinylicious](/server/routerlicious/packages/tinylicious), so there are a few extra steps to get started. We bring our own view that we will
bind to the data in the container.

<!-- AUTO-GENERATED-CONTENT:START (README_EXAMPLE_GETTING_STARTED_SECTION:usesTinylicious=FALSE) -->
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/attributable-map/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/attributable-map`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/collaborative-textarea/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/collaborative-textarea`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/contact-collection/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/contact-collection`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/data-object-grid/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/data-object-grid`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
4 changes: 2 additions & 2 deletions examples/apps/presence-tracker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

**Presence Tracker** is an example that demonstrates how transient state of audience members can be tracked among other audience members using signals. It does so using fluid-framework's `FluidContainer`, `IServiceAudience`, and `Signaler`.

This implementation visualizes the Container in a standalone application, rather than using the webpack-fluid-loader environment that most of our examples use. This implementation relies on [Tinylicious](/server/tinylicious), so there are a few extra steps to get started. We bring our own view that we will bind to the data in the container.
This implementation visualizes the Container in a standalone application, rather than using the webpack-fluid-loader environment that most of our examples use. This implementation relies on [Tinylicious](/server/routerlicious/packages/tinylicious), so there are a few extra steps to get started. We bring our own view that we will bind to the data in the container.

<!-- AUTO-GENERATED-CONTENT:START (README_EXAMPLE_GETTING_STARTED_SECTION:usesTinylicious=TRUE) -->

Expand All @@ -19,7 +19,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/presence-tracker`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/task-selection/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/task-selection`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/tree-comparison/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/tree-comparison`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
2 changes: 1 addition & 1 deletion examples/version-migration/live-schema-upgrade/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/app-integration-live-schema-upgrade`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
2 changes: 1 addition & 1 deletion examples/version-migration/same-container/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/version-migration-same-container`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
2 changes: 1 addition & 1 deletion examples/version-migration/schema-upgrade/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/app-integration-schema-upgrade`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
4 changes: 2 additions & 2 deletions examples/view-integration/container-views/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

**Dice Roller** is a basic example that has a die and a button. Clicking the button re-rolls the die and persists the value in the root SharedDirectory.

This implementation demonstrates plugging the container into a standalone application, rather than using the webpack-fluid-loader environment that most of our packages use. This implementation relies on [Tinylicious](/server/tinylicious), so there are a few extra steps to get started. We expect the container to respond with a mountable view that we can use for rendering.
This implementation demonstrates plugging the container into a standalone application, rather than using the webpack-fluid-loader environment that most of our packages use. This implementation relies on [Tinylicious](/server/routerlicious/packages/tinylicious), so there are a few extra steps to get started. We expect the container to respond with a mountable view that we can use for rendering.

<!-- AUTO-GENERATED-CONTENT:START (README_EXAMPLE_GETTING_STARTED_SECTION:usesTinylicious=TRUE) -->

Expand All @@ -17,7 +17,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/app-integration-container-views`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
4 changes: 2 additions & 2 deletions examples/view-integration/external-views/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

**Dice Roller** is a basic example that has a die and a button. Clicking the button re-rolls the die and persists the value in the root SharedDirectory. The Fluid Container is defined in container/, the data object is defined in dataObject/.

This implementation demonstrates plugging that Container into a standalone application, rather than using the webpack-fluid-loader environment that most of our packages use. This implementation relies on [Tinylicious](/server/tinylicious), so there are a few extra steps to get started. We bring our own view that we will bind to the data in the container.
This implementation demonstrates plugging that Container into a standalone application, rather than using the webpack-fluid-loader environment that most of our packages use. This implementation relies on [Tinylicious](/server/routerlicious/packages/tinylicious), so there are a few extra steps to get started. We bring our own view that we will bind to the data in the container.

<!-- AUTO-GENERATED-CONTENT:START (README_EXAMPLE_GETTING_STARTED_SECTION:usesTinylicious=TRUE) -->

Expand All @@ -17,7 +17,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/app-integration-external-views`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
2 changes: 1 addition & 1 deletion examples/view-integration/view-framework-sampler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ You can run this example using the following steps:
1. Run `pnpm install` and `pnpm run build:fast --nolint` from the `FluidFramework` root directory.
- For an even faster build, you can add the package name to the build command, like this:
`pnpm run build:fast --nolint @fluid-example/view-framework-sampler`
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/tinylicious).
1. In a separate terminal, start a Tinylicious server by following the instructions in [Tinylicious](https://github.com/microsoft/FluidFramework/tree/main/server/routerlicious/packages/tinylicious).
1. Run `pnpm start` from this directory and open <http://localhost:8080> in a web browser to see the app running.

<!-- prettier-ignore-end -->
Expand Down
2 changes: 0 additions & 2 deletions fluidBuild.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ module.exports = {
"tools/changelog-generator-wrapper",
"tools/getkeys",
"tools/test-tools",
"server/tinylicious",
],
},

Expand Down Expand Up @@ -298,7 +297,6 @@ module.exports = {
"@fluidframework/protocol-definitions",
"@fluidframework/test-tools",
"fluidframework-docs",
"tinylicious",
],
fluidBuildTasks: {
tsc: {
Expand Down
1 change: 1 addition & 0 deletions server/routerlicious/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ COPY packages/services-telemetry/package*.json packages/services-telemetry/
COPY packages/services-utils/package*.json packages/services-utils/
COPY packages/test-utils/package*.json packages/test-utils/
COPY packages/protocol-base/package*.json packages/protocol-base/
COPY packages/tinylicious/package*.json packages/tinylicious/

RUN corepack enable

Expand Down
1 change: 1 addition & 0 deletions server/routerlicious/feeds/internal-build.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
tinylicious
@fluidframework/server-test-utils
@fluidframework/server-services-utils
@fluidframework/server-services-telemetry
Expand Down
1 change: 1 addition & 0 deletions server/routerlicious/feeds/internal-test.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
tinylicious
@fluidframework/server-test-utils
@fluidframework/server-services-utils
@fluidframework/server-services-telemetry
Expand Down
1 change: 1 addition & 0 deletions server/routerlicious/feeds/public.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
tinylicious
@fluidframework/server-test-utils
@fluidframework/server-services-utils
@fluidframework/server-services-telemetry
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 3d8c453

Please sign in to comment.