Merge pull request #541 from flocon-trpg/main

flocon-trpg · Feb 25, 2023 · ff66394 · ff66394
2 parents f9db5c3 + c7aaf53
commit ff66394
Show file tree

Hide file tree

Showing 22 changed files with 177 additions and 154 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -239,10 +239,10 @@ jobs:
         steps:
             - uses: actions/checkout@v3
 
-            - name: Use Node 16.x
+            - name: Use Node 18.x
               uses: actions/setup-node@v3
               with:
-                  node-version: 16.x
+                  node-version: 18.x
                   cache: yarn
 
             - run: yarn
@@ -299,10 +299,10 @@ jobs:
                   # Requires full git history: https://github.com/chromaui/action#getting-started
                   fetch-depth: 0
 
-            - name: Use Node 16.x
+            - name: Use Node 18.x
               uses: actions/setup-node@v3
               with:
-                  node-version: 16.x
+                  node-version: 18.x
                   cache: yarn
 
             - run: yarn

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,6 +7,29 @@ on:
             - 'v3*.*.*'
 
 jobs:
+    git-diff-main:
+        name: git diff remotes/origin/main
+
+        runs-on: ubuntu-22.04
+
+        steps:
+            - name: List git config
+              run: git config -l
+
+            - uses: actions/checkout@v3
+              with:
+                  fetch-depth: 0
+
+            - name: Fail if not all the files are OK
+              run: |
+                  if [[ -n "$(git diff remotes/origin/main)" ]]; then
+                      echo "ERROR: The project is dirty!"
+                      git diff --stat remotes/origin/main
+                    exit 1
+                  else
+                      echo "OK."
+                  fi
+
     release:
         runs-on: ubuntu-20.04
         steps:

diff --git a/apps/api-server/dist/VERSION.js b/apps/api-server/dist/VERSION.js
diff --git a/apps/api-server/package.json b/apps/api-server/package.json
@@ -78,7 +78,7 @@
         "rate-limiter-flexible": "^2.3.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "rollup-plugin-multi-input": "^1.3.1",
         "rxjs": "^7.5.6",
         "safe-compare": "^1.1.4",

diff --git a/apps/api-server/src/VERSION.ts b/apps/api-server/src/VERSION.ts
@@ -3,5 +3,5 @@ import { SemVer } from '@flocon-trpg/utils';
 export const VERSION = new SemVer({
     major: 0,
     minor: 7,
-    patch: 14,
+    patch: 15,
 });
diff --git a/apps/web-server/package.json b/apps/web-server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flocon-trpg/web-server",
-    "version": "0.8.9",
+    "version": "0.8.10",
     "description": "Flocon Web server",
     "license": "MIT",
     "scripts": {

diff --git a/apps/web-server/public/licenses-npm-package.txt b/apps/web-server/public/licenses-npm-package.txt
@@ -69,7 +69,7 @@ SOFTWARE.
 
 -----
 
-The following software may be included in this product: @babel/code-frame, @babel/helper-module-imports, @babel/helper-plugin-utils, @babel/helper-string-parser, @babel/helper-validator-identifier, @babel/highlight, @babel/runtime, @babel/types. A copy of the source code may be downloaded from https://github.com/babel/babel.git (@babel/code-frame), https://github.com/babel/babel.git (@babel/helper-module-imports), https://github.com/babel/babel.git (@babel/helper-plugin-utils), https://github.com/babel/babel.git (@babel/helper-string-parser), https://github.com/babel/babel.git (@babel/helper-validator-identifier), https://github.com/babel/babel.git (@babel/highlight), https://github.com/babel/babel.git (@babel/runtime), https://github.com/babel/babel.git (@babel/types). This software contains the following license and notice below:
+The following software may be included in this product: @babel/code-frame, @babel/helper-module-imports, @babel/helper-string-parser, @babel/helper-validator-identifier, @babel/highlight, @babel/runtime, @babel/types. A copy of the source code may be downloaded from https://github.com/babel/babel.git (@babel/code-frame), https://github.com/babel/babel.git (@babel/helper-module-imports), https://github.com/babel/babel.git (@babel/helper-string-parser), https://github.com/babel/babel.git (@babel/helper-validator-identifier), https://github.com/babel/babel.git (@babel/highlight), https://github.com/babel/babel.git (@babel/runtime), https://github.com/babel/babel.git (@babel/types). This software contains the following license and notice below:
 
 MIT License
 

diff --git a/apps/web-server/src/components/models/room/Room/Room.stories.tsx b/apps/web-server/src/components/models/room/Room/Room.stories.tsx
@@ -46,6 +46,9 @@ export default {
     title: 'models/room/Room',
     component: Player,
     args: { myParticipantRole: 'Player' },
+    parameters: {
+        chromatic: { delay: 1000 },
+    },
 } as ComponentMeta<typeof Player>;
 
 const Template: ComponentStory<typeof Player> = args => <Player {...args} />;

diff --git a/...b-server/src/components/models/room/Room/subcomponents/components/Board/Board.stories.tsx b/...b-server/src/components/models/room/Room/subcomponents/components/Board/Board.stories.tsx
@@ -104,6 +104,9 @@ export default {
     title: 'models/room/Room/Board',
     component: Default,
     args: { myParticipantRole: 'Player', boardProps: boardEditorProps, setActiveBoard: false },
+    parameters: {
+        chromatic: { delay: 1000 },
+    },
 } as ComponentMeta<typeof Default>;
 
 const Template: ComponentStory<typeof Default> = args => <Default {...args} />;

diff --git a/...s/models/room/Room/subcomponents/components/BoardEditorModal/BoardEditorModal.stories.tsx b/...s/models/room/Room/subcomponents/components/BoardEditorModal/BoardEditorModal.stories.tsx
@@ -36,4 +36,7 @@ export default {
         myParticipantRole: 'Player',
         characterStateId: myRichCharacterId,
     },
+    parameters: {
+        chromatic: { delay: 1000 },
+    },
 } as ComponentMeta<typeof Player>;
