Commit c0bbfd4f by Jason Zhou

update old files for wildcat restore

parent ad2fb06b
...@@ -57,6 +57,7 @@ Promise.all([p1()]) ...@@ -57,6 +57,7 @@ Promise.all([p1()])
const ReactDOM = require('react-dom') const ReactDOM = require('react-dom')
const SupportWidget = require('js/components/support_widget/SupportWidget') const SupportWidget = require('js/components/support_widget/SupportWidget')
const PurchaseBridge = require('../../nextgen/domain/PurchaseBridge') const PurchaseBridge = require('../../nextgen/domain/PurchaseBridge')
.default
const SupportWidgetWithComponentKit = ComponentKitContext(SupportWidget) const SupportWidgetWithComponentKit = ComponentKitContext(SupportWidget)
const PublishManager = require('nextgen/subApps/publishManager') const PublishManager = require('nextgen/subApps/publishManager')
......
...@@ -21,7 +21,7 @@ import 'js/reactInit.es6' ...@@ -21,7 +21,7 @@ import 'js/reactInit.es6'
import * as UrlConstants from 'js/constants/url_constants' import * as UrlConstants from 'js/constants/url_constants'
import ProductPanel from 'nextgen/ecommerce/manager/components/productPanel' import ProductPanelWrapper from 'nextgen/ecommerce/manager/components/productPanelWrapper'
import CategoryManagerWrapper from 'nextgen/ecommerce/manager/components/settings/categoryManagerWrapper' import CategoryManagerWrapper from 'nextgen/ecommerce/manager/components/settings/categoryManagerWrapper'
import MembershipManager from 'nextgen/ecommerce/manager/components/settings/membershipManager' import MembershipManager from 'nextgen/ecommerce/manager/components/settings/membershipManager'
import PaymentGatewaySettingsPanel from 'nextgen/ecommerce/manager/components/settings/paymentChannel/PaymentGatewaySettingsPanel' import PaymentGatewaySettingsPanel from 'nextgen/ecommerce/manager/components/settings/paymentChannel/PaymentGatewaySettingsPanel'
...@@ -255,7 +255,7 @@ const supportedChannels = () => { ...@@ -255,7 +255,7 @@ const supportedChannels = () => {
return supportedChannelsConf return supportedChannelsConf
} }
const KitWrappedProductPanel = ComponentKitContext(ProductPanel) const KitWrappedProductPanel = ComponentKitContext(ProductPanelWrapper)
class ProductsContainer extends React.Component { class ProductsContainer extends React.Component {
componentWillMount() { componentWillMount() {
......
...@@ -10,6 +10,7 @@ import { Provider } from 'react-redux' ...@@ -10,6 +10,7 @@ import { Provider } from 'react-redux'
import ComponentKitContext from 'js/utils/ComponentKitContext' import ComponentKitContext from 'js/utils/ComponentKitContext'
import { createStore, applyMiddleware, compose } from 'redux' import { createStore, applyMiddleware, compose } from 'redux'
import thunkMiddleware from 'redux-thunk' import thunkMiddleware from 'redux-thunk'
import PaypalPopupDialog from 'js/components/dialogs/PaypalPopupDialog'
import { import {
Router, Router,
Route, Route,
...@@ -26,6 +27,10 @@ import Domains from 'nextgen/app/scenes/Domains' ...@@ -26,6 +27,10 @@ import Domains from 'nextgen/app/scenes/Domains'
import Domain from 'nextgen/app/scenes/Domain' import Domain from 'nextgen/app/scenes/Domain'
import DomainPurchase from 'nextgen/app/scenes/DomainPurchase' import DomainPurchase from 'nextgen/app/scenes/DomainPurchase'
import { initTrack } from 'js/utils/track'
initTrack() // analytics track init
const middleware = [thunkMiddleware] const middleware = [thunkMiddleware]
const composeEnhancers = const composeEnhancers =
(localStorage && (localStorage &&
...@@ -123,6 +128,7 @@ Promise.all([p1()]) ...@@ -123,6 +128,7 @@ Promise.all([p1()])
<DashboardRouterWithContext /> <DashboardRouterWithContext />
</Provider> </Provider>
</AppContainer> </AppContainer>
<PaypalPopupDialog />
</ErrorBoundary>, </ErrorBoundary>,
document.getElementById('mainDashboard'), document.getElementById('mainDashboard'),
) )
......
...@@ -15,6 +15,11 @@ import * as editorStoreCreator from 'js/reducers/editorStoreCreator' ...@@ -15,6 +15,11 @@ import * as editorStoreCreator from 'js/reducers/editorStoreCreator'
import ComponentKitContext from 'js/utils/ComponentKitContext' import ComponentKitContext from 'js/utils/ComponentKitContext'
import wrapErrorBoundary from 'js/components/ErrorBoundary' import wrapErrorBoundary from 'js/components/ErrorBoundary'
import 'js/reactInit.es6' import 'js/reactInit.es6'
import { initTrack } from 'js/utils/track'
initTrack() // analytics track init
// These two are direct reads so promises can be fired quicker // These two are direct reads so promises can be fired quicker
const supportedVerticals = ['personal'] const supportedVerticals = ['personal']
const themeName = $S.stores.pageMeta.theme.name const themeName = $S.stores.pageMeta.theme.name
......
...@@ -87,7 +87,7 @@ module.exports = class EntriesGenerationWebpackPlugin { ...@@ -87,7 +87,7 @@ module.exports = class EntriesGenerationWebpackPlugin {
} }
if (this.opts.appendMode && fse.existsSync(outputFile)) { if (this.opts.appendMode && fse.existsSync(outputFile)) {
const previousJson = JSON.parse( const previousJson = JSON.parse(
fse.readFileSync(outputFile).toString() fse.readFileSync(outputFile).toString() || '{}'
) )
json = JSON.stringify(Object.assign(previousJson, manifest), null, 2) json = JSON.stringify(Object.assign(previousJson, manifest), null, 2)
} }
......
...@@ -64,10 +64,11 @@ ...@@ -64,10 +64,11 @@
"@types/jest": "^21.1.2", "@types/jest": "^21.1.2",
"@types/lodash": "^4.14.61", "@types/lodash": "^4.14.61",
"@types/normalizr": "^2.0.18", "@types/normalizr": "^2.0.18",
"@types/react": "^16.0.4", "@types/ramda": "^0.25.36",
"@types/react": "16.0.40",
"@types/react-dom": "^16.0.4", "@types/react-dom": "^16.0.4",
"@types/react-native": "^0.42.14", "@types/react-native": "^0.42.14",
"@types/react-redux": "^4.4.38", "@types/react-redux": "^5.0.6",
"@types/react-router": "^2.0.49", "@types/react-router": "^2.0.49",
"@types/react-test-renderer": "^16.0.1", "@types/react-test-renderer": "^16.0.1",
"@types/redux-form": "^6.3.6", "@types/redux-form": "^6.3.6",
...@@ -214,6 +215,7 @@ ...@@ -214,6 +215,7 @@
"hypernova-morearty": "git://github.com/strikingly/hypernova-morearty", "hypernova-morearty": "git://github.com/strikingly/hypernova-morearty",
"hypernova-react": "^2.0.0", "hypernova-react": "^2.0.0",
"ie-version": "^0.1.0", "ie-version": "^0.1.0",
"immer": "^1.5.0",
"immutable": "github:strikingly/immutable-js#6fecef1e909bfe8eba4908c3f5aa4f8e126ce163", "immutable": "github:strikingly/immutable-js#6fecef1e909bfe8eba4908c3f5aa4f8e126ce163",
"in-viewport": "^3.4.1", "in-viewport": "^3.4.1",
"invariant": "^2.2.1", "invariant": "^2.2.1",
...@@ -296,8 +298,9 @@ ...@@ -296,8 +298,9 @@
"sha1": "^1.1.1", "sha1": "^1.1.1",
"shallow-equal": "^1.0.0", "shallow-equal": "^1.0.0",
"sw-toolbox": "^3.6.0", "sw-toolbox": "^3.6.0",
"typescript": "^2.2.2", "typescript": "^3.0.3",
"uglify-js": "2.7.5", "uglify-js": "2.7.5",
"url-join": "^4.0.0",
"uuid": "^2.0.1", "uuid": "^2.0.1",
"validator": "^9.1.1", "validator": "^9.1.1",
"walk": "^2.3.9", "walk": "^2.3.9",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment