Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit c67e84d

Browse files
committed
Merge branch 'develop'
2 parents 70b320f + 27770e4 commit c67e84d

File tree

62 files changed

+28750
-17822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+28750
-17822
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
# Jest unit-tests).
7979
test:
8080
docker:
81-
- image: circleci/node:8.11.1
81+
- image: circleci/node:8.11.2
8282
steps:
8383
- checkout
8484
- restore_cache:

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v8.11.1
1+
v8.11.2

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# and runs it against the specified Topcoder backend (development or
33
# production) when container is executed.
44

5-
FROM node:8.11.1
5+
FROM node:8.11.2
66

77
WORKDIR /opt/app
88
COPY . .

__tests__/shared/reducers/__snapshots__/index.js.snap

+6-42
Original file line numberDiff line numberDiff line change
@@ -25,48 +25,6 @@ Object {
2525
"unregistering": false,
2626
"updatingChallengeUuid": "",
2727
},
28-
"challengeListing": Object {
29-
"allDraftChallengesLoaded": false,
30-
"allPastChallengesLoaded": false,
31-
"allReviewOpportunitiesLoaded": false,
32-
"challengeSubtracks": Array [],
33-
"challengeSubtracksMap": Object {},
34-
"challengeTags": Array [],
35-
"challenges": Array [],
36-
"expandedTags": Array [],
37-
"filter": Object {},
38-
"filterPanel": Object {
39-
"expanded": false,
40-
"searchText": "",
41-
"trackModalShown": false,
42-
},
43-
"keepPastPlaceholders": false,
44-
"lastRequestedPageOfDraftChallenges": -1,
45-
"lastRequestedPageOfPastChallenges": -1,
46-
"lastRequestedPageOfReviewOpportunities": -1,
47-
"lastUpdateOfActiveChallenges": 0,
48-
"loadingActiveChallengesUUID": "",
49-
"loadingChallengeSubtracks": false,
50-
"loadingChallengeTags": false,
51-
"loadingDraftChallengesUUID": "",
52-
"loadingPastChallengesUUID": "",
53-
"loadingReviewOpportunitiesUUID": "",
54-
"reviewOpportunities": Array [],
55-
"selectedCommunityId": "",
56-
"sidebar": Object {
57-
"activeBucket": "all",
58-
"activeSavedFilter": 0,
59-
"editSavedFiltersMode": false,
60-
"isSavingFilter": false,
61-
"savedFilters": Array [],
62-
},
63-
"sorts": Object {},
64-
"srms": Object {
65-
"data": Array [],
66-
"loadingUuid": "",
67-
"timestamp": 0,
68-
},
69-
},
7028
"direct": Object {
7129
"loadingProjectDetailsForId": 0,
7230
"loadingProjectsForUsername": "",
@@ -90,6 +48,9 @@ Object {
9048
"groups": Object {},
9149
"loading": Object {},
9250
},
51+
"lookup": Object {
52+
"skillTags": Array [],
53+
},
9354
"memberTasks": Object {
9455
"allLoaded": false,
9556
"lastRequestedPageNum": -1,
@@ -137,6 +98,9 @@ Object {
13798
"isLoadingDetails": false,
13899
"requiredTerms": Array [],
139100
},
101+
"settings": Object {
102+
"userTraits": Array [],
103+
},
140104
"stats": Object {
141105
"communities": Object {},
142106
},

config/jest/default.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const config = require('topcoder-react-utils/config/jest/default');
22

3-
config.transformIgnorePatterns[0] =
4-
'/node_modules/(?!appirio-tech|topcoder|tc-)';
3+
config.transformIgnorePatterns[0] = '/node_modules/(?!appirio-tech|topcoder|tc-)';
54

65
module.exports = config;

config/webpack/development.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const path = require('path');
2-
const standardConfigFactory =
3-
require('topcoder-react-utils/config/webpack/app-development');
2+
const standardConfigFactory = require('topcoder-react-utils/config/webpack/app-development');
43
const webpack = require('webpack');
54
const webpackMerge = require('webpack-merge');
65

@@ -14,8 +13,7 @@ const standardDevelopmentConfig = standardConfigFactory({
1413
publicPath: '/api/cdn/public/static-assets',
1514
});
1615

17-
const jsxRule = standardDevelopmentConfig.module.rules.find(rule =>
18-
rule.loader === 'babel-loader');
16+
const jsxRule = standardDevelopmentConfig.module.rules.find(rule => rule.loader === 'babel-loader');
1917
jsxRule.exclude = [
2018
/node_modules[\\/](?!appirio-tech.*|topcoder|tc-)/,
2119
/src[\\/]assets[\\/]fonts/,

config/webpack/production.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const path = require('path');
2-
const standardConfigFactory =
3-
require('topcoder-react-utils/config/webpack/app-production');
2+
const standardConfigFactory = require('topcoder-react-utils/config/webpack/app-production');
43
const webpack = require('webpack');
54
const webpackMerge = require('webpack-merge');
65

@@ -22,8 +21,7 @@ const standardProductionConfig = standardConfigFactory({
2221
keepBuildInfo: Boolean(global.KEEP_BUILD_INFO),
2322
});
2423

25-
const jsxRule = standardProductionConfig.module.rules.find(rule =>
26-
rule.loader === 'babel-loader');
24+
const jsxRule = standardProductionConfig.module.rules.find(rule => rule.loader === 'babel-loader');
2725
jsxRule.exclude = [
2826
/node_modules[\\/](?!appirio-tech.*|topcoder|tc-)/,
2927
/src[\\/]assets[\\/]fonts/,

0 commit comments

Comments
 (0)