Skip to content
This repository has been archived by the owner on Oct 12, 2023. It is now read-only.

Commit

Permalink
Update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
maple10001 committed Dec 5, 2018
1 parent e35852e commit 9a3a45a
Show file tree
Hide file tree
Showing 8 changed files with 277 additions and 114 deletions.
343 changes: 252 additions & 91 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@
"adal-angular": "1.0.15",
"ag-grid": "16.0.1",
"ag-grid-react": "16.0.0",
"i18next": "10.3.0",
"i18next-browser-languagedetector": "2.1.0",
"i18next": "12.1.0",
"i18next-browser-languagedetector": "2.2.4",
"i18next-xhr-backend": "1.5.1",
"immutability-helper": "2.5.1",
"immutability-helper": "2.8.1",
"lodash": "^4.17.10",
"moment": "^2.22.2",
"moment-timezone": "^0.5.21",
"node-sass": "^4.10.0",
"node-sass": "4.11.0",
"normalizr": "3.2.4",
"react": "16.6.3",
"react-cookie": "^3.0.4",
"react-dom": "16.6.3",
"react-dom-factories": "1.0.2",
"react-i18next": "7.3.1",
"react-redux": "5.0.6",
"react-router-dom": "4.2.2",
"react-i18next": "8.3.8",
"react-redux": "5.1.1",
"react-router-dom": "4.3.1",
"react-scripts": "2.1.1",
"react-select": "1.0.0-rc.10",
"redux": "3.7.2",
"redux-observable": "0.17.0",
"reselect": "3.0.1",
"rxjs": "5.5.2",
"tsiclient": "1.2.6"
"redux": "4.0.1",
"redux-observable": "0.19.0",
"reselect": "4.0.0",
"rxjs": "5.5.12",
"tsiclient": "1.2.20"
},
"devDependencies": {
"enzyme": "3.2.0",
Expand Down
4 changes: 3 additions & 1 deletion scripts/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
FROM node:9.2.0-alpine as codebuilder
COPY .env ./ /app/
WORKDIR /app
RUN echo "Installing node packages ..." && npm install
RUN echo "Installing python2 (reqd for node pckgs)" && apk --update add python
RUN echo "Install GCC for make command" && apk add --no-cache --virtual build-base
RUN echo "Installing node packages ..." && npm --add-python-to-path='true' install
RUN echo "Building app..." && export CI=true && npm run build
RUN echo "Removing temp files..." && rm -rf node_modules src public package.json Dockerfile .dockerignore

Expand Down
4 changes: 2 additions & 2 deletions src/components/app/app.container.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { withRouter } from 'react-router-dom';
import { withCookies } from 'react-cookie';
import { connect } from 'react-redux';
import { translate } from 'react-i18next';
import { withNamespaces } from 'react-i18next';
import { AuthService } from 'services';
import { epics as appEpics } from 'store/reducers/appReducer';
import { getPreprovisionedIoTHub } from 'store/reducers/simulationReducer';
Expand All @@ -20,6 +20,6 @@ const mapDispatchToProps = dispatch => ({
logout: () => AuthService.logout()
});

const AppContainer = withCookies(withRouter(translate()(connect(mapStateToProps, mapDispatchToProps)(App))));
const AppContainer = withCookies(withRouter(withNamespaces()(connect(mapStateToProps, mapDispatchToProps)(App))));

export default AppContainer;
4 changes: 2 additions & 2 deletions src/components/app/header/settingsContainer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.

import { connect } from 'react-redux';
import { translate } from 'react-i18next';
import { withNamespaces } from 'react-i18next';
import Settings from './settings';
import {
epics,
Expand All @@ -17,4 +17,4 @@ const mapDispatchToProps = dispatch => ({
updateSolutionSettings: settings => dispatch(epics.actions.updateSolutionSettings(settings)),
});

export const SettingsContainer = translate()(connect(mapStateToProps, mapDispatchToProps)(Settings));
export const SettingsContainer = withNamespaces()(connect(mapStateToProps, mapDispatchToProps)(Settings));
4 changes: 2 additions & 2 deletions src/components/app/navigation/navigation.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.

import React, { Component } from 'react';
import { translate } from 'react-i18next';
import { withNamespaces } from 'react-i18next';
import { NavLink } from 'react-router-dom';
import Svgs from 'svgs';

Expand All @@ -26,7 +26,7 @@ const TabLink = ({svg: Svg , ...props}) => (
</NavLink>
);

const TransTabLink = translate()(TabLink);
const TransTabLink = withNamespaces()(TabLink);

/** The navigation component for the left navigation */
class Navigation extends Component {
Expand Down
4 changes: 2 additions & 2 deletions src/components/pages/deviceModels/deviceModels.container.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.

import { connect } from 'react-redux';
import { translate } from 'react-i18next';
import { withNamespaces } from 'react-i18next';
import {
epics,
redux,
Expand Down Expand Up @@ -29,4 +29,4 @@ const mapDispatchToProps = dispatch => ({
clearUploadDeviceModelError: () => dispatch(redux.actions.clearUploadDeviceModelError())
});

export const DeviceModelsContainer = translate()(connect(mapStateToProps, mapDispatchToProps)(DeviceModels));
export const DeviceModelsContainer = withNamespaces()(connect(mapStateToProps, mapDispatchToProps)(DeviceModels));
4 changes: 2 additions & 2 deletions src/components/pages/simulation/simulation.container.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.

import { connect } from 'react-redux';
import { translate } from 'react-i18next';
import { withNamespaces } from 'react-i18next';
import { Simulation } from './simulation';
import { epics as appEpics } from 'store/reducers/appReducer';
import {
Expand Down Expand Up @@ -30,4 +30,4 @@ const mapDispatchToProps = dispatch => ({
refresh: () => dispatch(appEpics.actions.initializeApp())
});

export const SimulationContainer = translate()(connect(mapStateToProps, mapDispatchToProps)(Simulation));
export const SimulationContainer = withNamespaces()(connect(mapStateToProps, mapDispatchToProps)(Simulation));

0 comments on commit 9a3a45a

Please sign in to comment.