Skip to content

Commit 4557868

Browse files
authored
Merge pull request #3424 from topcoder-platform/revert-3367-build-improvement
Revert "Build improvement"
2 parents 94a70e7 + b1b4c5d commit 4557868

File tree

6 files changed

+1616
-318
lines changed

6 files changed

+1616
-318
lines changed

.circleci/config.yml

+2
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ workflows:
176176
only:
177177
- develop
178178
- hot-fix
179+
- survey_tc
179180
# This is alternate dev env for parallel testing
180181
- "build-test":
181182
context : org-global
@@ -190,6 +191,7 @@ workflows:
190191
branches:
191192
only:
192193
- develop
194+
- survey_tc
193195
# Production builds are exectuted only on tagged commits to the
194196
# master branch.
195197
- "build-prod":

config/jest/default.js

-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@ const config = require('topcoder-react-utils/config/jest/default');
22

33
config.transformIgnorePatterns[0] = '/node_modules/(?!appirio-tech|topcoder|tc-)';
44

5-
// Include the directories whose tests has been written to minimize coverage time
6-
config.collectCoverageFrom = ['src/client/*.{js,jsx}', 'src/server/*.{js,jsx}', 'src/shared/*.{js,jsx}'];
7-
85
module.exports = config;

config/webpack/default.js

+8-34
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@ const path = require('path');
77
let publicPath = process.env.CDN_URL || '/api/cdn/public';
88
publicPath += '/static-assets';
99

10-
// Import Speed measure plugin
11-
const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
12-
13-
// Import Happypack plugin
14-
const HappyPack = require('happypack');
15-
16-
// Create Speed measure plugin instance to measure the build time
17-
const smp = new SpeedMeasurePlugin();
18-
19-
// Wrap the webpack config with Speed measure plugin instance to measure the build time
20-
module.exports = smp.wrap({
10+
module.exports = {
2111
entry: {
2212
'loading-indicator-animation': './src/client/loading-indicator-animation',
2313
},
@@ -40,21 +30,18 @@ module.exports = smp.wrap({
4030
* are not bundled. */
4131
/utils[\\/]router[\\/]require/,
4232
],
43-
/* Changed the rule to support for .png .svg and .jpg and jpeg files and
44-
* using happypack loader for parallelism
45-
*/
4633
rules: [
4734
{
48-
test: /\.(png|jpe?g|svg)$/i,
35+
test: /\.svg$/,
36+
loader: 'file-loader',
37+
options: {
38+
outputPath: '/images/',
39+
publicPath: `${publicPath}/images`,
40+
},
4941
exclude: /node_modules/,
50-
use: ['happypack/loader'],
5142
},
5243
],
5344
},
54-
// Marking optimization as false to cut time in terser plugin minification step
55-
optimization: {
56-
minimize: false,
57-
},
5845
plugins: [
5946
new CopyWebpackPlugin([{
6047
from: path.resolve(__dirname, '../../src/assets/mock-data'),
@@ -90,18 +77,5 @@ module.exports = smp.wrap({
9077
swDest: path.resolve(__dirname, '../../build/sw.js'),
9178
importWorkboxFrom: 'local',
9279
}),
93-
// Adding happypack plugin
94-
new HappyPack({
95-
// Adding the file-loader alongwith its options to instansiate with happypack
96-
loaders: [
97-
{
98-
loader: 'file-loader',
99-
options: {
100-
outputPath: '/images/',
101-
publicPath: `${publicPath}/images`,
102-
},
103-
},
104-
],
105-
}),
10680
],
107-
});
81+
};

docs/deployment-env.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
There are total 4 deployment environments
44

5-
| # | Environment | Backend API | Purpose | URL |
5+
| S | Environment | Backend API | Purpose | URL |
66
| - | ------------ | ----------- | --------------------- | -------------------------------------------- |
77
| 1 | Development | Development | feature/fixes testing | `https://community-app.topcoder-dev.com` |
88
| 2 | Test | Development | feature/fixes testing | `https://test-community-app.topcoder-dev.com`|

0 commit comments

Comments
 (0)