Browse Source

Switches to use yarn (maybe fixes #644?)

main
Eric Amodio 5 years ago
parent
commit
f16634542c
5 changed files with 7190 additions and 10428 deletions
  1. +2
    -0
      .vscode/settings.json
  2. +10
    -10
      CONTRIBUTING.md
  3. +0
    -10408
      package-lock.json
  4. +10
    -10
      package.json
  5. +7168
    -0
      yarn.lock

+ 2
- 0
.vscode/settings.json View File

@ -1,9 +1,11 @@
{ {
"editor.insertSpaces": true, "editor.insertSpaces": true,
"eslint.packageManager": "yarn",
"files.associations": { "files.associations": {
".eslintrc.json": "jsonc" ".eslintrc.json": "jsonc"
}, },
"files.trimTrailingWhitespace": true, "files.trimTrailingWhitespace": true,
"npm.packageManager": "yarn",
"postcssSorting.config": { "postcssSorting.config": {
"order": ["custom-properties", "dollar-variables", "declarations", "at-rules", "rules"], "order": ["custom-properties", "dollar-variables", "declarations", "at-rules", "rules"],
"properties-order": "alphabetical", "properties-order": "alphabetical",

+ 10
- 10
CONTRIBUTING.md View File

@ -19,15 +19,15 @@ git clone https://github.com/eamodio/vscode-gitlens.git
Prerequisites Prerequisites
- [Git](https://git-scm.com/) - [Git](https://git-scm.com/)
- [NodeJS](https://nodejs.org/en/), `>= 8.9.1, <= 10.2.0`
- [npm](https://npmjs.com/), `>= 6.2.0`
- [NodeJS](https://nodejs.org/), `>= 10.11.0`
- [yarn](https://yarnpkg.com/), `>= 1.17.3`
### Dependencies ### Dependencies
From a terminal, where you have cloned the repository, execute the following command to install the required dependencies: From a terminal, where you have cloned the repository, execute the following command to install the required dependencies:
``` ```
npm install --no-save
yarn --frozen-lockfile
``` ```
### Build ### Build
@ -35,7 +35,7 @@ npm install --no-save
From a terminal, where you have cloned the repository, execute the following command to re-build the project from scratch: From a terminal, where you have cloned the repository, execute the following command to re-build the project from scratch:
``` ```
npm run rebuild
yarn run rebuild
``` ```
👉 **NOTE!** This will run a complete rebuild of the project. 👉 **NOTE!** This will run a complete rebuild of the project.
@ -43,7 +43,7 @@ npm run rebuild
Or to just run a quick build, use: Or to just run a quick build, use:
``` ```
npm run build
yarn run build
``` ```
### Watch ### Watch
@ -51,7 +51,7 @@ npm run build
During development you can use a watcher to make builds on changes quick and easy. From a terminal, where you have cloned the repository, execute the following command: During development you can use a watcher to make builds on changes quick and easy. From a terminal, where you have cloned the repository, execute the following command:
``` ```
npm run watch
yarn run watch
``` ```
Or use the provided `watch` task in VS Code, execute the following from the command palette (be sure there is no `>` at the start): Or use the provided `watch` task in VS Code, execute the following from the command palette (be sure there is no `>` at the start):
@ -68,7 +68,7 @@ This will first do an initial full build and then watch for file changes, compil
### Formatting ### Formatting
This project uses [prettier](https://prettier.io/) for code formatting. You can run prettier across the code by calling `npm run pretty` from a terminal.
This project uses [prettier](https://prettier.io/) for code formatting. You can run prettier across the code by calling `yarn run pretty` from a terminal.
To format the code as you make changes you can install the [Prettier - Code formatter](https://marketplace.visualstudio.com/items/esbenp.prettier-vscode) extension. To format the code as you make changes you can install the [Prettier - Code formatter](https://marketplace.visualstudio.com/items/esbenp.prettier-vscode) extension.
@ -80,7 +80,7 @@ Add the following to your User Settings to run prettier:
### Linting ### Linting
This project uses [ESLint](https://eslint.org/) for code linting. You can run ESLint across the code by calling `npm run lint` from a terminal. Warnings from ESLint show up in the `Errors and Warnings` quick box and you can navigate to them from inside VS Code.
This project uses [ESLint](https://eslint.org/) for code linting. You can run ESLint across the code by calling `yarn run lint` from a terminal. Warnings from ESLint show up in the `Errors and Warnings` quick box and you can navigate to them from inside VS Code.
To lint the code as you make changes you can install the [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) extension. To lint the code as you make changes you can install the [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) extension.
@ -89,13 +89,13 @@ To lint the code as you make changes you can install the [ESLint](https://market
To generate a production bundle (without packaging) run the following from a terminal: To generate a production bundle (without packaging) run the following from a terminal:
``` ```
npm run bundle
yarn run bundle
``` ```
To generate a VSIX (installation package) run the following from a terminal: To generate a VSIX (installation package) run the following from a terminal:
``` ```
npm run pack
yarn run pack
``` ```
### Debugging ### Debugging

+ 0
- 10408
package-lock.json
File diff suppressed because it is too large
View File


+ 10
- 10
package.json View File

@ -5317,20 +5317,20 @@
"clean": "git clean -Xdf -e !node_modules -e !node_modules/**/*", "clean": "git clean -Xdf -e !node_modules -e !node_modules/**/*",
"lint": "eslint src/**/*.ts --fix", "lint": "eslint src/**/*.ts --fix",
"pack": "vsce package", "pack": "vsce package",
"pretty": "prettier --config .prettierrc --loglevel warn --write \"./**/*.{ts,md,json}\" && npm run lint",
"pretty": "prettier --config .prettierrc --loglevel warn --write \"./**/*.{ts,md,json}\" && yarn run lint",
"pub": "vsce publish", "pub": "vsce publish",
"rebuild": "npm run reset && npm run build",
"reset": "npm run clean && npm install --no-save",
"rebuild": "yarn run reset && yarn run build",
"reset": "yarn run clean && yarn install --no-save",
"watch": "webpack --watch --env.development --info-verbosity verbose", "watch": "webpack --watch --env.development --info-verbosity verbose",
"webviews:optimize": "webpack --config-name webviews --env.optimizeImages", "webviews:optimize": "webpack --config-name webviews --env.optimizeImages",
"webviews:watch": "webpack --watch --config-name webviews --env.development --info-verbosity verbose", "webviews:watch": "webpack --watch --config-name webviews --env.development --info-verbosity verbose",
"update:emoji": "pushd emoji && node ./shortcodeToEmoji.js && popd", "update:emoji": "pushd emoji && node ./shortcodeToEmoji.js && popd",
"vscode:prepublish": "npm run reset && npm run bundle"
"vscode:prepublish": "yarn run reset && yarn run bundle"
}, },
"dependencies": { "dependencies": {
"dayjs": "1.8.15", "dayjs": "1.8.15",
"iconv-lite": "0.5.0", "iconv-lite": "0.5.0",
"lodash-es": "4.17.14",
"lodash-es": "4.17.15",
"vsls": "0.3.1291" "vsls": "0.3.1291"
}, },
"devDependencies": { "devDependencies": {
@ -5339,9 +5339,9 @@
"@types/vscode": "1.31.0", "@types/vscode": "1.31.0",
"@typescript-eslint/eslint-plugin": "1.12.0", "@typescript-eslint/eslint-plugin": "1.12.0",
"@typescript-eslint/parser": "1.12.0", "@typescript-eslint/parser": "1.12.0",
"clean-webpack-plugin": "3.0.0",
"circular-dependency-plugin": "5.0.2", "circular-dependency-plugin": "5.0.2",
"css-loader": "3.0.0",
"clean-webpack-plugin": "3.0.0",
"css-loader": "3.1.0",
"eslint": "6.0.1", "eslint": "6.0.1",
"eslint-cli": "1.1.1", "eslint-cli": "1.1.1",
"eslint-config-prettier": "6.0.0", "eslint-config-prettier": "6.0.0",
@ -5361,8 +5361,8 @@
"ts-loader": "6.0.4", "ts-loader": "6.0.4",
"typescript": "3.5.3", "typescript": "3.5.3",
"vsce": "1.65.0", "vsce": "1.65.0",
"webpack": "4.35.3",
"webpack-cli": "3.3.6",
"webpack-bundle-analyzer": "3.3.2"
"webpack": "4.36.1",
"webpack-bundle-analyzer": "3.3.2",
"webpack-cli": "3.3.6"
} }
} }

+ 7168
- 0
yarn.lock
File diff suppressed because it is too large
View File


Loading…
Cancel
Save