Skip to content

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

TSN424 - Import files fine tuning (#1157)

Stanimirf85c8fae5af2
diff --git a/app/components/DirectoryTreeView.tsx b/app/components/DirectoryTreeView.tsx
index 1729dfeaa..31d865b1a 100644
--- a/app/components/DirectoryTreeView.tsx
+++ b/app/components/DirectoryTreeView.tsx
@@ -92,15 +92,25 @@ const DirectoryTreeView = forwardRef((props: Props, ref) => {
</td>
);*/
- const renderBodyRow = props => (
- <TargetTableMoveFileBox
- // @ts-ignore
- accepts={[DragItemTypes.FILE]}
- onDrop={props.handleFileMoveDrop}
- location={props.location}
- {...props}
- />
- );
+ const renderBodyRow = props => {
+ if (
+ AppConfig.isElectron ||
+ props.location.type !== locationType.TYPE_CLOUD
+ ) {
+ // DnD to S3 location is not permitted in web browser without <input> element
+ return (
+ <TargetTableMoveFileBox
+ // @ts-ignore
+ accepts={[DragItemTypes.FILE]}
+ onDrop={props.handleFileMoveDrop}
+ location={props.location}
+ {...props}
+ />
+ );
+ } else {
+ return <tr {...props} />;
+ }
+ };
const renderNameColumnAction = field => {
const children = (
diff --git a/app/components/VerticalNavigation.tsx b/app/components/VerticalNavigation.tsx
index 67681c795..6567707f8 100644
--- a/app/components/VerticalNavigation.tsx
+++ b/app/components/VerticalNavigation.tsx
@@ -419,7 +419,7 @@ class VerticalNavigation extends React.Component<Props, State> {
getProgressValue() {
const objProgress = this.props.progress.find(
- fileProgress => fileProgress.progress < 100
+ fileProgress => fileProgress.progress < 100 && fileProgress.progress > -1
);
if (objProgress !== undefined) {
return objProgress.progress;
diff --git a/app/components/dialogs/ConfirmDialog.tsx b/app/components/dialogs/ConfirmDialog.tsx
index fb33f6f4c..a2a69099a 100644
--- a/app/components/dialogs/ConfirmDialog.tsx
+++ b/app/components/dialogs/ConfirmDialog.tsx
@@ -22,8 +22,11 @@ import DialogActions from '@material-ui/core/DialogActions';
import DialogContent from '@material-ui/core/DialogContent';
import DialogTitle from '@material-ui/core/DialogTitle';
import DialogContentText from '@material-ui/core/DialogContentText';
+import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
-import Typography from '@material-ui/core/Typography';
+import BulletIcon from '@material-ui/icons/Remove';
+import ListItemIcon from '@material-ui/core/ListItemIcon';
+import ListItemText from '@material-ui/core/ListItemText';
import Dialog from '@material-ui/core/Dialog';
import i18n from '-/services/i18n';
@@ -53,14 +56,18 @@ const ConfirmDialog = (props: Props) => {
<DialogContent>
<DialogContentText data-tid={props.confirmDialogContentTID}>
{props.content}
- {props.list &&
- props.list.map(listItem => (
- <ListItem title={listItem} key={listItem.toString()}>
- <Typography variant="inherit" noWrap>
- {listItem}
- </Typography>
- </ListItem>
- ))}
+ {props.list && (
+ <List dense>
+ {props.list.map(listItem => (
+ <ListItem key={listItem.toString()}>
+ <ListItemIcon>
+ <BulletIcon />
+ </ListItemIcon>
+ <ListItemText primary={listItem} />
+ </ListItem>
+ ))}
+ </List>
+ )}
</DialogContentText>
</DialogContent>
<DialogActions>
diff --git a/app/components/dialogs/FileUploadDialog.tsx b/app/components/dialogs/FileUploadDialog.tsx
index aa6faf6ce..ebffd16c4 100644
--- a/app/components/dialogs/FileUploadDialog.tsx
+++ b/app/components/dialogs/FileUploadDialog.tsx
@@ -25,9 +25,12 @@ import Dialog from '@material-ui/core/Dialog';
import { connect } from 'react-redux';
import Typography from '@material-ui/core/Typography';
import Box from '@material-ui/core/Box';
-import { LinearProgress, Grid } from '@material-ui/core';
+import { LinearProgress, Grid, Tooltip } from '@material-ui/core';
import CloseIcon from '@material-ui/icons/Close';
+import WarningIcon from '@material-ui/icons/Warning';
+import PlatformIO from '-/services/platform-io';
import { getProgress } from '-/reducers/app';
+import { extractFileName } from '-/utils/paths';
import i18n from '-/services/i18n';
interface Props {
@@ -59,12 +62,16 @@ const FileUploadDialog = (props: Props) => {
if (props.progress) {
props.progress.map(fileProgress => {
const { abort } = fileProgress;
- abort();
+ if (abort !== undefined) {
+ abort();
+ }
return true;
});
}
};
+ let haveProgress = false;
+
return (
<Dialog
open={open}
@@ -89,6 +96,7 @@ const FileUploadDialog = (props: Props) => {
style={{
marginLeft: 'auto',
marginRight: 'auto',
+ width: '90%',
flexGrow: 1
}}
>
@@ -97,19 +105,43 @@ const FileUploadDialog = (props: Props) => {
.sort((a, b) => ('' + a.path).localeCompare(b.path))
.map(fileProgress => {
const percentage = fileProgress.progress;
- const { abort, path } = fileProgress;
+ const { path } = fileProgress;
+ const fileName = extractFileName(
+ path,
+ PlatformIO.getDirSeparator()
+ );
+ let { abort } = fileProgress;
+ if (percentage > -1 && percentage < 100) {
+ haveProgress = true;
+ } else {
+ abort = undefined;
+ }
+
return (
<Grid key={path} container justify="center" alignItems="center">
- <Grid item xs={10}>
- {path}
+ <Grid
+ item
+ xs={10}
+ style={{ display: 'flex', alignItems: 'center' }}
+ >
+ {fileName}
+ {percentage === -1 && (
+ <Tooltip title={i18n.t('core:fileExist')}>
+ <WarningIcon color="secondary" />
+ </Tooltip>
+ )}
</Grid>
<Grid item xs={2}>
- <Button onClick={() => abort()}>
- <CloseIcon />
- </Button>
+ {abort && (
+ <Button onClick={() => abort()}>
+ <CloseIcon />
+ </Button>
+ )}
</Grid>
<Grid item xs={12}>
- <LinearProgressWithLabel value={percentage} />
+ {percentage > -1 && (
+ <LinearProgressWithLabel value={percentage} />
+ )}
</Grid>
</Grid>
);
@@ -123,9 +155,15 @@ const FileUploadDialog = (props: Props) => {
>
{i18n.t('core:close')}
</Button>
- <Button data-tid="uploadCloseDialog" onClick={stopAll} color="primary">
- {i18n.t('core:stopAll')}
- </Button>
+ {haveProgress && (
+ <Button
+ data-tid="uploadCloseDialog"
+ onClick={stopAll}
+ color="primary"
+ >
+ {i18n.t('core:stopAll')}
+ </Button>
+ )}
</DialogActions>
</Dialog>
);
diff --git a/app/components/dialogs/ObjectStoreForm.tsx b/app/components/dialogs/ObjectStoreForm.tsx
index 1ab7dbef1..cc6f7724a 100644
--- a/app/components/dialogs/ObjectStoreForm.tsx
+++ b/app/components/dialogs/ObjectStoreForm.tsx
@@ -23,8 +23,12 @@ import TextField from '@material-ui/core/TextField';
import Grid from '@material-ui/core/Grid';
import FormControl from '@material-ui/core/FormControl';
import FormHelperText from '@material-ui/core/FormHelperText';
+import IconButton from '@material-ui/core/IconButton';
import Input from '@material-ui/core/Input';
import InputLabel from '@material-ui/core/InputLabel';
+import InputAdornment from '@material-ui/core/InputAdornment';
+import Visibility from '@material-ui/icons/Visibility';
+import VisibilityOff from '@material-ui/icons/VisibilityOff';
import i18n from '-/services/i18n';
export const regions = [
@@ -97,7 +101,13 @@ interface Props {
theme: any;
}
-class ObjectStoreForm extends React.Component<Props> {
+interface State {
+ showPassword: boolean;
+}
+
+class ObjectStoreForm extends React.Component<Props, State> {
+ state = { showPassword: false };
+
handleRegionChange = (inputValue: any, region: string, reason: string) => {
if (reason === 'input') {
this.props.handleChange('region', region, reason);
@@ -109,6 +119,10 @@ class ObjectStoreForm extends React.Component<Props> {
}
};
+ handleClickShowPassword = () => {
+ this.setState(prevState => ({ showPassword: !prevState.showPassword }));
+ };
+
render() {
const { handleInputChange, state } = this.props;
@@ -178,11 +192,25 @@ class ObjectStoreForm extends React.Component<Props> {
<Input
margin="dense"
name="secretAccessKey"
- type="password"
+ type={this.state.showPassword ? 'text' : 'password'}
fullWidth={true}
data-tid="secretAccessKey"
onChange={handleInputChange}
value={state.secretAccessKey}
+ endAdornment={
+ <InputAdornment position="end">
+ <IconButton
+ aria-label="toggle password visibility"
+ onClick={this.handleClickShowPassword}
+ >
+ {this.state.showPassword ? (
+ <Visibility />
+ ) : (
+ <VisibilityOff />
+ )}
+ </IconButton>
+ </InputAdornment>
+ }
/>
{state.cloudErrorSecretAccessKey && (
<FormHelperText>
diff --git a/app/locales/en/core.json b/app/locales/en/core.json
index 215e1ad4a..916d198ab 100644
--- a/app/locales/en/core.json
+++ b/app/locales/en/core.json
@@ -466,5 +466,6 @@
"enableIndexingBySearch": "By enabling this option, the search will deliver better results, but it will take longer",
"importDialogTitle": "Import Files",
"stopAll": "Stop all",
+ "fileExist": "File with the same name already exist",
"-": "-"
}
diff --git a/app/perspectives/grid-perspective/components/MainContainer.tsx b/app/perspectives/grid-perspective/components/MainContainer.tsx
index 27723fa38..8240a2c3a 100644
--- a/app/perspectives/grid-perspective/components/MainContainer.tsx
+++ b/app/perspectives/grid-perspective/components/MainContainer.tsx
@@ -62,6 +62,7 @@ import SortingMenu from './SortingMenu';
import GridOptionsMenu from './GridOptionsMenu';
import { getLocation, Location, locationType } from '-/reducers/locations';
import PlatformIO from '-/services/platform-io';
+import { extractFileName } from '-/utils/paths';
const settings = JSON.parse(localStorage.getItem('tsPerspectiveGrid')); // loading settings
@@ -882,7 +883,9 @@ class GridPerspective extends React.Component<Props, State> {
onClose={this.handleCloseDialogs}
title={i18n.t('core:deleteConfirmationTitle')}
content={i18n.t('core:deleteConfirmationContent')}
- list={selectedFilePaths}
+ list={selectedFilePaths.map(path =>
+ extractFileName(path, PlatformIO.getDirSeparator())
+ )}
confirmCallback={result => {
if (result && selectedEntries) {
selectedEntries.map(fsentry => {
diff --git a/app/reducers/app.ts b/app/reducers/app.ts
index d810e786d..3a2eeb0e2 100644
--- a/app/reducers/app.ts
+++ b/app/reducers/app.ts
@@ -299,11 +299,15 @@ export default (state: any = initialState, action: any) => {
};
}
case types.TOGGLE_UPLOAD_DIALOG: {
- return {
- ...state,
- // progress: (state.uploadDialogOpened ? state.progress : []),
- uploadDialogOpened: !state.uploadDialogOpened
- };
+ if (PlatformIO.haveObjectStoreSupport()) {
+ // upload dialog have objectStore support only
+ return {
+ ...state,
+ // progress: (state.uploadDialogOpened ? state.progress : []),
+ uploadDialogOpened: !state.uploadDialogOpened
+ };
+ }
+ return state;
}
case types.SET_SEARCH_RESULTS: {
return {
diff --git a/app/reducers/io-actions.ts b/app/reducers/io-actions.ts
index 2c29846b5..cdb5a69ed 100644
--- a/app/reducers/io-actions.ts
+++ b/app/reducers/io-actions.ts
@@ -166,13 +166,23 @@ const actions = {
* @param files
* @param targetPath
* @param onUploadProgress
- * TODO reader.onload not work for multiple files https://stackoverflow.com/questions/56178918/react-upload-multiple-files-using-window-filereader
+ * reader.onload not work for multiple files https://stackoverflow.com/questions/56178918/react-upload-multiple-files-using-window-filereader
*/
uploadFilesAPI: (
files: Array<File>,
targetPath: string,
onUploadProgress?: (progress: Progress, response: any) => void
) => (dispatch: (actions: Object) => void) => {
+ if (AppConfig.isElectron) {
+ const arrFiles = [];
+ for (let i = 0; i < files.length; i += 1) {
+ arrFiles.push(files[i].path);
+ }
+ return dispatch(
+ actions.uploadFiles(arrFiles, targetPath, onUploadProgress)
+ );
+ }
+ // -> cannot upload meta data (for every upload in web browser its need to have <input> element)
setupReader(0);
function setupReader(i) {
@@ -192,8 +202,8 @@ const actions = {
}
}
- function readerLoaded(event, i, filePath) {
- PlatformIO.getPropertiesPromise(filePath)
+ function readerLoaded(event, i, fileTargetPath) {
+ PlatformIO.getPropertiesPromise(fileTargetPath)
.then(entryProps => {
if (entryProps) {
dispatch(
@@ -205,7 +215,7 @@ const actions = {
);
} else {
PlatformIO.saveBinaryFilePromise(
- filePath,
+ fileTargetPath,
event.currentTarget.result,
true,
onUploadProgress
@@ -213,20 +223,22 @@ const actions = {
.then(() => {
dispatch(
AppActions.showNotification(
- 'File ' + filePath + ' successfully imported.',
+ 'File ' + fileTargetPath + ' successfully imported.',
'default',
true
)
);
- dispatch(AppActions.reflectCreateEntry(filePath, true));
+ dispatch(AppActions.reflectCreateEntry(fileTargetPath, true));
return true;
})
.catch(error => {
// TODO showAlertDialog("Saving " + filePath + " failed.");
- console.error('Save to file ' + filePath + ' failed ' + error);
+ console.error(
+ 'Save to file ' + fileTargetPath + ' failed ' + error
+ );
dispatch(
AppActions.showNotification(
- 'Importing file ' + filePath + ' failed.',
+ 'Importing file ' + fileTargetPath + ' failed.',
'error',
true
)
@@ -302,6 +314,7 @@ const actions = {
true
)
);
+ dispatch(AppActions.setProgress(filePath, -1, undefined));
} else {
// dispatch(AppActions.setProgress(filePath, progress));
PlatformIO.saveBinaryFilePromise(
diff --git a/app/third-party.txt b/app/third-party.txt
index 67b44f570..9dc065685 100644
--- a/app/third-party.txt
+++ b/app/third-party.txt
@@ -193,7 +193,7 @@ SOFTWARE.
-----
-The following software may be included in this product: @develar/schema-utils, css-loader, enhanced-resolve, extract-text-webpack-plugin, file-loader, json-loader, less-loader, loader-utils, memory-fs, mini-css-extract-plugin, raw-loader, schema-utils, style-loader, terser-webpack-plugin, url-loader, watchpack, webpack, webpack-bundle-analyzer, webpack-dev-middleware, webpack-dev-server, worker-loader. A copy of the source code may be downloaded from https://github.com/webpack-contrib/schema-utils.git (@develar/schema-utils), https://github.com/webpack-contrib/css-loader.git (css-loader), git://github.com/webpack/enhanced-resolve.git (enhanced-resolve), https://github.com/webpack-contrib/extract-text-webpack-plugin (extract-text-webpack-plugin), https://github.com/webpack-contrib/file-loader.git (file-loader), https://github.com/webpack/json-loader.git (json-loader), https://github.com/webpack-contrib/less-loader.git (less-loader), https://github.com/webpack/loader-utils.git (loader-utils), https://github.com/webpack/memory-fs.git (memory-fs), https://github.com/webpack-contrib/mini-css-extract-plugin.git (mini-css-extract-plugin), https://github.com/webpack-contrib/raw-loader.git (raw-loader), https://github.com/webpack/schema-utils.git (schema-utils), https://github.com/webpack-contrib/style-loader.git (style-loader), https://github.com/webpack-contrib/terser-webpack-plugin.git (terser-webpack-plugin), https://github.com/webpack-contrib/url-loader.git (url-loader), https://github.com/webpack/watchpack.git (watchpack), https://github.com/webpack/webpack.git (webpack), git+https://github.com/webpack-contrib/webpack-bundle-analyzer.git (webpack-bundle-analyzer), https://github.com/webpack/webpack-dev-middleware.git (webpack-dev-middleware), https://github.com/webpack/webpack-dev-server.git (webpack-dev-server), https://github.com/webpack-contrib/worker-loader.git (worker-loader). This software contains the following license and notice below:
+The following software may be included in this product: @develar/schema-utils, css-loader, enhanced-resolve, extract-text-webpack-plugin, file-loader, json-loader, less-loader, loader-utils, memory-fs, mini-css-extract-plugin, raw-loader, schema-utils, style-loader, terser-webpack-plugin, url-loader, watchpack, webpack, webpack-bundle-analyzer, webpack-dev-middleware, webpack-dev-server, worker-loader. A copy of the source code may be downloaded from https://github.com/webpack/schema-utils.git (@develar/schema-utils), https://github.com/webpack-contrib/css-loader.git (css-loader), git://github.com/webpack/enhanced-resolve.git (enhanced-resolve), https://github.com/webpack-contrib/extract-text-webpack-plugin (extract-text-webpack-plugin), https://github.com/webpack-contrib/file-loader.git (file-loader), https://github.com/webpack/json-loader.git (json-loader), https://github.com/webpack-contrib/less-loader.git (less-loader), https://github.com/webpack/loader-utils.git (loader-utils), https://github.com/webpack/memory-fs.git (memory-fs), https://github.com/webpack-contrib/mini-css-extract-plugin.git (mini-css-extract-plugin), https://github.com/webpack-contrib/raw-loader.git (raw-loader), https://github.com/webpack/schema-utils.git (schema-utils), https://github.com/webpack-contrib/style-loader.git (style-loader), https://github.com/webpack-contrib/terser-webpack-plugin.git (terser-webpack-plugin), https://github.com/webpack-contrib/url-loader.git (url-loader), https://github.com/webpack/watchpack.git (watchpack), https://github.com/webpack/webpack.git (webpack), git+https://github.com/webpack-contrib/webpack-bundle-analyzer.git (webpack-bundle-analyzer), https://github.com/webpack/webpack-dev-middleware.git (webpack-dev-middleware), https://github.com/webpack/webpack-dev-server.git (webpack-dev-server), https://github.com/webpack-contrib/worker-loader.git (worker-loader). This software contains the following license and notice below:
Copyright JS Foundation and other contributors
@@ -513,6 +513,82 @@ THE SOFTWARE.
-----
+The following software may be included in this product: @react-dnd/asap, asap. A copy of the source code may be downloaded from https://github.com/kriskowal/asap.git (@react-dnd/asap), https://github.com/kriskowal/asap.git (asap). This software contains the following license and notice below:
+
+Copyright 2009–2014 Contributors. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
+-----
+
+The following software may be included in this product: @react-dnd/invariant, babel-plugin-dev-expression, babel-preset-fbjs, confusing-browser-globals, fbjs-scripts, invariant, prop-types, react-addons-test-utils, warning. A copy of the source code may be downloaded from https://github.com/react-dnd/invariant (@react-dnd/invariant), git+https://github.com/4Catalyzer/babel-plugin-dev-expression.git (babel-plugin-dev-expression), https://github.com/facebook/fbjs.git (babel-preset-fbjs), https://github.com/facebook/create-react-app.git (confusing-browser-globals), https://github.com/facebook/fbjs.git (fbjs-scripts), https://github.com/zertosh/invariant (invariant), https://github.com/facebook/prop-types.git (prop-types), https://github.com/facebook/react.git (react-addons-test-utils), https://github.com/BerkeleyTrue/warning.git (warning). This software contains the following license and notice below:
+
+MIT License
+
+Copyright (c) 2013-present, Facebook, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-----
+
+The following software may be included in this product: @react-dnd/shallowequal, shallowequal. A copy of the source code may be downloaded from https://github.com/react-dnd/shallowequal.git (@react-dnd/shallowequal), https://github.com/dashed/shallowequal.git (shallowequal). This software contains the following license and notice below:
+
+MIT License
+
+Copyright (c) 2017 Alberto Leal <[email protected]> (github.com/dashed)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-----
+
The following software may be included in this product: @samverschueren/stream-to-observable. A copy of the source code may be downloaded from https://github.com/SamVerschueren/stream-to-observable.git. This software contains the following license and notice below:
The MIT License (MIT)
@@ -539,7 +615,7 @@ THE SOFTWARE.
-----
-The following software may be included in this product: @sindresorhus/is, ansi-escapes, ansi-regex, ansi-styles, any-observable, binary-extensions, boxen, callsites, camelcase, chalk, cli-boxes, cli-cursor, crypto-random-string, del, dot-prop, electron-debug, electron-is-dev, env-paths, escape-goat, escape-string-regexp, eslint-formatter-pretty, execa, figures, find-up, find-versions, get-port, get-stdin, get-stream, global-dirs, globals, globby, got, gzip-size, has-flag, has-yarn, html-tags, import-fresh, import-lazy, import-local, indent-string, internal-ip, invert-kv, irregular-plurals, is-absolute-url, is-fullwidth-code-point, is-generator-fn, is-installed-globally, is-npm, is-obj, is-observable, is-path-cwd, is-path-in-cwd, is-path-inside, is-svg, is-text-path, is-wsl, latest-version, lcid, leven, load-json-file, locate-path, log-symbols, log-update, lowercase-keys, macos-release, make-dir, matcher, mem, meow, mimic-fn, mimic-response, multimatch, normalize-url, onetime, opn, os-locale, os-name, p-cancelable, p-is-promise, p-limit, p-locate, p-map, p-pipe, p-queue, p-retry, p-try, package-json, parent-module, parse-json, path-exists, path-type, pify, pkg-dir, pkg-up, plur, prepend-http, pupa, quick-lru, read-pkg, read-pkg-up, registry-url, resolve-from, restore-cursor, semver-diff, semver-regex, serialize-error, slash, sort-keys, string-length, string-width, strip-ansi, strip-json-comments, supports-color, temp-write, term-size, text-extensions, to-readable-stream, type-fest, unique-string, url-parse-lax, widest-line, windows-release, wrap-ansi, write-json-file, write-pkg, xdg-basedir. A copy of the source code may be downloaded from https://github.com/sindresorhus/is.git (@sindresorhus/is), https://github.com/sindresorhus/ansi-escapes.git (ansi-escapes), https://github.com/chalk/ansi-regex.git (ansi-regex), https://github.com/chalk/ansi-styles.git (ansi-styles), https://github.com/sindresorhus/any-observable.git (any-observable), https://github.com/sindresorhus/binary-extensions.git (binary-extensions), https://github.com/sindresorhus/boxen.git (boxen), https://github.com/sindresorhus/callsites.git (callsites), https://github.com/sindresorhus/camelcase.git (camelcase), https://github.com/chalk/chalk.git (chalk), https://github.com/sindresorhus/cli-boxes.git (cli-boxes), https://github.com/sindresorhus/cli-cursor.git (cli-cursor), https://github.com/sindresorhus/crypto-random-string.git (crypto-random-string), https://github.com/sindresorhus/del.git (del), https://github.com/sindresorhus/dot-prop.git (dot-prop), https://github.com/sindresorhus/electron-debug.git (electron-debug), https://github.com/sindresorhus/electron-is-dev.git (electron-is-dev), https://github.com/sindresorhus/env-paths.git (env-paths), https://github.com/sindresorhus/escape-goat.git (escape-goat), https://github.com/sindresorhus/escape-string-regexp.git (escape-string-regexp), https://github.com/sindresorhus/eslint-formatter-pretty.git (eslint-formatter-pretty), https://github.com/sindresorhus/execa.git (execa), https://github.com/sindresorhus/figures.git (figures), https://github.com/sindresorhus/find-up.git (find-up), https://github.com/sindresorhus/find-versions.git (find-versions), https://github.com/sindresorhus/get-port.git (get-port), https://github.com/sindresorhus/get-stdin.git (get-stdin), https://github.com/sindresorhus/get-stream.git (get-stream), https://github.com/sindresorhus/global-dirs.git (global-dirs), https://github.com/sindresorhus/globals.git (globals), https://github.com/sindresorhus/globby.git (globby), https://github.com/sindresorhus/got.git (got), https://github.com/sindresorhus/gzip-size.git (gzip-size), https://github.com/sindresorhus/has-flag.git (has-flag), https://github.com/sindresorhus/has-yarn.git (has-yarn), https://github.com/sindresorhus/html-tags.git (html-tags), https://github.com/sindresorhus/import-fresh.git (import-fresh), https://github.com/sindresorhus/import-lazy.git (import-lazy), https://github.com/sindresorhus/import-local.git (import-local), https://github.com/sindresorhus/indent-string.git (indent-string), https://github.com/sindresorhus/internal-ip.git (internal-ip), https://github.com/sindresorhus/invert-kv.git (invert-kv), https://github.com/sindresorhus/irregular-plurals.git (irregular-plurals), https://github.com/sindresorhus/is-absolute-url.git (is-absolute-url), https://github.com/sindresorhus/is-fullwidth-code-point.git (is-fullwidth-code-point), https://github.com/sindresorhus/is-generator-fn.git (is-generator-fn), https://github.com/sindresorhus/is-installed-globally.git (is-installed-globally), https://github.com/sindresorhus/is-npm.git (is-npm), https://github.com/sindresorhus/is-obj.git (is-obj), https://github.com/sindresorhus/is-observable.git (is-observable), https://github.com/sindresorhus/is-path-cwd.git (is-path-cwd), https://github.com/sindresorhus/is-path-in-cwd.git (is-path-in-cwd), https://github.com/sindresorhus/is-path-inside.git (is-path-inside), https://github.com/sindresorhus/is-svg.git (is-svg), https://github.com/sindresorhus/is-text-path.git (is-text-path), https://github.com/sindresorhus/is-wsl.git (is-wsl), https://github.com/sindresorhus/latest-version.git (latest-version), https://github.com/sindresorhus/lcid.git (lcid), https://github.com/sindresorhus/leven.git (leven), https://github.com/sindresorhus/load-json-file.git (load-json-file), https://github.com/sindresorhus/locate-path.git (locate-path), https://github.com/sindresorhus/log-symbols.git (log-symbols), https://github.com/sindresorhus/log-update.git (log-update), https://github.com/sindresorhus/lowercase-keys.git (lowercase-keys), https://github.com/sindresorhus/macos-release.git (macos-release), https://github.com/sindresorhus/make-dir.git (make-dir), https://github.com/sindresorhus/matcher.git (matcher), https://github.com/sindresorhus/mem.git (mem), https://github.com/sindresorhus/meow.git (meow), https://github.com/sindresorhus/mimic-fn.git (mimic-fn), https://github.com/sindresorhus/mimic-response.git (mimic-response), https://github.com/sindresorhus/multimatch.git (multimatch), https://github.com/sindresorhus/normalize-url.git (normalize-url), https://github.com/sindresorhus/onetime.git (onetime), https://github.com/sindresorhus/opn.git (opn), https://github.com/sindresorhus/os-locale.git (os-locale), https://github.com/sindresorhus/os-name.git (os-name), https://github.com/sindresorhus/p-cancelable.git (p-cancelable), https://github.com/sindresorhus/p-is-promise.git (p-is-promise), https://github.com/sindresorhus/p-limit.git (p-limit), https://github.com/sindresorhus/p-locate.git (p-locate), https://github.com/sindresorhus/p-map.git (p-map), https://github.com/sindresorhus/p-pipe.git (p-pipe), https://github.com/sindresorhus/p-queue.git (p-queue), https://github.com/sindresorhus/p-retry.git (p-retry), https://github.com/sindresorhus/p-try.git (p-try), https://github.com/sindresorhus/package-json.git (package-json), https://github.com/sindresorhus/parent-module.git (parent-module), https://github.com/sindresorhus/parse-json.git (parse-json), https://github.com/sindresorhus/path-exists.git (path-exists), https://github.com/sindresorhus/path-type.git (path-type), https://github.com/sindresorhus/pify.git (pify), https://github.com/sindresorhus/pkg-dir.git (pkg-dir), https://github.com/sindresorhus/pkg-up.git (pkg-up), https://github.com/sindresorhus/plur.git (plur), https://github.com/sindresorhus/prepend-http.git (prepend-http), https://github.com/sindresorhus/pupa.git (pupa), https://github.com/sindresorhus/quick-lru.git (quick-lru), https://github.com/sindresorhus/read-pkg.git (read-pkg), https://github.com/sindresorhus/read-pkg-up.git (read-pkg-up), https://github.com/sindresorhus/registry-url.git (registry-url), https://github.com/sindresorhus/resolve-from.git (resolve-from), https://github.com/sindresorhus/restore-cursor.git (restore-cursor), https://github.com/sindresorhus/semver-diff.git (semver-diff), https://github.com/sindresorhus/semver-regex.git (semver-regex), https://github.com/sindresorhus/serialize-error.git (serialize-error), https://github.com/sindresorhus/slash.git (slash), https://github.com/sindresorhus/sort-keys.git (sort-keys), https://github.com/sindresorhus/string-length.git (string-length), https://github.com/sindresorhus/string-width.git (string-width), https://github.com/chalk/strip-ansi.git (strip-ansi), https://github.com/sindresorhus/strip-json-comments.git (strip-json-comments), https://github.com/chalk/supports-color.git (supports-color), https://github.com/sindresorhus/temp-write.git (temp-write), https://github.com/sindresorhus/term-size.git (term-size), https://github.com/sindresorhus/text-extensions.git (text-extensions), https://github.com/sindresorhus/to-readable-stream.git (to-readable-stream), https://github.com/sindresorhus/type-fest.git (type-fest), https://github.com/sindresorhus/unique-string.git (unique-string), https://github.com/sindresorhus/url-parse-lax.git (url-parse-lax), https://github.com/sindresorhus/widest-line.git (widest-line), https://github.com/sindresorhus/windows-release.git (windows-release), https://github.com/chalk/wrap-ansi.git (wrap-ansi), https://github.com/sindresorhus/write-json-file.git (write-json-file), https://github.com/sindresorhus/write-pkg.git (write-pkg), https://github.com/sindresorhus/xdg-basedir.git (xdg-basedir). This software contains the following license and notice below:
+The following software may be included in this product: @sindresorhus/is, ansi-escapes, ansi-regex, ansi-styles, any-observable, binary-extensions, boxen, callsites, camelcase, chalk, cli-boxes, cli-cursor, crypto-random-string, decamelize, del, dot-prop, electron-debug, electron-is-dev, env-paths, escape-goat, escape-string-regexp, eslint-formatter-pretty, execa, figures, find-up, find-versions, get-port, get-stdin, get-stream, global-dirs, globals, globby, got, gzip-size, has-flag, has-yarn, html-tags, import-fresh, import-lazy, import-local, indent-string, internal-ip, invert-kv, irregular-plurals, is-absolute-url, is-fullwidth-code-point, is-generator-fn, is-installed-globally, is-npm, is-obj, is-observable, is-path-cwd, is-path-in-cwd, is-path-inside, is-svg, is-text-path, is-wsl, latest-version, lcid, leven, load-json-file, locate-path, log-symbols, log-update, lowercase-keys, macos-release, make-dir, matcher, mem, meow, mimic-fn, mimic-response, multimatch, normalize-url, onetime, opn, os-locale, os-name, p-cancelable, p-is-promise, p-limit, p-locate, p-map, p-pipe, p-queue, p-retry, p-try, package-json, parent-module, parse-json, path-exists, path-type, pify, pkg-dir, pkg-up, plur, prepend-http, pupa, quick-lru, read-pkg, read-pkg-up, registry-url, resolve-from, restore-cursor, semver-diff, semver-regex, serialize-error, slash, sort-keys, string-length, string-width, strip-ansi, strip-json-comments, supports-color, temp-write, term-size, text-extensions, to-readable-stream, type-fest, unique-string, url-parse-lax, widest-line, windows-release, wrap-ansi, write-json-file, write-pkg, xdg-basedir. A copy of the source code may be downloaded from https://github.com/sindresorhus/is.git (@sindresorhus/is), https://github.com/sindresorhus/ansi-escapes.git (ansi-escapes), https://github.com/chalk/ansi-regex.git (ansi-regex), https://github.com/chalk/ansi-styles.git (ansi-styles), https://github.com/sindresorhus/any-observable.git (any-observable), https://github.com/sindresorhus/binary-extensions.git (binary-extensions), https://github.com/sindresorhus/boxen.git (boxen), https://github.com/sindresorhus/callsites.git (callsites), https://github.com/sindresorhus/camelcase.git (camelcase), https://github.com/chalk/chalk.git (chalk), https://github.com/sindresorhus/cli-boxes.git (cli-boxes), https://github.com/sindresorhus/cli-cursor.git (cli-cursor), https://github.com/sindresorhus/crypto-random-string.git (crypto-random-string), https://github.com/sindresorhus/decamelize.git (decamelize), https://github.com/sindresorhus/del.git (del), https://github.com/sindresorhus/dot-prop.git (dot-prop), https://github.com/sindresorhus/electron-debug.git (electron-debug), https://github.com/sindresorhus/electron-is-dev.git (electron-is-dev), https://github.com/sindresorhus/env-paths.git (env-paths), https://github.com/sindresorhus/escape-goat.git (escape-goat), https://github.com/sindresorhus/escape-string-regexp.git (escape-string-regexp), https://github.com/sindresorhus/eslint-formatter-pretty.git (eslint-formatter-pretty), https://github.com/sindresorhus/execa.git (execa), https://github.com/sindresorhus/figures.git (figures), https://github.com/sindresorhus/find-up.git (find-up), https://github.com/sindresorhus/find-versions.git (find-versions), https://github.com/sindresorhus/get-port.git (get-port), https://github.com/sindresorhus/get-stdin.git (get-stdin), https://github.com/sindresorhus/get-stream.git (get-stream), https://github.com/sindresorhus/global-dirs.git (global-dirs), https://github.com/sindresorhus/globals.git (globals), https://github.com/sindresorhus/globby.git (globby), https://github.com/sindresorhus/got.git (got), https://github.com/sindresorhus/gzip-size.git (gzip-size), https://github.com/sindresorhus/has-flag.git (has-flag), https://github.com/sindresorhus/has-yarn.git (has-yarn), https://github.com/sindresorhus/html-tags.git (html-tags), https://github.com/sindresorhus/import-fresh.git (import-fresh), https://github.com/sindresorhus/import-lazy.git (import-lazy), https://github.com/sindresorhus/import-local.git (import-local), https://github.com/sindresorhus/indent-string.git (indent-string), https://github.com/sindresorhus/internal-ip.git (internal-ip), https://github.com/sindresorhus/invert-kv.git (invert-kv), https://github.com/sindresorhus/irregular-plurals.git (irregular-plurals), https://github.com/sindresorhus/is-absolute-url.git (is-absolute-url), https://github.com/sindresorhus/is-fullwidth-code-point.git (is-fullwidth-code-point), https://github.com/sindresorhus/is-generator-fn.git (is-generator-fn), https://github.com/sindresorhus/is-installed-globally.git (is-installed-globally), https://github.com/sindresorhus/is-npm.git (is-npm), https://github.com/sindresorhus/is-obj.git (is-obj), https://github.com/sindresorhus/is-observable.git (is-observable), https://github.com/sindresorhus/is-path-cwd.git (is-path-cwd), https://github.com/sindresorhus/is-path-in-cwd.git (is-path-in-cwd), https://github.com/sindresorhus/is-path-inside.git (is-path-inside), https://github.com/sindresorhus/is-svg.git (is-svg), https://github.com/sindresorhus/is-text-path.git (is-text-path), https://github.com/sindresorhus/is-wsl.git (is-wsl), https://github.com/sindresorhus/latest-version.git (latest-version), https://github.com/sindresorhus/lcid.git (lcid), https://github.com/sindresorhus/leven.git (leven), https://github.com/sindresorhus/load-json-file.git (load-json-file), https://github.com/sindresorhus/locate-path.git (locate-path), https://github.com/sindresorhus/log-symbols.git (log-symbols), https://github.com/sindresorhus/log-update.git (log-update), https://github.com/sindresorhus/lowercase-keys.git (lowercase-keys), https://github.com/sindresorhus/macos-release.git (macos-release), https://github.com/sindresorhus/make-dir.git (make-dir), https://github.com/sindresorhus/matcher.git (matcher), https://github.com/sindresorhus/mem.git (mem), https://github.com/sindresorhus/meow.git (meow), https://github.com/sindresorhus/mimic-fn.git (mimic-fn), https://github.com/sindresorhus/mimic-response.git (mimic-response), https://github.com/sindresorhus/multimatch.git (multimatch), https://github.com/sindresorhus/normalize-url.git (normalize-url), https://github.com/sindresorhus/onetime.git (onetime), https://github.com/sindresorhus/opn.git (opn), https://github.com/sindresorhus/os-locale.git (os-locale), https://github.com/sindresorhus/os-name.git (os-name), https://github.com/sindresorhus/p-cancelable.git (p-cancelable), https://github.com/sindresorhus/p-is-promise.git (p-is-promise), https://github.com/sindresorhus/p-limit.git (p-limit), https://github.com/sindresorhus/p-locate.git (p-locate), https://github.com/sindresorhus/p-map.git (p-map), https://github.com/sindresorhus/p-pipe.git (p-pipe), https://github.com/sindresorhus/p-queue.git (p-queue), https://github.com/sindresorhus/p-retry.git (p-retry), https://github.com/sindresorhus/p-try.git (p-try), https://github.com/sindresorhus/package-json.git (package-json), https://github.com/sindresorhus/parent-module.git (parent-module), https://github.com/sindresorhus/parse-json.git (parse-json), https://github.com/sindresorhus/path-exists.git (path-exists), https://github.com/sindresorhus/path-type.git (path-type), https://github.com/sindresorhus/pify.git (pify), https://github.com/sindresorhus/pkg-dir.git (pkg-dir), https://github.com/sindresorhus/pkg-up.git (pkg-up), https://github.com/sindresorhus/plur.git (plur), https://github.com/sindresorhus/prepend-http.git (prepend-http), https://github.com/sindresorhus/pupa.git (pupa), https://github.com/sindresorhus/quick-lru.git (quick-lru), https://github.com/sindresorhus/read-pkg.git (read-pkg), https://github.com/sindresorhus/read-pkg-up.git (read-pkg-up), https://github.com/sindresorhus/registry-url.git (registry-url), https://github.com/sindresorhus/resolve-from.git (resolve-from), https://github.com/sindresorhus/restore-cursor.git (restore-cursor), https://github.com/sindresorhus/semver-diff.git (semver-diff), https://github.com/sindresorhus/semver-regex.git (semver-regex), https://github.com/sindresorhus/serialize-error.git (serialize-error), https://github.com/sindresorhus/slash.git (slash), https://github.com/sindresorhus/sort-keys.git (sort-keys), https://github.com/sindresorhus/string-length.git (string-length), https://github.com/sindresorhus/string-width.git (string-width), https://github.com/chalk/strip-ansi.git (strip-ansi), https://github.com/sindresorhus/strip-json-comments.git (strip-json-comments), https://github.com/chalk/supports-color.git (supports-color), https://github.com/sindresorhus/temp-write.git (temp-write), https://github.com/sindresorhus/term-size.git (term-size), https://github.com/sindresorhus/text-extensions.git (text-extensions), https://github.com/sindresorhus/to-readable-stream.git (to-readable-stream), https://github.com/sindresorhus/type-fest.git (type-fest), https://github.com/sindresorhus/unique-string.git (unique-string), https://github.com/sindresorhus/url-parse-lax.git (url-parse-lax), https://github.com/sindresorhus/widest-line.git (widest-line), https://github.com/sindresorhus/windows-release.git (windows-release), https://github.com/chalk/wrap-ansi.git (wrap-ansi), https://github.com/sindresorhus/write-json-file.git (write-json-file), https://github.com/sindresorhus/write-pkg.git (write-pkg), https://github.com/sindresorhus/xdg-basedir.git (xdg-basedir). This software contains the following license and notice below:
MIT License
@@ -579,7 +655,7 @@ SOFTWARE.
-----
-The following software may be included in this product: @types/babel__core, @types/babel__generator, @types/babel__template, @types/babel__traverse, @types/color-name, @types/debug, @types/events, @types/fs-extra, @types/glob, @types/history, @types/hoist-non-react-statics, @types/istanbul-lib-coverage, @types/istanbul-lib-report, @types/istanbul-reports, @types/jest, @types/json-schema, @types/minimatch, @types/node, @types/parse-json, @types/prop-types, @types/q, @types/react, @types/react-dom, @types/react-redux, @types/react-router, @types/react-router-dom, @types/react-transition-group, @types/redux-logger, @types/stack-utils, @types/styled-jsx, @types/unist, @types/vfile, @types/vfile-message, @types/yargs, @types/yargs-parser. A copy of the source code may be downloaded from https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/babel__core), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/babel__generator), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/babel__template), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/babel__traverse), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/color-name), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/debug), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/events), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/fs-extra), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/glob), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/history), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/hoist-non-react-statics), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/istanbul-lib-coverage), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/istanbul-lib-report), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/istanbul-reports), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/jest), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/json-schema), https://www.github.com/DefinitelyTyped/DefinitelyTyped.git (@types/minimatch), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/node), https://www.github.com/DefinitelyTyped/DefinitelyTyped.git (@types/parse-json), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/prop-types), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/q), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-dom), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-redux), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-router), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-router-dom), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-transition-group), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/redux-logger), https://www.github.com/DefinitelyTyped/DefinitelyTyped.git (@types/stack-utils), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/styled-jsx), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/unist), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/vfile), https://github.com/vfile/vfile-message#readme (@types/vfile-message), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/yargs), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/yargs-parser). This software contains the following license and notice below:
+The following software may be included in this product: @types/babel__core, @types/babel__generator, @types/babel__template, @types/babel__traverse, @types/color-name, @types/debug, @types/events, @types/glob, @types/history, @types/hoist-non-react-statics, @types/istanbul-lib-coverage, @types/istanbul-lib-report, @types/istanbul-reports, @types/jest, @types/json-schema, @types/minimatch, @types/node, @types/parse-json, @types/prop-types, @types/q, @types/react, @types/react-dom, @types/react-redux, @types/react-router, @types/react-router-dom, @types/react-transition-group, @types/redux-logger, @types/stack-utils, @types/styled-jsx, @types/unist, @types/vfile, @types/vfile-message, @types/yargs, @types/yargs-parser. A copy of the source code may be downloaded from https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/babel__core), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/babel__generator), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/babel__template), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/babel__traverse), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/color-name), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/debug), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/events), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/glob), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/history), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/hoist-non-react-statics), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/istanbul-lib-coverage), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/istanbul-lib-report), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/istanbul-reports), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/jest), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/json-schema), https://www.github.com/DefinitelyTyped/DefinitelyTyped.git (@types/minimatch), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/node), https://www.github.com/DefinitelyTyped/DefinitelyTyped.git (@types/parse-json), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/prop-types), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/q), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-dom), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-redux), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-router), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-router-dom), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-transition-group), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/redux-logger), https://www.github.com/DefinitelyTyped/DefinitelyTyped.git (@types/stack-utils), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/styled-jsx), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/unist), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/vfile), https://github.com/vfile/vfile-message#readme (@types/vfile-message), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/yargs), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/yargs-parser). This software contains the following license and notice below:
MIT License
@@ -605,6 +681,32 @@ MIT License
-----
+The following software may be included in this product: @types/fs-extra, @types/yargs. A copy of the source code may be downloaded from https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/fs-extra), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/yargs). This software contains the following license and notice below:
+
+MIT License
+
+ Copyright (c) Microsoft Corporation.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE
+
+-----
+
The following software may be included in this product: @typescript-eslint/experimental-utils. A copy of the source code may be downloaded from https://github.com/typescript-eslint/typescript-eslint.git. This software contains the following license and notice below:
MIT License
@@ -1377,20 +1479,6 @@ THE SOFTWARE.
-----
-The following software may be included in this product: add-dom-event-listener. A copy of the source code may be downloaded from [email protected]:yiminghe/add-dom-event-listener. This software contains the following license and notice below:
-
-The MIT License (MIT)
-
-Copyright (c) 2014-present yiminghe
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
------
-
The following software may be included in this product: address. A copy of the source code may be downloaded from git://github.com/node-modules/address.git. This software contains the following license and notice below:
This software is licensed under the MIT License.
@@ -1418,7 +1506,7 @@ THE SOFTWARE.
-----
-The following software may be included in this product: ajv. A copy of the source code may be downloaded from https://github.com/epoberezkin/ajv.git. This software contains the following license and notice below:
+The following software may be included in this product: ajv. A copy of the source code may be downloaded from https://github.com/ajv-validator/ajv.git. This software contains the following license and notice below:
The MIT License (MIT)
@@ -2710,30 +2798,6 @@ SOFTWARE.
-----
-The following software may be included in this product: asap. A copy of the source code may be downloaded from https://github.com/kriskowal/asap.git. This software contains the following license and notice below:
-
-Copyright 2009–2014 Contributors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
------
-
The following software may be included in this product: asn1. A copy of the source code may be downloaded from git://github.com/joyent/node-asn1.git. This software contains the following license and notice below:
Copyright (c) 2011 Mark Cavage, All rights reserved.
@@ -2797,6 +2861,30 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
The following software may be included in this product: async. A copy of the source code may be downloaded from https://github.com/caolan/async.git. This software contains the following license and notice below:
+Copyright (c) 2010-2014 Caolan McMahon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-----
+
+The following software may be included in this product: async. A copy of the source code may be downloaded from https://github.com/caolan/async.git. This software contains the following license and notice below:
+
Copyright (c) 2010-2018 Caolan McMahon
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -2858,6 +2946,17 @@ SOFTWARE.
-----
+The following software may be included in this product: at-least-node. A copy of the source code may be downloaded from git+https://github.com/RyanZim/at-least-node.git. This software contains the following license and notice below:
+
+The ISC License
+Copyright (c) 2020 Ryan Zimmerman <[email protected]>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+-----
+
The following software may be included in this product: atob. A copy of the source code may be downloaded from git://git.coolaj86.com/coolaj86/atob.js.git. This software contains the following license and notice below:
At your option you may choose either of the following licenses:
@@ -3411,32 +3510,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----
-The following software may be included in this product: babel-plugin-dev-expression, babel-preset-fbjs, confusing-browser-globals, fbjs-scripts, invariant, prop-types, react-addons-test-utils, warning. A copy of the source code may be downloaded from git+https://github.com/4Catalyzer/babel-plugin-dev-expression.git (babel-plugin-dev-expression), https://github.com/facebook/fbjs.git (babel-preset-fbjs), https://github.com/facebook/create-react-app.git (confusing-browser-globals), https://github.com/facebook/fbjs.git (fbjs-scripts), https://github.com/zertosh/invariant (invariant), https://github.com/facebook/prop-types.git (prop-types), https://github.com/facebook/react.git (react-addons-test-utils), https://github.com/BerkeleyTrue/warning.git (warning). This software contains the following license and notice below:
-
-MIT License
-
-Copyright (c) 2013-present, Facebook, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------
-
The following software may be included in this product: babel-plugin-dynamic-import-node. A copy of the source code may be downloaded from git+https://github.com/airbnb/babel-plugin-dynamic-import-node.git. This software contains the following license and notice below:
MIT License
@@ -20013,6 +20086,18 @@ IN THE SOFTWARE.
-----
+The following software may be included in this product: raf. A copy of the source code may be downloaded from git://github.com/chrisdickinson/raf.git. This software contains the following license and notice below:
+
+Copyright 2013 Chris Dickinson <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----
+
The following software may be included in this product: randomatic. A copy of the source code may be downloaded from https://github.com/jonschlinkert/randomatic.git. This software contains the following license and notice below:
The MIT License (MIT)
@@ -20120,6 +20205,20 @@ THE SOFTWARE.
-----
+The following software may be included in this product: rc-resize-observer. A copy of the source code may be downloaded from [email protected]:react-component/resize-observer.git. This software contains the following license and notice below:
+
+The MIT License (MIT)
+
+Copyright (c) 2019-present afc163
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----
+
The following software may be included in this product: rc-table. A copy of the source code may be downloaded from [email protected]:react-component/table.git. This software contains the following license and notice below:
MIT LICENSE
@@ -20150,6 +20249,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
The following software may be included in this product: rc-util. A copy of the source code may be downloaded from [email protected]:react-component/util.git. This software contains the following license and notice below:
The MIT License (MIT)
+
+Copyright (c) 2014-present yiminghe
Copyright (c) 2015-present Alipay.com, https://www.alipay.com/
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -22188,32 +22289,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-----
-The following software may be included in this product: shallowequal. A copy of the source code may be downloaded from https://github.com/dashed/shallowequal.git. This software contains the following license and notice below:
-
-MIT License
-
-Copyright (c) 2017 Alberto Leal <[email protected]> (github.com/dashed)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------
-
The following software may be included in this product: shebang-command. A copy of the source code may be downloaded from https://github.com/kevva/shebang-command.git. This software contains the following license and notice below:
The MIT License (MIT)
@@ -26822,6 +26897,32 @@ http://www.gnu.org/licenses/lgpl.html
-----
+The following software may be included in this product: xregexp. A copy of the source code may be downloaded from https://github.com/slevithan/xregexp.git. This software contains the following license and notice below:
+
+The MIT License
+
+Copyright (c) 2007-present Steven Levithan <http://xregexp.com/>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-----
+
The following software may be included in this product: xtend. A copy of the source code may be downloaded from git://github.com/Raynos/xtend.git. This software contains the following license and notice below:
The MIT License (MIT)
@@ -26883,7 +26984,7 @@ THIS SOFTWARE.
-----
-The following software may be included in this product: yargs. A copy of the source code may be downloaded from https://github.com/yargs/yargs.git. This software contains the following license and notice below:
+The following software may be included in this product: yargs. A copy of the source code may be downloaded from http://github.com/yargs/yargs.git. This software contains the following license and notice below:
Copyright 2010 James Halliday ([email protected])
Modified work Copyright 2014 Contributors ([email protected])
@@ -26910,6 +27011,32 @@ THE SOFTWARE.
-----
+The following software may be included in this product: yargs. A copy of the source code may be downloaded from https://github.com/yargs/yargs.git. This software contains the following license and notice below:
+
+MIT License
+
+Copyright 2010 James Halliday ([email protected]); Modified work Copyright 2014 Contributors ([email protected])
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-----
+
The following software may be included in this product: yarn. A copy of the source code may be downloaded from https://github.com/yarnpkg/yarn.git. This software contains the following license and notice below:
BSD 2-Clause License
diff --git a/configs/webpack.config.cordova.dev.babel.js b/configs/webpack.config.cordova.dev.babel.js
new file mode 100644
index 000000000..c2ecf7c9d
--- /dev/null
+++ b/configs/webpack.config.cordova.dev.babel.js
@@ -0,0 +1,229 @@
+/**
+ * Build config for electron renderer process
+ */
+
+import path from 'path';
+import webpack from 'webpack';
+import MiniCssExtractPlugin from 'mini-css-extract-plugin';
+import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+import merge from 'webpack-merge';
+import baseConfig from './webpack.config.base';
+import CheckNodeEnv from '../internals/scripts/CheckNodeEnv';
+
+const targetPlatform = 'cordova-io'; // electron-io | webdav-io | cordova-io | process.env.APP_TARGET ||
+
+CheckNodeEnv('development');
+export default merge.smart(baseConfig, {
+ cache: false,
+ devtool: 'inline-source-map',
+
+ mode: 'development',
+
+ target: 'web',
+
+ entry: path.join(__dirname, '..', 'app/index'),
+ // entry: ['babel-polyfill', './app/index'],
+
+ output: {
+ libraryTarget: 'window', // 'window', // 'commonjs2',
+ path: path.join(__dirname, '../cordova/www/dist'),
+ publicPath: './dist/',
+ filename: 'bundle.js',
+ sourceMapFilename: '[file].map'
+ },
+
+ node: {
+ fs: 'empty',
+ child_process: 'empty'
+ },
+
+ module: {
+ rules: [
+ // Extract all .global.css to style.css as is
+ {
+ test: /\.global\.css$/,
+ use: [
+ {
+ loader: MiniCssExtractPlugin.loader,
+ options: {
+ publicPath: './'
+ }
+ },
+ {
+ loader: 'css-loader',
+ options: {
+ sourceMap: true
+ }
+ }
+ ]
+ },
+ // Pipe other styles through css modules and append to style.css
+ {
+ test: /^((?!\.global).)*\.css$/,
+ use: [
+ {
+ loader: MiniCssExtractPlugin.loader
+ },
+ {
+ loader: 'css-loader',
+ options: {
+ modules: true,
+ localIdentName: '[name]__[local]__[hash:base64:5]',
+ sourceMap: true
+ }
+ }
+ ]
+ },
+ // Add SASS support - compile all .global.scss files and pipe it to style.css
+ {
+ test: /\.global\.(scss|sass)$/,
+ use: [
+ {
+ loader: MiniCssExtractPlugin.loader
+ },
+ {
+ loader: 'css-loader',
+ options: {
+ sourceMap: true,
+ importLoaders: 1
+ }
+ },
+ {
+ loader: 'sass-loader',
+ options: {
+ sourceMap: true
+ }
+ }
+ ]
+ },
+ // Add SASS support - compile all other .scss files and pipe it to style.css
+ {
+ test: /^((?!\.global).)*\.(scss|sass)$/,
+ use: [
+ {
+ loader: MiniCssExtractPlugin.loader
+ },
+ {
+ loader: 'css-loader',
+ options: {
+ modules: true,
+ importLoaders: 1,
+ localIdentName: '[name]__[local]__[hash:base64:5]',
+ sourceMap: true
+ }
+ },
+ {
+ loader: 'sass-loader',
+ options: {
+ sourceMap: true
+ }
+ }
+ ]
+ },
+ // WOFF Font
+ {
+ test: /\.woff(\?v=\d+\.\d+\.\d+)?$/,
+ use: {
+ loader: 'url-loader',
+ options: {
+ limit: 10000,
+ mimetype: 'application/font-woff'
+ }
+ }
+ },
+ // WOFF2 Font
+ {
+ test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/,
+ use: {
+ loader: 'url-loader',
+ options: {
+ limit: 10000,
+ mimetype: 'application/font-woff'
+ }
+ }
+ },
+ // TTF Font
+ {
+ test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
+ use: {
+ loader: 'url-loader',
+ options: {
+ limit: 10000,
+ mimetype: 'application/octet-stream'
+ }
+ }
+ },
+ // EOT Font
+ {
+ test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
+ use: 'file-loader'
+ },
+ // SVG Font
+ {
+ test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
+ use: {
+ loader: 'url-loader',
+ options: {
+ limit: 10000,
+ mimetype: 'image/svg+xml'
+ }
+ }
+ },
+ // Text files
+ {
+ test: /\.(txt)$/,
+ use: 'raw-loader'
+ },
+ // Common Image Formats
+ {
+ test: /\.(?:ico|gif|png|jpg|jpeg|webp)$/,
+ use: 'url-loader'
+ }
+ ]
+ },
+
+ plugins: [
+ /**
+ * Create global constants which can be configured at compile time.
+ *
+ * Useful for allowing different behaviour between development builds and
+ * release builds
+ *
+ * NODE_ENV should be production so that modules do not perform certain
+ * development checks
+ */
+ new webpack.EnvironmentPlugin({
+ NODE_ENV: 'production'
+ }),
+
+ new MiniCssExtractPlugin({
+ filename: 'style.css'
+ }),
+
+ new webpack.NormalModuleReplacementPlugin(
+ /(.*)_PLATFORMIO_(\.*)/,
+ resource => {
+ resource.request = resource.request.replace(
+ /_PLATFORMIO_/,
+ `${targetPlatform}`
+ );
+ }
+ ),
+
+ new webpack.NormalModuleReplacementPlugin(
+ /(.*)_PDFDISTLIB_(\.*)/,
+ resource => {
+ resource.request = resource.request.replace(
+ /_PDFDISTLIB_/,
+ `pdfjs-dist`
+ );
+ }
+ ),
+
+ new BundleAnalyzerPlugin({
+ analyzerMode:
+ process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
+ openAnalyzer: process.env.OPEN_ANALYZER === 'true'
+ })
+ ]
+});
diff --git a/cordova/yarn.lock b/cordova/yarn.lock
index 1ea8139e7..dacfa5a0b 100644
--- a/cordova/yarn.lock
+++ b/cordova/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-abbrev@*, abbrev@1:
+abbrev@1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -14,12 +14,12 @@ [email protected]:
dependencies:
semver "^5.4.1"
-ansi@*, ansi@^0.3.1:
+ansi@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
-balanced-match@*, balanced-match@^1.0.0:
+balanced-match@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
@@ -34,23 +34,11 @@ [email protected]:
resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.32.tgz#5867458b25ecd5bcb36b627c30bb501a13c07e89"
integrity sha512-ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw==
-big-integer@^1.6.44:
- version "1.6.48"
- resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
- integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==
-
big-integer@^1.6.7:
version "1.6.40"
resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.40.tgz#02e4cd4d6e266c4d9ece2469c05cb6439149fc78"
integrity sha512-CjhtJp0BViLzP1ZkEnoywjgtFQXS2pomKjAJtIISTCnuHILkLcAXLdFLG/nxsHc4s9kJfc+82Xpg8WNyhfACzQ==
-bplist-parser@*:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e"
- integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==
- dependencies:
- big-integer "^1.6.44"
-
bplist-parser@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
@@ -58,7 +46,7 @@ bplist-parser@^0.1.0:
dependencies:
big-integer "^1.6.7"
-brace-expansion@*, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
@@ -66,7 +54,7 @@ brace-expansion@*, brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"
-concat-map@*, [email protected]:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
@@ -134,7 +122,7 @@ cordova-plugin-whitelist@^1.3.4:
resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz#31938545c7c3e7de35c20ab08c2c3afa06e8a3f9"
integrity sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==
-cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@^1.1.8:
version "1.1.15"
resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
integrity sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw=
@@ -157,7 +145,7 @@ [email protected], glob@^5.0.13:
once "^1.3.0"
path-is-absolute "^1.0.0"
-inflight@*, inflight@^1.0.4:
+inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
@@ -165,17 +153,12 @@ inflight@*, inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
-inherits@*:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
- integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
inherits@2:
version "2.0.3"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-minimatch@*, "minimatch@2 || 3", minimatch@^3.0.0:
+"minimatch@2 || 3", minimatch@^3.0.0:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -189,7 +172,7 @@ [email protected]:
dependencies:
abbrev "1"
-once@*, once@^1.3.0:
+once@^1.3.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -245,22 +228,17 @@ [email protected], shelljs@^0.5.3:
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113"
integrity sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=
-underscore@*:
- version "1.9.2"
- resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz#0c8d6f536d6f378a5af264a72f7bec50feb7cf2f"
- integrity sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==
-
underscore@^1.8.3:
version "1.9.1"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
-unorm@*, unorm@^1.3.3:
+unorm@^1.3.3:
version "1.6.0"
resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.6.0.tgz#029b289661fba714f1a9af439eb51d9b16c205af"
integrity sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==
-wrappy@*, wrappy@1:
+wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
@@ -270,11 +248,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"
integrity sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=
-xmldom@*:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.2.1.tgz#cac9465066f161e1c3302793ea4dbe59c518274f"
- integrity sha512-kXXiYvmblIgEemGeB75y97FyaZavx6SQhGppLw5TKWAD2Wd0KAly0g23eVLh17YcpxZpnFym1Qk/eaRjy1APPg==
-
version "0.1.27"
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
diff --git a/package.json b/package.json
index aa03e34fa..a0f0a6182 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"build-worker-dev": "cross-env NODE_ENV=production webpack --config ./configs/webpack.config.worker.dev.js --colors",
"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",
+ "build-cordova-dev": "cross-env NODE_ENV=development webpack --config ./configs/webpack.config.cordova.dev.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-old": "cross-env NODE_ENV=development eslint --cache --format=pretty .",
"lint": "tsc --noEmit && eslint '*/**/*.{js,ts,tsx}'",
@@ -49,7 +50,7 @@
"package-web": "yarn prepare-web && yarn clean-maps && zip -r ../builds/tagspaces-web.zip web -x web/files/**\\*",
"package-web-pro": "yarn prepare-web && yarn clean-maps && zip -r ../builds/tagspaces-pro-web.zip web -xi web/files/**\\* ",
"prepare-web": "rimraf web/node_modules && cp -r app/node_modules web && cp LICENSE.txt web && node scripts/genswconf.js",
- "prepare-cordova": "rimraf cordova/www/dist && rimraf cordova/www/node_modules && cp -Lr app/node_modules cordova/www && cp LICENSE.txt cordova/www",
+ "prepare-cordova": "rimraf cordova/www/dist && rimraf cordova/www/node_modules && cp -LR app/node_modules cordova/www && cp LICENSE.txt cordova/www",
"clean": "rimraf node_modules && rimraf app/dist",
"clean-pro": "yarn clean-maps",
"clean-maps": "rimraf app/dist/**/*.map && rimraf web/dist/**/*.map",
@@ -59,7 +60,7 @@
"run-webdav": "yarn build-web && yarn prepare-web && node scripts/webdavserver.js",
"run-web": "yarn build-web && yarn prepare-web && node scripts/webserver.js",
"run-android": "yarn build-cordova && cd cordova && cordova run android && cd ..",
- "run-android-dev": "yarn prepare-cordova && yarn build-cordova-dev && yarn run-android",
+ "run-android-dev": "yarn prepare-cordova && yarn build-cordova-dev && cd cordova && cordova run android && cd ..",
"cordova-add-android": "cd cordova && cordova platform add android && cd ..",
"cordova-create-app": "cordova create ./cordova org.tagspaces.mobile TagSpaces",
"update-changelog": "git log v3.4.2..HEAD --no-merges --format=%B > CHANGELOG.TXT",