@plusscommunities/pluss-circles-app 1.0.14 → 1.1.3

package/assets/fonts.js

@@ -1,5 +1,3 @@
-import { PlussCore } from '../src/feature.config';
-
-const { Fonts } = PlussCore;
+import { Fonts } from '../src/core.config';
 
 export const Pl60Icon = Fonts.Pl60Icon;

package/package.json

@@ -1,32 +1,37 @@
 {
   "name": "@plusscommunities/pluss-circles-app",
-  "version": "1.0.14",
+  "version": "1.1.3",
   "description": "Extension package to enable circles on Pluss Communities Platform",
   "main": "src/index.js",
   "scripts": {
+    "betacore": "npm i @plusscommunities/pluss-core-app@beta",
     "core": "npm i @plusscommunities/pluss-core-app@latest",
+    "betapatch": "npm version prepatch --preid=beta",
     "patch": "npm version patch",
+    "betaupload": "npm publish --access public --tag beta && rm -rf node_modules",
+    "betaupload:p": "npm run betapatch && npm run betaupload",
+    "betaupload:cp": "npm run betacore && npm run betaupload:p",
     "upload": "npm publish --access public && rm -rf node_modules",
     "upload:p": "npm run patch && npm run upload",
-    "upload:cp": "npm run core && npm run patch && npm run upload"
+    "upload:cp": "npm run core && npm run upload:p"
   },
   "author": "Phillip Suh",
   "license": "ISC",
   "dependencies": {
-    "@plusscommunities/pluss-core-app": "^1.1.2",
+    "@plusscommunities/pluss-core-app": "1.4.8",
     "axios": "^0.16.2",
     "lodash": "^4.17.4",
     "moment": "^2.18.1",
-    "react": "16.13.1",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-41.0.0.tar.gz",
+    "react": "17.0.1",
+    "react-native": "0.64.3",
     "react-native-elements": "^0.17.0",
     "react-native-iphone-x-helper": "^1.3.1",
-    "react-native-webview": "11.2.3",
+    "react-native-webview": "11.15.0",
     "react-redux": "^5.0.5"
   },
   "peerDependencies": {
-    "expo-linear-gradient": "~9.1.0",
-    "expo-constants": "~10.1.3",
+    "expo-linear-gradient": "~11.0.0",
+    "expo-constants": "~13.0.0",
     "redux-persist": "^4.8.3"
   }
 }

package/src/actions/index.js

@@ -1,6 +1,4 @@
-import { PlussCore } from '../feature.config';
-
-const { Actions } = PlussCore;
+import { Actions } from '../core.config';
 
 export const getFollowers = Actions.getFollowers;
 export const addFollower = Actions.addFollower;

package/src/actions/types.js

@@ -1,6 +1,4 @@
-import { PlussCore } from '../feature.config';
-
-const { ActionTypes } = PlussCore;
+import { ActionTypes } from '../core.config';
 
 export const LOGOUT = ActionTypes.LOGOUT;
 export const CHANGE_ROLE = ActionTypes.CHANGE_ROLE;

package/src/components/common/index.js

@@ -1,6 +1,5 @@
-import { PlussCore } from '../../feature.config';
+import { Components } from '../../core.config';
 
-const { Components } = PlussCore;
 export const Attachment = Components.Attachment;
 export const BackButton = Components.BackButton;
 export const ConfirmPopup = Components.ConfirmPopup;

package/src/components/groups/EditGroup.js

@@ -203,7 +203,7 @@ class EditGroup extends Component {
     if (this.state.uploadingImage || this.state.submittingGroup) {
       return;
     }
-    this.imageUploader.getWrappedInstance().showUploadMenu();
+    this.imageUploader.showUploadMenu();
   }
 
   renderInvitePopup() {

package/src/components/groups/GroupsList.js

@@ -73,4 +73,4 @@ const mapStateToProps = state => {
   };
 };
 
-export default connect(mapStateToProps, { updateGroups, updateUnreadCounter }, null, { withRef: true })(GroupsList);
+export default connect(mapStateToProps, { updateGroups, updateUnreadCounter }, null, { forwardRef: true })(GroupsList);

package/src/components/groups/GroupsWidget.js

@@ -125,4 +125,4 @@ const mapStateToProps = state => {
   };
 };
 
-export default connect(mapStateToProps, { updateGroups, updateUnreadCounter }, null, { withRef: true })(GroupsWidget);
+export default connect(mapStateToProps, { updateGroups, updateUnreadCounter }, null, { forwardRef: true })(GroupsWidget);

