From b433be9cc8e222508d2dc9f2066310c07e4833a0 Mon Sep 17 00:00:00 2001 From: Luutzen Dijkstra Date: Thu, 11 Apr 2019 10:34:07 +0200 Subject: [PATCH 1/2] added Vds prefix to Vue Components to avoid conflict with standard HTML elements --- package-lock.json | 45 ++++++++++++++----- src/elements/{Button.vue => VdsButton.vue} | 24 +++++----- src/elements/{Heading.vue => VdsHeading.vue} | 16 +++---- src/elements/{Icon.vue => VdsIcon.vue} | 14 +++--- src/elements/{Input.vue => VdsInput.vue} | 17 ++++--- .../{Paragraph.vue => VdsParagraph.vue} | 16 +++---- .../{TextStyle.vue => VdsTextStyle.vue} | 15 +++---- .../{Textarea.vue => VdsTextarea.vue} | 13 +++--- src/elements/{Wrapper.vue => VdsWrapper.vue} | 11 ++--- src/patterns/{NavBar.vue => VdsNavBar.vue} | 10 ++--- src/router/index.js | 8 ++-- src/templates/{Index.vue => VdsIndex.vue} | 38 ++++++++-------- .../{NotFound.vue => VdsNotFound.vue} | 35 ++++++++------- 13 files changed, 138 insertions(+), 124 deletions(-) rename src/elements/{Button.vue => VdsButton.vue} (87%) rename src/elements/{Heading.vue => VdsHeading.vue} (80%) rename src/elements/{Icon.vue => VdsIcon.vue} (83%) rename src/elements/{Input.vue => VdsInput.vue} (90%) rename src/elements/{Paragraph.vue => VdsParagraph.vue} (91%) rename src/elements/{TextStyle.vue => VdsTextStyle.vue} (80%) rename src/elements/{Textarea.vue => VdsTextarea.vue} (90%) rename src/elements/{Wrapper.vue => VdsWrapper.vue} (79%) rename src/patterns/{NavBar.vue => VdsNavBar.vue} (91%) rename src/templates/{Index.vue => VdsIndex.vue} (69%) rename src/templates/{NotFound.vue => VdsNotFound.vue} (71%) diff --git a/package-lock.json b/package-lock.json index 686433af..0fb38fca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1578,6 +1578,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -7655,7 +7656,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -7676,12 +7678,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7696,17 +7700,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -7823,7 +7830,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -7835,6 +7843,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7849,6 +7858,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7856,12 +7866,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7880,6 +7892,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7960,7 +7973,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7972,6 +7986,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -8057,7 +8072,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -8093,6 +8109,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8112,6 +8129,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -8155,12 +8173,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -11671,7 +11691,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "longest-streak": { "version": "2.0.2", diff --git a/src/elements/Button.vue b/src/elements/VdsButton.vue similarity index 87% rename from src/elements/Button.vue rename to src/elements/VdsButton.vue index df9eba82..f7d194c7 100644 --- a/src/elements/Button.vue +++ b/src/elements/VdsButton.vue @@ -1,6 +1,6 @@ @@ -11,7 +11,7 @@ * Primary style should be used only once per view for main call-to-action. */ export default { - name: "Button", + name: "VdsButton", status: "prototype", release: "3.5.0", props: { @@ -81,7 +81,7 @@ export default { - ```jsx
- - - - + + + +
```
diff --git a/src/elements/Paragraph.vue b/src/elements/VdsParagraph.vue similarity index 91% rename from src/elements/Paragraph.vue rename to src/elements/VdsParagraph.vue index 74563a7c..4f4d9c04 100644 --- a/src/elements/Paragraph.vue +++ b/src/elements/VdsParagraph.vue @@ -1,12 +1,10 @@ - ```jsx
- Design isn’t just about the look and feel. + Design isn’t just about the look and feel.
- Design isn’t just about + Design isn’t just about
- Design isn’t + Design isn’t
```
diff --git a/src/elements/Textarea.vue b/src/elements/VdsTextarea.vue similarity index 90% rename from src/elements/Textarea.vue rename to src/elements/VdsTextarea.vue index 2d985da2..3e5783c8 100644 --- a/src/elements/Textarea.vue +++ b/src/elements/VdsTextarea.vue @@ -1,5 +1,5 @@