rename: client -> frontend
							
								
								
									
										2
									
								
								.github/dependabot.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						| 
						 | 
					@ -16,7 +16,7 @@ updates:
 | 
				
			||||||
    interval: daily
 | 
					    interval: daily
 | 
				
			||||||
  open-pull-requests-limit: 0
 | 
					  open-pull-requests-limit: 0
 | 
				
			||||||
- package-ecosystem: npm
 | 
					- package-ecosystem: npm
 | 
				
			||||||
  directory: "/packages/client"
 | 
					  directory: "/packages/frontend"
 | 
				
			||||||
  schedule:
 | 
					  schedule:
 | 
				
			||||||
    interval: daily
 | 
					    interval: daily
 | 
				
			||||||
  open-pull-requests-limit: 0
 | 
					  open-pull-requests-limit: 0
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								.github/labeler.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
- packages/backend/**/*
 | 
					- packages/backend/**/*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
'🖥️Client':
 | 
					'🖥️Client':
 | 
				
			||||||
- packages/client/**/*
 | 
					- packages/frontend/**/*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
'🧪Test':
 | 
					'🧪Test':
 | 
				
			||||||
- cypress/**/*
 | 
					- cypress/**/*
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								.github/workflows/lint.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						| 
						 | 
					@ -30,7 +30,7 @@ jobs:
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
        workspace:
 | 
					        workspace:
 | 
				
			||||||
        - backend
 | 
					        - backend
 | 
				
			||||||
        - client
 | 
					        - frontend
 | 
				
			||||||
        - sw
 | 
					        - sw
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v2
 | 
					    - uses: actions/checkout@v2
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						| 
						 | 
					@ -16,7 +16,7 @@ report.*.json
 | 
				
			||||||
!.yarn/releases
 | 
					!.yarn/releases
 | 
				
			||||||
!.yarn/sdks
 | 
					!.yarn/sdks
 | 
				
			||||||
!.yarn/versions
 | 
					!.yarn/versions
 | 
				
			||||||
packages/client/.yarn/cache
 | 
					packages/frontend/.yarn/cache
 | 
				
			||||||
packages/backend/.yarn/cache
 | 
					packages/backend/.yarn/cache
 | 
				
			||||||
packages/sw/.yarn/cache
 | 
					packages/sw/.yarn/cache
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@ COPY [".yarnrc.yml", "package.json", "yarn.lock", "./"]
 | 
				
			||||||
COPY [".yarn", "./.yarn"]
 | 
					COPY [".yarn", "./.yarn"]
 | 
				
			||||||
COPY ["scripts", "./scripts"]
 | 
					COPY ["scripts", "./scripts"]
 | 
				
			||||||
COPY ["packages/backend/package.json", "./packages/backend/"]
 | 
					COPY ["packages/backend/package.json", "./packages/backend/"]
 | 
				
			||||||
COPY ["packages/client/package.json", "./packages/client/"]
 | 
					COPY ["packages/frontend/package.json", "./packages/frontend/"]
 | 
				
			||||||
