TagSpaces is an offline, open source, document manager with tagging support
general.pw.e2e.js (#1481)
Stanimir9757f8d7d4f5
diff --git a/.gitignore b/.gitignoreindex 0a1ccc42d..935478b30 100644--- a/.gitignore+++ b/.gitignore@@ -100,6 +100,7 @@ tests/*!tests/global-teardown-web.js!tests/setup-after-env.js!tests/setup-functions.js+!tests/test-data-refresh.jsbuilds/*web/sw-condiff --git a/app/components/DirectoryTreeView.tsx b/app/components/DirectoryTreeView.tsxindex a64ecc3c2..cb083a6ca 100644--- a/app/components/DirectoryTreeView.tsx+++ b/app/components/DirectoryTreeView.tsx@@ -255,6 +255,7 @@ const DirectoryTreeView = forwardRef(// @ts-ignore.then(dirEntries => {if (dirEntries !== undefined) {+ // console.debug('listDirectoryPromise resolved:' + dirEntries.length);const directoryContent = [];dirEntries.map(entry => {if (@@ -303,7 +304,7 @@ const DirectoryTreeView = forwardRef(return subFolder;}).catch(error => {- console.log('getDirectoriesTree', error);+ console.debug('getDirectoriesTree', error);});/**diff --git a/app/components/LocationView.tsx b/app/components/LocationView.tsxindex b057a6551..c2f331c91 100644--- a/app/components/LocationView.tsx+++ b/app/components/LocationView.tsx@@ -95,7 +95,9 @@ const LocationView = (props: Props) => {const isCloudLocation = location.type === locationType.TYPE_CLOUD;const handleLocationClick = () => {- directoryTreeRef.current.changeLocation(location);+ if (directoryTreeRef.current) {+ directoryTreeRef.current.changeLocation(location);+ }if (location.uuid === props.currentLocationId) {// the same location clickprops.loadDirectoryContent(getLocationPath(location), false);diff --git a/app/components/dialogs/settings/SettingsGeneral.tsx b/app/components/dialogs/settings/SettingsGeneral.tsxindex 63d0bce8e..b67093410 100644--- a/app/components/dialogs/settings/SettingsGeneral.tsx+++ b/app/components/dialogs/settings/SettingsGeneral.tsx@@ -238,13 +238,18 @@ const SettingsGeneral = (props: Props) => {<ListItem className={classes.listItem}><ListItemText primary={i18n.t('core:useGenerateThumbnails')} /><Switch+ disabled={AppConfig.useGenerateThumbnails !== undefined}data-tid="settingsUseGenerateThumbnails"onClick={() =>props.setUseGenerateThumbnails(!props.settings.useGenerateThumbnails)}- checked={props.settings.useGenerateThumbnails}+ checked={+ AppConfig.useGenerateThumbnails !== undefined+ ? AppConfig.useGenerateThumbnails+ : props.settings.useGenerateThumbnails+ }/></ListItem><ListItem className={classes.listItem}>diff --git a/app/config.ts b/app/config.tsindex a80a1e302..fd6d1b7bd 100644--- a/app/config.ts+++ b/app/config.ts@@ -71,6 +71,7 @@ export const AppConfig = {: false,useSidecarsForFileTaggingDisableSetting:window.ExtUseSidecarsForFileTagging !== undefined,+ useGenerateThumbnails: window.ExtUseGenerateThumbnails,customLogo: window.ExtLogoURL || false,showAdvancedSearch:window.ExtShowAdvancedSearch !== undefineddiff --git a/app/main.dev.ts b/app/main.dev.tsindex e7c453930..e7803805a 100644--- a/app/main.dev.ts+++ b/app/main.dev.ts@@ -16,7 +16,14 @@**/-import { app, BrowserWindow, dialog, globalShortcut, ipcMain } from 'electron';+import {+ app,+ BrowserWindow,+ dialog,+ globalShortcut,+ ipcMain,+ shell+} from 'electron';import windowStateKeeper from 'electron-window-state';import path from 'path';import i18n from '-/services/i18n'; // '-/i18nBackend';@@ -86,7 +93,7 @@ process.argv.forEach((arg, count) => {let mainHTML = `file://${__dirname}/app.html`;let workerDevMode = false;-if (devMode) {+if (devMode || testMode) {// eslint-disable-next-linerequire('electron-debug')({ showDevTools: false, devToolsMode: 'right' });const p = path.join(__dirname, '..', 'app', 'node_modules');@@ -413,6 +420,10 @@ async function createAppWindow() {}});+ /*setTimeout(() => {+ mainWindow.toggleDevTools(); // debugging+ }, 2000);*/+const winUserAgent ='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36';const testWinOnUnix = false; // set to true to simulate windows os, useful for testing s3 handling@@ -491,7 +502,9 @@ app.on('ready', async () => {await installExtensions();}+ // if (!process.env.DISABLE_WORKER) {createSplashWorker();+ //}buildAppMenu();await createAppWindow();buildTrayMenu();@@ -583,6 +596,19 @@ app.on('ready', async () => {event.returnValue = path.join(__dirname, ''); // eslint-disable-line});+ ipcMain.on('move-to-trash', async (event, files) => {+ const result = [];+ files.forEach(fullPath => {+ result.push(shell.trashItem(fullPath));+ });+ try {+ event.returnValue = await Promise.all(result);+ } catch (err) {+ console.error('moveToTrash error:', err);+ event.returnValue = undefined;+ }+ });+ipcMain.on('set-language', (e, language) => {i18n.changeLanguage(language);});diff --git a/app/reducers/app.ts b/app/reducers/app.tsindex 983e1c5b2..b4c6518cf 100644--- a/app/reducers/app.ts+++ b/app/reducers/app.ts@@ -17,7 +17,6 @@*/import uuidv1 from 'uuid';-import pathLib from 'path';import { getLocation, getDefaultLocationId } from './locations';import PlatformIO from '../services/platform-io';import AppConfig from '../config';@@ -924,6 +923,7 @@ export const actions = {).then(results => {if (results !== undefined) {+ // console.debug('app listDirectoryPromise resolved:' + results.length);prepareDirectoryContent(results,directoryPath,@@ -937,15 +937,15 @@ export const actions = {return true;}).catch(error => {- console.timeEnd('listDirectoryPromise');- dispatch(actions.loadDirectoryFailure(error)); // Currently this is never called, due the promise always resolve+ // console.timeEnd('listDirectoryPromise');+ dispatch(actions.loadDirectoryFailure(directoryPath, error)); // Currently this is never called, due the promise always resolve});},loadDirectoryContent: (directoryPath: string,generateThumbnails: boolean- ) => (dispatch: (actions: Object) => void, getState: () => any) => {- console.time('listDirectoryPromise');+ ) => async (dispatch: (actions: Object) => void, getState: () => any) => {+ // console.debug('loadDirectoryContent:' + directoryPath);window.walkCanceled = false;const state = getState();@@ -953,32 +953,32 @@ export const actions = {if (selectedEntries.length > 0) {dispatch(actions.setSelectedEntries([]));}- loadMetaDataPromise(- normalizePath(directoryPath) + PlatformIO.getDirSeparator()- )- .then(fsEntryMeta => {- dispatch(- actions.loadDirectoryContentInt(- directoryPath,- generateThumbnails,- fsEntryMeta- )- );- /* if (fsEntryMeta.color) { // TODO rethink this states changes are expensive+ try {+ const fsEntryMeta = await loadMetaDataPromise(+ normalizePath(directoryPath) + PlatformIO.getDirSeparator()+ );+ // console.debug('Loading meta succeeded for:' + directoryPath);+ dispatch(+ actions.loadDirectoryContentInt(+ directoryPath,+ generateThumbnails,+ fsEntryMeta+ )+ );+ /* if (fsEntryMeta.color) { // TODO rethink this states changes are expensivedispatch(actions.setCurrentDirectoryColor(fsEntryMeta.color));}if (fsEntryMeta.perspective) {dispatch(actions.setCurrentDirPerspective(fsEntryMeta.perspective));} */- return true;- })- .catch(err => {- console.log('Error loading meta of the current folder' + err);- dispatch(- actions.loadDirectoryContentInt(directoryPath, generateThumbnails)- );- });+ // return true;+ } catch (err) {+ console.debug('Error loading meta of:' + directoryPath + ' ' + err);+ dispatch(+ actions.loadDirectoryContentInt(directoryPath, generateThumbnails)+ );+ }},loadDirectorySuccess: (directoryPath: string,@@ -2099,17 +2099,7 @@ export const getCurrentLocationPath = (state: any) => {state.app.currentLocationId &&location.uuid === state.app.currentLocationId) {- const locationPath = getLocationPath(location);- if (- AppConfig.isElectron &&- locationPath &&- locationPath.startsWith('./')- ) {- // TODO test relative path (Directory Back) with other platforms- // relative paths- return pathLib.resolve(locationPath);- }- return locationPath;+ return getLocationPath(location);}}}diff --git a/app/services/electron-io.ts b/app/services/electron-io.tsindex 12782150e..44055c41b 100644--- a/app/services/electron-io.ts+++ b/app/services/electron-io.ts@@ -268,10 +268,10 @@ export default class ElectronIO {let eentry;let containsMetaFolder = false;// const metaMetaFolder = AppConfig.metaFolder + AppConfig.dirSeparator + AppConfig.metaFolder;- if (path.startsWith('./')) {+ /* if (path.startsWith('./')) {// relative pathspath = pathLib.resolve(path);- }+ } */this.fs.readdir(path, (error, entries) => {if (error) {console.warn('Error listing directory ' + path);@@ -285,6 +285,9 @@ export default class ElectronIO {}if (entries) {+ console.debug(+ 'Listing directory ' + path + ' entries:' + entries.length+ );if (!showIgnored && ignorePatterns.length > 0) {// eslint-disable-next-line no-param-reassignentries = entries.filter(@@ -339,7 +342,9 @@ export default class ElectronIO {eentry.meta = this.fs.readJsonSync(folderMetaPath);// console.log('Success reading meta folder file ' + folderMetaPath);} catch (err) {- // console.log('Failed reading meta folder file ' + folderMetaPath);+ console.log(+ 'Failed reading meta folder file ' + folderMetaPath+ );}// Loading thumbs for folders@@ -465,8 +470,24 @@ export default class ElectronIO {});});- getPropertiesPromise = (path: string): Promise<any> =>- new Promise(resolve => {+ // Create a promise that rejects in <ms> milliseconds+ timeout = (ms: number): Promise<any> =>+ new Promise((resolve, reject) => {+ const id = setTimeout(() => {+ clearTimeout(id);+ reject(new Error('Timed out in ' + ms + 'ms.'));+ }, ms);+ });++ /**+ * TODO lstat sometimes hangs on Electron e2e tests+ * @param path+ * return on success: resolve Promise<TS.FileSystemEntry>+ * on error: resolve Promise<false> (file not exist) TODO rethink this to reject error too+ * on timeout: reject error+ */+ getPropertiesPromise = (path: string): Promise<any> => {+ const promise = new Promise(resolve => {/* stats for file:* "dev":41, "mode":33204, "nlink":1, "uid":1000, "gid":1000, "rdev":0,* "blksize":4096, "ino":2634172, "size":230, "blocks":24, "atime":"2015-11-24T09:56:41.932Z",@@ -492,13 +513,18 @@ export default class ElectronIO {}});});+ // Returns a race between our timeout and the passed in promise+ return Promise.race([promise, this.timeout(2000)]);+ };createDirectoryPromise = (dirPath: string): Promise<any> => {console.log('Creating directory: ' + dirPath);return new Promise((resolve, reject) => {this.fs.mkdirp(dirPath, error => {if (error) {- reject('Error creating folder: ' + dirPath + ' with ' + error);+ reject(+ new Error('Error creating folder: ' + dirPath + ' with ' + error)+ );return;}// Make newly created .ts folders hidden under Windows@@ -693,6 +719,12 @@ export default class ElectronIO {xhr.send();});+ /**+ * TODO rethink return Promise<TS.FileSystemEntry> and optimize and remove getPropertiesPromise before save file+ * @param filePath+ * @param content+ * @param overwrite+ */saveFilePromise = (filePath: string,content: any,@@ -712,10 +744,27 @@ export default class ElectronIO {this.getPropertiesPromise(filePath).then((entry: TS.FileSystemEntry) => {- if (entry && entry.isFile && overwrite) {- saveFile({ ...entry, isNewFile: false, tags: [] }, content);+ if (entry) {+ if (entry.isFile && overwrite) {+ saveFile({ ...entry, isNewFile: false, tags: [] }, content);+ }} else {- saveFile({ ...entry, isNewFile: true, tags: [] }, content);+ saveFile(+ {+ name: extractFileName(filePath, AppConfig.dirSeparator),+ isFile: true,+ path: filePath,+ extension: extractFileExtension(+ filePath,+ AppConfig.dirSeparator+ ),+ size: 0,+ lmdt: new Date().getTime(),+ isNewFile: true,+ tags: []+ },+ content+ );}return true;})@@ -774,9 +823,12 @@ export default class ElectronIO {): Promise<any> => {if (useTrash) {return new Promise((resolve, reject) => {- this.moveToTrash([path])- .then(() => resolve(path))- .catch(err => reject(err));+ if (this.moveToTrash([path])) {+ resolve(path);+ } else {+ // console.error('deleteDirectoryPromise '+path+' failed');+ reject(new Error('deleteDirectoryPromise ' + path + ' failed'));+ }});}@@ -796,9 +848,12 @@ export default class ElectronIO {): Promise<any> => {if (useTrash) {return new Promise((resolve, reject) => {- this.moveToTrash([path])- .then(() => resolve(path))- .catch(err => reject(err));+ if (this.moveToTrash([path])) {+ resolve(path);+ } else {+ // console.error('deleteDirectoryPromise '+path+' failed');+ reject(new Error('deleteDirectoryPromise ' + path + ' failed'));+ }});}@@ -812,18 +867,23 @@ export default class ElectronIO {});};- moveToTrash = (files: Array<string>): Promise<any> =>- new Promise((resolve, reject) => {- let result = true;+ moveToTrash = (files: Array<string>): boolean => {+ // Promise<any> => {++ const result = this.ipcRenderer.sendSync('move-to-trash', files);+ return result && result.length > 0;+ /* const result = [];files.forEach(fullPath => {- result = this.electron.shell.trashItem(fullPath);+ result.push(this.electron.shell.trashItem(fullPath));});- if (result) {+ return Promise.all(result); */++ /* if (result) {resolve(true);} else {reject('Moving of at least one file to trash failed.');- }- });+ } */+ };openDirectory = (dirPath: string): void => {if (AppConfig.isWin) {diff --git a/app/services/utils-io.ts b/app/services/utils-io.tsindex 9cce9293b..52b125de4 100644--- a/app/services/utils-io.ts+++ b/app/services/utils-io.ts@@ -193,6 +193,13 @@ export function prepareDirectoryContent();const isCloudLocation = currentLocation.type === locationType.TYPE_CLOUD;+ function useGenerateThumbnails() {+ if (AppConfig.useGenerateThumbnails !== undefined) {+ return AppConfig.useGenerateThumbnails;+ }+ return settings.useGenerateThumbnails;+ }+const {directoryContent,tmbGenerationPromises,@@ -201,7 +208,7 @@ export function prepareDirectoryContent(dirEntries,isCloudLocation,settings.showUnixHiddenEntries,- settings.useGenerateThumbnails+ generateThumbnails && useGenerateThumbnails());function handleTmbGenerationResults(results) {@@ -563,6 +570,7 @@ export async function getAllPropertiesPromise(}export async function loadJSONFile(filePath: string) {+ // console.debug('loadJSONFile:' + filePath);const jsonContent = await PlatformIO.loadTextFilePromise(filePath);return loadJSONString(jsonContent);/* const UTF8_BOM = '\ufeff';@@ -787,63 +795,46 @@ export async function loadLocationDataPromise(return undefined;}-export async function loadMetaDataPromise(+export function loadMetaDataPromise(path: string): Promise<TS.FileSystemEntryMeta> {- const entryProperties = await PlatformIO.getPropertiesPromise(path);- let metaDataObject;- if (entryProperties.isFile) {- const metaFilePath = getMetaFileLocationForFile(- path,- PlatformIO.getDirSeparator()- );- let metaData;- try {- metaData = await loadJSONFile(metaFilePath);- } catch (e) {- console.debug('cannot load json:' + metaFilePath, e);- }- if (!metaData) {- metaData = {};- }- metaDataObject = {- ...metaData,- description: metaData.description || '',- color: metaData.color || '',- tags: metaData.tags || [],- appName: metaData.appName || '',- appVersion: metaData.appVersion || '',- lastUpdated: metaData.lastUpdated || ''- };- } else {- const metaFilePath = getMetaFileLocationForDir(- path,- PlatformIO.getDirSeparator()- );- let metaData;- try {- metaData = await loadJSONFile(metaFilePath);- } catch (e) {- console.debug('cannot load json:' + metaFilePath, e);- }- if (!metaData) {- metaData = {};+ return PlatformIO.getPropertiesPromise(path).then(entryProperties => {+ if (entryProperties) {+ if (entryProperties.isFile) {+ const metaFilePath = getMetaFileLocationForFile(+ path,+ PlatformIO.getDirSeparator()+ );+ return loadJSONFile(metaFilePath).then(metaData => ({+ ...metaData,+ description: metaData.description || '',+ color: metaData.color || '',+ tags: metaData.tags || [],+ appName: metaData.appName || '',+ appVersion: metaData.appVersion || '',+ lastUpdated: metaData.lastUpdated || ''+ }));+ }+ const metaFilePath = getMetaFileLocationForDir(+ path,+ PlatformIO.getDirSeparator()+ );+ return loadJSONFile(metaFilePath).then(metaData => ({+ ...metaData,+ id: metaData.id || uuidv1(),+ description: metaData.description || '',+ color: metaData.color || '',+ perspective: metaData.perspective || '',+ tags: metaData.tags || [],+ appName: metaData.appName || '',+ appVersion: metaData.appVersion || '',+ lastUpdated: metaData.lastUpdated || '',+ files: metaData.files || [],+ dirs: metaData.dirs || []+ }));}- metaDataObject = {- ...metaData,- id: metaData.id || uuidv1(),- description: metaData.description || '',- color: metaData.color || '',- perspective: metaData.perspective || '',- tags: metaData.tags || [],- appName: metaData.appName || '',- appVersion: metaData.appVersion || '',- lastUpdated: metaData.lastUpdated || '',- files: metaData.files || [],- dirs: metaData.dirs || []- };- }- return metaDataObject;+ throw new Error('loadMetaDataPromise not exist' + path);+ });}export function cleanMetaData(@@ -935,12 +926,14 @@ export async function saveMetaDataPromise(PlatformIO.getDirSeparator());// check and create meta folder if not exist- /* await PlatformIO.createDirectoryPromise(- extractContainingDirectoryPath(- metaFilePath,- PlatformIO.getDirSeparator()- )- ); */+ const metaFolder = getMetaDirectoryPath(+ extractContainingDirectoryPath(path, PlatformIO.getDirSeparator()),+ PlatformIO.getDirSeparator()+ );+ const metaExist = await PlatformIO.getPropertiesPromise(metaFolder);+ if (!metaExist) {+ await PlatformIO.createDirectoryPromise(metaFolder);+ }} else {// check and create meta folder if not exist// todo not need to check if folder exist first createDirectoryPromise() recursively will skip creation of existing folders https://nodejs.org/api/fs.html#fs_fs_mkdir_path_options_callbackdiff --git a/app/tagspaces.d.ts b/app/tagspaces.d.tsindex dd66266be..3f512ee13 100644--- a/app/tagspaces.d.ts+++ b/app/tagspaces.d.ts@@ -50,6 +50,7 @@ declare interface Window {ExtShowWelcomePanel?: string;ExtShowSmartTags?: string;ExtShowAdvancedSearch?: string;+ ExtUseGenerateThumbnails?: boolean;__REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: any;plugins?: any; // needed for CordovaresolveLocalFileSystemURL?: any; // needed for Cordovadiff --git a/app/utils/paths.ts b/app/utils/paths.tsindex ec29b08fb..b147cc99e 100644--- a/app/utils/paths.ts+++ b/app/utils/paths.ts@@ -16,6 +16,7 @@**/+import pathLib from 'path';import AppConfig from '../config';import { TS } from '-/tagspaces.namespace';@@ -154,12 +155,15 @@ export function extractFileName(filePath: string,dirSeparator: string // = AppConfig.dirSeparator): string {- return filePath- ? filePath.substring(- filePath.lastIndexOf(dirSeparator) + 1,- filePath.length- )- : filePath;+ if (filePath) {+ const path = filePath;+ if (filePath.endsWith(dirSeparator)) {+ return '';+ // path = filePath.substring(0, filePath.length - dirSeparator.length);+ }+ return path.substring(path.lastIndexOf(dirSeparator) + 1, path.length);+ }+ return filePath;}export function cleanTrailingDirSeparator(dirPath: string): string {@@ -393,15 +397,24 @@ export function extractTags(}export function getLocationPath(location: TS.Location) {+ let locationPath = '';if (location) {if (location.path) {- return location.path;+ locationPath = location.path;}if (location.paths && location.paths[0]) {- return location.paths[0];+ // eslint-disable-next-line prefer-destructuring+ locationPath = location.paths[0];+ }++ if (AppConfig.isElectron && locationPath && locationPath.startsWith('./')) {+ // TODO test relative path (Directory Back) with other platforms+ // relative paths+ return pathLib.resolve(locationPath);}}- return '';++ return locationPath;}/**diff --git a/jest.config.playwright.js b/jest.config.playwright.jsindex 3083152a6..d61e26185 100644--- a/jest.config.playwright.js+++ b/jest.config.playwright.js@@ -40,13 +40,16 @@ module.exports = async () => {* setupFiles: ran once per test file before all tests* https://jestjs.io/docs/en/configuration#setupfiles-array*/- setupFiles: ['../scripts/test-config-env-playwright.js'],+ setupFiles: [+ '../scripts/test-config-env-playwright.js',+ '../scripts/test-config-env.js'+ ],/*** setupFilesAfterEnv: ran before each test** https://jestjs.io/docs/en/configuration#setupfilesafterenv-array*/- setupFilesAfterEnv: ['./setup-after-env.js', 'expect-playwright'],+ setupFilesAfterEnv: ['./test-data-refresh.js', './setup-after-env.js'],/*** globalSetup: ran once before all tests*diff --git a/package.json b/package.jsonindex 12e080a35..dac15cc74 100644--- a/package.json+++ b/package.json@@ -90,9 +90,10 @@"test-unit": "cross-env NODE_JEST=unit_test BABEL_DISABLE_CACHE=1 jest --config=jest.config.unit.js --verbose ./tests/unit/","test-all": "yarn build && yarn test-unit && yarn build-e2e && yarn test-e2e","test-one": "cross-env HEADLESS_MODE=true jest --detectOpenHandles --config=jest.config.web.js -t 'TST5016' --runInBand --verbose ./tests/e2e/",- "test-playwright": "rimraf tests/testdata-tmp && cross-env DISABLE_WORKER=true NODE_ENV=test jest --config=jest.config.playwright.js -t 'electron' --verbose ./tests/e2e/",- "test-playwright-web": "rimraf tests/testdata-tmp && cross-env DEBUG=pw:api PLAYWRIGHT=test_playwright jest --config=jest.config.web.js -t 'web' --verbose ./tests/e2e/",- "test-playwright-web-headless": "rimraf tests/testdata-tmp && cross-env PLAYWRIGHT=test_playwright HEADLESS_MODE=true jest --config=jest.config.web.js -t 'web' --verbose ./tests/e2e/",+ "test-playwright": "yarn test-refresh-data && cross-env DISABLE_WORKER=true NODE_ENV=test jest --config=jest.config.playwright.js -t 'electron' --verbose ./tests/e2e/",+ "test-refresh-data": "rimraf tests/testdata-tmp && shx mkdir -p tests/testdata-tmp/file-structure && shx cp -rL tests/testdata/file-structure tests/testdata-tmp",+ "test-playwright-web": "yarn test-refresh-data && cross-env DEBUG=pw:api PLAYWRIGHT=test_playwright jest --config=jest.config.web.js -t 'web' --verbose ./tests/e2e/",+ "test-playwright-web-headless": "yarn test-refresh-data && cross-env PLAYWRIGHT=test_playwright HEADLESS_MODE=true jest --config=jest.config.web.js -t 'web' --verbose ./tests/e2e/","playwright-show-trace": "npx playwright show-trace \"tests/test-reports/TST0813 - Delete file [web,minio,electron].zip\"","test-one-suite-headless": "cross-env HEADLESS_MODE=true jest --config=jest.config.web.js --verbose ./tests/e2e/fileopener.e2e.js","test-one-suite": "cross-env jest --config=jest.config.web.js --verbose ./tests/e2e/perspective-grid-right-button.e2e.js",@@ -154,7 +155,7 @@"@babel/preset-react": "^7.12.7","@babel/preset-typescript": "^7.12.7","@babel/register": "^7.12.1",- "@playwright/test": "^1.12.3",+ "@playwright/test": "^1.13.1","@types/jest": "^26.0.10","@types/react": "^16.7.18","@types/react-dom": "^16.0.11",@@ -195,7 +196,6 @@"eslint-plugin-promise": "^4.0.1","eslint-plugin-react": "^7.12.3","eslint-plugin-testcafe": "^0.2.1",- "expect-playwright": "^0.7.1","express": "^4.17.1","extract-text-webpack-plugin": "^v4.0.0-beta.0","fbjs-scripts": "^1.2.0",@@ -211,10 +211,10 @@"less-loader": "^4.0.5","lint-staged": "^8.1.0","mini-css-extract-plugin": "^0.5.0",- "node-sass": "^4.5.3",+ "node-sass": "^6.0.1","npx": "^10.2.0","optimize-css-assets-webpack-plugin": "^5.0.1",- "playwright": "^1.12.3",+ "playwright": "^1.13.1","prettier": "1.19.1","raw-loader": "^3.1.0","react-addons-test-utils": "^15.5.1",diff --git a/scripts/extconfig-with-welcome.js b/scripts/extconfig-with-welcome.jsindex c1eb9cb14..b040bb7a1 100644--- a/scripts/extconfig-with-welcome.js+++ b/scripts/extconfig-with-welcome.js@@ -7,12 +7,13 @@ window.ExtLightThemeMainColor = '#3bc8ff';window.ExtDarkThemeLightColor = '#a6def4';window.ExtDarkThemeMainColor = '#3bc8ff';window.ExtIsFirstRun = true;+window.ExtUseGenerateThumbnails = false;window.ExtLocations = [{uuid: '30565f09-c7fd-2333-fc67-a75db27rt5ba', // an unique id of the locationtype: '0', // 1 defines the locations a cloud basedname: 'supported-filestypes', // the name of the location- path: './testdata-tmp/file-structure/supported-filestypes', // the path to sub folder in the location+ path: './tests/testdata-tmp/file-structure/supported-filestypes', // the path to sub folder in the location// accessKeyId: 'your_access_key', // the access key of the user// secretAccessKey: 'your_secret_key', // the secret case of the user// bucketName: 'demo-bucket', // the name of the S3 bucketdiff --git a/scripts/extconfig.js b/scripts/extconfig.jsindex c5fe8fe35..51e861716 100644--- a/scripts/extconfig.js+++ b/scripts/extconfig.js@@ -12,7 +12,7 @@ window.ExtLocations = [uuid: '30565f09-c7fd-2333-fc67-a75db27rt5ba', // an unique id of the locationtype: '0', // 1 defines the locations a cloud basedname: 'supported-filestypes', // the name of the location- path: './testdata-tmp/file-structure/supported-filestypes', // the path to sub folder in the location+ path: './tests/testdata-tmp/file-structure/supported-filestypes', // the path to sub folder in the location// accessKeyId: 'your_access_key', // the access key of the user// secretAccessKey: 'your_secret_key', // the secret case of the user// bucketName: 'demo-bucket', // the name of the S3 bucketdiff --git a/tests/e2e/fileopener.pw.e2e.js b/tests/e2e/fileopener.pw.e2e.jsindex f4b0e0039..beff9bfc6 100644--- a/tests/e2e/fileopener.pw.e2e.js+++ b/tests/e2e/fileopener.pw.e2e.js@@ -21,17 +21,25 @@ import {waitForNotification} from './general.helpers';import { expect } from '@playwright/test';-import { matchers } from 'expect-playwright';import {AddRemovePropertiesTags,getPropertiesFileName} from './file.properties.helpers';import { searchEngine } from './search.helpers';import { openContextEntryMenu } from './test-utils';+import { startTestingApp, stopSpectronApp, testDataRefresh } from './hook';describe('TST08 - File folder properties', () => {+ beforeAll(async () => {+ await startTestingApp('extconfig-with-welcome.js');+ });++ afterAll(async () => {+ await stopSpectronApp();+ await testDataRefresh();+ });+beforeEach(async () => {- expect.extend(matchers);if (global.isMinio) {await createPwMinioLocation('', defaultLocationName, true);} else {@@ -39,7 +47,7 @@ describe('TST08 - File folder properties', () => {}await clickOn('[data-tid=location_' + defaultLocationName + ']');// If its have opened file- await closeFileProperties();+ // await closeFileProperties();});it('TST0801 - Arrow keys select next prev file (keybindings) [web,minio,electron]', async () => {@@ -177,7 +185,8 @@ describe('TST08 - File folder properties', () => {});it('TST0809 - Add and remove tag to a file (sidecar files) [web,minio,electron]', async () => {- await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]');+ // global.client.setDefaultTimeout(300000);+ await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]', true);// await searchEngine('bmp');// open filePropertiesawait clickOn(selectorFile);diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.jsindex 14022fd44..bd2eef623 100644--- a/tests/e2e/general.helpers.js+++ b/tests/e2e/general.helpers.js@@ -144,13 +144,14 @@ export async function addInputKeys(tid, value) {* TODO not work in Playwright* @param tid* @param value+ * @param delay* @returns {Promise<*>}*/-export async function setInputKeys(tid, value) {+export async function setInputKeys(tid, value, delay = 50) {if (isPlaywright) {// global.client.keyboard.type('[data-tid=' + tid + '] input', value, { delay: 100 });await global.client.type('[data-tid=' + tid + '] input', value, {- delay: 100+ delay});} else {return await setSelectorKeys('[data-tid=' + tid + ']', value);@@ -266,7 +267,7 @@ export async function isDisplayed(selector, displayed = true, timeout = 500) {}return el !== null;} catch (error) {- console.log('The FileProperties not open.');+ console.log('The FileProperties not open:' + selector);}return false;}@@ -589,7 +590,7 @@ export async function waitForNotification(if (await isDisplayed('[data-tid=' + tid + ']')) {//const closeButton = await global.client.$('[data-tid=close' + tid + ']');if (forceClose && (await isDisplayed('[data-tid=close' + tid + ']'))) {- await clickOn('[data-tid=close' + tid + ']');+ await clickOn('[data-tid=close' + tid + ']', { force: true });} else {// autohide Notificationawait isDisplayed('[data-tid=' + tid + ']', false, 2000);@@ -598,9 +599,15 @@ export async function waitForNotification(}}-export async function setSettings(selector) {+export async function setSettings(selector, click = false) {await clickOn('[data-tid=settings]');- await clickOn(selector);+ if (click) {+ await clickOn(selector);+ } else {+ // check+ await global.client.check(selector + ' input');+ expect(await global.client.isChecked(selector + ' input')).toBeTruthy();+ }await clickOn('[data-tid=closeSettingsDialog]');}@@ -682,7 +689,9 @@ export async function deleteDirectory() {await clickOn('[data-tid=folderContainerOpenDirMenu]');await clickOn('[data-tid=deleteDirectory]');await clickOn('[data-tid=confirmDeleteFileDialog]');- await waitForNotification();+ if (global.isElectron) {+ await waitForNotification();+ }}export async function toHaveText() {diff --git a/tests/e2e/general.pw.e2e.js b/tests/e2e/general.pw.e2e.jsindex 665be02da..979cd79d2 100644--- a/tests/e2e/general.pw.e2e.js+++ b/tests/e2e/general.pw.e2e.js@@ -2,11 +2,10 @@* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.*/import {- createLocation,defaultLocationPath,defaultLocationName,- closeFileProperties,- createMinioLocation+ createPwMinioLocation,+ createPwLocation} from './location.helpers';import {reloadDirectory,@@ -20,10 +19,10 @@ import {clickOn,expectElementExist,selectorFile,- setSettings,- doubleClickOn+ setSettings} from './general.helpers';import { searchEngine } from './search.helpers';+import { startTestingApp, stopSpectronApp, testDataRefresh } from './hook';export const firstFile = '/span';export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';@@ -33,150 +32,96 @@ const subFolderContentExtractionPath =const subFolderThumbnailsPath = defaultLocationPath + '/thumbnails';const testFolder = 'testFolder';-describe('TST07 - General', () => {- beforeEach(async () => {- await clearLocalStorage();- await delay(500);- });-- it.skip('TST0701 - Open About TagSpaces', async () => {- await global.client.waitForVisible('[data-tid=aboutTagSpaces]');- await global.client.click('[data-tid=aboutTagSpaces]');- await global.client.waitForVisible('[data-tid=closeAboutDialog]');- await global.client.click('[data-tid=closeAboutDialog]');+describe('TST51 - Perspective Grid', () => {+ beforeAll(async () => {+ await startTestingApp('extconfig-with-welcome.js');});- it.skip('TST0705 - Open Settings Dialog', async () => {- await global.client.waitForVisible('[data-tid=settings]');- await global.client.click('[data-tid=settings]');- await checkForIdExist('settingsDialog');- await global.client.waitForVisible('[data-tid=closeSettingsDialog]');- await global.client.click('[data-tid=closeSettingsDialog]');+ afterAll(async () => {+ await stopSpectronApp();+ await testDataRefresh();});-- it.skip('TST07** - Change theme color', async () => {- await global.client.waitForVisible('[data-tid=settings]');- await global.client.click('[data-tid=settings]');- await delay(500);- // activate dark theme- await global.client.waitForVisible('[data-tid=settingsSetCurrentTheme]');- await global.client.selectByValue(- '[data-tid=settingsSetCurrentTheme]/div/select',- 'dark'- );- await delay(500);- // const style = await global.client.getAttribute('//button[contains(., "done")]', 'style');- // await delay(500);- // expect(style).toContain('rgb(208, 107, 100)');- // await global.client.waitForVisible('[data-tid=closeSettingsDialog]');- // await global.client.click('[data-tid=closeSettingsDialog]');- });-- /* it('TST10** - Desktop Mode', async () => {- await createLocation(defaultLocationPath, testLocationName, false);- await checkForIdExist('folderContainerLocationChooser');- await delay(500);- await global.client.waitForVisible('[data-tid=settings]');- await global.client.click('[data-tid=settings]');- await global.client.waitForVisible('[data-tid=settingsSetDesktopMode]');- await global.client.click('[data-tid=settingsSetDesktopMode]');- await delay(2000);- await global.client.waitForVisible('[data-tid=closeSettingsDialog]');- await global.client.click('[data-tid=closeSettingsDialog]');- // set desktop mode and check for desktop text / Location Chooser bottom in Toolbar- const isDesktopMode = await global.client.element('[data-tid=folderContainerLocationChooser]');- await delay(500);- expect(isDesktopMode.selector).not.toBe('[data-tid=folderContainerLocationChooser]');- }); */-- // it('TST1003 - Checkbox in the settings to open the tag library on startup', async () => {- //- // });-});--describe('TST51 - Perspective Grid [general]', () => {beforeEach(async () => {- //await closeWelcome();- //await delay(500);if (global.isMinio) {- await createMinioLocation('', defaultLocationName, true);+ await createPwMinioLocation('', defaultLocationName, true);} else {- await createLocation(defaultLocationPath, defaultLocationName, true);+ await createPwLocation(defaultLocationPath, defaultLocationName, true);}- // openLocationawait clickOn('[data-tid=location_' + defaultLocationName + ']');// If its have opened file- await closeFileProperties();+ // await closeFileProperties();});- it('TST0501 - Create HTML file [electron]', async () => {- /*await createNewDirectory();- await reloadDirectory();- // await global.client.pause(500);- await expectElementExist('[data-tid=fsEntryName_' + testFolder + ']');- await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');*/-- //await setSettings('[data-tid=settingsSetUseTrashCan]');- //await global.client.pause(500);+ it('TST0501 - Create HTML file [electron,web]', async () => {await createNewDirectory();- // await reloadDirectory();- // await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');+ await expectElementExist(+ '[data-tid=fsEntryName_' + testFolder + ']',+ true,+ 5000+ );+ await global.client.dblclick('[data-tid=fsEntryName_' + testFolder + ']');// create new fileawait newHTMLFile();await closeOpenedFile();// await reloadDirectory();await expectElementExist(selectorFile, true);- /*await global.client.pause(500);*/+ /**/// delete directory// await deleteFirstFile();await deleteDirectory(testFolder);await expectElementExist('[data-tid=fsEntryName_' + testFolder + ']',- false+ false,+ 5000);});- it('TST0502 - Create MD file [electron]', async () => {+ it('TST0502 - Create MD file [electron,web]', async () => {await createNewDirectory();- // await reloadDirectory();- // await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');+ await expectElementExist(+ '[data-tid=fsEntryName_' + testFolder + ']',+ true,+ 5000+ );+ await global.client.dblclick('[data-tid=fsEntryName_' + testFolder + ']');// create new fileawait newMDFile();await closeOpenedFile();// await reloadDirectory();await expectElementExist(selectorFile, true);- await global.client.pause(500);// await deleteFirstFile();await deleteDirectory(testFolder);await expectElementExist('[data-tid=fsEntryName_' + testFolder + ']',- false+ false,+ 5000);});- it('TST0502 - Create TEXT file [electron]', async () => {+ it('TST0503 - Create TEXT file [electron,web]', async () => {await createNewDirectory();- // await reloadDirectory();- // await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');+ await expectElementExist(+ '[data-tid=fsEntryName_' + testFolder + ']',+ true,+ 5000+ );+ await global.client.dblclick('[data-tid=fsEntryName_' + testFolder + ']');// create new fileawait newTEXTFile();await closeOpenedFile();// await reloadDirectory();await expectElementExist(selectorFile, true);- await global.client.pause(500);// await deleteFirstFile();await deleteDirectory(testFolder);await expectElementExist('[data-tid=fsEntryName_' + testFolder + ']',- false+ false,+ 5000);});@@ -184,15 +129,13 @@ describe('TST51 - Perspective Grid [general]', () => {// let filename = 'sample.jpg';// activate 'Show Hidden File' functionality in the general settingsawait setSettings('[data-tid=settingsSetShowUnixHiddenEntries]');- await global.client.pause(500);await reloadDirectory();- await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');+ await global.client.dblclick('[data-tid=fsEntryName_' + tsFolder + ']');await searchEngine('jpg');// await openEntry('sample.jpg');// await openFile();- await doubleClickOn(perspectiveGridTable + firstFile);+ await global.client.dblclick(perspectiveGridTable + firstFile);await closeOpenedFile();//TODO expect// const file = await global.client.$(@@ -204,13 +147,11 @@ describe('TST51 - Perspective Grid [general]', () => {it('TST0511 - Generate thumbnail from Videos', async () => {// activate 'Show Hidden File' functionality in the general settingsawait setSettings('[data-tid=settingsSetShowUnixHiddenEntries]');- await global.client.pause(500);await reloadDirectory();- await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');+ await global.client.dblclick('[data-tid=fsEntryName_' + tsFolder + ']');await searchEngine('mp4');- await doubleClickOn(perspectiveGridTable + firstFile);+ await global.client.dblclick(perspectiveGridTable + firstFile);await closeOpenedFile();//TODO expect});@@ -218,13 +159,11 @@ describe('TST51 - Perspective Grid [general]', () => {it('TST0516 - Generate thumbnail from PDF', async () => {// activate 'Show Hidden File' functionality in the general settingsawait setSettings('[data-tid=settingsSetShowUnixHiddenEntries]');- await global.client.pause(500);await reloadDirectory();- await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');+ await global.client.dblclick('[data-tid=fsEntryName_' + tsFolder + ']');await searchEngine('pdf');- await doubleClickOn(perspectiveGridTable + firstFile);+ await global.client.dblclick(perspectiveGridTable + firstFile);await closeOpenedFile();//TODO expect});@@ -232,13 +171,13 @@ describe('TST51 - Perspective Grid [general]', () => {it('TST0517 - Generate thumbnail from ODT', async () => {// activate 'Show Hidden File' functionality in the general settingsawait setSettings('[data-tid=settingsSetShowUnixHiddenEntries]');- await global.client.pause(500);+await reloadDirectory();- await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');++ await global.client.dblclick('[data-tid=fsEntryName_' + tsFolder + ']');await searchEngine('odt');- await doubleClickOn(perspectiveGridTable + firstFile);+ await global.client.dblclick(perspectiveGridTable + firstFile);await closeOpenedFile();//TODO expect});@@ -246,15 +185,15 @@ describe('TST51 - Perspective Grid [general]', () => {it('TST0519 - Generate thumbnail from TIFF', async () => {// activate 'Show Hidden File' functionality in the general settingsawait setSettings('[data-tid=settingsSetShowUnixHiddenEntries]');- await global.client.pause(500);+await reloadDirectory();- await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');++ await global.client.dblclick('[data-tid=fsEntryName_' + tsFolder + ']');await searchEngine('tiff');// await openEntry('sample.jpg');// await openFile();- await doubleClickOn(perspectiveGridTable + firstFile);+ await global.client.dblclick(perspectiveGridTable + firstFile);await closeOpenedFile();//TODO expect});@@ -262,15 +201,15 @@ describe('TST51 - Perspective Grid [general]', () => {it('TST0520 - Generate thumbnail from PSD', async () => {// activate 'Show Hidden File' functionality in the general settingsawait setSettings('[data-tid=settingsSetShowUnixHiddenEntries]');- await global.client.pause(500);+await reloadDirectory();- await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');++ await global.client.dblclick('[data-tid=fsEntryName_' + tsFolder + ']');await searchEngine('psd');// await openEntry('sample.jpg');// await openFile();- await doubleClickOn(perspectiveGridTable + firstFile);+ await global.client.dblclick(perspectiveGridTable + firstFile);await closeOpenedFile();//TODO expect});@@ -278,15 +217,15 @@ describe('TST51 - Perspective Grid [general]', () => {it('TST0524 - Generate thumbnail from TXT', async () => {// activate 'Show Hidden File' functionality in the general settingsawait setSettings('[data-tid=settingsSetShowUnixHiddenEntries]');- await global.client.pause(500);+await reloadDirectory();- await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');++ await global.client.dblclick('[data-tid=fsEntryName_' + tsFolder + ']');await searchEngine('txt');// await openEntry('sample.jpg');// await openFile();- await doubleClickOn(perspectiveGridTable + firstFile);+ await global.client.dblclick(perspectiveGridTable + firstFile);await closeOpenedFile();//TODO expect});@@ -294,15 +233,15 @@ describe('TST51 - Perspective Grid [general]', () => {it('TST0523 - Generate thumbnail from HTML', async () => {// activate 'Show Hidden File' functionality in the general settingsawait setSettings('[data-tid=settingsSetShowUnixHiddenEntries]');- await global.client.pause(500);+await reloadDirectory();- await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');++ await global.client.dblclick('[data-tid=fsEntryName_' + tsFolder + ']');await searchEngine('html');// await openEntry('sample.jpg');// await openFile();- await doubleClickOn(perspectiveGridTable + firstFile);+ await global.client.dblclick(perspectiveGridTable + firstFile);await closeOpenedFile();//TODO expect});@@ -310,15 +249,15 @@ describe('TST51 - Perspective Grid [general]', () => {it('TST0522 - Generate thumbnail from URL', async () => {// activate 'Show Hidden File' functionality in the general settingsawait setSettings('[data-tid=settingsSetShowUnixHiddenEntries]');- await global.client.pause(500);+await reloadDirectory();- await global.client.pause(500);- await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');++ await global.client.dblclick('[data-tid=fsEntryName_' + tsFolder + ']');await searchEngine('url');// await openEntry('sample.jpg');// await openFile();- await doubleClickOn(perspectiveGridTable + firstFile);+ await global.client.dblclick(perspectiveGridTable + firstFile);await closeOpenedFile();//TODO expect});diff --git a/tests/e2e/hook.js b/tests/e2e/hook.jsindex df28a61f5..061dc7574 100644--- a/tests/e2e/hook.js+++ b/tests/e2e/hook.js@@ -1,6 +1,7 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import electronPath from 'electron';import pathLib from 'path';+import fse from 'fs-extra';// Spectron API https://github.com/electron/spectron// Webdriver.io http://webdriver.io/api.html@@ -53,7 +54,20 @@ export async function clearLocalStorage() {// global.app.client.reload(false);}-export async function startSpectronApp() {+export async function copyExtConfig(extconfig = 'extconfig-with-welcome.js') {+ const srcDir = pathLib.join(__dirname, '..', '..', 'scripts', extconfig);+ const destDir = pathLib.join(__dirname, '..', '..', 'app', 'extconfig.js');+ await fse.copy(srcDir, destDir);+}++export async function removeExtConfig() {+ await fse.remove(pathLib.join(__dirname, '..', 'app', 'extconfig.js'));+}++export async function startTestingApp(extconfig) {+ if (extconfig) {+ await copyExtConfig(extconfig);+ }const chromeDriverArgs = [// '--disable-gpu','--disable-infobars',@@ -146,13 +160,6 @@ export async function startSpectronApp() {global.client = await global.app.firstWindow();await global.client.waitForLoadState('load'); //'domcontentloaded'); //'networkidle');// await global.client.bringToFront();- // Evaluation expression in the Electron context.- /*const appPath = await global.app.evaluate(async ({ app }) => {- // This runs in the main Electron process, parameter here is always- // the result of the require('electron') in the main app script.- return app.getAppPath();- });- console.log(appPath);*/// Print the title.// console.log(await global.client.title());@@ -218,6 +225,9 @@ export async function stopSpectronApp() {export async function testDataRefresh() {const fse = require('fs-extra');+ //const gracefulFs = require('graceful-fs')+ //gracefulFs.gracefulify(fse);+const src = pathLib.join(__dirname,'..',@@ -230,9 +240,9 @@ export async function testDataRefresh() {let newPath = pathLib.join(dst, pathLib.basename(src));fse.emptyDirSync(newPath);fse.copySync(src, newPath, { overwrite: true });- if (global.isElectron && global.client) {+ /*if (global.isElectron && global.client) {await global.client.waitForTimeout(1000);- }+ }*/}export async function takeScreenshot(name = expect.getState().currentTestName) {diff --git a/tests/e2e/key-bindings.pw.e2e.js b/tests/e2e/key-bindings.pw.e2e.jsindex aa056f183..109a8446e 100644--- a/tests/e2e/key-bindings.pw.e2e.js+++ b/tests/e2e/key-bindings.pw.e2e.js@@ -1,23 +1,24 @@/** Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.*/-import {- createLocation,- defaultLocationPath,- defaultLocationName,- closeFileProperties,- createMinioLocation,- createPwMinioLocation,- createPwLocation-} from './location.helpers';+import { defaultLocationName } from './location.helpers';import {clickOn,expectElementExist,selectorFile,setInputValue} from './general.helpers';+import { startTestingApp, stopSpectronApp, testDataRefresh } from './hook';describe('TST13 - Settings Key Bindings [electron]', () => {+ beforeAll(async () => {+ await startTestingApp('extconfig-with-welcome.js');+ });++ afterAll(async () => {+ await stopSpectronApp();+ await testDataRefresh();+ });beforeEach(async () => {// if (global.isMinio) {// await createPwMinioLocation('', defaultLocationName, true);@@ -30,8 +31,13 @@ describe('TST13 - Settings Key Bindings [electron]', () => {});it('TST1311 - Test show search [electron]', async () => {+ const isMac = /^darwin/.test(process.platform);await clickOn(selectorFile);- await global.client.keyboard.press('Control+KeyF');+ if (isMac) {+ await global.client.keyboard.press('Meta+KeyF');+ } else {+ await global.client.keyboard.press('Control+KeyF');+ }await expectElementExist('[data-tid=searchMenu]', true);});diff --git a/tests/e2e/location.e2e.js b/tests/e2e/location.e2e.jsindex 6dfcb815d..cde710b7f 100644--- a/tests/e2e/location.e2e.js+++ b/tests/e2e/location.e2e.js@@ -9,7 +9,7 @@ import {getLocationTid} from './location.helpers';import { clickOn, expectElementExist, setInputKeys } from './general.helpers';-import { startSpectronApp, stopSpectronApp } from './hook';+import { startTestingApp, stopSpectronApp } from './hook';export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';export const newLocationName = 'Location_Name_Changed';@@ -33,7 +33,7 @@ describe('TST03 - Testing locations:', () => {fse.copySync(srcDir, destDir);await stopSpectronApp();- await startSpectronApp();+ await startTestingApp();});afterAll(async () => {@@ -46,7 +46,7 @@ describe('TST03 - Testing locations:', () => {fse.copySync(srcDir, destDir);await stopSpectronApp();- await startSpectronApp();+ await startTestingApp();});beforeEach(async () => {diff --git a/tests/e2e/location.helpers.js b/tests/e2e/location.helpers.jsindex d1af5694d..3b1a3f219 100644--- a/tests/e2e/location.helpers.js+++ b/tests/e2e/location.helpers.js@@ -11,7 +11,7 @@ import {} from './general.helpers';export const defaultLocationPath =- './testdata-tmp/file-structure/supported-filestypes';+ './tests/testdata-tmp/file-structure/supported-filestypes';export const defaultLocationName = 'supported-filestypes';export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';export const newLocationName = 'Location Name Changed';@@ -97,18 +97,16 @@ export async function createPwLocation(// Check if location not exist (from extconfig.js)if (locationName !== lastLocationTID) {await global.client.click('[data-tid=createNewLocation]');- await global.client.click('[data-tid=locationPath]');- await global.client.fill(- '[data-tid=locationPath]',- locationPath || defaultLocationPath- );- await global.client.fill(- '[data-tid=locationName]',- locationName || 'Test Location' + new Date().getTime()+ // await global.client.click('[data-tid=locationPath]');+ await setInputKeys('locationPath', locationPath || defaultLocationPath, 20);+ await setInputKeys(+ 'locationName',+ locationName || 'Test Location' + new Date().getTime(),+ 20);if (isDefault) {- await global.client.click('[data-tid=locationIsDefault]');+ await global.client.check('[data-tid=locationIsDefault] input');}await global.client.click('[data-tid=confirmLocationCreation]');}diff --git a/tests/e2e/location.pw.e2e.js b/tests/e2e/location.pw.e2e.jsnew file mode 100644index 000000000..c4fead1f4--- /dev/null+++ b/tests/e2e/location.pw.e2e.js@@ -0,0 +1,137 @@+/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */+import {+ defaultLocationPath,+ openLocationMenu,+ startupLocation,+ getPwLocationTid,+ createPwMinioLocation,+ createPwLocation+} from './location.helpers';+import { clickOn, expectElementExist, setInputKeys } from './general.helpers';+import { startTestingApp, stopSpectronApp, testDataRefresh } from './hook';++export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';+export const newLocationName = 'Location_Name_Changed';++let testLocationName;++describe('TST03 - Testing locations:', () => {+ beforeAll(async () => {+ await startTestingApp('extconfig-without-locations.js');+ });++ afterAll(async () => {+ await stopSpectronApp();+ await testDataRefresh();+ });++ beforeEach(async () => {+ testLocationName = '' + new Date().getTime();++ if (global.isMinio) {+ await createPwMinioLocation('', testLocationName, true);+ } else {+ await createPwLocation(defaultLocationPath, testLocationName, true);+ }+ await clickOn('[data-tid=location_' + testLocationName + ']');+ // await delay(500);+ // await closeFileProperties();+ });++ it('TST0301 - Should create a location [web,electron]', async () => {+ // const allLocations = await global.client.$$('[data-tid=locationTitleElement]');+ // expect(allLocations.length).toBeGreaterThan(0);+ // const lastLocation = allLocations[allLocations.length - 1];+ // const lastLocationNameInDom = (await global.client.elementIdText(lastLocation.ELEMENT)).value;+ // const addedLocation = await global.client.getText('//button[contains(., "' + testTagName + '")]');+ await expectElementExist('[data-tid=location_' + testLocationName + ']');+ });++ it('TST0302 - Should remove a location [web,electron]', async () => {+ // await global.client.waitForVisible('[data-tid=locationList]');+ // const allLocations = await global.client.$$('[data-tid=locationList]');+ // await delay(500);+ // expect(allLocations.length).toBeGreaterThan(0);+ // const lastLocation = allLocations[allLocations.length - 1];+ // await global.client.elementIdClick(lastLocation.ELEMENT);+ await openLocationMenu(testLocationName);+ await clickOn('[data-tid=removeLocation]');+ await clickOn('[data-tid=confirmDeleteLocationDialog]');+ //const locationList = await global.client.$('[data-tid=locationList]');+ //await locationList.waitForDisplayed();+ await expectElementExist(+ '[data-tid=location_' + testLocationName + ']',+ false+ );+ });++ it('TST0303 - Rename location [web,electron]', async () => {+ await openLocationMenu(testLocationName);+ await clickOn('[data-tid=editLocation]');+ await setInputKeys('locationName', newLocationName);+ await clickOn('[data-tid=confirmLocationCreation]');+ /*await delay(500);+ await global.client.$('[data-tid=locationList]');+ const allLocationsList = await global.client.getText(+ '[data-tid=locationList]'+ );*/+ //await delay(500);+ //expect(allLocationsList.indexOf(newLocationName) >= 0).toBe(true);++ await expectElementExist(+ '[data-tid=location_' + newLocationName + testLocationName + ']',+ true,+ 1000+ );+ });++ it('TST0305 - Set as startup location [web,electron]', async () => {+ await openLocationMenu(testLocationName);+ await startupLocation();+ await expectElementExist('[data-tid=startupIndication]', false);+ // await global.client.pause(500);+ await openLocationMenu(testLocationName);+ await startupLocation();+ await expectElementExist('[data-tid=startupIndication]');+ // TODO check if the indicator is setted on the correct location+ // TODO evlt reastart the applcatio and see if the loading of default locations works+ });++ /**+ * You can create two locations with the same name now+ */+ it('TST0306 - should test duplication warning on creating locations with the same name', async () => {+ // TODO test duplication warning on creating locations+ });++ it('TST0307 - Move location Up and Down [web,electron]', async () => {+ if (global.isWeb) {+ // in web there is no other locations+ await createPwMinioLocation('', 'dummyLocation', false);+ }+ await openLocationMenu(testLocationName);+ await clickOn('[data-tid=moveLocationUp]');++ const prevLocation = await getPwLocationTid(-2);+ expect(prevLocation).toBe(testLocationName);++ await openLocationMenu(testLocationName);+ await clickOn('[data-tid=moveLocationDown]');++ const lastLocation = await getPwLocationTid(-1);+ expect(lastLocation).toBe(testLocationName);+ });+});+/*+describe.skip('TST03 - Testing locations - test Context Menu in Tree Directory', () => {+ beforeEach(async () => {+ const locationPath = defaultLocationPath; // to local path+ const locationName = 'test-data';+ await createLocation(locationPath, locationName);+ });++ afterEach(() => {+ // global.shouldClearLocaleStorage = true;+ });+});+*/diff --git a/tests/e2e/tag.pw.e2e.js b/tests/e2e/tag.pw.e2e.jsindex ef1b059a4..42c2d0d80 100644--- a/tests/e2e/tag.pw.e2e.js+++ b/tests/e2e/tag.pw.e2e.js@@ -7,7 +7,7 @@ import {setInputKeys,setInputValue} from './general.helpers';-import { matchers } from 'expect-playwright';+import { startTestingApp, stopSpectronApp, testDataRefresh } from './hook';const testTagName = 'testTag';const newTagName = 'newTagName';@@ -40,8 +40,15 @@ export async function tagMenu(tagName, menuOperation) {}describe('TST04 - Testing the tag library:', () => {+ beforeAll(async () => {+ await startTestingApp();+ });++ afterAll(async () => {+ await stopSpectronApp();+ await testDataRefresh();+ });beforeEach(async () => {- expect.extend(matchers);await clickOn('[data-tid=tagLibrary]');});diff --git a/tests/e2e/welcome.helpers.js b/tests/e2e/welcome.helpers.jsindex 1f1c61b80..927d7f42e 100644--- a/tests/e2e/welcome.helpers.js+++ b/tests/e2e/welcome.helpers.js@@ -1,4 +1,4 @@-import { clickOn } from './general.helpers';+import { clickOn, isDisplayed } from './general.helpers';export async function closeWelcome() {const nextButton = await global.client.$('[data-tid=nextStepOnboarding]');@@ -15,10 +15,12 @@ export async function closeWelcome() {}export async function closeWelcomePlaywright() {- await global.client.click('[data-tid=nextStepOnboarding]');- await global.client.click('[data-tid=nextStepOnboarding]');- await global.client.click('[data-tid=nextStepOnboarding]');- await global.client.click('[data-tid=nextStepOnboarding]');- await global.client.click('[data-tid=startTagSpacesAfterOnboarding]');- await global.client.click('[data-tid=agreeLicenseDialog]');+ if (await isDisplayed('[data-tid=nextStepOnboarding]', true, 3000)) {+ await global.client.click('[data-tid=nextStepOnboarding]');+ await global.client.click('[data-tid=nextStepOnboarding]');+ await global.client.click('[data-tid=nextStepOnboarding]');+ await global.client.click('[data-tid=nextStepOnboarding]');+ await global.client.click('[data-tid=startTagSpacesAfterOnboarding]');+ await global.client.click('[data-tid=agreeLicenseDialog]');+ }}diff --git a/tests/global-setup-minio.js b/tests/global-setup-minio.jsindex 15684036b..ab1e5fb8e 100644--- a/tests/global-setup-minio.js+++ b/tests/global-setup-minio.js@@ -1,11 +1,8 @@-import pathLib from 'path';-import { globalSetup, startMinio } from './setup-functions';+import { startMinio } from './setup-functions';+import { removeExtConfig } from './e2e/hook';module.exports = async function() {- await globalSetup();-- const fse = require('fs-extra');- fse.removeSync(pathLib.join(__dirname, '..', 'app', 'extconfig.js'));+ await removeExtConfig();global.minio = await startMinio();};diff --git a/tests/global-setup-web.js b/tests/global-setup-web.jsindex c3c7fc5f9..b3bf92c27 100644--- a/tests/global-setup-web.js+++ b/tests/global-setup-web.js@@ -1,16 +1,8 @@-import pathLib from 'path';-import {- globalSetup,- // startChromeDriver,- startMinio,- startWebServer-} from './setup-functions';+import { startMinio, startWebServer } from './setup-functions';+import { removeExtConfig } from './e2e/hook';module.exports = async function() {- await globalSetup();-- const fse = require('fs-extra');- fse.removeSync(pathLib.join(__dirname, '..', 'app', 'extconfig.js'));+ await removeExtConfig();global.webserver = await startWebServer();// global.chromeDriver = await startChromeDriver();diff --git a/tests/global-setup.js b/tests/global-setup.jsindex 67fe75beb..5faa0b08b 100644--- a/tests/global-setup.js+++ b/tests/global-setup.js@@ -1,7 +1,11 @@import { globalSetup } from './setup-functions';+/**+ * https://jestjs.io/docs/configuration#globalsetup-string+ * Note: Any global variables that are defined through globalSetup can only be read in globalTeardown. You cannot retrieve globals defined here in your test suites.+ */module.exports = async function() {- await globalSetup();+ // await globalSetup();// copy extconfigconst fse = require('fs-extra');diff --git a/tests/global-teardown.js b/tests/global-teardown.jsindex ce988d817..4d98aa8f2 100644--- a/tests/global-teardown.js+++ b/tests/global-teardown.js@@ -1,5 +1,5 @@+import { removeExtConfig } from './e2e/hook';+module.exports = async function() {- const fse = require('fs-extra');- const path = require('path');- fse.removeSync(path.join(__dirname, '..', 'app', 'extconfig.js'));+ await removeExtConfig();};diff --git a/tests/setup-after-env.js b/tests/setup-after-env.jsindex c04a885ae..f29d6a3d2 100644--- a/tests/setup-after-env.js+++ b/tests/setup-after-env.js@@ -1,13 +1,6 @@-import {- clearLocalStorage,- startSpectronApp,- stopSpectronApp,- takeScreenshot,- testDataRefresh-} from './e2e/hook';+import { clearLocalStorage, takeScreenshot } from './e2e/hook';import { closeWelcome, closeWelcomePlaywright } from './e2e/welcome.helpers';import { clearStorage } from './e2e/clearstorage.helpers';-import pathLib from 'path';// the default timeout before starting every testjasmine.DEFAULT_TIMEOUT_INTERVAL = 300000;@@ -46,18 +39,18 @@ jasmine.getEnv().addReporter({}});*/-beforeAll(async () => {- await testDataRefresh();+/*beforeAll(async () => {await startSpectronApp();});afterAll(async () => {await stopSpectronApp();-});+ await testDataRefresh();+});*/beforeEach(async () => {if (global.isPlaywright) {- if (global.context) {+ /*if (global.context) {if (jasmine.currentTest && jasmine.currentTest.status !== 'disabled') {// Start tracing before creating / navigating a page.await global.context.tracing.start({@@ -65,11 +58,11 @@ beforeEach(async () => {snapshots: true});}- }+ }*/- // if (global.isMinio) {await closeWelcomePlaywright();- // }+ await clearStorage();+ await closeWelcomePlaywright();} else {if (jasmine.currentTest && jasmine.currentTest.status !== 'disabled') {// console.log('specDone Done' + JSON.stringify(result));@@ -90,7 +83,7 @@ afterEach(async () => {// // takeScreenshot();// // await clearLocalStorage();// testDataRefresh();- if (global.context) {+ /*if (global.context) {if (jasmine.currentTest && jasmine.currentTest.status !== 'disabled') {// console.log('specDone Done' + JSON.stringify(result));// if (jasmine.previousTest && jasmine.previousTest.status === 'failed') {@@ -102,6 +95,6 @@ afterEach(async () => {});//}}- }- await clearStorage();+ }*/+ // await clearStorage();});diff --git a/tests/setup-functions.js b/tests/setup-functions.jsindex c34b41a78..c456e9efa 100644--- a/tests/setup-functions.js+++ b/tests/setup-functions.js@@ -2,10 +2,8 @@ import pathLib from 'path';import sh from 'shelljs';export async function globalSetup() {- global.isWin = /^win/.test(process.platform);- global.isMac = /^darwin/.test(process.platform);- // global.isWeb = process.env.NODE_JEST === 'test_web';- // global.isMinio = global.isWeb || process.env.NODE_JEST === 'test_minio';+ // global.isWin = /^win/.test(process.platform);+ // global.isMac = /^darwin/.test(process.platform);const extensionDir = pathLib.resolve(__dirname); //,'../tests');if (!sh.test('-d', extensionDir)) {diff --git a/tests/test-data-refresh.js b/tests/test-data-refresh.jsnew file mode 100644index 000000000..710f01773--- /dev/null+++ b/tests/test-data-refresh.js@@ -0,0 +1,15 @@+import pathLib from 'path';++const fse = require('fs-extra');++const src = pathLib.join(+ __dirname,+ 'testdata',+ 'file-structure',+ 'supported-filestypes'+);+const dst = pathLib.join(__dirname, 'testdata-tmp', 'file-structure');++let newPath = pathLib.join(dst, pathLib.basename(src));+// fse.emptyDirSync(newPath);+fse.copySync(src, newPath); //, { overwrite: true });diff --git a/yarn.lock b/yarn.lockindex 75d1ac3ed..7dd37e857 100644--- a/yarn.lock+++ b/yarn.lock@@ -3925,10 +3925,10 @@"@nodelib/fs.scandir" "2.1.3"fastq "^1.6.0"-"@playwright/test@^1.12.3":- version "1.12.3"- resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.12.3.tgz#178e5d84e4c97c339dd315bd265ab1af39275ef0"- integrity sha512-e8i8rMqd1nhdyW2ELShOc5F2EiLIcZs+2LRglrCAy/nzftpLdAqfsk6gp29n8N5KExIlzpKdoQ5QBviqGzT9DA==+"@playwright/test@^1.13.1":+ version "1.13.1"+ resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.13.1.tgz#a040020d81227cf33fbe71b918578ed3b6e5bc8c"+ integrity sha512-i8se6FK65hdbTzGMWnvPEaFoCh7DQ0XLKmaf2rWnh+ufhn4Ad/1jhdK8c6s4Mo87veTfd6N60fKCAWjyhbHyCg==dependencies:"@babel/code-frame" "^7.12.13""@babel/core" "^7.14.0"@@ -4211,6 +4211,11 @@resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==+"@types/minimist@^1.2.0":+ version "1.2.2"+ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"+ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==+"@types/mkdirp@^1.0.0":version "1.0.1"resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.1.tgz#0930b948914a78587de35458b86c907b6e98bbf6"@@ -6084,14 +6089,6 @@ callsites@^3.0.0:resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==-camelcase-keys@^2.0.0:- version "2.1.0"- resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"- integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=- dependencies:- camelcase "^2.0.0"- map-obj "^1.0.0"-camelcase-keys@^4.0.0:version "4.2.0"resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"@@ -6101,10 +6098,14 @@ camelcase-keys@^4.0.0:map-obj "^2.0.0"quick-lru "^1.0.0"-camelcase@^2.0.0:- version "2.1.1"- resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"- integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=+camelcase-keys@^6.2.2:+ version "6.2.2"+ resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"+ integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==+ dependencies:+ camelcase "^5.3.1"+ map-obj "^4.0.0"+ quick-lru "^4.0.1"camelcase@^4.0.0, camelcase@^4.1.0:version "4.1.0"@@ -6305,6 +6306,11 @@ chownr@^1.0.1, chownr@^1.1.1:resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==+chownr@^2.0.0:+ version "2.0.0"+ resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"+ integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==+chownr@~1.0.1:version "1.0.1"resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"@@ -6946,14 +6952,6 @@ [email protected]:dependencies:node-fetch "2.6.1"-cross-spawn@^3.0.0:- version "3.0.1"- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"- integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=- dependencies:- lru-cache "^4.0.1"- which "^1.2.9"-cross-spawn@^5.0.1, cross-spawn@^5.1.0:version "5.1.0"resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"@@ -7381,7 +7379,7 @@ debuglog@^1.0.1:resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=-decamelize-keys@^1.0.0:+decamelize-keys@^1.0.0, decamelize-keys@^1.1.0:version "1.1.0"resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=@@ -7389,7 +7387,7 @@ decamelize-keys@^1.0.0:decamelize "^1.1.0"map-obj "^1.0.0"-decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:+decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.2.0:version "1.2.0"resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=@@ -8693,11 +8691,6 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:dependencies:homedir-polyfill "^1.0.1"-expect-playwright@^0.7.1:- version "0.7.2"- resolved "https://registry.yarnpkg.com/expect-playwright/-/expect-playwright-0.7.2.tgz#e1f2c31cd0d13d04e1ba4136019613ad01f6ea43"- integrity sha512-5o9si+8SUi68QVI0CRVv8tvTjZinpJWRSfQ3GP6v0DvlK55lDgFvD79r6A/NU+EUawrBc62qP30MxzOUnXNJZQ==-expect@^26.4.2:version "26.4.2"resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1"@@ -9067,14 +9060,6 @@ find-root@^1.1.0:resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==-find-up@^1.0.0:- version "1.1.2"- resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"- integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=- dependencies:- path-exists "^2.0.0"- pinkie-promise "^2.0.0"-find-up@^2.0.0, find-up@^2.1.0:version "2.1.0"resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"@@ -9262,6 +9247,13 @@ fs-extra@^9.1.0:jsonfile "^6.0.1"universalify "^2.0.0"+fs-minipass@^2.0.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"+ integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==+ dependencies:+ minipass "^3.0.0"+fs-vacuum@~1.2.10:version "1.2.10"resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"@@ -9707,7 +9699,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.4resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==-graceful-fs@^4.1.6, graceful-fs@^4.2.0:+graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3:version "4.2.6"resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==@@ -9772,6 +9764,11 @@ har-validator@~5.1.3:ajv "^6.12.3"har-schema "^2.0.0"+hard-rejection@^2.1.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"+ integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==+harmony-reflect@^1.4.6:version "1.6.1"resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz#c108d4f2bb451efef7a37861fdbdae72c9bdefa9"@@ -10346,11 +10343,6 @@ imurmurhash@^0.1.4:resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=-in-publish@^2.0.0:- version "2.0.1"- resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c"- integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==-indefinite-observable@^2.0.1:version "2.0.1"resolved "https://registry.yarnpkg.com/indefinite-observable/-/indefinite-observable-2.0.1.tgz#574af29bfbc17eb5947793797bddc94c9d859400"@@ -10358,13 +10350,6 @@ indefinite-observable@^2.0.1:dependencies:symbol-observable "1.2.0"-indent-string@^2.1.0:- version "2.1.0"- resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"- integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=- dependencies:- repeating "^2.0.0"-indent-string@^3.0.0:version "3.2.0"resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"@@ -10705,11 +10690,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=-is-finite@^1.0.0:- version "1.1.0"- resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"- integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==-is-fullwidth-code-point@^1.0.0:version "1.0.0"resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"@@ -10965,11 +10945,6 @@ is-url@^1.2.2:resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==-is-utf8@^0.2.0:- version "0.2.1"- resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"- integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=-is-whitespace-character@^1.0.0:version "1.0.4"resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"@@ -11984,7 +11959,7 @@ kind-of@^5.0.0:resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==-kind-of@^6.0.0, kind-of@^6.0.2:+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:version "6.0.3"resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==@@ -12212,17 +12187,6 @@ listr@^0.14.2:p-map "^2.0.0"rxjs "^6.3.3"-load-json-file@^1.0.0:- version "1.1.0"- resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"- integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=- dependencies:- graceful-fs "^4.1.2"- parse-json "^2.2.0"- pify "^2.0.0"- pinkie-promise "^2.0.0"- strip-bom "^2.0.0"-load-json-file@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"@@ -12619,7 +12583,7 @@ map-cache@^0.2.2:resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=-map-obj@^1.0.0, map-obj@^1.0.1:+map-obj@^1.0.0:version "1.0.1"resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=@@ -12629,6 +12593,11 @@ map-obj@^2.0.0:resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=+map-obj@^4.0.0:+ version "4.2.1"+ resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7"+ integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==+map-visit@^1.0.0:version "1.0.0"resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"@@ -12748,22 +12717,6 @@ memory-fs@^0.5.0:errno "^0.1.3"readable-stream "^2.0.1"-meow@^3.7.0:- version "3.7.0"- resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"- integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=- dependencies:- camelcase-keys "^2.0.0"- decamelize "^1.1.2"- loud-rejection "^1.0.0"- map-obj "^1.0.1"- minimist "^1.1.3"- normalize-package-data "^2.3.4"- object-assign "^4.0.1"- read-pkg-up "^1.0.1"- redent "^1.0.0"- trim-newlines "^1.0.0"-meow@^5.0.0:version "5.0.0"resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"@@ -12779,6 +12732,24 @@ meow@^5.0.0:trim-newlines "^2.0.0"yargs-parser "^10.0.0"+meow@^9.0.0:+ version "9.0.0"+ resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"+ integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==+ dependencies:+ "@types/minimist" "^1.2.0"+ camelcase-keys "^6.2.2"+ decamelize "^1.2.0"+ decamelize-keys "^1.1.0"+ hard-rejection "^2.1.0"+ minimist-options "4.1.0"+ normalize-package-data "^3.0.0"+ read-pkg-up "^7.0.1"+ redent "^3.0.0"+ trim-newlines "^3.0.0"+ type-fest "^0.18.0"+ yargs-parser "^20.2.3"+version "1.0.1"resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"@@ -12891,6 +12862,11 @@ min-document@^2.19.0:dependencies:dom-walk "^0.1.0"+min-indent@^1.0.0:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"+ integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==+mini-css-extract-plugin@^0.5.0:version "0.5.0"resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"@@ -12917,6 +12893,15 @@ [email protected], minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatchdependencies:brace-expansion "^1.1.7"+ version "4.1.0"+ resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"+ integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==+ dependencies:+ arrify "^1.0.1"+ is-plain-obj "^1.1.0"+ kind-of "^6.0.3"+minimist-options@^3.0.1:version "3.0.2"resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"@@ -12925,11 +12910,26 @@ minimist-options@^3.0.1:arrify "^1.0.1"is-plain-obj "^1.1.0"-minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:version "1.2.5"resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==+minipass@^3.0.0:+ version "3.1.3"+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"+ integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==+ dependencies:+ yallist "^4.0.0"++minizlib@^2.1.1:+ version "2.1.2"+ resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"+ integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==+ dependencies:+ minipass "^3.0.0"+ yallist "^4.0.0"+mississippi@^1.2.0, mississippi@^1.3.0, mississippi@~1.3.0:version "1.3.1"resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.1.tgz#2a8bb465e86550ac8b36a7b6f45599171d78671e"@@ -13141,23 +13141,21 @@ node-forge@^0.10.0:resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==-node-gyp@^3.8.0:- version "3.8.0"- resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"- integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==+node-gyp@^7.1.0:+ version "7.1.2"+ resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"+ integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==dependencies:- fstream "^1.0.0"- glob "^7.0.3"- graceful-fs "^4.1.2"- mkdirp "^0.5.0"- nopt "2 || 3"- npmlog "0 || 1 || 2 || 3 || 4"- osenv "0"- request "^2.87.0"- rimraf "2"- semver "~5.3.0"- tar "^2.0.0"- which "1"+ env-paths "^2.2.0"+ glob "^7.1.4"+ graceful-fs "^4.2.3"+ nopt "^5.0.0"+ npmlog "^4.1.2"+ request "^2.88.2"+ rimraf "^3.0.2"+ semver "^7.3.2"+ tar "^6.0.2"+ which "^2.0.2"node-gyp@~3.6.2:version "3.6.3"@@ -13244,23 +13242,21 @@ node-releases@^1.1.71:resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==-node-sass@^4.5.3:- version "4.14.1"- resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"- integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==+node-sass@^6.0.1:+ version "6.0.1"+ resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-6.0.1.tgz#cad1ccd0ce63e35c7181f545d8b986f3a9a887fe"+ integrity sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==dependencies:async-foreach "^0.1.3"chalk "^1.1.1"- cross-spawn "^3.0.0"+ cross-spawn "^7.0.3"gaze "^1.0.0"get-stdin "^4.0.1"glob "^7.0.3"- in-publish "^2.0.0"lodash "^4.17.15"- meow "^3.7.0"- mkdirp "^0.5.1"+ meow "^9.0.0"nan "^2.13.2"- node-gyp "^3.8.0"+ node-gyp "^7.1.0"npmlog "^4.0.0"request "^2.88.0"sass-graph "2.2.5"@@ -13282,6 +13278,13 @@ nopt@^4.0.1, nopt@~4.0.1:abbrev "1"osenv "^0.1.4"+nopt@^5.0.0:+ version "5.0.0"+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"+ integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==+ dependencies:+ abbrev "1"+normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0, "normalize-package-data@~1.0.1 || ^2.0.0":version "2.5.0"resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"@@ -13542,7 +13545,7 @@ [email protected]:wrappy "~1.0.2"write-file-atomic "~2.1.0"-"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@~4.1.2:+"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.1.2, npmlog@~4.1.2:version "4.1.2"resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==@@ -14074,13 +14077,6 @@ path-dirname@^1.0.0:resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=-path-exists@^2.0.0:- version "2.1.0"- resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"- integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=- dependencies:- pinkie-promise "^2.0.0"-path-exists@^3.0.0:version "3.0.0"resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"@@ -14128,15 +14124,6 @@ path-to-regexp@^1.7.0:dependencies:isarray "0.0.1"-path-type@^1.0.0:- version "1.1.0"- resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"- integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=- dependencies:- graceful-fs "^4.1.2"- pify "^2.0.0"- pinkie-promise "^2.0.0"-path-type@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"@@ -14274,10 +14261,10 @@ pkg-up@^3.1.0:dependencies:find-up "^3.0.0"-playwright@^1.12.3:- version "1.12.3"- resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.12.3.tgz#113afa2cba10fb56e9a5b307377343e32a155a99"- integrity sha512-eyhHvZV7dMAUltqjQsgJ9CjZM8dznzN1+rcfCI6W6lfQ7IlPvTFGLuKOCcI4ETbjfbxqaS5FKIkb1WDDzq2Nww==+playwright@^1.13.1:+ version "1.13.1"+ resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.13.1.tgz#53c49244ffa7fc2d5d8bf7ce87739393206eda5e"+ integrity sha512-pGbILcUV1+Yx0fcRJZBEIsqTDjQSwGYkJ4tVUQUtuAyMuHg5B++Nasl+pIeIJRMqKSWTyvZfPxJuPIGsLJgiFg==dependencies:commander "^6.1.0"debug "^4.1.1"@@ -15051,6 +15038,11 @@ quick-lru@^1.0.0:resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=+quick-lru@^4.0.1:+ version "4.0.1"+ resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"+ integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==+raf-schd@^4.0.2:version "4.0.2"resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.2.tgz#bd44c708188f2e84c810bf55fcea9231bcaed8a0"@@ -15520,14 +15512,6 @@ read-package-tree@~5.1.6:read-package-json "^2.0.0"readdir-scoped-modules "^1.0.0"-read-pkg-up@^1.0.1:- version "1.0.1"- resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"- integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=- dependencies:- find-up "^1.0.0"- read-pkg "^1.0.0"-read-pkg-up@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"@@ -15553,15 +15537,6 @@ read-pkg-up@^7.0.1:read-pkg "^5.2.0"type-fest "^0.8.1"-read-pkg@^1.0.0:- version "1.1.0"- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"- integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=- dependencies:- load-json-file "^1.0.0"- normalize-package-data "^2.3.2"- path-type "^1.0.0"-read-pkg@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"@@ -15671,14 +15646,6 @@ rechoir@^0.6.2:dependencies:resolve "^1.1.6"-redent@^1.0.0:- version "1.0.0"- resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"- integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=- dependencies:- indent-string "^2.1.0"- strip-indent "^1.0.1"-redent@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"@@ -15687,6 +15654,14 @@ redent@^2.0.0:indent-string "^3.0.0"strip-indent "^2.0.0"+redent@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"+ integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==+ dependencies:+ indent-string "^4.0.0"+ strip-indent "^3.0.0"+redux-logger@^3.0.6:version "3.0.6"resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf"@@ -15924,13 +15899,6 @@ repeat-string@^1.5.4, repeat-string@^1.6.1:resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=-repeating@^2.0.0:- version "2.0.1"- resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"- integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=- dependencies:- is-finite "^1.0.0"-version "1.0.0"resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"@@ -17266,13 +17234,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:dependencies:ansi-regex "^4.1.0"-strip-bom@^2.0.0:- version "2.0.0"- resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"- integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=- dependencies:- is-utf8 "^0.2.0"-strip-bom@^3.0.0:version "3.0.0"resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"@@ -17293,18 +17254,18 @@ strip-final-newline@^2.0.0:resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==-strip-indent@^1.0.1:- version "1.0.1"- resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"- integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=- dependencies:- get-stdin "^4.0.1"-strip-indent@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=+strip-indent@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"+ integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==+ dependencies:+ min-indent "^1.0.0"+strip-json-comments@^3.0.1:version "3.1.1"resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"@@ -17561,6 +17522,18 @@ tar@^2.0.0, tar@~2.2.1:fstream "^1.0.12"inherits "2"+tar@^6.0.2:+ version "6.1.2"+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz#1f045a90a6eb23557a603595f41a16c57d47adc6"+ integrity sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q==+ dependencies:+ chownr "^2.0.0"+ fs-minipass "^2.0.0"+ minipass "^3.0.0"+ minizlib "^2.1.1"+ mkdirp "^1.0.3"+ yallist "^4.0.0"+tcp-port-used@^1.0.1:version "1.0.1"resolved "https://registry.yarnpkg.com/tcp-port-used/-/tcp-port-used-1.0.1.tgz#46061078e2d38c73979a2c2c12b5a674e6689d70"@@ -17832,16 +17805,16 @@ treeify@^1.1.0:resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8"integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==-trim-newlines@^1.0.0:- version "1.0.0"- resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"- integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=-trim-newlines@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=+trim-newlines@^3.0.0:+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"+ integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==+trim-trailing-lines@^1.0.0:version "1.1.3"resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz#7f0739881ff76657b7776e10874128004b625a94"@@ -17956,6 +17929,11 @@ type-fest@^0.13.1:resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==+type-fest@^0.18.0:+ version "0.18.1"+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"+ integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==+type-fest@^0.20.2:version "0.20.2"resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"@@ -19140,6 +19118,11 @@ yargs-parser@^20.2.2:resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==+yargs-parser@^20.2.3:+ version "20.2.9"+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"+ integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==+yargs-parser@^9.0.2:version "9.0.2"resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"