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

Commit 298e528

Browse files
committedJul 5, 2018
Update of npm dependencies
Not functional due to topcoder-platform/topcoder-react-lib#15
1 parent 4dd2d18 commit 298e528

File tree

7 files changed

+31610
-17244
lines changed

7 files changed

+31610
-17244
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 . .

‎package-lock.json

+31,516-17,178
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+48-42
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
{
22
"name": "topcoder-payment-tool",
3-
"version": "0.0.1",
3+
"version": "0.2.0",
44
"description": "Topcoder Payment Tool",
55
"main": "index.js",
66
"scripts": {
77
"build": "npm run clean && ./node_modules/.bin/webpack --env=production --progress --profile --colors --display-optimization-bailout",
88
"build:dev": "npm run clean && ./node_modules/.bin/webpack --env=development --progress --profile --colors --display-optimization-bailout",
99
"clean": "./node_modules/.bin/rimraf build",
1010
"dev": "cross-env BABEL_ENV=development NODE_ENV=development node ./bin/www",
11-
"fix:js": "./node_modules/.bin/eslint --fix --ext .js,.jsx .",
12-
"fix:styles": "./node_modules/.bin/stylelint **/*.scss --syntax scss --fix",
1311
"jest": "cross-env BABEL_ENV=test ./node_modules/.bin/jest --no-cache --maxWorkers=4 --config config/jest/default.js",
1412
"lint": "npm run lint:js && npm run lint:scss",
1513
"lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .",
@@ -35,77 +33,85 @@
3533
"dependencies": {
3634
"babel-register": "^6.26.0",
3735
"babel-runtime": "^6.26.0",
36+
"browser-cookies": "^1.1.0",
3837
"cross-env": "^5.1.4",
38+
"express": "^4.16.3",
3939
"i": "^0.3.6",
4040
"isomorphic-fetch": "^2.2.1",
41-
"lodash": "^4.17.5",
42-
"moment": "^2.22.1",
43-
"moment-timezone": "^0.5.17",
41+
"lodash": "^4.17.10",
42+
"moment": "^2.22.2",
43+
"moment-timezone": "^0.5.21",
4444
"npm": "^6.1.0",
45-
"prop-types": "^15.6.0",
45+
"prop-types": "^15.6.2",
46+
"qs": "^6.5.2",
4647
"rc-tooltip": "^3.4.9",
47-
"browser-cookies": "^1.1.0",
48-
"react": "^16.3.2",
48+
"react": "^16.4.1",
4949
"react-css-super-themr": "^2.2.0",
5050
"react-dates": "^12.6.0",
51-
"react-redux": "^5.0.3",
52-
"react-router-dom": "^4.2.2",
51+
"react-redux": "^5.0.7",
52+
"react-router-dom": "^4.3.1",
5353
"react-select": "^1.1.0",
54-
"slick-carousel": "^1.8.1",
55-
"redux": "^3.6.0",
56-
"qs": "^6.5.1",
57-
"express": "^4.16.2",
58-
"redux-actions": "^2.0.1",
54+
"redux": "^3.7.2",
55+
"redux-actions": "^2.4.0",
5956
"shortid": "^2.2.8",
60-
"tc-accounts": "https://github.com/appirio-tech/accounts-app.git#dev",
61-
"topcoder-react-lib": "0.0.6",
62-
"topcoder-react-ui-kit": "^0.2.5",
63-
"topcoder-react-utils": "^0.3.11"
57+
"slick-carousel": "^1.8.1",
58+
"tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
59+
"topcoder-react-lib": "^0.4.0",
60+
"topcoder-react-ui-kit": "^0.5.0",
61+
"topcoder-react-utils": "^0.7.0"
6462
},
6563
"devDependencies": {
66-
"autoprefixer": "^8.5.0",
64+
"autoprefixer": "^8.6.4",
6765
"babel-cli": "^6.26.0",
68-
"babel-eslint": "^8.2.3",
66+
"babel-eslint": "^8.2.5",
6967
"babel-loader": "^7.1.4",
7068
"babel-plugin-css-modules-transform": "^1.6.1",
71-
"babel-plugin-dynamic-import-node": "^1.2.0",
72-
"babel-plugin-inline-react-svg": "^0.5.2",
69+
"babel-plugin-dynamic-import-node": "^2.0.0",
70+
"babel-plugin-inline-react-svg": "^0.5.3",
7371
"babel-plugin-module-resolver": "^3.1.1",
7472
"babel-plugin-react-css-modules": "^3.4.2",
75-
"babel-plugin-transform-assets": "^0.2.0",
73+
"babel-plugin-transform-assets": "^1.0.1",
74+
"babel-plugin-transform-export-extensions": "^6.22.0",
7675
"babel-plugin-transform-runtime": "^6.23.0",
7776
"babel-polyfill": "^6.26.0",
7877
"babel-preset-env": "^1.7.0",
7978
"babel-preset-react": "^6.24.1",
8079
"babel-preset-stage-2": "^6.24.1",
80+
"command-line-args": "^5.0.2",
81+
"command-line-usage": "^5.0.5",
8182
"css-loader": "^0.28.11",
8283
"eslint": "^4.19.1",
83-
"eslint-config-airbnb": "^16.1.0",
84-
"eslint-import-resolver-babel-module": "^4.0.0",
85-
"eslint-plugin-import": "^2.12.0",
86-
"eslint-plugin-jest": "^21.15.2",
84+
"eslint-config-airbnb": "^17.0.0",
85+
"eslint-import-resolver-babel-module": "^4.0.0-beta.3",
86+
"eslint-plugin-import": "^2.13.0",
87+
"eslint-plugin-jest": "^21.17.0",
8788
"eslint-plugin-jsx-a11y": "^6.0.3",
88-
"eslint-plugin-react": "^7.8.2",
89-
"extract-css-chunks-webpack-plugin": "^2.0.19",
89+
"eslint-plugin-react": "^7.10.0",
9090
"file-loader": "^1.1.11",
9191
"identity-obj-proxy": "^3.0.0",
92-
"jest": "^22.4.4",
92+
"jest": "^23.2.0",
93+
"jsdoc-to-markdown": "^4.0.1",
94+
"mini-css-extract-plugin": "^0.4.1",
95+
"mkpath": "^1.0.0",
96+
"mockdate": "^2.0.2",
9397
"node-sass": "^4.9.0",
9498
"nodelist-foreach-polyfill": "^1.2.0",
95-
"optimize-css-assets-webpack-plugin": "^3.2.0",
99+
"optimize-css-assets-webpack-plugin": "^4.0.3",
96100
"postcss-loader": "^2.1.5",
97-
"postcss-scss": "^1.0.5",
98-
"react-hot-loader": "^4.2.0",
99-
"react-test-renderer": "^16.4.0",
101+
"postcss-scss": "^1.0.6",
102+
"react-hot-loader": "^4.3.3",
103+
"react-test-renderer": "^16.4.1",
100104
"resolve-url-loader": "^2.3.0",
101105
"rimraf": "^2.6.2",
102-
"sass-loader": "^6.0.7",
103-
"style-loader": "^0.20.3",
104-
"stylelint": "^9.2.1",
106+
"sass-loader": "^7.0.3",
107+
"style-loader": "^0.21.0",
108+
"stylelint": "^9.3.0",
105109
"stylelint-config-standard": "^18.2.0",
106-
"webpack": "^3.12.0",
107-
"webpack-dev-middleware": "^2.0.6",
110+
"webpack": "^4.14.0",
111+
"webpack-cli": "^3.0.8",
112+
"webpack-dev-middleware": "^3.1.3",
108113
"webpack-hot-middleware": "^2.22.2",
109-
"webpack-merge": "^4.1.2"
114+
"webpack-merge": "^4.1.3",
115+
"webpack-stats-plugin": "^0.2.1"
110116
}
111117
}

‎src/shared/App.jsx

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/**
2+
* Root component of the app.
3+
*/
4+
5+
import React from 'react';
6+
import Routes from 'routes';
7+
8+
import { DevTools, MetaTags, isomorphy } from 'topcoder-react-utils';
9+
10+
import 'styles/global.scss';
11+
import 'slick-carousel/slick/slick.css';
12+
import 'slick-carousel/slick/slick-theme.css';
13+
14+
export default function Application() {
15+
return (
16+
<div>
17+
<MetaTags
18+
title="Topcoder Payment Tool"
19+
description="Topcoder Payment Tool"
20+
/>
21+
<Routes />
22+
{ isomorphy.isDevBuild() ? <DevTools /> : undefined }
23+
</div>
24+
);
25+
}

‎src/shared/index.jsx

+18-21
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
/**
2-
* Root component of the app.
2+
* The shared part of Topcoder Payment Tool. This code is further wrapped in
3+
* different ways by Wepback and ExpressJS server to properly support both
4+
* client- and server-side rendering.
5+
*
6+
* This very file is the entry point that ensures correct order of imported
7+
* external styles.
38
*/
49

5-
import React from 'react';
6-
import Routes from 'routes';
7-
8-
import { DevTools, MetaTags, isomorphy } from 'topcoder-react-utils';
10+
/* eslint-disable global-require */
11+
if (process.env.NODE_ENV === 'production') {
12+
require('topcoder-react-ui-kit/dist/prod/style.css');
13+
} else {
14+
require('topcoder-react-ui-kit/dist/dev/style.css');
15+
}
16+
/* eslint-enable global-require */
917

10-
import 'topcoder-react-ui-kit/dist/style.css';
18+
require('styles/global.scss');
19+
require('slick-carousel/slick/slick.css');
20+
require('slick-carousel/slick/slick-theme.css');
1121

12-
import 'styles/global.scss';
13-
import 'slick-carousel/slick/slick.css';
14-
import 'slick-carousel/slick/slick-theme.css';
22+
const App = require('./App').default;
1523

16-
export default function Application() {
17-
return (
18-
<div>
19-
<MetaTags
20-
title="Topcoder Payment Tool"
21-
description="Topcoder Payment Tool"
22-
/>
23-
<Routes />
24-
{ isomorphy.isDevBuild() ? <DevTools /> : undefined }
25-
</div>
26-
);
27-
}
24+
export default App;

0 commit comments

Comments
 (0)
This repository has been archived.