From de73f3723ce8c834e61299508ede38d4d1744c17 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Fri, 17 Nov 2017 08:32:58 -0500 Subject: [PATCH] Scoped packages (#4354) * Updates for scoped packages dependencies * bumps s3 adapter * Update README.md * Update README.md * Update README.md --- README.md | 9 +++++++-- package.json | 8 ++++---- resources/buildConfigDefinitions.js | 4 ++-- spec/AdapterLoader.spec.js | 8 ++++---- spec/ParseLiveQueryServer.spec.js | 2 +- spec/helper.js | 2 +- spec/index.spec.js | 8 ++++---- src/Controllers/index.js | 2 +- src/Options/index.js | 2 +- src/index.js | 6 +++--- 10 files changed, 28 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index cfd72fb9..f426aa6b 100644 --- a/README.md +++ b/README.md @@ -294,7 +294,7 @@ var server = ParseServer({ appName: 'Parse App', // The email adapter emailAdapter: { - module: 'parse-server-simple-mailgun-adapter', + module: '@parse/simple-mailgun-adapter', options: { // The address that your emails come from fromAddress: 'parse@example.com', @@ -360,7 +360,12 @@ $ PORT=8080 parse-server --appId APPLICATION_ID --masterKey MASTER_KEY For the full list of configurable environment variables, run `parse-server --help`. ### Available Adapters -[Parse Server Modules (Adapters)](https://github.com/parse-server-modules) + +All official adapters are distributed as scoped pacakges on [npm (@parse)](https://www.npmjs.com/search?q=scope%3Aparse). + +Some well maintained adapters are also available on the [Parse Server Modules](https://github.com/parse-server-modules) organization. + +You can also find more adapters maintained by the community by searching on [npm](https://www.npmjs.com/search?q=parse-server%20adapter&page=1&ranking=optimal). ### Configuring File Adapters diff --git a/package.json b/package.json index 086faa6e..cfecaacf 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,10 @@ ], "license": "BSD-3-Clause", "dependencies": { + "@parse/fs-files-adapter": "1.0.1", + "@parse/push-adapter": "2.0.2", + "@parse/s3-files-adapter": "1.2.1", + "@parse/simple-mailgun-adapter": "1.0.1", "bcryptjs": "2.4.3", "body-parser": "1.18.2", "commander": "2.11.0", @@ -30,10 +34,6 @@ "mongodb": "2.2.33", "multer": "1.3.0", "parse": "1.10.2", - "parse-server-fs-adapter": "1.0.1", - "parse-server-push-adapter": "2.0.2", - "parse-server-s3-adapter": "1.2.0", - "parse-server-simple-mailgun-adapter": "1.0.1", "pg-promise": "7.3.1", "redis": "2.8.0", "request": "2.83.0", diff --git a/resources/buildConfigDefinitions.js b/resources/buildConfigDefinitions.js index ffe5b2e6..99ddb247 100644 --- a/resources/buildConfigDefinitions.js +++ b/resources/buildConfigDefinitions.js @@ -1,11 +1,11 @@ /** * Parse Server Configuration Builder - * + * * This module builds the definitions file (src/Options/Definitions.js) * from the src/Options/index.js options interfaces. * The Definitions.js module is responsible for the default values as well * as the mappings for the CLI. - * + * * To rebuild the definitions file, run * `$ node resources/buildConfigDefinitions.js` */ diff --git a/spec/AdapterLoader.spec.js b/spec/AdapterLoader.spec.js index c318fac8..2601883e 100644 --- a/spec/AdapterLoader.spec.js +++ b/spec/AdapterLoader.spec.js @@ -1,8 +1,8 @@ var loadAdapter = require("../src/Adapters/AdapterLoader").loadAdapter; -var FilesAdapter = require("parse-server-fs-adapter").default; -var S3Adapter = require("parse-server-s3-adapter").default; -var ParsePushAdapter = require("parse-server-push-adapter").default; +var FilesAdapter = require("@parse/fs-files-adapter").default; +var S3Adapter = require("@parse/s3-files-adapter").default; +var ParsePushAdapter = require("@parse/push-adapter").default; const Config = require('../src/Config'); describe("AdapterLoader", ()=>{ @@ -48,7 +48,7 @@ describe("AdapterLoader", ()=>{ it("should instantiate an adapter from npm module", (done) => { var adapter = loadAdapter({ - module: 'parse-server-fs-adapter' + module: '@parse/fs-files-adapter' }); expect(typeof adapter).toBe('object'); diff --git a/spec/ParseLiveQueryServer.spec.js b/spec/ParseLiveQueryServer.spec.js index 86a68b56..deebaa3b 100644 --- a/spec/ParseLiveQueryServer.spec.js +++ b/spec/ParseLiveQueryServer.spec.js @@ -474,7 +474,7 @@ describe('ParseLiveQueryServer', function() { // Trigger disconnect event parseWebSocket.emit('disconnect'); expect(spy).toHaveBeenCalled(); - // call for ws_connect, another for ws_disconnect + // call for ws_connect, another for ws_disconnect expect(spy.calls.count()).toBe(2); }); diff --git a/spec/helper.js b/spec/helper.js index 109f1b07..95d52aa7 100644 --- a/spec/helper.js +++ b/spec/helper.js @@ -29,7 +29,7 @@ var path = require('path'); var TestUtils = require('../src/TestUtils'); var MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter'); const GridStoreAdapter = require('../src/Adapters/Files/GridStoreAdapter').GridStoreAdapter; -const FSAdapter = require('parse-server-fs-adapter'); +const FSAdapter = require('@parse/fs-files-adapter'); const PostgresStorageAdapter = require('../src/Adapters/Storage/Postgres/PostgresStorageAdapter'); const RedisCacheAdapter = require('../src/Adapters/Cache/RedisCacheAdapter').default; diff --git a/spec/index.spec.js b/spec/index.spec.js index c0fa872d..b1f5b5f4 100644 --- a/spec/index.spec.js +++ b/spec/index.spec.js @@ -108,7 +108,7 @@ describe('server', () => { appName: 'unused', verifyUserEmails: true, emailAdapter: { - module: 'parse-server-simple-mailgun-adapter', + module: '@parse/simple-mailgun-adapter', options: { fromAddress: 'parse@example.com', apiKey: 'k', @@ -123,7 +123,7 @@ describe('server', () => { reconfigureServer({ appName: 'unused', verifyUserEmails: true, - emailAdapter: 'parse-server-simple-mailgun-adapter', + emailAdapter: '@parse/simple-mailgun-adapter', publicServerURL: 'http://localhost:8378/1' }) .catch(error => { @@ -137,7 +137,7 @@ describe('server', () => { appName: 'unused', verifyUserEmails: true, emailAdapter: { - module: 'parse-server-simple-mailgun-adapter', + module: '@parse/simple-mailgun-adapter', options: { domain: 'd', } @@ -350,7 +350,7 @@ describe('server', () => { it('exposes correct adapters', done => { expect(ParseServer.S3Adapter).toThrow(); - expect(ParseServer.GCSAdapter).toThrow('GCSAdapter is not provided by parse-server anymore; please install parse-server-gcs-adapter'); + expect(ParseServer.GCSAdapter).toThrow('GCSAdapter is not provided by parse-server anymore; please install @parse/gcs-files-adapter'); expect(ParseServer.FileSystemAdapter).toThrow(); expect(ParseServer.InMemoryCacheAdapter).toThrow(); expect(ParseServer.NullCacheAdapter).toThrow(); diff --git a/src/Controllers/index.js b/src/Controllers/index.js index 70b95524..7f0288a4 100644 --- a/src/Controllers/index.js +++ b/src/Controllers/index.js @@ -24,7 +24,7 @@ import { InMemoryCacheAdapter } from '../Adapters/Cache/InMemoryCacheAdapter'; import { AnalyticsAdapter } from '../Adapters/Analytics/AnalyticsAdapter'; import MongoStorageAdapter from '../Adapters/Storage/Mongo/MongoStorageAdapter'; import PostgresStorageAdapter from '../Adapters/Storage/Postgres/PostgresStorageAdapter'; -import ParsePushAdapter from 'parse-server-push-adapter'; +import ParsePushAdapter from '@parse/push-adapter'; export function getControllers(options: ParseServerOptions) { const loggerController = getLoggerController(options); diff --git a/src/Options/index.js b/src/Options/index.js index d21e7152..e501dd7a 100644 --- a/src/Options/index.js +++ b/src/Options/index.js @@ -116,7 +116,7 @@ export interface ParseServerOptions { enableSingleSchemaCache: ?boolean; // = false /* Sets the number of characters in generated object id's, default 10 */ objectIdSize: ?number; // = 10 - /* The port to run the ParseServer. defaults to 1337. + /* The port to run the ParseServer. defaults to 1337.@parse/gcs-adapter :ENV: PORT */ port: ?number; // = 1337 /* The host to serve ParseServer on. defaults to 0.0.0.0 */ diff --git a/src/index.js b/src/index.js index 26133472..0cceb234 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ import ParseServer from './ParseServer'; -import S3Adapter from 'parse-server-s3-adapter' -import FileSystemAdapter from 'parse-server-fs-adapter' +import S3Adapter from '@parse/s3-files-adapter' +import FileSystemAdapter from '@parse/fs-files-adapter' import InMemoryCacheAdapter from './Adapters/Cache/InMemoryCacheAdapter' import NullCacheAdapter from './Adapters/Cache/NullCacheAdapter' import RedisCacheAdapter from './Adapters/Cache/RedisCacheAdapter' @@ -20,7 +20,7 @@ const _ParseServer = function(options: ParseServerOptions) { _ParseServer.createLiveQueryServer = ParseServer.createLiveQueryServer; _ParseServer.start = ParseServer.start; -const GCSAdapter = useExternal('GCSAdapter', 'parse-server-gcs-adapter'); +const GCSAdapter = useExternal('GCSAdapter', '@parse/gcs-files-adapter'); Object.defineProperty(module.exports, 'logger', { get: getLogger