Merge branch 'main' into doc-readme (44dd7b72) · Commits · FQQD / Canvas

.gitlab-ci.yml

+6 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,9 @@ eslint client:
		script:
		- npm i --include=dev
		- npm -w packages/client run lint
		artifacts:
		reports:
		codequality: packages/client/gl-codequality.json

		eslint server:
		stage: lint
		@@ -25,6 +28,9 @@ eslint server:
		script:
		- npm i --include=dev
		- npm -w packages/server run lint
		artifacts:
		reports:
		codequality: packages/server/gl-codequality.json

		build wiki:
		stage: build

package-lock.json

+42 −0

Original line number	Diff line number	Diff line
		@@ -37,8 +37,10 @@
		"@vitejs/plugin-react": "^4.3.4",
		"autoprefixer": "^10.4.20",
		"dotenv": "^16.4.7",
		"dotenv-cli": "^8.0.0",
		"eslint": "^8.57.0",
		"eslint-config-react-app": "^7.0.1",
		"eslint-formatter-gitlab": "^5.1.0",
		"eslint-plugin-react-hooks": "^5.1.0",
		"eslint-plugin-simple-import-sort": "^12.1.1",
		"nodemon": "^3.1.9",
		@@ -9833,6 +9835,30 @@
		"url": "https://dotenvx.com"
		}
		},
		"node_modules/dotenv-cli": {
		"version": "8.0.0",
		"resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-8.0.0.tgz",
		"integrity": "sha512-aLqYbK7xKOiTMIRf1lDPbI+Y+Ip/wo5k3eyp6ePysVaSqbyxjyK3dK35BTxG+rmd7djf5q2UPs4noPNH+cj0Qw==",
		"dev": true,
		"dependencies": {
		"cross-spawn": "^7.0.6",
		"dotenv": "^16.3.0",
		"dotenv-expand": "^10.0.0",
		"minimist": "^1.2.6"
		},
		"bin": {
		"dotenv": "cli.js"
		}
		},
		"node_modules/dotenv-expand": {
		"version": "10.0.0",
		"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
		"integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
		"dev": true,
		"engines": {
		"node": ">=12"
		}
		},
		"node_modules/dunder-proto": {
		"version": "1.0.1",
		"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
		@@ -10556,6 +10582,22 @@
		"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
		"dev": true
		},
		"node_modules/eslint-formatter-gitlab": {
		"version": "5.1.0",
		"resolved": "https://registry.npmjs.org/eslint-formatter-gitlab/-/eslint-formatter-gitlab-5.1.0.tgz",
		"integrity": "sha512-IxhrjLYzDlbFgPWEnvZlWLwPjMeyymbyo0hDHWntZ3DSAP9AP9huj15KbU+BK3OqeO3OHhbFEh2TA6sR0KZhkA==",
		"dev": true,
		"dependencies": {
		"chalk": "^4.0.0",
		"yaml": "^2.0.0"
		},
		"funding": {
		"url": "https://github.com/sponsors/remcohaszing"
		},
		"peerDependencies": {
		"eslint": ">=5"
		}
		},
		"node_modules/eslint-import-resolver-node": {
		"version": "0.3.9",
		"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",

package.json

+2 −0

Original line number	Diff line number	Diff line
		@@ -36,8 +36,10 @@
		"@vitejs/plugin-react": "^4.3.4",
		"autoprefixer": "^10.4.20",
		"dotenv": "^16.4.7",
		"dotenv-cli": "^8.0.0",
		"eslint": "^8.57.0",
		"eslint-config-react-app": "^7.0.1",
		"eslint-formatter-gitlab": "^5.1.0",
		"eslint-plugin-react-hooks": "^5.1.0",
		"eslint-plugin-simple-import-sort": "^12.1.1",
		"nodemon": "^3.1.9",

packages/client/package.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		"build": "vite build",
		"dev": "vite serve",
		"preview": "vite preview",
		"lint": "eslint ."
		"lint": "eslint --format gitlab ."
		},
		"type": "module",
		"keywords": [],

packages/client/src/components/App.tsx

+1 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ const AppInner = () => {
		return (
		<>
		<Header />
		<CanvasWrapper />
		{config && <CanvasWrapper />}
		<ToolbarWrapper />

		{/* <DynamicallyLoadChat /> */}