From ed3c1375438425b0cb27361ba7f7098fb25159f8 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Tue, 16 May 2023 19:37:15 +0900 Subject: [PATCH] Revert "refactor: define _IS_CHROMATIC_" This reverts commit a35f0d43e40d7178616b91bd62a9948ed3984ae1. --- packages/frontend/.eslintrc.js | 1 - packages/frontend/.storybook/main.ts | 3 --- packages/frontend/@types/global.d.ts | 1 - packages/frontend/src/components/MkAnimBg.vue | 3 ++- packages/frontend/vite.config.ts | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/frontend/.eslintrc.js b/packages/frontend/.eslintrc.js index 0b7750c9f6..e8e0e57d2a 100644 --- a/packages/frontend/.eslintrc.js +++ b/packages/frontend/.eslintrc.js @@ -82,7 +82,6 @@ module.exports = { '_LANGS_': false, '_VERSION_': false, '_ENV_': false, - '_IS_CHROMATIC_': false, '_PERF_PREFIX_': false, '_DATA_TRANSFER_DRIVE_FILE_': false, '_DATA_TRANSFER_DRIVE_FOLDER_': false, diff --git a/packages/frontend/.storybook/main.ts b/packages/frontend/.storybook/main.ts index 80628d9bc6..1d0ce5ab63 100644 --- a/packages/frontend/.storybook/main.ts +++ b/packages/frontend/.storybook/main.ts @@ -32,9 +32,6 @@ const config = { rootDir: config.root ?? process.cwd(), }), ], - define: { - _IS_CHROMATIC_: true, - }, build: { target: [ 'chrome108', diff --git a/packages/frontend/@types/global.d.ts b/packages/frontend/@types/global.d.ts index e91d341be7..c757482900 100644 --- a/packages/frontend/@types/global.d.ts +++ b/packages/frontend/@types/global.d.ts @@ -4,7 +4,6 @@ declare const _LANGS_: string[][]; declare const _VERSION_: string; declare const _ENV_: string; declare const _DEV_: boolean; -declare const _IS_CHROMATIC_: boolean; declare const _PERF_PREFIX_: string; declare const _DATA_TRANSFER_DRIVE_FILE_: string; declare const _DATA_TRANSFER_DRIVE_FOLDER_: string; diff --git a/packages/frontend/src/components/MkAnimBg.vue b/packages/frontend/src/components/MkAnimBg.vue index 6b42c158cb..5a5c427cf1 100644 --- a/packages/frontend/src/components/MkAnimBg.vue +++ b/packages/frontend/src/components/MkAnimBg.vue @@ -4,6 +4,7 @@ <script lang="ts" setup> import { onMounted, onUnmounted, shallowRef } from 'vue'; +import isChromatic from 'chromatic/isChromatic'; const canvasEl = shallowRef<HTMLCanvasElement>(); @@ -203,7 +204,7 @@ onMounted(() => { const vertices = [1.0, 1.0, -1.0, 1.0, 1.0, -1.0, -1.0, -1.0]; gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(vertices), gl.DYNAMIC_DRAW); - if (_IS_CHROMATIC_) { + if (isChromatic()) { gl!.uniform1f(u_time, 0); gl!.drawArrays(gl!.TRIANGLE_STRIP, 0, 4); } else { diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts index a2a9bb3f56..339761e78c 100644 --- a/packages/frontend/vite.config.ts +++ b/packages/frontend/vite.config.ts @@ -95,7 +95,6 @@ export function getConfig(): UserConfig { _LANGS_: JSON.stringify(Object.entries(locales).map(([k, v]) => [k, v._lang_])), _ENV_: JSON.stringify(process.env.NODE_ENV), _DEV_: process.env.NODE_ENV !== 'production', - _IS_CHROMATIC_: false, _PERF_PREFIX_: JSON.stringify('Misskey:'), _DATA_TRANSFER_DRIVE_FILE_: JSON.stringify('mk_drive_file'), _DATA_TRANSFER_DRIVE_FOLDER_: JSON.stringify('mk_drive_folder'),