Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5445e8f

Browse files
authored
Merge pull request#487 from coderoad/fix/git-init-default-branch-warning
Fix/git init default branch warning
2 parentsb53eea4 +f511ab5 commit5445e8f

File tree

6 files changed

+2818
-1641
lines changed

6 files changed

+2818
-1641
lines changed

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ vsc-extension-quickstart.md
2020

2121
# releases
2222
*.vsix
23-
/releases
23+
/releases
24+
25+
# other
26+
/other

‎package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,38 +35,38 @@
3535
},
3636
"dependencies": {
3737
"@types/events":"^3.0.0",
38-
"chokidar":"3.4.3",
38+
"chokidar":"3.5.1",
3939
"dotenv":"^8.2.0",
40-
"eslint":"7.16.0",
41-
"git-url-parse":"11.4.3",
40+
"eslint":"7.26.0",
41+
"git-url-parse":"11.4.4",
4242
"jest":"26.6.3",
43-
"jsdom":"^16.4.0",
43+
"jsdom":"16.5.3",
4444
"node-fetch":"^2.6.1",
45-
"semver":"7.3.4",
46-
"ts-jest":"26.4.4",
47-
"typescript":"4.1.3",
48-
"vscode-extension-telemetry":"^0.1.6"
45+
"semver":"7.3.5",
46+
"ts-jest":"26.5.6",
47+
"typescript":"4.2.4",
48+
"vscode-extension-telemetry":"0.1.7"
4949
},
5050
"devDependencies": {
51-
"@types/assert":"^1.5.2",
52-
"@types/jest":"26.0.19",
53-
"@types/jsdom":"16.2.5",
51+
"@types/assert":"1.5.4",
52+
"@types/jest":"26.0.23",
53+
"@types/jsdom":"16.2.10",
5454
"@types/node":"14.14.19",
55-
"@types/node-fetch":"^2.5.7",
56-
"@types/semver":"7.3.4",
57-
"@typescript-eslint/eslint-plugin":"4.11.1",
58-
"@typescript-eslint/parser":"4.11.1",
55+
"@types/node-fetch":"2.5.10",
56+
"@types/semver":"7.3.5",
57+
"@typescript-eslint/eslint-plugin":"4.23.0",
58+
"@typescript-eslint/parser":"4.23.0",
5959
"eslint-config-prettier":"^6.11.0",
6060
"eslint-config-react-app":"^5.2.1",
61-
"eslint-plugin-flowtype":"^5.2.0",
61+
"eslint-plugin-flowtype":"5.7.2",
6262
"eslint-plugin-import":"2.22.1",
6363
"eslint-plugin-jsx-a11y":"6.4.1",
64-
"eslint-plugin-prettier":"3.3.0",
65-
"eslint-plugin-react":"7.22.0",
64+
"eslint-plugin-prettier":"3.4.0",
65+
"eslint-plugin-react":"7.23.2",
6666
"eslint-plugin-react-hooks":"4.2.0",
67-
"prettier":"2.2.1",
67+
"prettier":"2.3.0",
6868
"vscode":"^1.1.37",
69-
"vscode-test":"1.4.1"
69+
"vscode-test":"1.5.2"
7070
},
7171
"engines": {
7272
"vscode":"^1.39.2"

‎src/services/git/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ export async function clear(): Promise<Error | void> {
7070
}
7171

7272
asyncfunctioninit():Promise<Error|void>{
73-
const{ stderr}=awaitexec({command:'git init'})
73+
// note: prevents stderr warning concerning default init branch
74+
const{ stderr}=awaitexec({command:'git init --initial-branch=master'})
7475
if(stderr){
75-
thrownewError('Error initializing Git')
76+
thrownewError(`Error initializing Git:${stderr}`)
7677
}
7778
}
7879

‎web-app/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"extends":"react-app"
2626
},
2727
"dependencies": {
28-
"@alifd/next":"1.21.16",
28+
"@alifd/next":"1.22.25",
2929
"@emotion/babel-preset-css-prop":"10.0.27",
3030
"@emotion/core":"10.0.35",
31-
"@xstate/react":"1.2.2",
31+
"@xstate/react":"1.3.3",
3232
"babel-jest":"26.6.3",
3333
"emotion-theming":"10.0.27",
3434
"js-yaml":"3.14.1",
@@ -41,23 +41,23 @@
4141
"react-dom":"16.13.1",
4242
"reselect":"4.0.0",
4343
"use-media":"1.4.0",
44-
"xstate":"4.15.3"
44+
"xstate":"4.19.1"
4545
},
4646
"devDependencies": {
47-
"@babel/core":"7.12.10",
48-
"@storybook/addon-actions":"6.1.11",
49-
"@storybook/addon-knobs":"6.1.11",
50-
"@storybook/addon-links":"6.1.11",
51-
"@storybook/addons":"6.1.11",
52-
"@storybook/preset-create-react-app":"3.1.5",
53-
"@storybook/react":"6.1.11",
47+
"@babel/core":"7.14.0",
48+
"@storybook/addon-actions":"6.2.9",
49+
"@storybook/addon-knobs":"6.2.9",
50+
"@storybook/addon-links":"6.2.9",
51+
"@storybook/addons":"6.2.9",
52+
"@storybook/preset-create-react-app":"3.1.7",
53+
"@storybook/react":"6.2.9",
5454
"@types/graphql":"14.5.0",
5555
"@types/highlight.js":"9.12.4",
56-
"@types/jest":"26.0.19",
56+
"@types/jest":"26.0.23",
5757
"@types/js-yaml":"3.12.5",
5858
"@types/markdown-it":"10.0.2",
5959
"@types/node":"14.14.19",
60-
"@types/prismjs":"1.16.2",
60+
"@types/prismjs":"1.16.5",
6161
"@types/react":"16.9.49",
6262
"@types/react-addons-css-transition-group":"15.0.5",
6363
"@types/react-dom":"16.9.8",
@@ -66,10 +66,10 @@
6666
"customize-cra":"1.0.0",
6767
"mini-css-extract-plugin":"0.11.2",
6868
"node-sass":"4.14.1",
69-
"prettier":"2.2.1",
69+
"prettier":"2.3.0",
7070
"react-app-rewired":"2.1.8",
7171
"react-scripts":"3.4.3",
7272
"sass-loader":"8.0.2",
73-
"typescript":"4.1.3"
73+
"typescript":"4.2.4"
7474
}
7575
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp