Skip to content
This repository has been archived by the owner on Nov 5, 2020. It is now read-only.

switched from dedent to dedent-tabs #90

Merged
merged 6 commits into from
Apr 20, 2019
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
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"@babel/core": "^7.2.2",
"@storybook/addons": "^5.0.0",
"@storybook/vue": "^5.0.0",
"@types/dedent": "^0.7.0",
"@types/highlight.js": "^9.12.2",
"@types/jest": "^22.2.3",
"@types/marked": "^0.3.0",
Expand Down Expand Up @@ -105,7 +104,7 @@
},
"dependencies": {
"clone": "^2.1.2",
"dedent": "^0.7.0",
"dedent-tabs": "^0.8.0",
"highlight.js": "^9.12.0",
"loader-utils": "^1.2.3",
"marked": "^0.3.19",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Wrapper/index.stories.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { storiesOf } from '@storybook/vue'

import dedent from 'dedent'
import dedent from 'dedent-tabs'

import XWrapper from './index.vue'

Expand Down
2 changes: 1 addition & 1 deletion src/extract/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import dedent from 'dedent'
import dedent from 'dedent-tabs'
import hljs from 'highlight.js'
import marked from 'marked'
import Vue, { ComponentOptions } from 'vue'
Expand Down
6 changes: 6 additions & 0 deletions src/types/dedent-tabs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
declare module 'dedent-tabs'
declare function dedent(literals: string): string
declare function dedent(
literals: TemplateStringsArray,
...placeholders: any[]
): string
2 changes: 1 addition & 1 deletion src/utils/getTagNames.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import dedent from 'dedent'
import dedent from 'dedent-tabs'
import { VNodeChildren } from 'vue'
import { ASTElement, compile } from 'vue-template-compiler'

Expand Down
26 changes: 17 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1152,11 +1152,6 @@
dependencies:
"@types/babel-types" "*"

"@types/dedent@^0.7.0":
version "0.7.0"
resolved "https://registry.yarnpkg.com/@types/dedent/-/dedent-0.7.0.tgz#155f339ca404e6dd90b9ce46a3f78fd69ca9b050"
integrity sha512-EGlKlgMhnLt/cM4DbUSafFdrkeJoC9Mvnj0PUCU7tFmTjMjNRT957kXCx0wYm3JuEq4o4ZsS5vG+NlkM2DMd2A==

"@types/estree@0.0.38":
version "0.0.38"
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
Expand Down Expand Up @@ -4014,10 +4009,10 @@ decode-uri-component@^0.2.0:
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=

dedent@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
dedent-tabs@^0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/dedent-tabs/-/dedent-tabs-0.8.0.tgz#e8e37e2a84f8d305bc714c2f1121fee873170db6"
integrity sha512-YKS/ItX7e9+TdLaUiwht1IxkFDbQEHNJSTruwvrwODRXFov8X7C7iCwrUynrsOh1+CkwmjFK51P5d1HsrI5VJA==

deep-extend@^0.6.0:
version "0.6.0"
Expand Down Expand Up @@ -5895,6 +5890,19 @@ is-alphanumerical@^1.0.0:
is-alphabetical "^1.0.0"
is-decimal "^1.0.0"

is-alphabetical@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.2.tgz#1fa6e49213cb7885b75d15862fb3f3d96c884f41"
integrity sha512-V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==

is-alphanumerical@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz#1138e9ae5040158dc6ff76b820acd6b7a181fd40"
integrity sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==
dependencies:
is-alphabetical "^1.0.0"
is-decimal "^1.0.0"

is-arrayish@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
Expand Down