Merge branch 'main' into relational-updates

This commit is contained in:
rijkvanzanten
2020-10-14 12:45:06 -04:00
31 changed files with 21831 additions and 312 deletions

4200
api/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -65,7 +65,7 @@
],
"dependencies": {
"@directus/app": "file:../app",
"@directus/format-title": "^3.2.0",
"@directus/format-title": "file:../packages/format-title",
"@directus/specs": "file:../packages/spec",
"@slynova/flydrive": "^1.0.2",
"@slynova/flydrive-gcs": "^1.0.2",
@@ -135,7 +135,7 @@
"devDependencies": {
"copyfiles": "^2.4.0",
"cross-env": "^7.0.2",
"ts-node-dev": "^1.0.0-pre.63",
"ts-node-dev": "^1.0.0-pre.64",
"typescript": "^4.0.3"
}
}

View File

@@ -6,7 +6,7 @@ const readdir = promisify(fs.readdir);
const stat = promisify(fs.stat);
export default async function listFolders(location: string) {
const fullPath = path.join(process.cwd(), location);
const fullPath = path.resolve(location);
const files = await readdir(fullPath);
const directories: string[] = [];