Skip to content

Commit b63c31b

Browse files
authoredApr 18, 2020
Merge pull request #281 from coderoad/use-yarn
Migrate NPM to Yarn
·
v0.19.40.4.0
2 parents d875e4c + 2c41a38 commit b63c31b

File tree

7 files changed

+18452
-33209
lines changed

7 files changed

+18452
-33209
lines changed
 

‎package-lock.json

Lines changed: 0 additions & 7337 deletions
This file was deleted.

‎package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"scripts": {
2727
"build": "./scripts/build.sh",
2828
"postinstall": "node ./node_modules/vscode/bin/install",
29+
"install-all": "yarn && cd web-app && yarn",
2930
"lint": "eslint src/**/*ts",
3031
"package": "./scripts/package.sh",
3132
"storybook": "cd web-app && npm run storybook",
@@ -37,20 +38,20 @@
3738
"@types/assert": "^1.4.6",
3839
"@types/jest": "^25.2.1",
3940
"@types/jsdom": "^16.2.1",
40-
"@types/node": "^13.11.1",
41+
"@types/node": "^13.13.0",
4142
"@types/semver": "^7.1.0",
42-
"@typescript-eslint/eslint-plugin": "^2.27.0",
43-
"@typescript-eslint/parser": "^2.27.0",
43+
"@typescript-eslint/eslint-plugin": "^2.28.0",
44+
"@typescript-eslint/parser": "^2.28.0",
4445
"chokidar": "^3.3.0",
4546
"dotenv": "^8.2.0",
4647
"eslint": "^6.8.0",
4748
"eslint-config-prettier": "^6.10.1",
48-
"eslint-plugin-prettier": "^3.1.2",
49+
"eslint-plugin-prettier": "^3.1.3",
4950
"jest": "^25.3.0",
5051
"jsdom": "^16.2.2",
5152
"prettier": "^2.0.4",
52-
"semver": "^7.2.2",
53-
"ts-jest": "^25.3.1",
53+
"semver": "^7.3.2",
54+
"ts-jest": "^25.4.0",
5455
"typescript": "^3.8.3"
5556
},
5657
"devDependencies": {

‎scripts/package.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ OUTPUT_FILE=coderoad-$PACKAGE_VERSION.vsix
1212
echo "Creating $OUTPUT_FILE..."
1313

1414
echo "Building..."
15-
npm run build
15+
yarn build
1616

1717
echo "Packaging Extension..."
18-
vsce package --out ./$RELEASES_FOLDER
18+
vsce package --yarn --out ./$RELEASES_FOLDER
1919

2020
echo "Installing Extension..."
2121
code --install-extension ./$RELEASES_FOLDER/$OUTPUT_FILE

‎web-app/package-lock.json

Lines changed: 0 additions & 25858 deletions
This file was deleted.

‎web-app/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"extends": "react-app"
2626
},
2727
"dependencies": {
28-
"@alifd/next": "^1.19.24",
28+
"@alifd/next": "^1.19.25",
2929
"@alifd/theme-4": "^0.2.3",
3030
"@emotion/babel-preset-css-prop": "^10.0.27",
3131
"@emotion/core": "^10.0.28",
@@ -38,7 +38,7 @@
3838
"react-addons-css-transition-group": "^15.6.2",
3939
"react-dom": "^16.13.1",
4040
"reselect": "^4.0.0",
41-
"xstate": "^4.8.0"
41+
"xstate": "^4.9.1"
4242
},
4343
"devDependencies": {
4444
"@babel/core": "^7.9.0",
@@ -51,19 +51,19 @@
5151
"@types/highlight.js": "^9.12.3",
5252
"@types/jest": "^25.2.1",
5353
"@types/markdown-it": "^10.0.0",
54-
"@types/node": "^13.11.1",
54+
"@types/node": "^13.13.0",
5555
"@types/prismjs": "^1.16.0",
5656
"@types/react": "^16.9.34",
5757
"@types/react-addons-css-transition-group": "^15.0.5",
5858
"@types/react-dom": "^16.9.6",
59-
"@typescript-eslint/eslint-plugin": "^2.27.0",
60-
"@typescript-eslint/parser": "^2.27.0",
59+
"@typescript-eslint/eslint-plugin": "^2.28.0",
60+
"@typescript-eslint/parser": "^2.28.0",
6161
"babel-loader": "8.1.0",
6262
"babel-plugin-import": "^1.13.0",
6363
"customize-cra": "^0.9.1",
6464
"eslint": "^6.8.0",
6565
"eslint-config-prettier": "^6.10.1",
66-
"eslint-plugin-prettier": "^3.1.2",
66+
"eslint-plugin-prettier": "^3.1.3",
6767
"mini-css-extract-plugin": "^0.9.0",
6868
"node-sass": "^4.13.1",
6969
"prettier": "^2.0.4",

‎web-app/yarn.lock

Lines changed: 14045 additions & 0 deletions
Large diffs are not rendered by default.

‎yarn.lock

Lines changed: 4392 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.