From 0d7a42dfbc2e9debdbc04b670eb84c25047c920b Mon Sep 17 00:00:00 2001 From: gianni Date: Thu, 4 Oct 2018 11:41:47 +0200 Subject: [PATCH 1/3] removed protocol --- .env-cmdrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env-cmdrc b/.env-cmdrc index a36ce26..46eeac1 100644 --- a/.env-cmdrc +++ b/.env-cmdrc @@ -2,12 +2,12 @@ "development": { "NODE_ENV": "development", "APP_ENV": "WEB", - "ROOT_DIRECTORY": "http://d2.motime.com/js/wl/webstore_html5game/gfsdk/3.x.x/dist/" + "ROOT_DIRECTORY": "//d2.motime.com/js/wl/webstore_html5game/gfsdk/3.x.x/dist/" }, "production": { "NODE_ENV": "production", "APP_ENV": "WEB", - "ROOT_DIRECTORY": "http://d.motime.com/js/wl/webstore_html5game/gfsdk/3.x.x/dist/" + "ROOT_DIRECTORY": "//d.motime.com/js/wl/webstore_html5game/gfsdk/3.x.x/dist/" }, "test":{ "NODE_ENV": "test" From cd25c5b2a683147e7502bfe31ed6a6aa717b7bf8 Mon Sep 17 00:00:00 2001 From: gianni Date: Fri, 5 Oct 2018 13:00:17 +0200 Subject: [PATCH 2/3] removed protocol --- .env-cmdrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env-cmdrc b/.env-cmdrc index 46eeac1..d940221 100644 --- a/.env-cmdrc +++ b/.env-cmdrc @@ -2,12 +2,12 @@ "development": { "NODE_ENV": "development", "APP_ENV": "WEB", - "ROOT_DIRECTORY": "//d2.motime.com/js/wl/webstore_html5game/gfsdk/3.x.x/dist/" + "ROOT_DIRECTORY": "//s2_motime.buongiorno.com/js/wl/webstore_html5game/gfsdk/3.x.x/dist/" }, "production": { "NODE_ENV": "production", "APP_ENV": "WEB", - "ROOT_DIRECTORY": "//d.motime.com/js/wl/webstore_html5game/gfsdk/3.x.x/dist/" + "ROOT_DIRECTORY": "//s.motime.com/js/wl/webstore_html5game/gfsdk/3.x.x/dist/" }, "test":{ "NODE_ENV": "test" From 1aa886c8f1d233bcbc9bf3036b5a81553dd704cf Mon Sep 17 00:00:00 2001 From: gianni Date: Mon, 8 Oct 2018 17:04:02 +0200 Subject: [PATCH 3/3] removed hybrid logic --- .env-cmdrc | 8 -------- package.json | 2 -- src/index.js | 5 +---- src/js/actions/session-actions.js | 2 -- src/js/lib/FacebookInterface.js | 3 --- src/js/reducers/generic.js | 2 -- tools/webpack.config.dev.js | 5 +---- tools/webpack.config.prod.js | 4 +--- 8 files changed, 3 insertions(+), 28 deletions(-) diff --git a/.env-cmdrc b/.env-cmdrc index d940221..212849f 100644 --- a/.env-cmdrc +++ b/.env-cmdrc @@ -11,13 +11,5 @@ }, "test":{ "NODE_ENV": "test" - }, - "hybrid-development":{ - "NODE_ENV": "development", - "APP_ENV": "HYBRID" - }, - "hybrid-production":{ - "NODE_ENV": "production", - "APP_ENV": "HYBRID" } } \ No newline at end of file diff --git a/package.json b/package.json index 8d7301e..1f750fc 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,6 @@ "test:coverage": "jest --coverage --no-cache && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", "test:watch": "jest --watch", "test": "jest", - "build:hybrid:dev": "$(npm bin)/env-cmd hybrid-development webpack --config tools/webpack.config.dev.js", - "build:hybrid:prod": "$(npm bin)/env-cmd hybrid-production webpack --config tools/webpack.config.prod.js -p", "build:dev": "$(npm bin)/env-cmd development webpack --config tools/webpack.config.dev.js", "build:prod": "$(npm bin)/env-cmd production webpack --config tools/webpack.config.prod.js -p", "dev": "env-cmd development webpack-dev-server --config tools/webpack.config.local.js", diff --git a/src/index.js b/src/index.js index 205728a..656f754 100644 --- a/src/index.js +++ b/src/index.js @@ -5,14 +5,11 @@ import { Provider } from 'react-redux'; import store from './store'; import App from './App'; -import { localStorage } from './js/lib/LocalStorage'; +// import { localStorage } from './js/lib/LocalStorage'; import SDK from './SDK'; import { getLabel } from './js/actions/utils'; /* global __webpack_public_path__:true, RUNTIME_PUBLIC_PATH */ -if (process.env.APP_ENV === 'HYBRID') { - __webpack_public_path__ = RUNTIME_PUBLIC_PATH; -} let ROOT_ELEMENT = null; function onDomLoaded() { diff --git a/src/js/actions/session-actions.js b/src/js/actions/session-actions.js index e69aab2..b0e4895 100644 --- a/src/js/actions/session-actions.js +++ b/src/js/actions/session-actions.js @@ -13,7 +13,6 @@ import { showBanner } from './banner-actions'; import location from '../lib/Location'; let onStartCallback = () => { }; -const hybrid = process.env.APP_ENV === 'HYBRID'; function doStartSession() { return (dispatch, getState) => { @@ -113,7 +112,6 @@ export function endSession(data = { score: 0, level: 1 }) { const bannerCondition = [ (user.matchPlayed % 3 === 0), - !hybrid, (generic.platformInfo.android || generic.platformInfo.ios), vhost.INSTALL_HYBRID_VISIBLE, ].every(condition => condition === true); diff --git a/src/js/lib/FacebookInterface.js b/src/js/lib/FacebookInterface.js index 4ce49d2..9941587 100644 --- a/src/js/lib/FacebookInterface.js +++ b/src/js/lib/FacebookInterface.js @@ -24,9 +24,6 @@ export class FacebookInterface { * @memberof FacebookInterface */ init(config) { - if (process.env.APP_ENV === 'HYBRID') { - return; - } this.config = config; this.downloadSDK(); } diff --git a/src/js/reducers/generic.js b/src/js/reducers/generic.js index 0479d55..a8c8e1c 100644 --- a/src/js/reducers/generic.js +++ b/src/js/reducers/generic.js @@ -42,8 +42,6 @@ export default function generic(state = { focus: true, }, action) { switch (action.type) { - case 'SET_IS_HYBRID': - return Object.assign({}, state, { hybrid: action.hybrid }); case 'SET_LABEL': return Object.assign({}, state, { label: action.label }); case 'INIT_START': diff --git a/tools/webpack.config.dev.js b/tools/webpack.config.dev.js index 5b65bab..dc30440 100644 --- a/tools/webpack.config.dev.js +++ b/tools/webpack.config.dev.js @@ -4,9 +4,6 @@ var webpack = require('webpack'); var baseConfiguration = require('./webpack.config.base'); var devConfiguration = Object.create(baseConfiguration); -var FILENAME = '[name].js'; -var FILENAME_HYBRID = '[name].hybrid.js'; - var envPlugin = new webpack.DefinePlugin({ 'process.env': { APP_ENV: JSON.stringify(process.env.APP_ENV), @@ -22,7 +19,7 @@ if(process.env.ROOT_DIRECTORY) { devConfiguration.output.publicPath = ROOT_DIRECTORY; } -devConfiguration.output.filename = process.env.APP_ENV === "WEB" ? FILENAME : FILENAME_HYBRID; +devConfiguration.output.filename = '[name].js'; devConfiguration.devtool = 'eval-source-map'; devConfiguration.plugins.push(envPlugin); diff --git a/tools/webpack.config.prod.js b/tools/webpack.config.prod.js index 57d2af0..b201128 100644 --- a/tools/webpack.config.prod.js +++ b/tools/webpack.config.prod.js @@ -4,8 +4,6 @@ var webpack = require('webpack'); const CleanWebpackPlugin = require('clean-webpack-plugin'); var baseConfiguration = require('./webpack.config.base'); var getAssetsChunkName = require('./getAssetsChunkName')(process.env.NODE_ENV); -var FILENAME = '[name].[chunkhash:5].min.js'; -var FILENAME_HYBRID = '[name].[chunkhash:5].hybrid.min.js'; var prodConfiguration = Object.create(baseConfiguration); var ROOT_DIRECTORY = null; @@ -16,7 +14,7 @@ if (process.env.ROOT_DIRECTORY) { prodConfiguration.output.publicPath = ROOT_DIRECTORY; } -prodConfiguration.output.filename = process.env.APP_ENV === "WEB" ? FILENAME : FILENAME_HYBRID; +prodConfiguration.output.filename = '[name].[chunkhash:5].min.js'; prodConfiguration.devtool = 'source-map'; prodConfiguration.plugins = [