diff --git a/package.json b/package.json index a8eae52..445817d 100644 --- a/package.json +++ b/package.json @@ -27,32 +27,32 @@ "devDependencies": { "@babel/eslint-parser": "^7.15.0", "@types/lodash-es": "^4.17.4", - "@types/node": "^16.6.1", - "@types/react": "^17.0.18", + "@types/node": "^16.7.1", + "@types/react": "^17.0.19", "@types/react-dom": "^17.0.9", "@types/react-router-dom": "^5.1.8", "@types/react-table": "^7.7.2", "@types/react-virtualized-auto-sizer": "^1.0.1", "@types/react-window": "^1.8.5", - "@typescript-eslint/eslint-plugin": "^4.29.1", - "@typescript-eslint/parser": "^4.29.1", + "@typescript-eslint/eslint-plugin": "^4.29.2", + "@typescript-eslint/parser": "^4.29.2", "@vitejs/plugin-react-refresh": "^1.3.6", "eslint": "^7.32.0", "eslint-config-react-app": "^6.0.0", "eslint-config-standard-with-typescript": "^20.0.0", "eslint-import-resolver-typescript": "^2.4.0", "eslint-plugin-flowtype": "^5.9.0", - "eslint-plugin-import": "^2.24.0", + "eslint-plugin-import": "^2.24.1", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.1.0", "eslint-plugin-react": "^7.24.0", "eslint-plugin-react-hooks": "^4.2.0", - "sass": "^1.37.5", + "sass": "^1.38.0", "type-fest": "^2.0.0", "typescript": "^4.3.5", - "vite": "^2.4.4", - "vite-plugin-pwa": "^0.10.0", + "vite": "^2.5.0", + "vite-plugin-pwa": "^0.11.0", "vite-plugin-windicss": "^1.2.7", "vite-tsconfig-paths": "^3.3.13", "windicss": "^3.1.7" diff --git a/vite.config.ts b/vite.config.ts index b64e15e..3b0b057 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -10,6 +10,17 @@ export default defineConfig({ tsConfigPath(), windiCSS(), VitePWA({ + injectRegister: 'inline', + manifest: { + icons: [{ + src: '//cdn.jsdelivr.net/gh/Dreamacro/clash-dashboard/src/assets/Icon.png', + sizes: '512x512', + type: 'image/png', + }], + start_url: '/', + short_name: 'Clash Dashboard', + name: 'Clash Dashboard', + }, workbox: { sourcemap: false, }, diff --git a/yarn.lock b/yarn.lock index 0ef8413..4ec24f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1490,13 +1490,20 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^16.6.1": +"@types/node@npm:*": version: 16.6.1 resolution: "@types/node@npm:16.6.1" checksum: c13aa0da0c2bf9070e521d1b537ba38f64b213dd1b8aeec66c279fc21f8c0ccaf380364f6dc2ec8f84440c4cd1460b67dfe47de2cafcb6eaf4b648817cb27dc4 languageName: node linkType: hard +"@types/node@npm:^16.7.1": + version: 16.7.1 + resolution: "@types/node@npm:16.7.1" + checksum: fcf1a2c7b1f19c2201574b2110176b49c6efd824a39b2ed8ac3e6688740e2a35bef95a3334dfa345f4bd4873fd8b79d8ac8cfcc9fcd3d2f4f8f993c2c37ce4ab + languageName: node + linkType: hard + "@types/prop-types@npm:*": version: 15.7.4 resolution: "@types/prop-types@npm:15.7.4" @@ -1561,7 +1568,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:^17.0.18": +"@types/react@npm:*": version: 17.0.18 resolution: "@types/react@npm:17.0.18" dependencies: @@ -1572,6 +1579,17 @@ __metadata: languageName: node linkType: hard +"@types/react@npm:^17.0.19": + version: 17.0.19 + resolution: "@types/react@npm:17.0.19" + dependencies: + "@types/prop-types": "*" + "@types/scheduler": "*" + csstype: ^3.0.2 + checksum: d5af52623dd863e5a9f64eb72979f19c21e03012e25ee93adc93f664ed7976e81b654128dc653b225ad5ba2aaae24e0febe37face272bb051d6289e23ed7177d + languageName: node + linkType: hard + "@types/resolve@npm:1.17.1": version: 1.17.1 resolution: "@types/resolve@npm:1.17.1" @@ -1602,12 +1620,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^4.29.1": - version: 4.29.1 - resolution: "@typescript-eslint/eslint-plugin@npm:4.29.1" +"@typescript-eslint/eslint-plugin@npm:^4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/eslint-plugin@npm:4.29.2" dependencies: - "@typescript-eslint/experimental-utils": 4.29.1 - "@typescript-eslint/scope-manager": 4.29.1 + "@typescript-eslint/experimental-utils": 4.29.2 + "@typescript-eslint/scope-manager": 4.29.2 debug: ^4.3.1 functional-red-black-tree: ^1.0.1 regexpp: ^3.1.0 @@ -1619,27 +1637,27 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 66d8a92a0dc6fe4353334b5fadda73231dc7dbea977bc41f867bf9907e6781dc9594401273280d8de88165223bbf131241a1646ff5f2246bb4289949f95e7a5d + checksum: 3d3646059daa3d95200d71945a1ec8daebf62c7fedc3f29e1bece87bee9d689b06856fb18a8c55917f9c0bb5e86ddc8bc4c4f65f171e7d5784756dd59e3ff51d languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:4.29.1": - version: 4.29.1 - resolution: "@typescript-eslint/experimental-utils@npm:4.29.1" +"@typescript-eslint/experimental-utils@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/experimental-utils@npm:4.29.2" dependencies: "@types/json-schema": ^7.0.7 - "@typescript-eslint/scope-manager": 4.29.1 - "@typescript-eslint/types": 4.29.1 - "@typescript-eslint/typescript-estree": 4.29.1 + "@typescript-eslint/scope-manager": 4.29.2 + "@typescript-eslint/types": 4.29.2 + "@typescript-eslint/typescript-estree": 4.29.2 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: "*" - checksum: 4ab7827edfb42aa01a34b342656a2c6ef6ac753bff7523cffe6e2bd50de8c86c304abc8a790f11c2b02172436d1cc941ff26aa96a0b40ccaffc02f032faf6582 + checksum: e07b6b58f386ba84801d10bfe494548c3af20448c2f5596b77d13ba8621345ced4e1c6cf946dcf118c1e8566e0eed8284200f3f3a96f89aa7f367d9cdf6549a3 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^4.0.0, @typescript-eslint/parser@npm:^4.29.1": +"@typescript-eslint/parser@npm:^4.0.0": version: 4.29.1 resolution: "@typescript-eslint/parser@npm:4.29.1" dependencies: @@ -1656,6 +1674,23 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/parser@npm:^4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/parser@npm:4.29.2" + dependencies: + "@typescript-eslint/scope-manager": 4.29.2 + "@typescript-eslint/types": 4.29.2 + "@typescript-eslint/typescript-estree": 4.29.2 + debug: ^4.3.1 + peerDependencies: + eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 59f9727cea89c208fb31433c24dd7c1b4f2feb3af831b9320f4577f7b84f014f803864d4660b0f6bd16a4026d7ecd22b88523feb8c1593ef4a0a43ca9ea09c33 + languageName: node + linkType: hard + "@typescript-eslint/scope-manager@npm:4.29.1": version: 4.29.1 resolution: "@typescript-eslint/scope-manager@npm:4.29.1" @@ -1666,6 +1701,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/scope-manager@npm:4.29.2" + dependencies: + "@typescript-eslint/types": 4.29.2 + "@typescript-eslint/visitor-keys": 4.29.2 + checksum: f89d11cf7ce28c37a913db432d3dd2c4e5f5bc431bac205dd55c3d49704be691a28d5f27ae96fde7feee23d3e80192d7aff3d8350aef53b415e5b0b53cd965d7 + languageName: node + linkType: hard + "@typescript-eslint/types@npm:4.29.1": version: 4.29.1 resolution: "@typescript-eslint/types@npm:4.29.1" @@ -1673,6 +1718,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/types@npm:4.29.2" + checksum: 0bcab66bb1848e2361bb366abebe1f94baa56d7d2058b62467f14c054b969b72d1aa17717a52c11f48e9cfb50846f0e227e49ccc7f06ff750b9eb28ca8b064de + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:4.29.1": version: 4.29.1 resolution: "@typescript-eslint/typescript-estree@npm:4.29.1" @@ -1691,6 +1743,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/typescript-estree@npm:4.29.2" + dependencies: + "@typescript-eslint/types": 4.29.2 + "@typescript-eslint/visitor-keys": 4.29.2 + debug: ^4.3.1 + globby: ^11.0.3 + is-glob: ^4.0.1 + semver: ^7.3.5 + tsutils: ^3.21.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 90342d27f3f0837ad39f9b7e7d7c3c0b6de9c5b0770f5a18d490ebaf7be78efa65ba46ce0ca3004ad946ca1adc5865c5d3ba3b049c95b3b193bfdf0eb5e23095 + languageName: node + linkType: hard + "@typescript-eslint/visitor-keys@npm:4.29.1": version: 4.29.1 resolution: "@typescript-eslint/visitor-keys@npm:4.29.1" @@ -1701,6 +1771,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:4.29.2": + version: 4.29.2 + resolution: "@typescript-eslint/visitor-keys@npm:4.29.2" + dependencies: + "@typescript-eslint/types": 4.29.2 + eslint-visitor-keys: ^2.0.0 + checksum: 34185d8c6466340aba746d69b36d357da2d06577d73f58358648c142bd0f181d7fae01ca1138188a665ef074ea7e1bc6306ef9d50f29914c8bcea4e9ea1f82f2 + languageName: node + linkType: hard + "@vitejs/plugin-react-refresh@npm:^1.3.6": version: 1.3.6 resolution: "@vitejs/plugin-react-refresh@npm:1.3.6" @@ -2214,15 +2294,15 @@ __metadata: dependencies: "@babel/eslint-parser": ^7.15.0 "@types/lodash-es": ^4.17.4 - "@types/node": ^16.6.1 - "@types/react": ^17.0.18 + "@types/node": ^16.7.1 + "@types/react": ^17.0.19 "@types/react-dom": ^17.0.9 "@types/react-router-dom": ^5.1.8 "@types/react-table": ^7.7.2 "@types/react-virtualized-auto-sizer": ^1.0.1 "@types/react-window": ^1.8.5 - "@typescript-eslint/eslint-plugin": ^4.29.1 - "@typescript-eslint/parser": ^4.29.1 + "@typescript-eslint/eslint-plugin": ^4.29.2 + "@typescript-eslint/parser": ^4.29.2 "@vitejs/plugin-react-refresh": ^1.3.6 axios: ^0.21.1 classnames: ^2.3.1 @@ -2232,7 +2312,7 @@ __metadata: eslint-config-standard-with-typescript: ^20.0.0 eslint-import-resolver-typescript: ^2.4.0 eslint-plugin-flowtype: ^5.9.0 - eslint-plugin-import: ^2.24.0 + eslint-plugin-import: ^2.24.1 eslint-plugin-jsx-a11y: ^6.4.1 eslint-plugin-node: ^11.1.0 eslint-plugin-promise: ^5.1.0 @@ -2250,13 +2330,13 @@ __metadata: react-use: ^17.2.4 react-virtualized-auto-sizer: ^1.0.6 react-window: ^1.8.6 - sass: ^1.37.5 + sass: ^1.38.0 swr: ^0.5.6 type-fest: ^2.0.0 typescript: ^4.3.5 use-immer: ^0.6.0 - vite: ^2.4.4 - vite-plugin-pwa: ^0.10.0 + vite: ^2.5.0 + vite-plugin-pwa: ^0.11.0 vite-plugin-windicss: ^1.2.7 vite-tsconfig-paths: ^3.3.13 windicss: ^3.1.7 @@ -2674,12 +2754,12 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.12.8": - version: 0.12.20 - resolution: "esbuild@npm:0.12.20" +"esbuild@npm:^0.12.17": + version: 0.12.22 + resolution: "esbuild@npm:0.12.22" bin: esbuild: bin/esbuild - checksum: 52a67e06a675fe632655b9edb8beba2b67e55ff1853561fc2b1d5098e5c4801e885707af2441f3b3612791085f132eb46868f7353949ef4054caa714233156db + checksum: db14cc10914d40a875da1b102cee7479ebe1b085cdc2deaa8e275468ada9bf3c6b793bd6004a031a9f2e34865fe629dc59030c5fe4820978f1cf071966aa2c5d languageName: node linkType: hard @@ -2759,13 +2839,13 @@ __metadata: languageName: node linkType: hard -"eslint-import-resolver-node@npm:^0.3.5": - version: 0.3.5 - resolution: "eslint-import-resolver-node@npm:0.3.5" +"eslint-import-resolver-node@npm:^0.3.6": + version: 0.3.6 + resolution: "eslint-import-resolver-node@npm:0.3.6" dependencies: debug: ^3.2.7 resolve: ^1.20.0 - checksum: 93a8176205f18c40d2c11c444fab89aa3990c5a5eed226ef03a893b5779e7cd4d1f5f52b2bbbbbe4b13fb2a75ef629278be0b52099480cbe6e7024888d9982dd + checksum: 6266733af1e112970e855a5bcc2d2058fb5ae16ad2a6d400705a86b29552b36131ffc5581b744c23d550de844206fb55e9193691619ee4dbf225c4bde526b1c8 languageName: node linkType: hard @@ -2819,28 +2899,28 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:^2.24.0": - version: 2.24.0 - resolution: "eslint-plugin-import@npm:2.24.0" +"eslint-plugin-import@npm:^2.24.1": + version: 2.24.1 + resolution: "eslint-plugin-import@npm:2.24.1" dependencies: array-includes: ^3.1.3 array.prototype.flat: ^1.2.4 debug: ^2.6.9 doctrine: ^2.1.0 - eslint-import-resolver-node: ^0.3.5 + eslint-import-resolver-node: ^0.3.6 eslint-module-utils: ^2.6.2 find-up: ^2.0.0 has: ^1.0.3 - is-core-module: ^2.4.0 + is-core-module: ^2.6.0 minimatch: ^3.0.4 - object.values: ^1.1.3 + object.values: ^1.1.4 pkg-up: ^2.0.0 read-pkg-up: ^3.0.0 resolve: ^1.20.0 - tsconfig-paths: ^3.9.0 + tsconfig-paths: ^3.10.1 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 - checksum: 79fb1094197cd1dc720725bd29e5c5fe7d123fd9dd31eb182849993a81a8c18e2bfbc4d267a2caabe02bd4d21aafb1eca1da2f55aca7e5df99fd8ba908e7b869 + checksum: 6a43dc2c045d8f70a370fead2ed342a4b009685bb75818c0e4dab8bb118b853a77d532c63684f5c0b808239809a5a7289c968e45b5cc56960963be5b8cf1ee54 languageName: node linkType: hard @@ -3663,7 +3743,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"is-core-module@npm:^2.2.0, is-core-module@npm:^2.4.0": +"is-core-module@npm:^2.2.0": version: 2.5.0 resolution: "is-core-module@npm:2.5.0" dependencies: @@ -3672,6 +3752,15 @@ fsevents@~2.3.2: languageName: node linkType: hard +"is-core-module@npm:^2.6.0": + version: 2.6.0 + resolution: "is-core-module@npm:2.6.0" + dependencies: + has: ^1.0.3 + checksum: 183b3b96fed19822b13959876b0317e61fc2cb5ebcbc21639904c81f7ae328af57f8e18cc4750a9c4abebd686130c70d34a89521e57dbe002edfa4614507ce18 + languageName: node + linkType: hard + "is-date-object@npm:^1.0.1": version: 1.0.5 resolution: "is-date-object@npm:1.0.5" @@ -4502,7 +4591,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"object.values@npm:^1.1.3, object.values@npm:^1.1.4": +"object.values@npm:^1.1.4": version: 1.1.4 resolution: "object.values@npm:1.1.4" dependencies: @@ -5150,7 +5239,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"rollup@npm:^2.38.5, rollup@npm:^2.43.1, rollup@npm:^2.55.1": +"rollup@npm:^2.38.5, rollup@npm:^2.43.1, rollup@npm:^2.56.1": version: 2.56.2 resolution: "rollup@npm:2.56.2" dependencies: @@ -5203,14 +5292,14 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"sass@npm:^1.37.5": - version: 1.37.5 - resolution: "sass@npm:1.37.5" +"sass@npm:^1.38.0": + version: 1.38.0 + resolution: "sass@npm:1.38.0" dependencies: chokidar: ">=3.0.0 <4.0.0" bin: sass: sass.js - checksum: 301925e66ea8ac402fedc8e9b938fc000b8ae683ffeae474ed05bf34ee8a4b7a2e1a42a37a1bf2fbb7a5a9e88df5c0175bdbb3866cedc3bedde41a4270514d75 + checksum: 2a7140084785ab86a7577b8b1568a2fe9091716e02eacb071e37b32d3b5947d4b433ffc0361494ddeefcd0d8b2d44a87ee43b23630995250a7160261b1307e43 languageName: node linkType: hard @@ -5833,7 +5922,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"tsconfig-paths@npm:^3.9.0": +"tsconfig-paths@npm:^3.10.1, tsconfig-paths@npm:^3.9.0": version: 3.10.1 resolution: "tsconfig-paths@npm:3.10.1" dependencies: @@ -6053,21 +6142,21 @@ typescript@^4.3.5: languageName: node linkType: hard -"vite-plugin-pwa@npm:^0.10.0": - version: 0.10.0 - resolution: "vite-plugin-pwa@npm:0.10.0" +"vite-plugin-pwa@npm:^0.11.0": + version: 0.11.0 + resolution: "vite-plugin-pwa@npm:0.11.0" dependencies: debug: ^4.3.2 fast-glob: ^3.2.7 pretty-bytes: ^5.6.0 - rollup: ^2.55.1 - workbox-build: ^6.1.5 - workbox-window: ^6.1.5 + rollup: ^2.56.1 + workbox-build: ^6.2.2 + workbox-window: ^6.2.2 peerDependencies: vite: ^2.0.0 - workbox-build: ^6.1.5 - workbox-window: ^6.1.5 - checksum: abdf64c3ecb75d2bb6dfd1b1e9e7922e6f2b382120f93003b1d0810899de235b727aad329e1014035858eeab8f82b14fcb3412830ac6b6619560171975720437 + workbox-build: ^6.2.2 + workbox-window: ^6.2.2 + checksum: 9bea6593d39f4ced289ffd3695d06b02170ed59d58d4db972056fd8bfd71a2e9254e4a27164e1577dbbc7d4bc053b67fe9fc82ef73ab2dee01e47b54442cc685 languageName: node linkType: hard @@ -6099,11 +6188,11 @@ typescript@^4.3.5: languageName: node linkType: hard -"vite@npm:^2.4.4": - version: 2.4.4 - resolution: "vite@npm:2.4.4" +"vite@npm:^2.5.0": + version: 2.5.0 + resolution: "vite@npm:2.5.0" dependencies: - esbuild: ^0.12.8 + esbuild: ^0.12.17 fsevents: ~2.3.2 postcss: ^8.3.6 resolve: ^1.20.0 @@ -6113,7 +6202,7 @@ typescript@^4.3.5: optional: true bin: vite: bin/vite.js - checksum: 075deeb5f915f2a0a2b2e90c6bcbe919b894b6004133e3280eb413dfb17aa1dd6b82aaf35451291f3ba572566f8948e62b32476ce39d5046eef6092106c80a8a + checksum: 9465f56c7b3bf9014cb028fbf533590c9f150bd5d37eac81e1f3abb3a05a8a20ad431204b622a7d39d18fd245b175dbf00b5b800138544371d436c214cfbb09f languageName: node linkType: hard @@ -6203,7 +6292,7 @@ typescript@^4.3.5: languageName: node linkType: hard -"workbox-build@npm:^6.1.5": +"workbox-build@npm:^6.2.2": version: 6.2.4 resolution: "workbox-build@npm:6.2.4" dependencies: @@ -6365,7 +6454,7 @@ typescript@^4.3.5: languageName: node linkType: hard -"workbox-window@npm:6.2.4, workbox-window@npm:^6.1.5": +"workbox-window@npm:6.2.4, workbox-window@npm:^6.2.2": version: 6.2.4 resolution: "workbox-window@npm:6.2.4" dependencies: