wlxsp
/
test1
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Updates dependencies & build script naming

main
Eric Amodio 6 years ago
parent
bbd5933f08
commit
670da47cd2
4 changed files with 98 additions and 60 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      .vscode/tasks.json
  2. +78
    -32
      package-lock.json
  3. +5
    -5
      package.json
  4. +13
    -21
      src/ui/package-lock.json

+ 2
- 2
.vscode/tasks.json View File

@ -53,7 +53,7 @@
}, },
{ {
"type": "npm", "type": "npm",
"script": "watch-ui",
"script": "ui:watch",
"group": "build", "group": "build",
"isBackground": true, "isBackground": true,
"problemMatcher": [ "problemMatcher": [
@ -88,7 +88,7 @@
{ {
"label": "watch", "label": "watch",
"dependsOn": [ "dependsOn": [
"npm: watch-ui",
"npm: ui:watch",
"npm: watch" "npm: watch"
], ],
"group": { "group": {

+ 78
- 32
package-lock.json View File

@ -1327,10 +1327,13 @@
} }
}, },
"decamelize": { "decamelize": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
"dev": true
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
"dev": true,
"requires": {
"xregexp": "4.0.0"
}
}, },
"decode-uri-component": { "decode-uri-component": {
"version": "0.2.0", "version": "0.2.0",
@ -3793,18 +3796,18 @@
} }
}, },
"mime-db": { "mime-db": {
"version": "1.33.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
"integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
"version": "1.35.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
"integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==",
"dev": true "dev": true
}, },
"mime-types": { "mime-types": {
"version": "2.1.18",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
"integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
"version": "2.1.19",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
"integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
"dev": true, "dev": true,
"requires": { "requires": {
"mime-db": "~1.33.0"
"mime-db": "~1.35.0"
} }
}, },
"mimic-fn": { "mimic-fn": {
@ -5497,9 +5500,9 @@
"dev": true "dev": true
}, },
"tsutils": { "tsutils": {
"version": "2.27.2",
"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.27.2.tgz",
"integrity": "sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg==",
"version": "2.28.0",
"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.28.0.tgz",
"integrity": "sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==",
"dev": true, "dev": true,
"requires": { "requires": {
"tslib": "^1.8.1" "tslib": "^1.8.1"
@ -5935,9 +5938,9 @@
} }
}, },
"webpack-cli": { "webpack-cli": {
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.0.8.tgz",
"integrity": "sha512-KnRLJ0BUaYRqrhAMb9dv3gzdmhmgIMKo0FmdsnmfqbPGtLnnZ6tORZAvmmKfr+A0VgiVpqC60Gv7Ofg0R2CHtQ==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.0.tgz",
"integrity": "sha512-p5NeKDtYwjZozUWq6kGNs9w+Gtw/CPvyuXjXn2HMdz8Tie+krjEg8oAtonvIyITZdvpF7XG9xDHwscLr2c+ugQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"chalk": "^2.4.1", "chalk": "^2.4.1",
@ -5950,7 +5953,7 @@
"loader-utils": "^1.1.0", "loader-utils": "^1.1.0",
"supports-color": "^5.4.0", "supports-color": "^5.4.0",
"v8-compile-cache": "^2.0.0", "v8-compile-cache": "^2.0.0",
"yargs": "^11.1.0"
"yargs": "^12.0.1"
}, },
"dependencies": { "dependencies": {
"cross-spawn": { "cross-spawn": {
@ -6053,6 +6056,12 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true "dev": true
}, },
"xregexp": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
"integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
"dev": true
},
"xtend": { "xtend": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
@ -6071,14 +6080,14 @@
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
}, },
"yargs": { "yargs": {
"version": "11.1.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
"integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
"version": "12.0.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz",
"integrity": "sha512-B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"cliui": "^4.0.0", "cliui": "^4.0.0",
"decamelize": "^1.1.1",
"find-up": "^2.1.0",
"decamelize": "^2.0.0",
"find-up": "^3.0.0",
"get-caller-file": "^1.0.1", "get-caller-file": "^1.0.1",
"os-locale": "^2.0.0", "os-locale": "^2.0.0",
"require-directory": "^2.1.1", "require-directory": "^2.1.1",
@ -6086,22 +6095,59 @@
"set-blocking": "^2.0.0", "set-blocking": "^2.0.0",
"string-width": "^2.0.0", "string-width": "^2.0.0",
"which-module": "^2.0.0", "which-module": "^2.0.0",
"y18n": "^3.2.1",
"yargs-parser": "^9.0.2"
"y18n": "^3.2.1 || ^4.0.0",
"yargs-parser": "^10.1.0"
}, },
"dependencies": { "dependencies": {
"y18n": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
"integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
"find-up": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
"dev": true,
"requires": {
"locate-path": "^3.0.0"
}
},
"locate-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
"dev": true,
"requires": {
"p-locate": "^3.0.0",
"path-exists": "^3.0.0"
}
},
"p-limit": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
"integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
}
},
"p-locate": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
"dev": true,
"requires": {
"p-limit": "^2.0.0"
}
},
"p-try": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
"integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
"dev": true "dev": true
} }
} }
}, },
"yargs-parser": { "yargs-parser": {
"version": "9.0.2",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
"integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"camelcase": "^4.1.0" "camelcase": "^4.1.0"

+ 5
- 5
package.json View File

@ -3385,18 +3385,18 @@
} }
}, },
"scripts": { "scripts": {
"build": "npm run lint && tsc -m commonjs -p ./ && npm run build-ui -- --env.quick",
"build-ui": "webpack --context ./src/ui --config ./src/ui/webpack.config.js",
"build": "npm run lint && tsc -m commonjs -p ./ && npm run ui:build -- --env.quick",
"bundle": "npm run lint && webpack --env.production --context ./src/ui --config ./src/ui/webpack.config.js && webpack --env.production", "bundle": "npm run lint && webpack --env.production --context ./src/ui --config ./src/ui/webpack.config.js && webpack --env.production",
"clean": "git clean -Xdf", "clean": "git clean -Xdf",
"lint": "tslint --project tsconfig.json --fix", "lint": "tslint --project tsconfig.json --fix",
"pack": "vsce package", "pack": "vsce package",
"pretty": "prettier --config .prettierrc --loglevel warn --write \"./**/*.ts\"", "pretty": "prettier --config .prettierrc --loglevel warn --write \"./**/*.ts\"",
"pub": "vsce publish", "pub": "vsce publish",
"rebuild": "npm run reset && npm run lint && tsc -m commonjs -p ./ && npm run build-ui",
"rebuild": "npm run reset && npm run lint && tsc -m commonjs -p ./ && npm run ui:build",
"reset": "npm run clean && npm install --no-save", "reset": "npm run clean && npm install --no-save",
"watch": "tsc -watch -m commonjs -p ./", "watch": "tsc -watch -m commonjs -p ./",
"watch-ui": "cd \"./src/ui\" && npm run watch --no-save && cd \"../..\"",
"ui:build": "webpack --context ./src/ui --config ./src/ui/webpack.config.js",
"ui:watch": "cd \"./src/ui\" && npm run watch --no-save && cd \"../..\"",
"postinstall": "node ./node_modules/vscode/bin/install && cd \"./src/ui\" && npm install --no-save && cd \"../..\"", "postinstall": "node ./node_modules/vscode/bin/install && cd \"./src/ui\" && npm install --no-save && cd \"../..\"",
"prepush": "npm run build", "prepush": "npm run build",
"vscode:prepublish": "npm run reset && npm run bundle" "vscode:prepublish": "npm run reset && npm run bundle"
@ -3424,7 +3424,7 @@
"uglifyjs-webpack-plugin": "1.2.7", "uglifyjs-webpack-plugin": "1.2.7",
"vscode": "1.1.18", "vscode": "1.1.18",
"webpack": "4.16.1", "webpack": "4.16.1",
"webpack-cli": "3.0.8",
"webpack-cli": "3.1.0",
"webpack-node-externals": "1.7.2" "webpack-node-externals": "1.7.2"
} }
} }

+ 13
- 21
src/ui/package-lock.json View File

@ -5375,9 +5375,9 @@
} }
}, },
"js-base64": { "js-base64": {
"version": "2.4.6",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.6.tgz",
"integrity": "sha512-O9SR2NVICx6rCqh1qsU91QZ5IoNa+2T1ROJ0OQlfvATKGmnjsAvg3r0E5ufPZ4a95jdKTPXhFWiE/sOZ7a5Rtg==",
"version": "2.4.8",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz",
"integrity": "sha512-hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q==",
"dev": true "dev": true
}, },
"js-tokens": { "js-tokens": {
@ -6098,20 +6098,12 @@
"dev": true "dev": true
}, },
"mime-types": { "mime-types": {
"version": "2.1.18",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
"integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
"version": "2.1.19",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
"integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
"dev": true, "dev": true,
"requires": { "requires": {
"mime-db": "~1.33.0"
},
"dependencies": {
"mime-db": {
"version": "1.33.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
"integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
"dev": true
}
"mime-db": "~1.35.0"
} }
}, },
"mimic-response": { "mimic-response": {
@ -9875,9 +9867,9 @@
} }
}, },
"tsutils": { "tsutils": {
"version": "2.27.2",
"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.27.2.tgz",
"integrity": "sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg==",
"version": "2.28.0",
"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.28.0.tgz",
"integrity": "sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==",
"dev": true, "dev": true,
"requires": { "requires": {
"tslib": "^1.8.1" "tslib": "^1.8.1"
@ -9915,9 +9907,9 @@
"dev": true "dev": true
}, },
"uglify-js": { "uglify-js": {
"version": "3.4.4",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.4.tgz",
"integrity": "sha512-RiB1kNcC9RMyqwRrjXC+EjgLoXULoDnCaOnEDzUCHkBN0bHwmtF5rzDMiDWU29gu0kXCRRWwtcTAVFWRECmU2Q==",
"version": "3.4.5",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.5.tgz",
"integrity": "sha512-Fm52gLqJqFBnT+Sn411NPDnsgaWiYeRLw42x7Va/mS8TKgaepwoGY7JLXHSEef3d3PmdFXSz1Zx7KMLL89E2QA==",
"dev": true, "dev": true,
"requires": { "requires": {
"commander": "~2.16.0", "commander": "~2.16.0",

Write Preview
Loading…
Cancel
Save