Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(docsgen): windows fixes #111

Merged
merged 7 commits into from
Apr 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/utils/docs-template-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"vue.config.js"
],
"dependencies": {
"http-server": "^0.10.0"
"http-server": "0.12.1"
},
"devDependencies": {
"@diez/compiler-core": "^10.5.0-beta.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<a v-if="reference" :href="reference.link"><pill>{{reference.idPath.join('.')}}</pill></a>
<router-link v-if="reference" :to="reference.link"><pill>{{reference.idPath.join('.')}}</pill></router-link>
</template>

<script lang="ts">
Expand Down
2 changes: 1 addition & 1 deletion src/utils/docs-template-app/src/components/Mappings.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div v-if="referenceLink">
Defined by:<a :href="referenceLink"><pill>{{reference.parentType}}.{{reference.name}}</pill></a>
Defined by:<router-link :to="referenceLink"><pill>{{reference.parentType}}.{{reference.name}}</pill></router-link>
</div>
</template>

Expand Down
2 changes: 1 addition & 1 deletion src/utils/docs-template-app/src/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import SearchResults from './views/SearchResults.vue';
Vue.use(Router);

const router = new Router({
mode: 'history',
mode: 'hash',
base: process.env.BASE_URL,
routes: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/utils/docs-template-app/test/e2e/specs/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = testWithDefaults({
},

'Automatically searches when a query string for name is provided': (browser) => {
browser.url(`${process.env.VUE_DEV_SERVER_URL}?name=image`);
browser.url(`${process.env.VUE_DEV_SERVER_URL}/#/?name=image`);
browser.expect.elements(selectors.items.any).count.to.equal(1);
browser.expect.element(selectors.items.any).text.to.contain('image');
},
Expand Down
2 changes: 1 addition & 1 deletion src/utils/start/src/index.action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export = async (_: {}, target: Target) => {
return;
}

await packageManager.exec(['start'], {stdio: 'inherit', cwd: join(root, 'build', buildFolder)});
await packageManager.exec(['start'], {stdio: 'inherit', cwd: join(root, 'build', buildFolder), shell: true});
// Particular case, since docs doesn't have a 'hot' mode, we just start the docs server and exit.
return;
}
Expand Down
111 changes: 57 additions & 54 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4606,6 +4606,11 @@ base@^0.11.1:
mixin-deep "^1.2.0"
pascalcase "^0.1.1"

basic-auth@^1.0.3:
version "1.1.0"
resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-1.1.0.tgz#45221ee429f7ee1e5035be3f51533f1cdfd29884"
integrity sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=

batch@0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
Expand Down Expand Up @@ -5628,9 +5633,10 @@ color@^3.0.0:
color-convert "^1.9.1"
color-string "^1.5.2"

colors@1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
colors@^1.3.3:
version "1.4.0"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==

columnify@^1.5.4:
version "1.5.4"
Expand Down Expand Up @@ -6027,9 +6033,10 @@ cors@^2.8.5:
object-assign "^4"
vary "^1"

corser@~2.0.0:
corser@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87"
integrity sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c=

cosmiconfig@^4.0.0:
version "4.0.0"
Expand Down Expand Up @@ -7017,14 +7024,15 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0"
safer-buffer "^2.1.0"

ecstatic@^2.0.0:
version "2.2.2"
resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-2.2.2.tgz#1c7969b7a8893a04852e9373edeeb1d62809d393"
ecstatic@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.2.tgz#6d1dd49814d00594682c652adb66076a69d46c48"
integrity sha512-fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog==
dependencies:
he "^1.1.1"
mime "^1.2.11"
mime "^1.6.0"
minimist "^1.1.0"
url-join "^2.0.2"
url-join "^2.0.5"

editions@^2.1.2, editions@^2.1.3:
version "2.1.3"
Expand Down Expand Up @@ -7497,10 +7505,6 @@ eventemitter3@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"

eventemitter3@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"

events@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
Expand Down Expand Up @@ -9030,26 +9034,21 @@ http-proxy@^1.17.0:
follow-redirects "^1.0.0"
requires-port "^1.0.0"

http-proxy@^1.8.1:
version "1.18.0"
resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
dependencies:
eventemitter3 "^4.0.0"
follow-redirects "^1.0.0"
requires-port "^1.0.0"

http-server@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.10.0.tgz#b2a446b16a9db87ed3c622ba9beb1b085b1234a7"
http-server@0.12.1:
version "0.12.1"
resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.12.1.tgz#629ae9a8c786587ee21b0ff087b670f69b809d8c"
integrity sha512-T0jB+7J7GJ2Vo+a4/T7P7SbQ3x2GPDnqRqQXdfEuPuUOmES/9NBxPnDm7dh1HGEeUWqUmLUNtGV63ZC5Uy3tGA==
dependencies:
colors "1.0.3"
corser "~2.0.0"
ecstatic "^2.0.0"
http-proxy "^1.8.1"
opener "~1.4.0"
optimist "0.6.x"
portfinder "^1.0.13"
union "~0.4.3"
basic-auth "^1.0.3"
colors "^1.3.3"
corser "^2.0.1"
ecstatic "^3.3.2"
http-proxy "^1.17.0"
opener "^1.5.1"
optimist "~0.6.1"
portfinder "^1.0.20"
secure-compare "3.0.1"
union "~0.5.0"

http-signature@~1.2.0:
version "1.2.0"
Expand Down Expand Up @@ -11763,7 +11762,7 @@ mime@1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"

mime@1.6.0, mime@^1.2.11:
mime@1.6.0, mime@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"

Expand Down Expand Up @@ -12664,17 +12663,13 @@ opener@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"

opener@~1.4.0:
version "1.4.3"
resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"

opn@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
dependencies:
is-wsl "^1.1.0"

optimist@0.6.x, optimist@^0.6.1:
optimist@^0.6.1, optimist@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
dependencies:
Expand Down Expand Up @@ -13271,14 +13266,6 @@ pnp-webpack-plugin@^1.6.0:
dependencies:
ts-pnp "^1.1.6"

portfinder@^1.0.13, portfinder@^1.0.25:
version "1.0.25"
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
dependencies:
async "^2.6.2"
debug "^3.1.1"
mkdirp "^0.5.1"

portfinder@^1.0.20:
version "1.0.20"
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
Expand All @@ -13287,6 +13274,14 @@ portfinder@^1.0.20:
debug "^2.2.0"
mkdirp "0.5.x"

portfinder@^1.0.25:
version "1.0.25"
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
dependencies:
async "^2.6.2"
debug "^3.1.1"
mkdirp "^0.5.1"

posix-character-classes@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
Expand Down Expand Up @@ -14153,9 +14148,10 @@ qs@6.7.0:
version "6.7.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"

qs@~2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404"
qs@^6.4.0:
version "6.9.3"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e"
integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==

query-string@^4.1.0:
version "4.3.4"
Expand Down Expand Up @@ -15159,6 +15155,11 @@ scss-tokenizer@^0.2.3:
js-base64 "^2.1.8"
source-map "^0.4.2"

secure-compare@3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/secure-compare/-/secure-compare-3.0.1.tgz#f1a0329b308b221fae37b9974f3d578d0ca999e3"
integrity sha1-8aAymzCLIh+uN7mXTz1XjQypmeM=

seek-bzip@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
Expand Down Expand Up @@ -16918,11 +16919,12 @@ union-value@^1.0.0:
is-extendable "^0.1.1"
set-value "^0.4.3"

union@~0.4.3:
version "0.4.6"
resolved "https://registry.yarnpkg.com/union/-/union-0.4.6.tgz#198fbdaeba254e788b0efcb630bc11f24a2959e0"
union@~0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/union/-/union-0.5.0.tgz#b2c11be84f60538537b846edb9ba266ba0090075"
integrity sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==
dependencies:
qs "~2.3.3"
qs "^6.4.0"

uniq@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -16997,9 +16999,10 @@ urix@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"

url-join@^2.0.2:
url-join@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=

url-loader@2.3.0, url-loader@^2.2.0:
version "2.3.0"
Expand Down