Skip to content

Fix/git init default branch warning #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 11, 2021
Merged

Fix/git init default branch warning #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c431a0
update deps
ShMcK May 11, 2021
f511ab5
fix git init default branch warning
ShMcK May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ vsc-extension-quickstart.md

# releases
*.vsix
/releases
/releases

# other
/other
40 changes: 20 additions & 20 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,38 +35,38 @@
},
"dependencies": {
"@types/events": "^3.0.0",
"chokidar": "3.4.3",
"chokidar": "3.5.1",
"dotenv": "^8.2.0",
"eslint": "7.16.0",
"git-url-parse": "11.4.3",
"eslint": "7.26.0",
"git-url-parse": "11.4.4",
"jest": "26.6.3",
"jsdom": "^16.4.0",
"jsdom": "16.5.3",
"node-fetch": "^2.6.1",
"semver": "7.3.4",
"ts-jest": "26.4.4",
"typescript": "4.1.3",
"vscode-extension-telemetry": "^0.1.6"
"semver": "7.3.5",
"ts-jest": "26.5.6",
"typescript": "4.2.4",
"vscode-extension-telemetry": "0.1.7"
},
"devDependencies": {
"@types/assert": "^1.5.2",
"@types/jest": "26.0.19",
"@types/jsdom": "16.2.5",
"@types/assert": "1.5.4",
"@types/jest": "26.0.23",
"@types/jsdom": "16.2.10",
"@types/node": "14.14.19",
"@types/node-fetch": "^2.5.7",
"@types/semver": "7.3.4",
"@typescript-eslint/eslint-plugin": "4.11.1",
"@typescript-eslint/parser": "4.11.1",
"@types/node-fetch": "2.5.10",
"@types/semver": "7.3.5",
"@typescript-eslint/eslint-plugin": "4.23.0",
"@typescript-eslint/parser": "4.23.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-react-app": "^5.2.1",
"eslint-plugin-flowtype": "^5.2.0",
"eslint-plugin-flowtype": "5.7.2",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-jsx-a11y": "6.4.1",
"eslint-plugin-prettier": "3.3.0",
"eslint-plugin-react": "7.22.0",
"eslint-plugin-prettier": "3.4.0",
"eslint-plugin-react": "7.23.2",
"eslint-plugin-react-hooks": "4.2.0",
"prettier": "2.2.1",
"prettier": "2.3.0",
"vscode": "^1.1.37",
"vscode-test": "1.4.1"
"vscode-test": "1.5.2"
},
"engines": {
"vscode": "^1.39.2"
Expand Down
5 changes: 3 additions & 2 deletions src/services/git/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ export async function clear(): Promise<Error | void> {
}

async function init(): Promise<Error | void> {
const { stderr } = await exec({ command: 'git init' })
// note: prevents stderr warning concerning default init branch
const { stderr } = await exec({ command: 'git init --initial-branch=master' })
if (stderr) {
throw new Error('Error initializing Git')
throw new Error(`Error initializing Git: ${stderr}`)
}
}

Expand Down
28 changes: 14 additions & 14 deletions web-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"extends": "react-app"
},
"dependencies": {
"@alifd/next": "1.21.16",
"@alifd/next": "1.22.25",
"@emotion/babel-preset-css-prop": "10.0.27",
"@emotion/core": "10.0.35",
"@xstate/react": "1.2.2",
"@xstate/react": "1.3.3",
"babel-jest": "26.6.3",
"emotion-theming": "10.0.27",
"js-yaml": "3.14.1",
Expand All @@ -41,23 +41,23 @@
"react-dom": "16.13.1",
"reselect": "4.0.0",
"use-media": "1.4.0",
"xstate": "4.15.3"
"xstate": "4.19.1"
},
"devDependencies": {
"@babel/core": "7.12.10",
"@storybook/addon-actions": "6.1.11",
"@storybook/addon-knobs": "6.1.11",
"@storybook/addon-links": "6.1.11",
"@storybook/addons": "6.1.11",
"@storybook/preset-create-react-app": "3.1.5",
"@storybook/react": "6.1.11",
"@babel/core": "7.14.0",
"@storybook/addon-actions": "6.2.9",
"@storybook/addon-knobs": "6.2.9",
"@storybook/addon-links": "6.2.9",
"@storybook/addons": "6.2.9",
"@storybook/preset-create-react-app": "3.1.7",
"@storybook/react": "6.2.9",
"@types/graphql": "14.5.0",
"@types/highlight.js": "9.12.4",
"@types/jest": "26.0.19",
"@types/jest": "26.0.23",
"@types/js-yaml": "3.12.5",
"@types/markdown-it": "10.0.2",
"@types/node": "14.14.19",
"@types/prismjs": "1.16.2",
"@types/prismjs": "1.16.5",
"@types/react": "16.9.49",
"@types/react-addons-css-transition-group": "15.0.5",
"@types/react-dom": "16.9.8",
Expand All @@ -66,10 +66,10 @@
"customize-cra": "1.0.0",
"mini-css-extract-plugin": "0.11.2",
"node-sass": "4.14.1",
"prettier": "2.2.1",
"prettier": "2.3.0",
"react-app-rewired": "2.1.8",
"react-scripts": "3.4.3",
"sass-loader": "8.0.2",
"typescript": "4.1.3"
"typescript": "4.2.4"
}
}
Loading