Skip to content

Commit a628b43

Browse files
author
Guillaume Chau
committed
fix(ui): deps + dahsboard plugin
1 parent 2ef6900 commit a628b43

File tree

8 files changed

+275
-48
lines changed

8 files changed

+275
-48
lines changed

packages/@vue/cli-service/generator/index.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@ module.exports = (api, options) => {
33

44
api.extendPackage({
55
scripts: {
6-
'serve': 'vue-cli-service serve' + (
7-
// only auto open browser on MacOS where applescript
8-
// can avoid dupilcate window opens
9-
process.platform === 'darwin'
10-
? ' --open'
11-
: ''
12-
),
6+
'serve': 'vue-cli-service serve',
137
'build': 'vue-cli-service build'
148
},
159
dependencies: {

packages/@vue/cli-service/lib/webpack/DashboardPlugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class DashboardPlugin {
203203
const outputPath = compiler.options.output.path
204204
statsData.assets.forEach(asset => {
205205
asset.fullPath = path.join(outputPath, asset.name)
206-
asset.gzipSize = getGzipSize(assetSources.get(asset.name))
206+
asset.gzipSize = assetSources && getGzipSize(assetSources.get(asset.name))
207207
})
208208

209209
handler([

packages/@vue/cli-ui-addon-build/.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
],
77
"globals": {
88
"ClientAddonApi": false,
9+
"mapSharedData": false,
910
"Vue": false
1011
}
1112
}

packages/@vue/cli-ui-addon-build/src/components/AssetList.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,3 @@ export default {
6262
text-align right
6363
margin-bottom $padding-item
6464
</style>
65-

packages/@vue/cli-ui-addon-build/src/components/BuildProgress.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { mapGetters } from 'vuex'
2929
export default {
3030
computed: {
3131
...mapGetters([
32-
'mode',
32+
'mode'
3333
])
3434
},
3535

packages/@vue/cli-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"lint-staged": "^6.0.0",
5252
"stylus": "^0.54.5",
5353
"stylus-loader": "^3.0.1",
54-
"vue-cli-plugin-apollo": "^0.7.1",
54+
"vue-cli-plugin-apollo": "^0.7.4",
5555
"vue-template-compiler": "^2.5.17-beta.0"
5656
},
5757
"browserslist": [

packages/@vue/cli/lib/util/installDeps.js

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -177,20 +177,25 @@ function executeCommand (command, args, targetDir) {
177177
if (newLineIndex !== -1) {
178178
str = str.substr(newLineIndex)
179179
}
180-
const data = JSON.parse(str)
181-
if (data.type === 'step') {
182-
progress.enabled = false
183-
progress.log(data.data.message)
184-
} else if (data.type === 'progressStart') {
185-
progressTotal = data.data.total
186-
} else if (data.type === 'progressTick') {
187-
const time = Date.now()
188-
if (time - progressTime > 20) {
189-
progressTime = time
190-
progress.progress = data.data.current / progressTotal
180+
try {
181+
const data = JSON.parse(str)
182+
if (data.type === 'step') {
183+
progress.enabled = false
184+
progress.log(data.data.message)
185+
} else if (data.type === 'progressStart') {
186+
progressTotal = data.data.total
187+
} else if (data.type === 'progressTick') {
188+
const time = Date.now()
189+
if (time - progressTime > 20) {
190+
progressTime = time
191+
progress.progress = data.data.current / progressTotal
192+
}
193+
} else {
194+
progress.enabled = false
191195
}
192-
} else {
193-
progress.enabled = false
196+
} catch (e) {
197+
console.error(e)
198+
console.log(str)
194199
}
195200
} else {
196201
process.stdout.write(buffer)

0 commit comments

Comments
 (0)