Skip to content

Commit 9a844f7

Browse files
committed
Fix components names on Windows
Fix #256
1 parent 032f57f commit 9a844f7

File tree

3 files changed

+36
-11
lines changed

3 files changed

+36
-11
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"dependencies": {
5252
"circular-json-es6": "^2.0.0",
5353
"lodash.debounce": "^4.0.6",
54+
"regex-basename": "^1.0.0",
5455
"vue": "^2.0.0",
5556
"vuex": "^2.0.0"
5657
}

src/backend/index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ import { highlight, unHighlight, getInstanceRect } from './highlighter'
55
import { initVuexBackend } from './vuex'
66
import { initEventsBackend } from './events'
77
import { stringify, classify, camelize } from '../util'
8+
import reBasename from 'regex-basename'
9+
function basename (filename) {
10+
const res = reBasename.exec(filename)
11+
return res ? res[1] : filename
12+
}
813

914
// hook should have been injected before this executes.
1015
const hook = window.__VUE_DEVTOOLS_GLOBAL_HOOK__
@@ -317,7 +322,7 @@ export function getInstanceName (instance) {
317322
}
318323
const file = instance.$options.__file // injected by vue-loader
319324
if (file) {
320-
return classify(require('path').basename(file).replace(/\.vue$/, ''))
325+
return classify(basename(file).replace(/\.vue$/, ''))
321326
}
322327
return instance.$root === instance
323328
? 'Root'

yarn.lock

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -369,14 +369,7 @@ browserify-zlib@^0.1.4:
369369
dependencies:
370370
pako "~0.2.0"
371371

372-
browserslist@^1.0.1, browserslist@^1.5.2:
373-
version "1.7.0"
374-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.0.tgz#738df5b2971354d198b2fbd5a22c560d2d896084"
375-
dependencies:
376-
caniuse-db "^1.0.30000617"
377-
electron-to-chromium "^1.2.1"
378-
379-
browserslist@~1.6.0:
372+
browserslist@^1.0.1, browserslist@^1.5.2, browserslist@~1.6.0:
380373
version "1.6.0"
381374
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.6.0.tgz#85fb7c993540d3fda31c282baf7f5aee698ac9ee"
382375
dependencies:
@@ -459,7 +452,7 @@ caniuse-api@^1.5.2:
459452
lodash.uniq "^4.3.0"
460453
shelljs "^0.7.0"
461454

462-
caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000613, caniuse-db@^1.0.30000617:
455+
caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000613:
463456
version "1.0.30000617"
464457
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000617.tgz#9b7fd81f58a35526315c83e60cb5f076f0beb392"
465458

@@ -491,6 +484,12 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
491484
strip-ansi "^3.0.0"
492485
supports-color "^2.0.0"
493486

487+
check-if-windows@^1.0.0:
488+
version "1.0.0"
489+
resolved "https://registry.yarnpkg.com/check-if-windows/-/check-if-windows-1.0.0.tgz#c4a8648eda0f892d61421bebd913a3c29579d4b8"
490+
dependencies:
491+
utils-platform "^1.0.0"
492+
494493
chokidar@^1.4.3, chokidar@^1.6.0:
495494
version "1.6.1"
496495
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
@@ -1083,7 +1082,7 @@ ejs@~0.8.3:
10831082
version "0.8.8"
10841083
resolved "https://registry.yarnpkg.com/ejs/-/ejs-0.8.8.tgz#ffdc56dcc35d02926dd50ad13439bbc54061d598"
10851084

1086-
electron-to-chromium@^1.2.0, electron-to-chromium@^1.2.1:
1085+
electron-to-chromium@^1.2.0:
10871086
version "1.2.1"
10881087
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.1.tgz#63ac7579a1c5bedb296c8607621f2efc9a54b968"
10891088

@@ -3387,6 +3386,22 @@ regenerator@~0.8.13:
33873386
regenerator-runtime "~0.9.5"
33883387
through "~2.3.8"
33893388

3389+
regex-basename-posix@^1.0.0:
3390+
version "1.0.0"
3391+
resolved "https://registry.yarnpkg.com/regex-basename-posix/-/regex-basename-posix-1.0.0.tgz#4e88c96598bc1dd2a247212d775a36789fe8b191"
3392+
3393+
regex-basename-windows@^1.0.0:
3394+
version "1.0.0"
3395+
resolved "https://registry.yarnpkg.com/regex-basename-windows/-/regex-basename-windows-1.0.0.tgz#722212964e90b62f69fd779a714f132ed4e1771e"
3396+
3397+
regex-basename@^1.0.0:
3398+
version "1.0.0"
3399+
resolved "https://registry.yarnpkg.com/regex-basename/-/regex-basename-1.0.0.tgz#24f968700fba245c137ad138967c60e08f1cb774"
3400+
dependencies:
3401+
check-if-windows "^1.0.0"
3402+
regex-basename-posix "^1.0.0"
3403+
regex-basename-windows "^1.0.0"
3404+
33903405
regex-cache@^0.4.2:
33913406
version "0.4.3"
33923407
resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
@@ -4092,6 +4107,10 @@ [email protected]:
40924107
version "1.0.0"
40934108
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
40944109

4110+
utils-platform@^1.0.0:
4111+
version "1.0.0"
4112+
resolved "https://registry.yarnpkg.com/utils-platform/-/utils-platform-1.0.0.tgz#595eac97a3f68d9b36f4932b294fc226974513b0"
4113+
40954114
uuid@^2.0.2:
40964115
version "2.0.3"
40974116
resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"

0 commit comments

Comments
 (0)