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

Commit 8c1cf69

Browse files
committed
chore(yarn): update to yarn 2
1 parent a95d64f commit 8c1cf69

File tree

7 files changed

+17948
-12600
lines changed

7 files changed

+17948
-12600
lines changed

Diff for: .gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ main.js
1313
# dependencies
1414
/node_modules
1515

16+
# yarn
17+
.yarn/*
18+
!.yarn/patches
19+
!.yarn/releases
20+
!.yarn/plugins
21+
!.yarn/sdks
22+
!.yarn/versions
23+
.pnp.*
24+
1625
# IDEs and editors
1726
/.idea
1827
.project

Diff for: .npmrc

-2
This file was deleted.

Diff for: .yarn/releases/yarn-berry.cjs

+55
Large diffs are not rendered by default.

Diff for: .yarnrc.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
yarnPath: ".yarn/releases/yarn-berry.cjs"
2+
nodeLinker: node-modules
3+
# npmRegistryServer: https://registry.npm.taobao.org
4+
# ${ELECTRON_MIRROR}: http://npm.taobao.org/mirrors/electron/

Diff for: main.webpack.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,15 @@ module.exports = {
3333
path.resolve(__dirname, "src/background"),
3434
path.resolve(__dirname, "main.ts"),
3535
]
36+
},
37+
{
38+
test: /\.node$/,
39+
loader: "node-loader",
3640
}
3741
]
3842
},
3943
resolve: {
40-
extensions: ['.ts', '.js'],
44+
extensions: ['.ts', '.js', '.node'],
4145
plugins: [
4246
new TsconfigPathsPlugin({
4347
configFile: path.resolve(__dirname, "tsconfig.serve.json")

Diff for: package.json

+31-28
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,6 @@
3535
"ws": "7.4.6"
3636
},
3737
"devDependencies": {
38-
"@materia-ui/ngx-monaco-editor": "5.0.0",
39-
"angular-split": "5.0.0",
40-
"electron-is-running-in-asar": "1.0.0",
41-
"electron-store": "7.0.2",
42-
"get-port": "5.1.1",
43-
"iconv-lite": "0.6.2",
44-
"monaco-editor-core": "0.21.1",
45-
"monaco-languageclient": "0.13.1-next.4",
46-
"ng-zorro-antd": "11.0.1",
47-
"reconnecting-websocket": "4.2.0",
48-
"tsgdbmi": "0.3.2",
49-
"uuid": "8.3.2",
5038
"@angular-builders/custom-webpack": "11.1.0",
5139
"@angular-devkit/build-angular": "0.1102.2",
5240
"@angular-eslint/builder": "0.8.0-beta.3",
@@ -65,31 +53,38 @@
6553
"@angular/platform-browser": "11.2.3",
6654
"@angular/platform-browser-dynamic": "11.2.3",
6755
"@angular/router": "11.2.3",
56+
"@materia-ui/ngx-monaco-editor": "5.0.0",
6857
"@ngx-translate/core": "13.0.0",
6958
"@ngx-translate/http-loader": "6.0.0",
70-
"@types/express": "4.17.11",
59+
"@types/express": "^4.17.11",
7160
"@types/jasmine": "3.6.2",
7261
"@types/jasminewd2": "2.0.8",
7362
"@types/mocha": "8.0.4",
7463
"@types/node": "12.12.6",
7564
"@types/vscode": "1.52.0",
76-
"@types/webpack": "4.41.25",
77-
"@types/ws": "7.4.0",
65+
"@types/webpack": "^4.41.25",
66+
"@types/ws": "^7.4.0",
7867
"@typescript-eslint/eslint-plugin": "4.7.0",
7968
"@typescript-eslint/eslint-plugin-tslint": "4.7.0",
8069
"@typescript-eslint/parser": "4.7.0",
70+
"angular-split": "^5.0.0",
8171
"chai": "4.2.0",
72+
"chcp": "https://github.com/Guyutongxue/chcp/tarball/8fdd1eb2eecb3b9cd1194ead6beb3bdc0e0966d9",
8273
"conventional-changelog-cli": "2.1.1",
8374
"copy-webpack-plugin": "7.0.0",
8475
"core-js": "3.6.5",
8576
"cross-env": "7.0.2",
8677
"electron": "11.1.0",
87-
"electron-builder": "22.9.1",
88-
"electron-typed-ipc": "0.1.0",
89-
"eslint": "7.13.0",
90-
"eslint-plugin-import": "2.22.1",
91-
"eslint-plugin-jsdoc": "30.7.8",
92-
"eslint-plugin-prefer-arrow": "1.2.2",
78+
"electron-builder": "^22.9.1",
79+
"electron-is-running-in-asar": "^1.0.0",
80+
"electron-store": "^7.0.2",
81+
"electron-typed-ipc": "^0.1.0",
82+
"eslint": "^7.13.0",
83+
"eslint-plugin-import": "^2.22.1",
84+
"eslint-plugin-jsdoc": "^30.7.8",
85+
"eslint-plugin-prefer-arrow": "^1.2.2",
86+
"get-port": "^5.1.1",
87+
"iconv-lite": "^0.6.2",
9388
"jasmine-core": "3.6.0",
9489
"jasmine-spec-reporter": "6.0.0",
9590
"karma": "~6.1.1",
@@ -99,16 +94,24 @@
9994
"karma-jasmine-html-reporter": "1.5.4",
10095
"mini-css-extract-plugin": "1.3.9",
10196
"mocha": "8.2.1",
97+
"monaco-editor-core": "0.21.1",
98+
"monaco-languageclient": "0.13.1-next.4",
99+
"ng-zorro-antd": "^11.4.2",
100+
"node-gyp": "^8.1.0",
102101
"node-libs-browser": "2.2.1",
103-
"npm-run-all": "4.1.5",
102+
"node-loader": "^2.0.0",
103+
"npm-run-all": "^4.1.5",
104+
"reconnecting-websocket": "^4.2.0",
104105
"rxjs": "7.0.0-beta.10",
105106
"spectron": "13.0.0",
106-
"ts-loader": "8.0.17",
107-
"ts-node": "9.1.0",
108-
"tsconfig-paths-webpack-plugin": "3.3.0",
109-
"tslib": "2.0.3",
110-
"typescript": "4.0.5",
111-
"wait-on": "5.2.1",
107+
"ts-loader": "^8.0.17",
108+
"ts-node": "^9.1.0",
109+
"tsconfig-paths-webpack-plugin": "^3.3.0",
110+
"tsgdbmi": "^0.3.2",
111+
"tslib": "^2.0.3",
112+
"typescript": "^4.0.5",
113+
"uuid": "^8.3.2",
114+
"wait-on": "^5.2.1",
112115
"webdriver-manager": "12.1.7",
113116
"webpack": "5.24.2",
114117
"webpack-cli": "4.5.0",

0 commit comments

Comments
 (0)