diff --git a/package.json b/package.json index 302ce6e888..ade1a89a81 100644 --- a/package.json +++ b/package.json @@ -34,9 +34,8 @@ "multer": "^1.1.0", "parse": "^1.8.0", "parse-server-fs-adapter": "^1.0.0", - "parse-server-gcs-adapter": "^1.0.0", "parse-server-push-adapter": "^1.0.0", - "parse-server-s3-adapter": "^1.0.0", + "parse-server-s3-adapter": "^1.0.1", "parse-server-simple-mailgun-adapter": "^1.0.0", "redis": "^2.5.0-1", "request": "^2.65.0", @@ -61,7 +60,8 @@ "gaze": "^0.5.2", "jasmine": "^2.3.2", "mongodb-runner": "3.1.15", - "nodemon": "^1.8.1" + "nodemon": "^1.8.1", + "parse-server-gcs-adapter": "^1.0.0" }, "scripts": { "dev": "npm run build && node bin/dev", diff --git a/spec/index.spec.js b/spec/index.spec.js index b58cb2f2a6..48f59d1ac0 100644 --- a/spec/index.spec.js +++ b/spec/index.spec.js @@ -241,9 +241,9 @@ describe('server', () => { done(); }); - it('exposes all the "core" adapters', done => { + it('core adapters are not exposed anymore', done => { expect(ParseServer.S3Adapter).toThrow(); - expect(ParseServer.GCSAdapter).toThrow('GCSAdapter requires an projectId'); + expect(ParseServer.GCSAdapter).toThrow('GCSAdapter is not provided by parse-server anymore; please install parse-server-gcs-adapter'); expect(ParseServer.FileSystemAdapter).toThrow(); done(); }); diff --git a/src/deprecated.js b/src/deprecated.js new file mode 100644 index 0000000000..7192336c2c --- /dev/null +++ b/src/deprecated.js @@ -0,0 +1,5 @@ +export function useExternal(name, moduleName) { + return function() { + throw `${name} is not provided by parse-server anymore; please install ${moduleName}`; + } +} diff --git a/src/index.js b/src/index.js index bdf6b34231..515ea732ae 100644 --- a/src/index.js +++ b/src/index.js @@ -1,8 +1,8 @@ import winston from 'winston'; import ParseServer from './ParseServer'; -import GCSAdapter from 'parse-server-gcs-adapter'; -import S3Adapter from 'parse-server-s3-adapter'; -import FileSystemAdapter from 'parse-server-fs-adapter'; +import S3Adapter from 'parse-server-s3-adapter' +import FileSystemAdapter from 'parse-server-fs-adapter' +import { useExternal } from './deprecated' if (process.env.VERBOSE || process.env.VERBOSE_PARSE_SERVER) { winston.level = 'silly'; @@ -20,5 +20,7 @@ let _ParseServer = function(options) { // Mount the create liveQueryServer _ParseServer.createLiveQueryServer = ParseServer.createLiveQueryServer; +let GCSAdapter = useExternal('GCSAdapter', 'parse-server-gcs-adapter'); + export default ParseServer; export { S3Adapter, GCSAdapter, FileSystemAdapter, _ParseServer as ParseServer };