Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes GCS Adapter from provided adapters #1339

Merged
merged 2 commits into from
Apr 5, 2016
Merged

Removes GCS Adapter from provided adapters #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
090521f
:bomb: removes exposed files adapter
flovilmart Apr 2, 2016
758d2ac
Only removes GCS for now
flovilmart Apr 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions spec/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand Down
5 changes: 5 additions & 0 deletions src/deprecated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export function useExternal(name, moduleName) {
return function() {
throw `${name} is not provided by parse-server anymore; please install ${moduleName}`;
}
}
8 changes: 5 additions & 3 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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 };