COPY ["packages/sw/package.json", "./packages/sw/"]
 | 
					COPY ["packages/sw/package.json", "./packages/sw/"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN yarn install --immutable
 | 
					RUN yarn install --immutable
 | 
				
			||||||
| 
						 | 
					@ -37,7 +37,7 @@ COPY --from=builder /misskey/node_modules ./node_modules
 | 
				
			||||||
COPY --from=builder /misskey/built ./built
 | 
					COPY --from=builder /misskey/built ./built
 | 
				
			||||||
COPY --from=builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
 | 
					COPY --from=builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
 | 
				
			||||||
COPY --from=builder /misskey/packages/backend/built ./packages/backend/built
 | 
					COPY --from=builder /misskey/packages/backend/built ./packages/backend/built
 | 
				
			||||||
COPY --from=builder /misskey/packages/client/node_modules ./packages/client/node_modules
 | 
					COPY --from=builder /misskey/packages/frontend/node_modules ./packages/frontend/node_modules
 | 
				
			||||||
COPY . ./
 | 
					COPY . ./
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV NODE_ENV=production
 | 
					ENV NODE_ENV=production
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										16
									
								
								gulpfile.js
									
										
									
									
									
								
							
							
						
						| 
						 | 
					@ -15,21 +15,21 @@ gulp.task('copy:backend:views', () =>
 | 
				
			||||||
	gulp.src('./packages/backend/src/server/web/views/**/*').pipe(gulp.dest('./packages/backend/built/server/web/views'))
 | 
						gulp.src('./packages/backend/src/server/web/views/**/*').pipe(gulp.dest('./packages/backend/built/server/web/views'))
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
gulp.task('copy:client:fonts', () =>
 | 
					gulp.task('copy:frontend:fonts', () =>
 | 
				
			||||||
	gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/'))
 | 
						gulp.src('./packages/frontend/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_frontend_dist_/fonts/'))
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
gulp.task('copy:client:tabler-icons', () =>
 | 
					gulp.task('copy:frontend:tabler-icons', () =>
 | 
				
			||||||
	gulp.src('./packages/client/node_modules/@tabler/icons/iconfont/**/*').pipe(gulp.dest('./built/_client_dist_/tabler-icons/'))
 | 
						gulp.src('./packages/frontend/node_modules/@tabler/icons/iconfont/**/*').pipe(gulp.dest('./built/_frontend_dist_/tabler-icons/'))
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
gulp.task('copy:client:locales', cb => {
 | 
					gulp.task('copy:frontend:locales', cb => {
 | 
				
			||||||
	fs.mkdirSync('./built/_client_dist_/locales', { recursive: true });
 | 
						fs.mkdirSync('./built/_frontend_dist_/locales', { recursive: true });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	const v = { '_version_': meta.version };
 | 
						const v = { '_version_': meta.version };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (const [lang, locale] of Object.entries(locales)) {
 | 
						for (const [lang, locale] of Object.entries(locales)) {
 | 
				
			||||||
		fs.writeFileSync(`./built/_client_dist_/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8');
 | 
							fs.writeFileSync(`./built/_frontend_dist_/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8');
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	cb();
 | 
						cb();
 | 
				
			||||||
| 
						 | 
					@ -53,7 +53,7 @@ gulp.task('build:backend:style', () => {
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
gulp.task('build', gulp.parallel(
 | 
					gulp.task('build', gulp.parallel(
 | 
				
			||||||
	'copy:client:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:tabler-icons'
 | 
						'copy:frontend:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:frontend:fonts', 'copy:frontend:tabler-icons'
 | 
				
			||||||
));
 | 
					));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
gulp.task('default', gulp.task('build'));
 | 
					gulp.task('default', gulp.task('build'));
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,7 +8,7 @@
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
	"packageManager": "yarn@3.3.0",
 | 
						"packageManager": "yarn@3.3.0",
 | 
				
			||||||
	"workspaces": [
 | 
						"workspaces": [
 | 
				
			||||||
		"packages/client",
 | 
							"packages/frontend",
 | 
				
			||||||
		"packages/backend",
 | 
							"packages/backend",
 | 
				
			||||||
		"packages/sw"
 | 
							"packages/sw"
 | 
				
			||||||
	],
 | 
						],
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -38,8 +38,8 @@ const _filename = fileURLToPath(import.meta.url);
 | 
				
			||||||
const _dirname = dirname(_filename);
 | 
					const _dirname = dirname(_filename);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const staticAssets = `${_dirname}/../../../assets/`;
 | 
					const staticAssets = `${_dirname}/../../../assets/`;
 | 
				
			||||||
const clientAssets = `${_dirname}/../../../../client/assets/`;
 | 
					const clientAssets = `${_dirname}/../../../../frontend/assets/`;
 | 
				
			||||||
const assets = `${_dirname}/../../../../../built/_client_dist_/`;
 | 
					const assets = `${_dirname}/../../../../../built/_frontend_dist_/`;
 | 
				
			||||||
const swAssets = `${_dirname}/../../../../../built/_sw_dist_/`;
 | 
					const swAssets = `${_dirname}/../../../../../built/_sw_dist_/`;
 | 
				
			||||||
const viteOut = `${_dirname}/../../../../../built/_vite_/`;
 | 
					const viteOut = `${_dirname}/../../../../../built/_vite_/`;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	"typescript.tsdk": "node_modules\\typescript\\lib",
 | 
						"typescript.tsdk": "node_modules\\typescript\\lib",
 | 
				
			||||||
	"path-intellisense.mappings": {
 | 
						"path-intellisense.mappings": {
 | 
				
			||||||
		"@": "${workspaceRoot}/packages/client/src/"
 | 
							"@": "${workspaceRoot}/packages/frontend/src/"
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
	"eslint.validate": [
 | 
						"eslint.validate": [
 | 
				
			||||||
		"javascript",
 | 
							"javascript",
 | 
				
			||||||
| 
		 Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB  | 
| 
		 Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB  | 
| 
		 Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 76 KiB  | 
| 
		 Before Width: | Height: | Size: 441 B After Width: | Height: | Size: 441 B  | 
| 
		 Before Width: | Height: | Size: 441 B After Width: | Height: | Size: 441 B  | 
| 
		 Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.2 KiB  | 
| 
		 Before Width: | Height: | Size: 424 B After Width: | Height: | Size: 424 B  | 
| 
		 Before Width: | Height: | Size: 536 B After Width: | Height: | Size: 536 B  | 
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	"name": "client",
 | 
						"name": "frontend",
 | 
				
			||||||
	"private": true,
 | 
						"private": true,
 | 
				
			||||||
	"scripts": {
 | 
						"scripts": {
 | 
				
			||||||
		"watch": "vite",
 | 
							"watch": "vite",
 | 
				
			||||||