提交 45e5887a 编写于 作者: T Tomas Vik

Merge branch '206-migrate-to-npm' into 'master'

Migrate yarn -> npm to fix publishing

Closes #206

See merge request gitlab-org/gitlab-vscode-extension!71
......@@ -12,8 +12,8 @@ stages:
lint:
stage: test
script:
- yarn
- yarn run eslint
- npm ci
- npm run eslint
test-integration:
stage: test
......@@ -22,18 +22,18 @@ test-integration:
script:
- apt-get update
- apt-get install -y xvfb libxtst6 libnss3 libgtk-3-0 libxss1 libasound2 libsecret-1-0
- yarn
- npm ci
- echo $DISPLAY
- /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
- yarn test
- npm test
publish:
stage: publish
script:
- yarn
- cd src/webview && yarn && yarn build && cd ../.. # build webview
- yarn global add vsce
- vsce publish --yarn -p $AZURE_ACCESS_TOKEN
- npm ci
- cd src/webview && npm install && npm run build && cd ../.. # build webview
- npm install -g vsce
- vsce publish -p $AZURE_ACCESS_TOKEN
when: manual
only:
- tags
......@@ -4,5 +4,5 @@ test/**
.gitignore
.history
jsconfig.json
vsc-extension-quickstart.md
src/webview/node_modules
.eslintrc.json
此差异已折叠。
......@@ -487,14 +487,14 @@
}
},
"scripts": {
"vscode:prepublish": "yarn run compile",
"vscode:prepublish": "npm run compile",
"compile": "tsc -p ./",
"watch": "tsc -watch -p ./",
"test": "yarn compile && node ./out/runTest.js",
"test": "npm run compile && node ./out/runTest.js",
"eslint": "eslint --max-warnings 49 --ext .js .",
"format": "prettier --write '**/*.{js,json}'",
"publish": "vsce publish",
"webview": "cd src/webview ; yarn install ; yarn watch"
"webview": "cd src/webview ; npm install ; npm run watch"
},
"devDependencies": {
"@types/mocha": "^7.0.1",
......@@ -513,7 +513,6 @@
"vscode-test": "^1.3.0"
},
"dependencies": {
"eslint-plugin-vue-libs": "^4.0.0",
"execa": "^1.0.0",
"moment": "^2.24.0",
"request": "^2.88.0",
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册