From aab6f642cddcd707dea9afa2a5da8f7cf1592d71 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Fri, 18 Mar 2016 17:50:01 +0530 Subject: [PATCH 1/4] AS#101967871059519, Bundle NavBar components to be used by tc-site -- Cleanup of web pack config --- navbar.webpack.config.coffee | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/navbar.webpack.config.coffee b/navbar.webpack.config.coffee index 43537038d..bf62da78a 100644 --- a/navbar.webpack.config.coffee +++ b/navbar.webpack.config.coffee @@ -1,5 +1,6 @@ webpackConfig = require 'appirio-tech-webpack-config' webpack = require('webpack') +ExtractTextPlugin = require('extract-text-webpack-plugin') config = webpackConfig dirname: __dirname @@ -9,12 +10,16 @@ config = webpackConfig './index.coffee' ] -config.output.filename = 'TCNavComponents.[name].js'; +# exports javascript as library +config.output.filename = '[name].js'; config.output.publicPath = 'http://local.topcoder.com/mf/js/app/header/partials/' +config.output.library = '[name]'; config.output.libraryTarget = 'var' -console.log config.output +# CSS file without hash name +config.plugins.push new ExtractTextPlugin '[name].css' +# React would be provided externally by the application using the components config.externals = {"react" : "React"} module.exports = config From 19f86a98e0c50062e8bdca36e2e5cb73e591d0bf Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Fri, 18 Mar 2016 18:13:08 +0530 Subject: [PATCH 2/4] AS#101967871059519, Bundle NavBar components to be used by tc-site -- Updated CDN prefix. --- navbar.webpack.config.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/navbar.webpack.config.coffee b/navbar.webpack.config.coffee index bf62da78a..c25b18c90 100644 --- a/navbar.webpack.config.coffee +++ b/navbar.webpack.config.coffee @@ -12,7 +12,7 @@ config = webpackConfig # exports javascript as library config.output.filename = '[name].js'; -config.output.publicPath = 'http://local.topcoder.com/mf/js/app/header/partials/' +config.output.publicPath = 'http://components.topcoder-dev.com/' config.output.library = '[name]'; config.output.libraryTarget = 'var' From 2cfe86cf980ba43e293559857f8771a14061f09f Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Wed, 23 Mar 2016 12:32:59 +0530 Subject: [PATCH 3/4] AS#101967871059519, Bundle NavBar components to be used by tc-site -- Removed unused dependencies --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 9d4f3ee0c..7de3128d8 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,6 @@ "react-dom": "^0.14.7", "react-dropzone": "^3.3.2", "react-redux": "^4.2.1", - "react-select": "^0.9.1", - "url-loader": "^0.5.7", - "img-loader": "^1.2.0", - "file-loader": "^0.8.4" + "react-select": "^0.9.1" } } From ec3272ccf51e3832cf112a15bbf59366da3b80ac Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Wed, 23 Mar 2016 12:33:45 +0530 Subject: [PATCH 4/4] AS#102481437698830, Travis build to push bundle to S3/CDN -- Added encrypted aws key and secret --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 928f3aa65..5fcb5ccfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,8 @@ deploy: - provider: s3 cache_control: private, no-store, no-cache, must-revalidate, max-age=0 detect_encoding: true - access_key_id: $AWS_KEY - secret_access_key: $AWS_SECRET + access_key_id: "$AWS_KEY" + secret_access_key: "$AWS_SECRET" bucket: components.topcoder-dev.com skip_cleanup: true local_dir: dist @@ -19,15 +19,15 @@ deploy: branch: dev env: matrix: - - CXX=g++-4.8 + - CXX=g++-4.8 global: - # DEV_AWS_KEY - - secure: a5X4QlY2JD/sJnEBkT5WwwfWjYKq3ldRf/+Dh5x2oHB0swGzYyFxzVlezddPF8xDML+CcVoLHkd8WNM2F7qcxHZTDC5spH/ym2gX6YlRwFRTTFBRCJehgYs8Vit/s14f8gkuVV8fe2ubMiV+fpAw80tb3E+t+nCckmXwe8gDqDbHto5VIozTiqDOV/WvkPzaRQofTeNzSqjrAH/iRq8hJUx16shCO2ccdiLu7rnOuys+UwjWFRyjdLP01UZXd5u6a5XK3vigLGPBAqsEwSMgScATJjNIHwYofE5Q3ztD85jz/JoQatQf7LCnQUqkLT+xldMkOZuTlTHvzmVUOl2WYpVxWV9hXwBemvyuRPPtzIrZkKXi6OUgvpYwGgWn8eS1qulB1DYPrUWBtIYGQoxEchfNlmcrCIJ7BrbL9xiNUM8J+ZCWtNS01eSapMHdhAIUMLEsAjxBY+ArLuYAD+URB0d+JZrr9cORGnrGDB+1wI12Z/Qu5LEDp/TMOisK2PXEsaqzlaazr9lj2FXTYJQyyFMMWzq1v1o5lZ5mEJ5ea36eGApV1iQNmPrg7omhDHwKtBpMDFQWZ0Y1SrkIk3QTX6JfzsrehwAhAK2fZ25EaC6zcppAo0ia5/VZoWzxHFQyhkC47hRrM7C6nCriQPDc9kKsmTSX5rp5e/DNpiZ67qM= - # DEV_AWS_SECRET - - secure: p+od0xD/9vpMbR2AI6gZWknNAtvvIfq6jXIF98DEsDlqrrMFv4SwtuXLlCmX5PBnB/cWOkwgRhymI7/3+fLrDC+wqlhDEWyzSpVOvAcVAb5LEP7IDen0W8kTj2q9I2VRX+keL7lxQCknAf/21sRZeJfJhLGR+O3NcytEdsjlpFCopA6luZYv1QSd+nRJiTsI7I69T0hr7jZk+YioyjEEp/4qzI2qyJH7E5Ry+DD3gXnC3zva48Huq6rvOtLpgFmio1b1rNAcA55Q9Y3vb1jJyZhKpRvtel9OM9ekTxANEGJVaMzxyZXT7EFTxwxS+ub5c2HRzxedMnD3tY29ku2JJx7Ofm+Yxt9DZXSK7EV99xxE71kIhI9lZFiWZviym08MHGc4pee6+Cl6ZkiV44v4XnwbgUq8GCOkmDMQBQtGhXq7dC6jB/r7P7CJs+DIGDF7qNt/xizVOC1THS8GUCN68aWMVperP+IlUXo5d2XekhO6vjHk6o44K8A1s7yblBWXj54B6NfJnBzUK2X0g6Y2xdW6tmoKtad1r1I3062skc+UiU+6m4fGS8pLFElJNj+8N7QANoEw9oJDZfuQ47uVQzPjAA1/qdcy3ksMek0siNFbpZnMqzOJTPf2Xe7YgKuCPg0QczESXIjOeEIU0om7SWmGEIuMFqt6obQW0M3VHn0= + # AWS_SECRET + - secure: yFpLFrM42STWqxw6dlVvyr0hvBbVAOHhkKQ1yQcuZ4MtTktCUOItUt9hZTExy659sJJxeBsT0YD66FdVggV+rTG8KDFGcBZJ8RZqN2AHa1+PMZfzF5N35bkacOWoKd1aAReRWZcVspvHjC1h6lAlVR69qSRqRhOL7/IMTDYrZMMwuS7/Pqb0jfdCJgiOf8uFwAn1ZVsJvDvC7AcxYYNLMA+GFD6ay7GX4zoqBdHwcyupKU4g+Fwjy3673kZwfWKITtzmwmV18p0SIiqQp68K6lvsZ2H7Hw6TXOEMkvda1YMD+lmV/dcc6o6W6bsDAk2cZx5JxSu3trvhkpYpK9JE6FUJ1I5ITiPkAZYAnIjckSM+rLZ6Vanxtmc0zNL6cxc4DTfu7V8dQ2MlPxHV125rMspYeJcxi8u/nlSRSJy2C8jaPGzaBQmHM9HlzJNhpTeR4A/3YqTcbcRMgMxvuuslHEUXDeTV+lqfhw1pLvD+Ut+Q6IBkNVdMDVBoeLvuwtXwyFF4skuEcTvOezmh9VNNrMgx2ZcPnJR85aUD+A/MoYihn1dPr66rh2vNJSRKp4uQdgRnldtLaHh5JgX3cR0PPtSat99shV/YkhhGG3WGl6lqOLPQTDX9XLLm9mTmOQzAK7p6GjRKM1PVWOc+3VA8dc3XTCMjBaFh9zgtSsfDibs= + # AWS_KEY + - secure: QXxHO6Dt5kGDsN2hjSk//0Rf3eHsjOXBq9CdK1kyePLDks6J1wCUp7hT3PMqZG3wH8yd6i4m8mielDdOurquOHVZgdiWaDRw/FMggRcmOGzCl96Afdz199v4ep6aS1YzndEPmwaKp2jFiCsg8LvByJjlHKtGSWc4Yw7+B1WjSygLoZ1eU4TYeig3xfhHE2ENoIGdnk5DDSjZ2xypqc8upmQIbfFya2dd0nMwA8GjEpVWGAYJy3RhOyKlWKGvO2sW+bf3DVCqnYvLRs8kAGh7qQV//rkkycNWFVUsQZkNd0+mX7bi16aJoaj4HSiW4pR/Z0yDa55Lb7CZKdP0sZgKcojUqkUe8faU8N7LQEkK0RYF7zfSAt2y0ns25Nt7os1xUdY/3Xluw0SMzTR5zX8PiEUVtQyFS33T43GKuQT4joYCseIFCqpZ1a5iYemlR9M7DqZDPQ8TkwHn2yzP59ax25U3FB3AYMz6pd2WuIKsa3XU9irJOiGSHXC3YmS2H70cZpL+r4OxtmsjXVR5RQQWcGEurb3vadk/Iq5S4EXKG9M9HKtLCysGPdynw3/+0GlscdIf+O2eZSvFJfahcVvaPSUxLgyOFM+W3sd0EwjGnTWwXu9zN7LbMr57vqzNUZ0mgSNX7qz2+z9V4jBTNRk5DaG5vRr+7uDHgKdtNQHYWUU= addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-4.8 \ No newline at end of file + - g++-4.8