Scoped packages (#4354)

* Updates for scoped packages dependencies

* bumps s3 adapter

* Update README.md

* Update README.md

* Update README.md

Author: flovilmart

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: '[email protected]',
@@ -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
 

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",

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`
  */

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');

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);
   });
 

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;
 

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: '[email protected]',
           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();

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);

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 */

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