Skip to content
This repository was archived by the owner on Dec 26, 2022. It is now read-only.

Commit 3b9adf8

Browse files
committed
Merge branch 'fix-deps' into features-v1.0.1
2 parents 431430b + 79ab3cd commit 3b9adf8

File tree

3 files changed

+414
-2635
lines changed

3 files changed

+414
-2635
lines changed

package.json

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
"postinstall": "node -r @babel/register .erb/scripts/CheckNativeDep.js && electron-builder install-app-deps && yarn cross-env NODE_ENV=development webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.babel.js && opencollective-postinstall && yarn-deduplicate yarn.lock",
1414
"start": "node -r @babel/register ./.erb/scripts/CheckPortInUse.js && cross-env yarn start:renderer",
1515
"start:main": "cross-env NODE_ENV=development electron -r ./.erb/scripts/BabelRegister ./src/main.dev.ts",
16-
"start:renderer": "cross-env NODE_ENV=development webpack serve --config ./.erb/configs/webpack.config.renderer.dev.babel.js",
17-
"test": "jest"
16+
"start:renderer": "cross-env NODE_ENV=development webpack serve --config ./.erb/configs/webpack.config.renderer.dev.babel.js"
1817
},
1918
"lint-staged": {
2019
"*.{js,jsx,ts,tsx}": [
@@ -112,27 +111,6 @@
112111
"hot",
113112
"reload"
114113
],
115-
"jest": {
116-
"testURL": "http://localhost/",
117-
"moduleNameMapper": {
118-
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/.erb/mocks/fileMock.js",
119-
"\\.(css|less|sass|scss)$": "identity-obj-proxy"
120-
},
121-
"moduleFileExtensions": [
122-
"js",
123-
"jsx",
124-
"ts",
125-
"tsx",
126-
"json"
127-
],
128-
"moduleDirectories": [
129-
"node_modules",
130-
"src/node_modules"
131-
],
132-
"setupFiles": [
133-
"./.erb/scripts/CheckBuildsExist.js"
134-
]
135-
},
136114
"devDependencies": {
137115
"@babel/core": "^7.12.9",
138116
"@babel/plugin-proposal-class-properties": "^7.12.1",
@@ -159,22 +137,15 @@
159137
"@babel/register": "^7.12.1",
160138
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
161139
"@teamsupercell/typings-for-css-modules-loader": "^2.4.0",
162-
"@testing-library/jest-dom": "^5.11.6",
163-
"@testing-library/react": "^11.2.2",
164-
"@types/enzyme": "^3.10.5",
165-
"@types/enzyme-adapter-react-16": "^1.0.6",
166140
"@types/history": "4.7.6",
167-
"@types/jest": "^26.0.15",
168141
"@types/node": "14.14.10",
169142
"@types/react": "^16.9.44",
170143
"@types/react-dom": "^16.9.9",
171144
"@types/react-router-dom": "^5.1.6",
172-
"@types/react-test-renderer": "^16.9.3",
173145
"@types/webpack-env": "^1.15.2",
174146
"@typescript-eslint/eslint-plugin": "^4.8.1",
175147
"@typescript-eslint/parser": "^4.8.1",
176148
"babel-eslint": "^10.1.0",
177-
"babel-jest": "^26.1.0",
178149
"babel-loader": "^8.2.2",
179150
"babel-plugin-dev-expression": "^0.2.2",
180151
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
@@ -184,16 +155,13 @@
184155
"core-js": "^3.6.5",
185156
"cross-env": "^7.0.2",
186157
"css-loader": "^5.0.1",
187-
"css-minimizer-webpack-plugin": "^1.1.5",
158+
"css-minimizer-webpack-plugin": "^2.0.0",
188159
"detect-port": "^1.3.0",
189160
"electron": "^12.0.2",
190161
"electron-builder": "^22.11.1",
191162
"electron-devtools-installer": "git+https://github.com/MarshallOfSound/electron-devtools-installer.git",
192163
"electron-notarize": "^1.0.0",
193164
"electron-rebuild": "^2.3.2",
194-
"enzyme": "^3.11.0",
195-
"enzyme-adapter-react-16": "^1.15.3",
196-
"enzyme-to-json": "^3.5.0",
197165
"eslint": "^7.5.0",
198166
"eslint-config-airbnb": "^18.2.0",
199167
"eslint-config-airbnb-typescript": "^12.0.0",
@@ -202,23 +170,19 @@
202170
"eslint-import-resolver-webpack": "^0.13.0",
203171
"eslint-plugin-compat": "^3.8.0",
204172
"eslint-plugin-import": "^2.22.0",
205-
"eslint-plugin-jest": "^24.1.3",
206173
"eslint-plugin-jsx-a11y": "6.4.1",
207174
"eslint-plugin-prettier": "^3.1.4",
208175
"eslint-plugin-promise": "^4.2.1",
209176
"eslint-plugin-react": "^7.20.6",
210177
"eslint-plugin-react-hooks": "^4.0.8",
211178
"file-loader": "^6.0.0",
212179
"husky": "^4.2.5",
213-
"identity-obj-proxy": "^3.0.0",
214-
"jest": "^26.1.0",
215180
"lint-staged": "^10.2.11",
216181
"mini-css-extract-plugin": "^1.3.1",
217182
"node-sass": "^5.0.0",
218183
"opencollective-postinstall": "^2.0.3",
219184
"prettier": "^2.0.5",
220185
"react-refresh": "^0.9.0",
221-
"react-test-renderer": "^17.0.1",
222186
"rimraf": "^3.0.0",
223187
"sass-loader": "^10.1.0",
224188
"style-loader": "^2.0.0",
@@ -242,7 +206,7 @@
242206
"date-fns": "2.20.1",
243207
"dotenv": "10.0.0",
244208
"electron-debug": "^3.1.0",
245-
"electron-log": "^4.3.5",
209+
"electron-log": "^4.2.4",
246210
"electron-updater": "^4.3.4",
247211
"electron-windows-badge": "1.1.0",
248212
"history": "^5.0.0",

src/main.prod.js.LICENSE.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/*!
2+
* cookie
3+
* Copyright(c) 2012-2014 Roman Shtylman
4+
* Copyright(c) 2015 Douglas Christopher Wilson
5+
* MIT Licensed
6+
*/
7+
18
/*! *****************************************************************************
29
Copyright (c) Microsoft Corporation.
310

0 commit comments

Comments
 (0)