diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 016f428f1c..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "src/knex-schema-inspector"] - path = src/knex-schema-inspector - url = git@github.com:knex/knex-schema-inspector.git diff --git a/package-lock.json b/package-lock.json index eca7777a6c..b059767763 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "directus", - "version": "0.1.0-preview.5", + "version": "0.1.0-preview.8", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3915,6 +3915,11 @@ } } }, + "knex-schema-inspector": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/knex-schema-inspector/-/knex-schema-inspector-0.0.1.tgz", + "integrity": "sha512-NlZWd+24zUeu1mFM00DqnZE9OzLURhXrGfVcwIk3h1MB+rpEKrUM0N2b0V36pk+VKAlf+HKb2JnGrwK+/Lmzew==" + }, "levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", diff --git a/package.json b/package.json index cac36d2209..e92d3c4449 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,7 @@ "joi": "^17.1.1", "jsonwebtoken": "^8.5.1", "knex": "^0.21.1", + "knex-schema-inspector": "0.0.1", "liquidjs": "^9.14.1", "lodash": "^4.17.19", "ms": "^2.1.2", diff --git a/src/database/index.ts b/src/database/index.ts index 040b39ada9..19f00bf014 100644 --- a/src/database/index.ts +++ b/src/database/index.ts @@ -3,7 +3,7 @@ import dotenv from 'dotenv'; import camelCase from 'camelcase'; import path from 'path'; -import SchemaInspector from '../knex-schema-inspector/lib/index'; +import SchemaInspector from 'knex-schema-inspector'; dotenv.config({ path: path.resolve(__dirname, '../../', '.env') }); diff --git a/src/knex-schema-inspector b/src/knex-schema-inspector deleted file mode 160000 index 93730fe1c1..0000000000 --- a/src/knex-schema-inspector +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 93730fe1c190f2f6ec7152f713fd2349c7dc42da diff --git a/src/types/field.ts b/src/types/field.ts index 0f75780e36..5c4f81bfd2 100644 --- a/src/types/field.ts +++ b/src/types/field.ts @@ -1,4 +1,4 @@ -import { Column } from '../knex-schema-inspector/lib/types/column'; +import { Column } from 'knex-schema-inspector/lib/types/column'; export const types = [ 'bigInteger',