diff options
author | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2021-11-06 14:54:01 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-06 14:54:01 +0530 |
commit | 29902d83843ee6a59f152b8dd1bab8ffc7019f6f (patch) | |
tree | a434ca7a9583b6e0c671016d31a38bad31e2e209 | |
parent | 5.6.3-nightly.53 [skip ci] (diff) | |
download | ferdium-app-29902d83843ee6a59f152b8dd1bab8ffc7019f6f.tar.gz ferdium-app-29902d83843ee6a59f152b8dd1bab8ffc7019f6f.tar.zst ferdium-app-29902d83843ee6a59f152b8dd1bab8ffc7019f6f.zip |
chore: update 'node-gyp' and '@types/tar' modules; (#2183)
replace 'terser' with 'gulp-terser' to reduce custom code
-rw-r--r-- | gulpfile.babel.js | 8 | ||||
-rw-r--r-- | package-lock.json | 102 | ||||
-rw-r--r-- | package.json | 6 | ||||
-rw-r--r-- | src/components/auth/Invite.js | 4 | ||||
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 1 |
5 files changed, 96 insertions, 25 deletions
diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 9d6d1bd18..7368c7774 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js | |||
@@ -4,8 +4,7 @@ import babel from 'gulp-babel'; | |||
4 | import dartSass from 'sass'; | 4 | import dartSass from 'sass'; |
5 | import gulpSass from 'gulp-sass'; | 5 | import gulpSass from 'gulp-sass'; |
6 | import csso from 'gulp-csso'; | 6 | import csso from 'gulp-csso'; |
7 | import terser from 'terser'; | 7 | import terser from 'gulp-terser'; |
8 | import composer from 'gulp-uglify/composer'; | ||
9 | import htmlMin from 'gulp-htmlmin'; | 8 | import htmlMin from 'gulp-htmlmin'; |
10 | import connect from 'gulp-connect'; | 9 | import connect from 'gulp-connect'; |
11 | import { exec } from 'child_process'; | 10 | import { exec } from 'child_process'; |
@@ -24,7 +23,6 @@ import * as rawStyleConfig from './scripts/theme/default/legacy'; | |||
24 | dotenv.config(); | 23 | dotenv.config(); |
25 | 24 | ||
26 | const sass = gulpSass(dartSass); | 25 | const sass = gulpSass(dartSass); |
27 | const uglify = composer(terser, console); | ||
28 | 26 | ||
29 | const isDevBuild = process.env.NODE_ENV === 'development'; | 27 | const isDevBuild = process.env.NODE_ENV === 'development'; |
30 | 28 | ||
@@ -200,7 +198,7 @@ export function processJavascripts() { | |||
200 | comments: false, | 198 | comments: false, |
201 | }), | 199 | }), |
202 | ) | 200 | ) |
203 | .pipe(gulpIf(!isDevBuild, uglify())) // Only uglify in production to speed up dev builds | 201 | .pipe(gulpIf(!isDevBuild, terser())) // Only uglify in production to speed up dev builds |
204 | .pipe(gulp.dest(paths.javascripts.dest)) | 202 | .pipe(gulp.dest(paths.javascripts.dest)) |
205 | .pipe(connect.reload()); | 203 | .pipe(connect.reload()); |
206 | } | 204 | } |
@@ -214,7 +212,7 @@ export function processTypescripts() { | |||
214 | comments: false, | 212 | comments: false, |
215 | }), | 213 | }), |
216 | ) | 214 | ) |
217 | .pipe(gulpIf(!isDevBuild, uglify())) // Only uglify in production to speed up dev builds | 215 | .pipe(gulpIf(!isDevBuild, terser())) // Only uglify in production to speed up dev builds |
218 | .pipe(gulp.dest(paths.typescripts.dest)) | 216 | .pipe(gulp.dest(paths.typescripts.dest)) |
219 | .pipe(connect.reload()); | 217 | .pipe(connect.reload()); |
220 | } | 218 | } |
diff --git a/package-lock.json b/package-lock.json index 2c73e20fe..64a8de037 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -104,7 +104,7 @@ | |||
104 | "@types/react": "^17.0.31", | 104 | "@types/react": "^17.0.31", |
105 | "@types/react-dom": "^17.0.10", | 105 | "@types/react-dom": "^17.0.10", |
106 | "@types/route-parser": "^0.1.3", | 106 | "@types/route-parser": "^0.1.3", |
107 | "@types/tar": "^4.0.5", | 107 | "@types/tar": "^6.1.0", |
108 | "@types/uuid": "^8.3.1", | 108 | "@types/uuid": "^8.3.1", |
109 | "@types/validator": "^13.6.4", | 109 | "@types/validator": "^13.6.4", |
110 | "@typescript-eslint/eslint-plugin": "^5.1.0", | 110 | "@typescript-eslint/eslint-plugin": "^5.1.0", |
@@ -140,6 +140,7 @@ | |||
140 | "gulp-if": "^3.0.0", | 140 | "gulp-if": "^3.0.0", |
141 | "gulp-sass": "^5.0.0", | 141 | "gulp-sass": "^5.0.0", |
142 | "gulp-sass-variables": "^1.2.0", | 142 | "gulp-sass-variables": "^1.2.0", |
143 | "gulp-terser": "^2.1.0", | ||
143 | "gulp-typescript": "^6.0.0-alpha.1", | 144 | "gulp-typescript": "^6.0.0-alpha.1", |
144 | "gulp-uglify": "^3.0.2", | 145 | "gulp-uglify": "^3.0.2", |
145 | "hex-rgb": "^4.3.0", | 146 | "hex-rgb": "^4.3.0", |
@@ -149,13 +150,12 @@ | |||
149 | "jest": "^27.3.1", | 150 | "jest": "^27.3.1", |
150 | "kebab-case": "^1.0.1", | 151 | "kebab-case": "^1.0.1", |
151 | "mocha": "^9.1.3", | 152 | "mocha": "^9.1.3", |
152 | "node-gyp": "8.3.0", | 153 | "node-gyp": "8.4.0", |
153 | "prettier": "^2.4.1", | 154 | "prettier": "^2.4.1", |
154 | "preval-build-info": "^1.0.3", | 155 | "preval-build-info": "^1.0.3", |
155 | "rimraf": "^3.0.2", | 156 | "rimraf": "^3.0.2", |
156 | "sass": "^1.43.3", | 157 | "sass": "^1.43.3", |
157 | "simple-git": "^2.47.0", | 158 | "simple-git": "^2.47.0", |
158 | "terser": "^4.8.0", | ||
159 | "ts-loader": "^5.4.5", | 159 | "ts-loader": "^5.4.5", |
160 | "ts-mocha": "^8.0.0", | 160 | "ts-mocha": "^8.0.0", |
161 | "ts-node": "^10.2.1", | 161 | "ts-node": "^10.2.1", |
@@ -4955,9 +4955,9 @@ | |||
4955 | "dev": true | 4955 | "dev": true |
4956 | }, | 4956 | }, |
4957 | "node_modules/@types/tar": { | 4957 | "node_modules/@types/tar": { |
4958 | "version": "4.0.5", | 4958 | "version": "6.1.0", |
4959 | "resolved": "https://registry.npmjs.org/@types/tar/-/tar-4.0.5.tgz", | 4959 | "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.0.tgz", |
4960 | "integrity": "sha512-cgwPhNEabHaZcYIy5xeMtux2EmYBitfqEceBUi2t5+ETy4dW6kswt6WX4+HqLeiiKOo42EXbGiDmVJ2x+vi37Q==", | 4960 | "integrity": "sha512-uTZKMW7ZkdTJXX4+Bsp0ko9N7B5/NJ5wJRW14XTb6KNN+9i2NPel6iPKp8rTQahMW46BM9tM52dTeMSldB55og==", |
4961 | "dev": true, | 4961 | "dev": true, |
4962 | "dependencies": { | 4962 | "dependencies": { |
4963 | "@types/minipass": "*", | 4963 | "@types/minipass": "*", |
@@ -15201,6 +15201,47 @@ | |||
15201 | "node": ">=8" | 15201 | "node": ">=8" |
15202 | } | 15202 | } |
15203 | }, | 15203 | }, |
15204 | "node_modules/gulp-terser": { | ||
15205 | "version": "2.1.0", | ||
15206 | "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz", | ||
15207 | "integrity": "sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==", | ||
15208 | "dev": true, | ||
15209 | "dependencies": { | ||
15210 | "plugin-error": "^1.0.1", | ||
15211 | "terser": "^5.9.0", | ||
15212 | "through2": "^4.0.2", | ||
15213 | "vinyl-sourcemaps-apply": "^0.2.1" | ||
15214 | }, | ||
15215 | "engines": { | ||
15216 | "node": ">=10" | ||
15217 | } | ||
15218 | }, | ||
15219 | "node_modules/gulp-terser/node_modules/source-map": { | ||
15220 | "version": "0.7.3", | ||
15221 | "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", | ||
15222 | "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", | ||
15223 | "dev": true, | ||
15224 | "engines": { | ||
15225 | "node": ">= 8" | ||
15226 | } | ||
15227 | }, | ||
15228 | "node_modules/gulp-terser/node_modules/terser": { | ||
15229 | "version": "5.9.0", | ||
15230 | "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", | ||
15231 | "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", | ||
15232 | "dev": true, | ||
15233 | "dependencies": { | ||
15234 | "commander": "^2.20.0", | ||
15235 | "source-map": "~0.7.2", | ||
15236 | "source-map-support": "~0.5.20" | ||
15237 | }, | ||
15238 | "bin": { | ||
15239 | "terser": "bin/terser" | ||
15240 | }, | ||
15241 | "engines": { | ||
15242 | "node": ">=10" | ||
15243 | } | ||
15244 | }, | ||
15204 | "node_modules/gulp-typescript": { | 15245 | "node_modules/gulp-typescript": { |
15205 | "version": "6.0.0-alpha.1", | 15246 | "version": "6.0.0-alpha.1", |
15206 | "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-6.0.0-alpha.1.tgz", | 15247 | "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-6.0.0-alpha.1.tgz", |
@@ -22007,9 +22048,9 @@ | |||
22007 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" | 22048 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" |
22008 | }, | 22049 | }, |
22009 | "node_modules/node-gyp": { | 22050 | "node_modules/node-gyp": { |
22010 | "version": "8.3.0", | 22051 | "version": "8.4.0", |
22011 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.3.0.tgz", | 22052 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.0.tgz", |
22012 | "integrity": "sha512-e+vmKyTiybKgrmvs4M2REFKCnOd+NcrAAnn99Yko6NQA+zZdMlRvbIUHojfsHrSQ1CddLgZnHicnEVgDHziJzA==", | 22053 | "integrity": "sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q==", |
22013 | "dev": true, | 22054 | "dev": true, |
22014 | "dependencies": { | 22055 | "dependencies": { |
22015 | "env-paths": "^2.2.0", | 22056 | "env-paths": "^2.2.0", |
@@ -35637,9 +35678,9 @@ | |||
35637 | "dev": true | 35678 | "dev": true |
35638 | }, | 35679 | }, |
35639 | "@types/tar": { | 35680 | "@types/tar": { |
35640 | "version": "4.0.5", | 35681 | "version": "6.1.0", |
35641 | "resolved": "https://registry.npmjs.org/@types/tar/-/tar-4.0.5.tgz", | 35682 | "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.0.tgz", |
35642 | "integrity": "sha512-cgwPhNEabHaZcYIy5xeMtux2EmYBitfqEceBUi2t5+ETy4dW6kswt6WX4+HqLeiiKOo42EXbGiDmVJ2x+vi37Q==", | 35683 | "integrity": "sha512-uTZKMW7ZkdTJXX4+Bsp0ko9N7B5/NJ5wJRW14XTb6KNN+9i2NPel6iPKp8rTQahMW46BM9tM52dTeMSldB55og==", |
35643 | "dev": true, | 35684 | "dev": true, |
35644 | "requires": { | 35685 | "requires": { |
35645 | "@types/minipass": "*", | 35686 | "@types/minipass": "*", |
@@ -43871,6 +43912,37 @@ | |||
43871 | } | 43912 | } |
43872 | } | 43913 | } |
43873 | }, | 43914 | }, |
43915 | "gulp-terser": { | ||
43916 | "version": "2.1.0", | ||
43917 | "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz", | ||
43918 | "integrity": "sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==", | ||
43919 | "dev": true, | ||
43920 | "requires": { | ||
43921 | "plugin-error": "^1.0.1", | ||
43922 | "terser": "^5.9.0", | ||
43923 | "through2": "^4.0.2", | ||
43924 | "vinyl-sourcemaps-apply": "^0.2.1" | ||
43925 | }, | ||
43926 | "dependencies": { | ||
43927 | "source-map": { | ||
43928 | "version": "0.7.3", | ||
43929 | "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", | ||
43930 | "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", | ||
43931 | "dev": true | ||
43932 | }, | ||
43933 | "terser": { | ||
43934 | "version": "5.9.0", | ||
43935 | "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", | ||
43936 | "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", | ||
43937 | "dev": true, | ||
43938 | "requires": { | ||
43939 | "commander": "^2.20.0", | ||
43940 | "source-map": "~0.7.2", | ||
43941 | "source-map-support": "~0.5.20" | ||
43942 | } | ||
43943 | } | ||
43944 | } | ||
43945 | }, | ||
43874 | "gulp-typescript": { | 43946 | "gulp-typescript": { |
43875 | "version": "6.0.0-alpha.1", | 43947 | "version": "6.0.0-alpha.1", |
43876 | "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-6.0.0-alpha.1.tgz", | 43948 | "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-6.0.0-alpha.1.tgz", |
@@ -49068,9 +49140,9 @@ | |||
49068 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" | 49140 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" |
49069 | }, | 49141 | }, |
49070 | "node-gyp": { | 49142 | "node-gyp": { |
49071 | "version": "8.3.0", | 49143 | "version": "8.4.0", |
49072 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.3.0.tgz", | 49144 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.0.tgz", |
49073 | "integrity": "sha512-e+vmKyTiybKgrmvs4M2REFKCnOd+NcrAAnn99Yko6NQA+zZdMlRvbIUHojfsHrSQ1CddLgZnHicnEVgDHziJzA==", | 49145 | "integrity": "sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q==", |
49074 | "dev": true, | 49146 | "dev": true, |
49075 | "requires": { | 49147 | "requires": { |
49076 | "env-paths": "^2.2.0", | 49148 | "env-paths": "^2.2.0", |
diff --git a/package.json b/package.json index eaac08ce1..dc6435c4a 100644 --- a/package.json +++ b/package.json | |||
@@ -141,7 +141,7 @@ | |||
141 | "@types/react": "^17.0.31", | 141 | "@types/react": "^17.0.31", |
142 | "@types/react-dom": "^17.0.10", | 142 | "@types/react-dom": "^17.0.10", |
143 | "@types/route-parser": "^0.1.3", | 143 | "@types/route-parser": "^0.1.3", |
144 | "@types/tar": "^4.0.5", | 144 | "@types/tar": "^6.1.0", |
145 | "@types/uuid": "^8.3.1", | 145 | "@types/uuid": "^8.3.1", |
146 | "@types/validator": "^13.6.4", | 146 | "@types/validator": "^13.6.4", |
147 | "@typescript-eslint/eslint-plugin": "^5.1.0", | 147 | "@typescript-eslint/eslint-plugin": "^5.1.0", |
@@ -177,6 +177,7 @@ | |||
177 | "gulp-if": "^3.0.0", | 177 | "gulp-if": "^3.0.0", |
178 | "gulp-sass": "^5.0.0", | 178 | "gulp-sass": "^5.0.0", |
179 | "gulp-sass-variables": "^1.2.0", | 179 | "gulp-sass-variables": "^1.2.0", |
180 | "gulp-terser": "^2.1.0", | ||
180 | "gulp-typescript": "^6.0.0-alpha.1", | 181 | "gulp-typescript": "^6.0.0-alpha.1", |
181 | "gulp-uglify": "^3.0.2", | 182 | "gulp-uglify": "^3.0.2", |
182 | "hex-rgb": "^4.3.0", | 183 | "hex-rgb": "^4.3.0", |
@@ -186,13 +187,12 @@ | |||
186 | "jest": "^27.3.1", | 187 | "jest": "^27.3.1", |
187 | "kebab-case": "^1.0.1", | 188 | "kebab-case": "^1.0.1", |
188 | "mocha": "^9.1.3", | 189 | "mocha": "^9.1.3", |
189 | "node-gyp": "8.3.0", | 190 | "node-gyp": "8.4.0", |
190 | "prettier": "^2.4.1", | 191 | "prettier": "^2.4.1", |
191 | "preval-build-info": "^1.0.3", | 192 | "preval-build-info": "^1.0.3", |
192 | "rimraf": "^3.0.2", | 193 | "rimraf": "^3.0.2", |
193 | "sass": "^1.43.3", | 194 | "sass": "^1.43.3", |
194 | "simple-git": "^2.47.0", | 195 | "simple-git": "^2.47.0", |
195 | "terser": "^4.8.0", | ||
196 | "ts-loader": "^5.4.5", | 196 | "ts-loader": "^5.4.5", |
197 | "ts-mocha": "^8.0.0", | 197 | "ts-mocha": "^8.0.0", |
198 | "ts-node": "^10.2.1", | 198 | "ts-node": "^10.2.1", |
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index dd71c2450..f23417870 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js | |||
@@ -125,8 +125,8 @@ class Invite extends Component { | |||
125 | .some(emailValue => emailValue.trim() !== ''); | 125 | .some(emailValue => emailValue.trim() !== ''); |
126 | 126 | ||
127 | const sendButtonClassName = classnames({ | 127 | const sendButtonClassName = classnames({ |
128 | auth__button: true, | 128 | 'auth__button': true, |
129 | 'invite__embed--button': embed, | 129 | 'invite__embed--button': embed |
130 | }); | 130 | }); |
131 | 131 | ||
132 | const renderForm = ( | 132 | const renderForm = ( |
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 3e0736fb5..50a28803f 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -190,6 +190,7 @@ AppLayoutContainer.wrappedComponent.propTypes = { | |||
190 | app: PropTypes.instanceOf(AppStore).isRequired, | 190 | app: PropTypes.instanceOf(AppStore).isRequired, |
191 | requests: PropTypes.instanceOf(RequestStore).isRequired, | 191 | requests: PropTypes.instanceOf(RequestStore).isRequired, |
192 | }).isRequired, | 192 | }).isRequired, |
193 | // eslint-disable-next-line react/require-default-props | ||
193 | children: oneOrManyChildElements, | 194 | children: oneOrManyChildElements, |
194 | }; | 195 | }; |
195 | 196 | ||