Skip to content

Commit

Permalink
[chore] Refactor settings panel routing (and other fixes) (#2864)
Browse files Browse the repository at this point in the history
  • Loading branch information
tsmethurst authored Apr 24, 2024
1 parent 62788aa commit 7a1e639
Show file tree
Hide file tree
Showing 55 changed files with 1,785 additions and 1,442 deletions.
13 changes: 11 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,14 @@
},
"eslint.workingDirectories": ["web/source"],
"eslint.lintTask.enable": true,
"eslint.lintTask.options": "${workspaceFolder}/web/source"
}
"eslint.lintTask.options": "${workspaceFolder}/web/source",
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
}
}
2 changes: 1 addition & 1 deletion web/source/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ skulk({
// commonjs here, no need for the typescript preset.
["babelify", {
global: true,
ignore: [/node_modules\/(?!nanoid)/],
ignore: [/node_modules\/(?!(nanoid)|(wouter))/],
}]
],
presets: [
Expand Down
8 changes: 2 additions & 6 deletions web/source/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"dependencies": {
"@reduxjs/toolkit": "^1.8.6",
"ariakit": "^2.0.0-next.41",
"bluebird": "^3.7.2",
"get-by-dot": "^1.0.2",
"is-valid-domain": "^0.1.6",
"js-file-download": "^0.4.12",
Expand All @@ -33,9 +32,7 @@
"redux": "^4.2.0",
"redux-persist": "^6.0.0",
"skulk": "^0.0.8-fix",
"split-filter-n": "^1.1.3",
"syncpipe": "^1.0.0",
"wouter": "^2.8.0-alpha.2"
"wouter": "^3.1.0"
},
"devDependencies": {
"@babel/core": "^7.23.0",
Expand All @@ -45,14 +42,13 @@
"@browserify/envify": "^6.0.0",
"@browserify/uglifyify": "^6.0.0",
"@joepie91/eslint-config": "^1.1.1",
"@types/bluebird": "^3.5.39",
"@types/is-valid-domain": "^0.0.2",
"@types/papaparse": "^5.3.9",
"@types/psl": "^1.1.1",
"@types/react-dom": "^18.2.8",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"autoprefixer": "^10.4.13",
"autoprefixer": "^10.4.19",
"babelify": "^10.0.0",
"css-extract": "^2.0.0",
"eslint": "^8.26.0",
Expand Down
49 changes: 0 additions & 49 deletions web/source/settings/admin/domain-permissions/index.tsx

This file was deleted.

96 changes: 0 additions & 96 deletions web/source/settings/admin/emoji/category-select.jsx

This file was deleted.

153 changes: 0 additions & 153 deletions web/source/settings/admin/emoji/local/overview.js

This file was deleted.

Loading

0 comments on commit 7a1e639

Please sign in to comment.