Skip to content

Commit 6cb99d3

Browse files
committed
Removes separate package.json for ui build
Consolidates ui dependencies & build into main
1 parent 877cae2 commit 6cb99d3

File tree

7 files changed

+6116
-11410
lines changed

7 files changed

+6116
-11410
lines changed

package-lock.json

Lines changed: 6044 additions & 726 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3519,19 +3519,22 @@
35193519
}
35203520
},
35213521
"scripts": {
3522-
"build": "npm run lint && tsc -m commonjs -p ./ && npm run ui:build -- --env.quick",
3523-
"bundle": "npm run lint && webpack --env.production --context ./src/ui --config ./src/ui/webpack.config.js && webpack --env.production",
3522+
"build": "npm run lint && tsc -m commonjs -p ./ && npm run ui:build",
3523+
"bundle": "npm run lint && webpack --env.production && npm run ui:bundle",
35243524
"clean": "git clean -Xdf",
3525-
"lint": "tslint --project tsconfig.json",
3525+
"lint": "tslint --project tsconfig.json && npm run ui:lint",
35263526
"pack": "vsce package",
35273527
"pretty": "prettier --config .prettierrc --loglevel warn --write \"./**/*.ts\"",
35283528
"pub": "vsce publish",
35293529
"rebuild": "npm run reset && npm run lint && tsc -m commonjs -p ./ && npm run ui:build",
35303530
"reset": "npm run clean && npm install --no-save",
35313531
"watch": "tsc -watch -m commonjs -p ./",
3532-
"ui:build": "webpack --context ./src/ui --config ./src/ui/webpack.config.js",
3533-
"ui:watch": "cd \"./src/ui\" && npm run watch --no-save && cd \"../..\"",
3534-
"postinstall": "node ./node_modules/vscode/bin/install && cd \"./src/ui\" && npm install --no-save && cd \"../..\"",
3532+
"ui:build": "webpack --config ./ui.webpack.config.js",
3533+
"ui:bundle": "webpack --env.production --config ./ui.webpack.config.js",
3534+
"ui:lint": "tslint --project ui.tsconfig.json",
3535+
"ui:optimize": "webpack --env.optimizeImages --config ./ui.webpack.config.js",
3536+
"ui:watch": "webpack --watch --config ./ui.webpack.config.js",
3537+
"postinstall": "node ./node_modules/vscode/bin/install",
35353538
"prepush": "npm run build",
35363539
"vscode:prepublish": "npm run reset && npm run bundle"
35373540
},
@@ -3548,11 +3551,20 @@
35483551
"@types/clipboardy": "1.1.0",
35493552
"@types/node": "7.0.67",
35503553
"@types/tmp": "0.0.33",
3554+
"clean-webpack-plugin": "0.1.19",
3555+
"css-loader": "1.0.0",
3556+
"html-webpack-inline-source-plugin": "0.0.10",
3557+
"html-webpack-plugin": "3.2.0",
35513558
"husky": "0.14.3",
3559+
"imagemin-webpack-plugin": "2.2.0",
3560+
"mini-css-extract-plugin": "0.4.1",
3561+
"node-sass": "4.9.2",
35523562
"prettier": "1.13.7",
3553-
"ts-loader": "4.4.2",
3563+
"sass-loader": "7.0.3",
3564+
"style-loader": "0.21.0",
35543565
"tslint": "5.11.0",
35553566
"tslint-prettiest": "0.0.1",
3567+
"ts-loader": "4.4.2",
35563568
"typescript": "2.9.2",
35573569
"vscode": "1.1.18",
35583570
"webpack": "4.16.3",

0 commit comments

Comments
 (0)