package/src/components/groups/NewGroup.js

@@ -172,7 +172,7 @@ class NewGroup extends Component {
     if (this.state.uploadingImage || this.state.submittingGroup) {
       return;
     }
-    this.imageUploader.getWrappedInstance().showUploadMenu();
+    this.imageUploader.showUploadMenu();
   }
 
   renderInvitePopup() {

package/src/config/index.js

@@ -1,6 +1,4 @@
-import { PlussCore } from '../feature.config';
-
-const { Config } = PlussCore;
+import { Config } from '../core.config';
 
 export const CONST_STRINGS = {
   EMPTY_GROUPS: "You aren't in any Circles",

package/src/core.config.js

@@ -0,0 +1,5 @@
+// import * as PlussCore from '../../pluss-core/src';
+import * as PlussCore from '@plusscommunities/pluss-core-app';
+
+const { Apis, Fonts, Actions, ActionTypes, Config, Components, Styles, Session, Helper, Constants, Colours } = PlussCore;
+export { Apis, Fonts, Actions, ActionTypes, Config, Components, Styles, Session, Helper, Constants, Colours };

package/src/feature.config.js

@@ -5,8 +5,6 @@ import { CIRCLE_INVITES_LOADED, CIRCLES_LOAD_INITIALISE, UPDATE_CIRCLE_UNREAD }
 import { getSessionTokenAWS } from './js';
 import { circleActions } from './webapi';
 
-export { PlussCore };
-
 export const Services = {
   navigation: null,
 };

package/src/js/Colors.js

@@ -1,6 +1,4 @@
-import { PlussCore } from '../feature.config';
-
-const { Colours } = PlussCore;
+import { Colours } from '../core.config';
 
 export const getMainBrandingColourFromState = Colours.getMainBrandingColourFromState;
 export const getLightBrandingColourFromState = Colours.getLightBrandingColourFromState;

package/src/js/Styles.js

@@ -1,3 +1,3 @@
-import { PlussCore } from '../feature.config';
+import { Styles } from '../core.config';
 
-export default PlussCore.Styles;
+export default Styles;

package/src/js/index.js

@@ -1,6 +1,4 @@
-import { PlussCore } from '../feature.config';
-
-const { Session, Helper } = PlussCore;
+import { Session, Helper } from '../core.config';
 
 // Session
 export const authedFunction = Session.authedFunction;

package/src/reducers/ChatsReducer.js

@@ -1,4 +1,4 @@
-import { REHYDRATE } from 'redux-persist/constants';
+import { REHYDRATE } from 'redux-persist';
 import {
   SOFT_ADD_CIRCLE_CHAT,
   CREATED_CIRCLE_CHAT,
@@ -35,6 +35,7 @@ export default (state = INITIAL_STATE, action) => {
       return { ...state, blockedUsers: action.payload };
 
     case REHYDRATE:
+      if (!action.payload) return state;
       if (action.payload[CHAT_REDUCER_KEY] && Array.isArray(action.payload[CHAT_REDUCER_KEY])) {
         return {
           list: action.payload[CHAT_REDUCER_KEY],

package/src/reducers/GroupsReducer.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable no-case-declarations */
-import { REHYDRATE } from 'redux-persist/constants';
+import { REHYDRATE } from 'redux-persist';
 import _ from 'lodash';
 import {
   LOGOUT,
@@ -120,6 +120,7 @@ export default (state = INITIAL_STATE, action) => {
     case CLEAR_CIRCLES:
       return { list: [], invites: [] };
     case REHYDRATE:
+      if (!action.payload) return state;
       if (action.payload[GROUPS_REDUCER_KEY]) {
         if (action.payload[GROUPS_REDUCER_KEY].list == null) {
           action.payload[GROUPS_REDUCER_KEY].list = [];

package/src/webapi/helper.js

@@ -1,6 +1,4 @@
-import { PlussCore } from '../feature.config';
-
-const { Helper } = PlussCore;
+import { Helper } from '../core.config';
 
 export const getUrl = Helper.getUrl;
 export const getAuthTokenHeader = Helper.getAuthTokenHeader;

package/src/webapi/index.js

@@ -1,6 +1,4 @@
-import { PlussCore } from '../feature.config';
-
-const { Apis } = PlussCore;
+import { Apis } from '../core.config';
 
 export const userActions = Apis.userActions;
 export const contactActions = Apis.contactActions;