Skip to content

Scoped packages #4354

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.

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

Merged
merged 5 commits into from
Nov 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,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]',
Expand Down Expand Up @@ -337,7 +337,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).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Should we keep the github modules as well or are we deprecating that altogether in favor of npm?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all official adapters have moved from parse-server-modules to parse-community. Others are still there but not migrated yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re added back a line as there are still some adapter there.


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

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions resources/buildConfigDefinitions.js
Original file line number Diff line number Diff line change
@@ -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`
*/
Expand Down
8 changes: 4 additions & 4 deletions spec/AdapterLoader.spec.js
Original file line number Diff line number Diff line change
@@ -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", ()=>{
Expand Down Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion spec/ParseLiveQueryServer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down
2 changes: 1 addition & 1 deletion spec/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions spec/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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 => {
Expand All @@ -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',
}
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/Controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/Options/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
6 changes: 3 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
Expand Down