keii.dev / osu-web
the browser-facing portion of osu!
fork atom

Merge branch 'master' into deps-webpack

authored by bakaneko and committed by GitHub ff8641f7 6cc0b655

options
unified split
Changed files
+7 -20
SETUP.md
docker-compose.yml
webpack.config.js
yarn.lock
+1
SETUP.md
··· 186 Docker images need to be occasionally updated to make sure they're running latest version of the packages. 187 188 ``` 189 docker compose build --no-cache 190 ``` 191
··· 186 Docker images need to be occasionally updated to make sure they're running latest version of the packages. 187 188 ``` 189 + docker compose pull 190 docker compose build --no-cache 191 ``` 192
+1 -1
docker-compose.yml
··· 69 beatmap-difficulty-lookup-cache: 70 image: pppy/osu-beatmap-difficulty-lookup-cache 71 ports: 72 - - "${BEATMAPS_DIFFICULTY_CACHE_EXTERNAL_PORT:-127.0.0.1:5001}:80" 73 74 notification-server: 75 image: pppy/osu-notification-server
··· 69 beatmap-difficulty-lookup-cache: 70 image: pppy/osu-beatmap-difficulty-lookup-cache 71 ports: 72 + - "${BEATMAPS_DIFFICULTY_CACHE_EXTERNAL_PORT:-127.0.0.1:5001}:8080" 73 74 notification-server: 75 image: pppy/osu-notification-server
+1 -1
webpack.config.js
··· 205 modules: [ 206 resolvePath('resources/builds'), 207 resolvePath('resources/js'), 208 - resolvePath('node_modules'), 209 ], 210 plugins: [new TsconfigPathsPlugin()], 211 };
··· 205 modules: [ 206 resolvePath('resources/builds'), 207 resolvePath('resources/js'), 208 + 'node_modules', 209 ], 210 plugins: [new TsconfigPathsPlugin()], 211 };
+4 -18
yarn.lock
··· 7122 dependencies: 7123 safe-buffer "~5.2.0" 7124 7125 - "strip-ansi-cjs@npm:strip-ansi@^6.0.1": 7126 version "6.0.1" 7127 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" 7128 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== ··· 7142 integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow== 7143 dependencies: 7144 ansi-regex "^3.0.0" 7145 - 7146 - strip-ansi@^6.0.0, strip-ansi@^6.0.1: 7147 - version "6.0.1" 7148 - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" 7149 - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== 7150 - dependencies: 7151 - ansi-regex "^5.0.1" 7152 7153 strip-ansi@^7.0.1: 7154 version "7.1.0" ··· 7819 resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f" 7820 integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA== 7821 7822 - "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": 7823 version "7.0.0" 7824 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" 7825 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== ··· 7835 dependencies: 7836 string-width "^1.0.1" 7837 strip-ansi "^3.0.1" 7838 - 7839 - wrap-ansi@^7.0.0: 7840 - version "7.0.0" 7841 - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" 7842 - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== 7843 - dependencies: 7844 - ansi-styles "^4.0.0" 7845 - string-width "^4.1.0" 7846 - strip-ansi "^6.0.0" 7847 7848 wrap-ansi@^8.1.0: 7849 version "8.1.0"
··· 7122 dependencies: 7123 safe-buffer "~5.2.0" 7124 7125 + "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: 7126 + name strip-ansi-cjs 7127 version "6.0.1" 7128 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" 7129 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== ··· 7143 integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow== 7144 dependencies: 7145 ansi-regex "^3.0.0" 7146 7147 strip-ansi@^7.0.1: 7148 version "7.1.0" ··· 7813 resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f" 7814 integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA== 7815 7816 + "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: 7817 + name wrap-ansi-cjs 7818 version "7.0.0" 7819 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" 7820 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== ··· 7830 dependencies: 7831 string-width "^1.0.1" 7832 strip-ansi "^3.0.1" 7833 7834 wrap-ansi@^8.1.0: 7835 version "8.1.0"