Skip to content

TagSpaces is an offline, open source, document manager with tagging support

adjusting eslint integration

Ilian Sapundshiev42af41f967d2
diff --git a/.eslintignore b/.eslintignore
index 54d6c90c3..c27fb4f30 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -54,3 +54,5 @@ web
# TODO just temporal
tests
+
+tsprofile
diff --git a/.eslintrc b/.eslintrc
index 28ef05375..dce043ed5 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -49,7 +49,7 @@
"react/jsx-indent-props": ["warn", 2],
"react/prefer-stateless-function": "off",
"react/forbid-prop-types": "warn",
- "react/destructuring-assignment": "warn",
+ "react/destructuring-assignment": "off",
"react/jsx-boolean-value": "off"
},
"plugins": ["import", "promise", "compat", "react"]
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c7322ba7b..24bc5f0a1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -33,5 +33,14 @@
],
"flow.enabled": false,
"typescript.tsdk": "node_modules/typescript/lib",
- "eslint.enable": true
+ "eslint.enable": true,
+ "editor.codeActionsOnSave": {
+ "source.fixAll.eslint": true
+ },
+ "eslint.validate": [
+ "javascript",
+ "javascriptreact",
+ { "language": "typescript", "autoFix": true },
+ { "language": "typescriptreact", "autoFix": true }
+ ]
}
diff --git a/app/perspectives/grid-perspective/components/MainContainer.tsx b/app/perspectives/grid-perspective/components/MainContainer.tsx
index 96eb18999..22f5dd1ef 100644
--- a/app/perspectives/grid-perspective/components/MainContainer.tsx
+++ b/app/perspectives/grid-perspective/components/MainContainer.tsx
@@ -278,13 +278,19 @@ class GridPerspective extends React.Component<Props, State> {
};
handleGridCellClick = (event, fsEntry: FileSystemEntry) => {
- const { selectedEntries } = this.props;
+ const {
+ selectedEntries,
+ directoryContent,
+ lastSelectedEntryPath,
+ setLastSelectedEntry,
+ setSelectedEntries
+ } = this.props;
const selectHelperKey = AppConfig.isMacLike ? event.metaKey : event.ctrlKey;
if (event.shiftKey) {
- let lastSelectedIndex = this.props.directoryContent.findIndex(
- entry => entry.path === this.props.lastSelectedEntryPath
+ let lastSelectedIndex = directoryContent.findIndex(
+ entry => entry.path === lastSelectedEntryPath
);
- const currentSelectedIndex = this.props.directoryContent.findIndex(
+ const currentSelectedIndex = directoryContent.findIndex(
entry => entry.path === fsEntry.path
);
if (lastSelectedIndex < 0) {
@@ -294,41 +300,41 @@ class GridPerspective extends React.Component<Props, State> {
let entriesToSelect;
// console.log('lastSelectedIndex: ' + lastSelectedIndex + ' currentSelectedIndex: ' + currentSelectedIndex);
if (currentSelectedIndex > lastSelectedIndex) {
- entriesToSelect = this.props.directoryContent.slice(
+ entriesToSelect = directoryContent.slice(
lastSelectedIndex,
currentSelectedIndex + 1
);
} else if (currentSelectedIndex < lastSelectedIndex) {
- entriesToSelect = this.props.directoryContent.slice(
+ entriesToSelect = directoryContent.slice(
currentSelectedIndex,
lastSelectedIndex + 1
);
} else if (currentSelectedIndex === lastSelectedIndex) {
entriesToSelect = [fsEntry];
- this.props.setLastSelectedEntry(fsEntry.path);
+ setLastSelectedEntry(fsEntry.path);
}
- this.props.setSelectedEntries(entriesToSelect);
+ setSelectedEntries(entriesToSelect);
this.setState(this.computeFileOperationsEnabled);
} else if (selectHelperKey) {
if (
selectedEntries &&
selectedEntries.some(entry => entry.path === fsEntry.path)
) {
- this.props.setSelectedEntries(
+ setSelectedEntries(
selectedEntries.filter(entry => entry.path !== fsEntry.path)
); // deselect selected entry
this.setState(this.computeFileOperationsEnabled);
// this.props.setLastSelectedEntry(null);
} else {
- this.props.setSelectedEntries([...selectedEntries, fsEntry]);
+ setSelectedEntries([...selectedEntries, fsEntry]);
this.setState(this.computeFileOperationsEnabled);
// this.props.setLastSelectedEntry(fsEntry.path);
}
} else {
- this.props.setSelectedEntries([fsEntry]);
+ setSelectedEntries([fsEntry]);
this.setState(this.computeFileOperationsEnabled);
- this.props.setLastSelectedEntry(fsEntry.path);
+ setLastSelectedEntry(fsEntry.path);
if (fsEntry.isFile) {
if (this.state.singleClickAction === 'openInternal') {
this.props.openFile(fsEntry.path, fsEntry.isFile);
@@ -341,14 +347,15 @@ class GridPerspective extends React.Component<Props, State> {
};
clearSelection = () => {
- this.props.setSelectedEntries([]);
+ const { setSelectedEntries, setLastSelectedEntry } = this.props;
+ setSelectedEntries([]);
this.setState(
{
allFilesSelected: false
},
this.computeFileOperationsEnabled
);
- this.props.setLastSelectedEntry(null);
+ setLastSelectedEntry(null);
};
toggleSelectAllFiles = () => {
diff --git a/configs/webpack.config.base.js b/configs/webpack.config.base.js
index 27ecf9dea..c89d45e6f 100644
--- a/configs/webpack.config.base.js
+++ b/configs/webpack.config.base.js
@@ -22,7 +22,13 @@ export default {
cacheDirectory: true
}
},
- 'ts-loader'
+ {
+ loader: 'ts-loader',
+ options: {
+ transpileOnly: true,
+ experimentalWatchApi: true
+ }
+ }
]
}
]
@@ -31,7 +37,8 @@ export default {
output: {
path: path.join(__dirname, '..', 'app'),
// https://github.com/webpack/webpack/issues/1114
- libraryTarget: 'commonjs2'
+ libraryTarget: 'commonjs2',
+ pathinfo: false
},
/**
diff --git a/package.json b/package.json
index 1ba4d42eb..8962bb041 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
"build-web": "rimraf web/dist && cross-env NODE_ENV=production webpack --config ./configs/webpack.config.web.prod.babel.js --colors",
"build-cordova": "cross-env NODE_ENV=production webpack --config ./configs/webpack.config.cordova.prod.babel.js --colors",
"dev": "cross-env START_HOT=1 node -r @babel/register ./internals/scripts/CheckPortInUse.js && cross-env START_HOT=1 yarn start-renderer-dev",
- "lint": "cross-env NODE_ENV=development eslint --cache --format=pretty .",
+ "lint-old": "cross-env NODE_ENV=development eslint --cache --format=pretty .",
+ "lint": "tsc --noEmit && eslint '*/**/*.{js,ts,tsx}'",
"lint-fix": "yarn --silent lint --fix; exit 0",
"lint-styles": "stylelint --ignore-path .eslintignore '**/*.*(css|scss)' --syntax scss",
"lint-styles-fix": "yarn --silent lint-styles --fix; exit 0",
diff --git a/scripts/webdavserver.js b/scripts/webdavserver.js
index 630b0facc..bcbd5f4fc 100644
--- a/scripts/webdavserver.js
+++ b/scripts/webdavserver.js
@@ -1,11 +1,11 @@
const jsDAV = require('jsDAV/lib/jsdav');
-const jsDAV_Auth_Backend_File = require('jsDAV/lib/DAV/plugins/auth/file');
+const jsDAVAuthBackendFile = require('jsDAV/lib/DAV/plugins/auth/file');
jsDAV.debugMode = false;
jsDAV.createServer(
{
node: './web',
- authBackend: jsDAV_Auth_Backend_File.new('./scripts/jsdavauth'),
+ authBackend: jsDAVAuthBackendFile.new('./scripts/jsdavauth'),
realm: 'jdavtest'
},
8000