From abf6f358a8f0b5badd4a36c464e20ac103db0c2d Mon Sep 17 00:00:00 2001 From: Nick Foscarini <50146659+codemile@users.noreply.github.com> Date: Sat, 1 Jun 2024 10:06:14 -0400 Subject: [PATCH] Update cache action usage to v1 in GitHub workflows (#28) * chore: Update cache action usage to v1 in GitHub workflows * chore: reorganize scripts in package.json * chore: Update package.json version to 2.0.0 * chore: Update next.config.mjs to include output option for exporting * chore: Update audio file paths to use relative URLs * chore: fixed favicon * chore: Remove deprecated version field and update package.json version to 2.0.0 --- .env | 1 - .env.local | 3 +-- .github/workflows/deploy-artifacts.yml | 8 +++---- .github/workflows/pull_request.yml | 10 ++++----- next.config.mjs | 4 +++- package.json | 9 ++++---- src/app/favicon.ico | Bin 25931 -> 0 bytes src/app/page.tsx | 15 ++++++++++++- src/components/atoms/app/AppCopyright.tsx | 8 +++++-- .../organisms/dialogs/OptionsDialog.tsx | 7 ++++-- src/components/particles/audio.types.tsx | 20 +++++++++--------- src/components/particles/hooks/usePersist.tsx | 17 ++++++++------- src/components/templates/App.tsx | 10 ++++++--- src/environment/environment.ts | 7 +++++- src/store/app/app-model.ts | 19 +---------------- src/store/app/app-selectors.ts | 4 +--- src/store/app/app-state.ts | 11 ++-------- 17 files changed, 79 insertions(+), 74 deletions(-) delete mode 100644 src/app/favicon.ico diff --git a/.env b/.env index f8f8d26..b79058f 100644 --- a/.env +++ b/.env @@ -1,7 +1,6 @@ NEXT_PUBLIC_BRAND_NAME=Tetromino NEXT_PUBLIC_GITHUB=https://github.com/reactgular/tetromino NEXT_PUBLIC_STORAGE_KEY=tetromino -NEXT_PUBLIC_VERSION=2.0.0 # Base path for loading audio files NEXT_PUBLIC_BASE=/tetromino NEXT_PUBLIC_ANALYTICS= diff --git a/.env.local b/.env.local index 40cf09e..47a22fa 100644 --- a/.env.local +++ b/.env.local @@ -1,3 +1,2 @@ -NEXT_PUBLIC_BASE=http://localhost:3000/ +NEXT_PUBLIC_BASE=/ NEXT_PUBLIC_ANALYTICS= - diff --git a/.github/workflows/deploy-artifacts.yml b/.github/workflows/deploy-artifacts.yml index d100bf1..78122ba 100644 --- a/.github/workflows/deploy-artifacts.yml +++ b/.github/workflows/deploy-artifacts.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v4 - name: "📦 Install dependencies" - uses: reactgular/cache@main + uses: reactgular/cache@v1 with: mode: "install" @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v4 - name: "💽 Restore node_modules cache" - uses: reactgular/cache@main + uses: reactgular/cache@v1 with: mode: "restore" @@ -47,7 +47,7 @@ jobs: uses: actions/checkout@v4 - name: "💽 Restore node_modules cache" - uses: reactgular/cache@main + uses: reactgular/cache@v1 with: mode: "restore" @@ -79,7 +79,7 @@ jobs: uses: actions/checkout@v4 - name: "💽 Restore node_modules cache" - uses: reactgular/cache@main + uses: reactgular/cache@v1 with: mode: "restore" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index a792625..4d6cc05 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v4 - name: "📦 Install dependencies" - uses: reactgular/cache@main + uses: reactgular/cache@v1 with: mode: "install" @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v4 - name: "💽 Restore node_modules cache" - uses: reactgular/cache@main + uses: reactgular/cache@v1 with: mode: "restore" @@ -44,7 +44,7 @@ jobs: uses: actions/checkout@v4 - name: "💽 Restore node_modules cache" - uses: reactgular/cache@main + uses: reactgular/cache@v1 with: mode: "restore" @@ -60,7 +60,7 @@ jobs: uses: actions/checkout@v4 - name: "💽 Restore node_modules cache" - uses: reactgular/cache@main + uses: reactgular/cache@v1 with: mode: "restore" @@ -75,7 +75,7 @@ jobs: uses: actions/checkout@v4 - name: "💽 Restore node_modules cache" - uses: reactgular/cache@main + uses: reactgular/cache@v1 with: mode: "restore" diff --git a/next.config.mjs b/next.config.mjs index 4678774..54461bd 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,4 +1,6 @@ /** @type {import('next').NextConfig} */ -const nextConfig = {}; +const nextConfig = { + output: "export" +}; export default nextConfig; diff --git a/package.json b/package.json index e656837..229ea9b 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { "name": "tetromino", - "version": "0.1.0", + "version": "2.0.0", "private": true, "scripts": { - "dev": "next dev", "build": "next build", - "start": "next start", - "lint": "next lint" + "dev": "next dev", + "lint": "next lint", + "sort": "npx --yes sort-package-json", + "start": "next start" }, "dependencies": { "@material-ui/core": "^4.12.4", diff --git a/src/app/favicon.ico b/src/app/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/src/app/page.tsx b/src/app/page.tsx index b115a32..b246692 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,10 +1,23 @@ import {App} from '../components/templates/App'; import {Providers} from '../components/templates/Providers'; +/** + * Read the package.json within a server component, so we don't + * expose the entire package.json to the client. + */ +const getPackageJsonVersion = () => { + try { + return require('../../package.json').version; + } catch (err) { + console.error('Could not find package.json. Please make sure the file exists and is valid JSON.', err); + return '0.0.0'; + } +}; + export default function Home() { return ( - + ); } diff --git a/src/components/atoms/app/AppCopyright.tsx b/src/components/atoms/app/AppCopyright.tsx index b08a3fb..c069d00 100644 --- a/src/components/atoms/app/AppCopyright.tsx +++ b/src/components/atoms/app/AppCopyright.tsx @@ -4,10 +4,14 @@ import {FaGithub} from 'react-icons/fa'; import {environment} from '../../../environment/environment'; import {ClassNameProps} from '../../particles/particles.types'; -export const AppCopyright: FC = ({className}) => { +export interface AppCopyrightProps { + version: string; +} + +export const AppCopyright: FC = ({version, className}) => { return (
-
Version {environment.version}
+
Version {version}
boolean; + + version: string; } export const OptionsDialog: FC> = ({ selectWelcoming = GameSelectors.welcoming, - selectOpen = AppSelectors.isOpen(AppDialogType.OPTIONS) + selectOpen = AppSelectors.isOpen(AppDialogType.OPTIONS), + version }) => { const welcoming = useSelector(selectWelcoming); return ( @@ -25,7 +28,7 @@ export const OptionsDialog: FC> = selectOpen={selectOpen} > - + ); }; diff --git a/src/components/particles/audio.types.tsx b/src/components/particles/audio.types.tsx index 6417758..6eb954e 100644 --- a/src/components/particles/audio.types.tsx +++ b/src/components/particles/audio.types.tsx @@ -4,18 +4,18 @@ import {environment} from '../../environment/environment'; import {UiOption} from './ui/UiSelect'; export const AUDIO_FILES = [ - `${environment.base}/audio/music/bonkers-for-arcades.mp3`, - `${environment.base}/audio/music/the-ice-cream-man.mp3`, - `${environment.base}/audio/music/8-bit-perplexion.mp3`, - `${environment.base}/audio/music/its-raining-pixels.mp3`, - `${environment.base}/audio/music/arcade-puzzler.mp3` + `${environment.base}audio/music/bonkers-for-arcades.mp3`, + `${environment.base}audio/music/the-ice-cream-man.mp3`, + `${environment.base}audio/music/8-bit-perplexion.mp3`, + `${environment.base}audio/music/its-raining-pixels.mp3`, + `${environment.base}audio/music/arcade-puzzler.mp3` ]; -export const SOUND_FINISHED = `${environment.base}/audio/sounds/power-down-13.mp3`; -export const SOUND_LEVEL = `${environment.base}/audio/sounds/retro-chip-power.mp3`; -export const SOUND_SCORE = `${environment.base}/audio/sounds/ui-quirky-19.mp3`; -export const SOUND_DROP = `${environment.base}/audio/sounds/zapsplat_bambo_swoosh.mp3`; -export const SOUND_LEVEL_10 = `${environment.base}/audio/sounds/zapsplat_level_up.mp3`; +export const SOUND_FINISHED = `${environment.base}audio/sounds/power-down-13.mp3`; +export const SOUND_LEVEL = `${environment.base}audio/sounds/retro-chip-power.mp3`; +export const SOUND_SCORE = `${environment.base}audio/sounds/ui-quirky-19.mp3`; +export const SOUND_DROP = `${environment.base}audio/sounds/zapsplat_bambo_swoosh.mp3`; +export const SOUND_LEVEL_10 = `${environment.base}audio/sounds/zapsplat_level_up.mp3`; export const PRELOAD_AUDIO = [ SOUND_FINISHED, diff --git a/src/components/particles/hooks/usePersist.tsx b/src/components/particles/hooks/usePersist.tsx index 1925a95..945daa7 100644 --- a/src/components/particles/hooks/usePersist.tsx +++ b/src/components/particles/hooks/usePersist.tsx @@ -2,10 +2,10 @@ import {useEffect} from 'react'; import {useSelector} from 'react-redux'; import {useAppDispatch} from '../../../store/app-store'; import {AppActions} from '../../../store/app/app-actions'; -import {APP_PERSIST_DEFAULT, AppPersist} from '../../../store/app/app-model'; +import {AppPersist} from '../../../store/app/app-model'; import {AppSelectors} from '../../../store/app/app-selectors'; -export const usePersist = (storageKey: string) => { +export const usePersist = (version: string, storageKey: string) => { const persist = useSelector(AppSelectors.persist); const dispatch = useAppDispatch(); @@ -13,17 +13,18 @@ export const usePersist = (storageKey: string) => { const json = localStorage.getItem(storageKey); if (json) { try { - const data: AppPersist = JSON.parse(json); - if (data?.version === APP_PERSIST_DEFAULT.version) { - dispatch(AppActions.persist(data)); + const data: AppPersist & {version: string} = JSON.parse(json); + if (data?.version === version) { + const {version, ...state} = data; + dispatch(AppActions.persist(state)); } } catch (err) { console.error('Could not read persist data.', err); } } - }, [storageKey, dispatch]); + }, [version, storageKey, dispatch]); useEffect(() => { - localStorage.setItem(storageKey, JSON.stringify(persist)); - }, [storageKey, persist]); + localStorage.setItem(storageKey, JSON.stringify({...persist, version})); + }, [version, storageKey, persist]); }; diff --git a/src/components/templates/App.tsx b/src/components/templates/App.tsx index caaa517..3c9ccd2 100644 --- a/src/components/templates/App.tsx +++ b/src/components/templates/App.tsx @@ -18,14 +18,18 @@ import {GameDesktop} from './GameDesktop'; import {GameMobile} from './GameMobile'; import {Welcome} from './Welcome'; -export const App: FC = () => { +export interface AppProps { + version: string; +} + +export const App: FC = ({version}) => { const welcoming = useSelector(GameSelectors.welcoming); const isWideScreen = useMediaQuery('(min-width:600px)'); const isShortScreen = useMediaQuery('(max-height:850px)'); const isNarrowScreen = useMediaQuery('(max-width:380px)'); usePageView('/'); - usePersist(environment.storageKey); + usePersist(version, environment.storageKey); useTitle(); const game = useMemo(() => { @@ -49,7 +53,7 @@ export const App: FC = () => { - +
); diff --git a/src/environment/environment.ts b/src/environment/environment.ts index 555cf95..94b5230 100644 --- a/src/environment/environment.ts +++ b/src/environment/environment.ts @@ -1,3 +1,5 @@ +const endsInSlash = (str: string): string => str.endsWith('/') ? str : `${str}/`; + export interface Environment { analytics: string; @@ -9,6 +11,9 @@ export interface Environment { storageKey: string; + /** + * @deprecated + */ version: string; } @@ -18,5 +23,5 @@ export const environment: Environment = { github: process.env.NEXT_PUBLIC_GITHUB as string, storageKey: process.env.NEXT_PUBLIC_STORAGE_KEY as string, version: process.env.NEXT_PUBLIC_VERSION as string, - base: process.env.NEXT_PUBLIC_BASE as string + base: endsInSlash(process.env.NEXT_PUBLIC_BASE as string ?? '/') }; diff --git a/src/store/app/app-model.ts b/src/store/app/app-model.ts index 32be5fa..d66fdc7 100644 --- a/src/store/app/app-model.ts +++ b/src/store/app/app-model.ts @@ -102,23 +102,6 @@ export type AppPersist = Pick< | 'music_type' | 'high_scores' | 'keys' -> & {version: string}; - -/** - * Defaults persist values. - */ -export const APP_PERSIST_DEFAULT: AppPersist = { - dark: APP_INITIAL_STATE.dark, - ghost_piece: APP_INITIAL_STATE.ghost_piece, - start_level: APP_INITIAL_STATE.start_level, - sound: APP_INITIAL_STATE.sound, - sound_volume: APP_INITIAL_STATE.sound_volume, - music: APP_INITIAL_STATE.music, - music_volume: APP_INITIAL_STATE.music_volume, - music_type: APP_INITIAL_STATE.music_type, - high_scores: APP_INITIAL_STATE.high_scores, - keys: APP_INITIAL_STATE.keys, - version: environment.version -}; +>; export const APP_NAME = 'app'; diff --git a/src/store/app/app-selectors.ts b/src/store/app/app-selectors.ts index ec2b938..d1d456a 100644 --- a/src/store/app/app-selectors.ts +++ b/src/store/app/app-selectors.ts @@ -1,7 +1,6 @@ import {createSelector} from '@reduxjs/toolkit'; -import {environment} from '../../environment/environment'; import {selectRoot} from '../select-root'; -import {AppDialogType, AppPersist} from './app-model'; +import {AppDialogType, AppModel, AppPersist} from './app-model'; export namespace AppSelectors { /** @@ -97,7 +96,6 @@ export namespace AppSelectors { keys ): AppPersist => { return { - version: environment.version, dark, ghost_piece, start_level, diff --git a/src/store/app/app-state.ts b/src/store/app/app-state.ts index df0a3f6..c12ebe9 100644 --- a/src/store/app/app-state.ts +++ b/src/store/app/app-state.ts @@ -1,9 +1,8 @@ import {createSlice} from '@reduxjs/toolkit'; import ReactGA from 'react-ga'; import {KEY_BINDINGS} from '../../components/particles/key_bindings.types'; -import {environment} from '../../environment/environment'; import {AppActions} from './app-actions'; -import {APP_INITIAL_STATE, APP_NAME} from './app-model'; +import {APP_INITIAL_STATE, APP_NAME, AppModel} from './app-model'; export namespace AppState { const track = (action: string, value?: number) => { @@ -104,13 +103,7 @@ export namespace AppState { }; }) .addCase(AppActions.persist, (state, {payload}) => { - const {version, ...restore} = payload; - if (version === environment.version) { - return { - ...state, - ...restore - }; - } + return {...payload} satisfies AppModel; }); } });