diff --git a/package.json b/package.json
@@ -19,8 +19,8 @@
         "test-node14": "yarn workspaces foreach -pv --exclude '{@flocon-trpg/servers,@flocon-trpg/web-server}' run test"
     },
     "devDependencies": {
-        "@commitlint/cli": "17.4.3",
-        "@commitlint/config-conventional": "17.4.3",
+        "@commitlint/cli": "17.4.4",
+        "@commitlint/config-conventional": "17.4.4",
         "@flocon-trpg/prettier-config": "workspace:^",
         "husky": "8.0.3",
         "prettier": "2.8.4",

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -39,7 +39,7 @@
         "jest": "29.4.3",
         "prettier": "2.8.4",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "ts-jest": "29.0.5",
         "typescript": "4.9.5"
     },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -51,7 +51,7 @@
         "jest": "29.4.3",
         "prettier": "2.8.4",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "ts-jest": "29.0.5",
         "typescript": "4.9.5"
     },

diff --git a/packages/defaultPinoTransport/package.json b/packages/defaultPinoTransport/package.json
@@ -33,7 +33,7 @@
         "eslint-plugin-import": "2.27.5",
         "prettier": "2.8.4",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "typescript": "4.9.5"
     },
     "engines": {

diff --git a/packages/flocon-script/package.json b/packages/flocon-script/package.json
@@ -39,7 +39,7 @@
         "jest": "29.4.3",
         "prettier": "2.8.4",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "ts-jest": "29.0.5",
         "typescript": "4.9.5"
     },

diff --git a/packages/sdk-react/package.json b/packages/sdk-react/package.json
@@ -43,7 +43,7 @@
         "jest-environment-jsdom": "29.4.3",
         "prettier": "2.8.4",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "ts-jest": "29.0.5",
         "typescript": "4.9.5"
     },

diff --git a/packages/sdk-urql/package.json b/packages/sdk-urql/package.json
@@ -41,7 +41,7 @@
         "eslint-plugin-import": "2.27.5",
         "prettier": "2.8.4",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "typescript": "4.9.5"
     },
     "engines": {

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -42,7 +42,7 @@
         "jest": "29.4.3",
         "prettier": "2.8.4",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "ts-jest": "29.0.5",
         "typescript": "4.9.5"
     },

diff --git a/packages/typed-document-node/package.json b/packages/typed-document-node/package.json
@@ -34,7 +34,7 @@
         "eslint-plugin-import": "2.27.5",
         "prettier": "2.8.4",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "typescript": "4.9.5"
     },
     "engines": {

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -42,7 +42,7 @@
         "lodash": "4.17.21",
         "prettier": "2.8.4",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "ts-jest": "29.0.5",
         "typescript": "4.9.5"
     },

diff --git a/packages/web-server-utils/package.json b/packages/web-server-utils/package.json
@@ -41,7 +41,7 @@
         "jest": "29.4.3",
         "prettier": "2.8.4",
         "rimraf": "4.1.2",
-        "rollup": "3.15.0",
+        "rollup": "3.17.2",
         "ts-jest": "29.0.5",
         "typescript": "4.9.5"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,7 @@ SOFTWARE. @@
     -----
-    The following software may be included in this product: @babel/code-frame, @babel/helper-module-imports, @babel/helper-plugin-utils, @babel/helper-string-parser, @babel/helper-validator-identifier, @babel/highlight, @babel/runtime, @babel/types. A copy of the source code may be downloaded from https://github.com/babel/babel.git (@babel/code-frame), https://github.com/babel/babel.git (@babel/helper-module-imports), https://github.com/babel/babel.git (@babel/helper-plugin-utils), https://github.com/babel/babel.git (@babel/helper-string-parser), https://github.com/babel/babel.git (@babel/helper-validator-identifier), https://github.com/babel/babel.git (@babel/highlight), https://github.com/babel/babel.git (@babel/runtime), https://github.com/babel/babel.git (@babel/types). This software contains the following license and notice below:
+    The following software may be included in this product: @babel/code-frame, @babel/helper-module-imports, @babel/helper-string-parser, @babel/helper-validator-identifier, @babel/highlight, @babel/runtime, @babel/types. A copy of the source code may be downloaded from https://github.com/babel/babel.git (@babel/code-frame), https://github.com/babel/babel.git (@babel/helper-module-imports), https://github.com/babel/babel.git (@babel/helper-string-parser), https://github.com/babel/babel.git (@babel/helper-validator-identifier), https://github.com/babel/babel.git (@babel/highlight), https://github.com/babel/babel.git (@babel/runtime), https://github.com/babel/babel.git (@babel/types). This software contains the following license and notice below:
     MIT License
@@ Expand Down @@