Skip to content

Commit

Permalink
fix: correctly add all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@EvanLovely
EvanLovely committed Jul 3, 2019
1 parent b422ffa commit d9de9c0
Show file tree
Hide file tree
Showing 30 changed files with 130 additions and 93 deletions.
1 change: 1 addition & 0 deletions packages/components/bolt-action-blocks/package.json
View file
Expand Up @@ -37,6 +37,7 @@
"access": "public"
},
"dependencies": {
"@bolt/components-icon": "^2.5.2",
"@bolt/core": "^2.5.2"
},
"gitHead": "3d198feea5f73c63913a956a2a077e229ad8d462"
Expand Down
3 changes: 2 additions & 1 deletion packages/components/bolt-action-blocks/src/action-block.twig
View file
@@ -1,2 +1,3 @@
{# DEPRECATED. This will be removed with Bolt v3.0. #}
{% include "@bolt-components-action-blocks/_action-block.twig" %}
{# @todo consider deleting - the file below does not exist; using `~` so dependency mapper does not try to find it #}
{% include "@bolt-components-action-blocks/" ~ "_action-block.twig" %}
1 change: 1 addition & 0 deletions packages/components/bolt-band/package.json
View file
Expand Up @@ -32,6 +32,7 @@
"access": "public"
},
"dependencies": {
"@bolt/components-background": "^2.5.2",
"@bolt/components-grid": "^2.5.2",
"@bolt/core": "^2.5.2"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/components/bolt-blockquote/package.json
View file
Expand Up @@ -29,6 +29,8 @@
"access": "public"
},
"dependencies": {
"@bolt/components-headline": "^2.5.2",
"@bolt/components-logo": "^2.5.2",
"@bolt/components-image": "^2.5.2",
"@bolt/components-text": "^2.5.2",
"@bolt/core": "^2.5.2"
Expand Down
2 changes: 2 additions & 0 deletions packages/components/bolt-button-group/package.json
View file
Expand Up @@ -32,6 +32,8 @@
"access": "public"
},
"dependencies": {
"@bolt/components-headline": "^2.5.2",
"@bolt/components-button": "^2.5.2",
"@bolt/core": "^2.5.2"
},
"schema": "button-group.schema.yml",
Expand Down
1 change: 1 addition & 0 deletions packages/components/bolt-card/package.json
View file
Expand Up @@ -31,6 +31,7 @@
"access": "public"
},
"dependencies": {
"@bolt/components-teaser": "^2.5.2",
"@bolt/core": "^2.5.2"
},
"schema": "card.schema.yml",
Expand Down
1 change: 1 addition & 0 deletions packages/components/bolt-chip-list/package.json
View file
Expand Up @@ -32,6 +32,7 @@
"access": "public"
},
"dependencies": {
"@bolt/components-list": "^2.5.2",
"@bolt/components-chip": "^2.5.2",
"@bolt/core": "^2.5.2"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/components/bolt-device-viewer/package.json
View file
Expand Up @@ -32,6 +32,8 @@
"access": "public"
},
"dependencies": {
"@bolt/components-image": "^2.5.2",
"@bolt/components-icon": "^2.5.2",
"@bolt/core": "^2.5.2",
"drift-zoom": "^1.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/components/bolt-device-viewer/src/devices/_ipad.twig
View file
Expand Up @@ -27,11 +27,11 @@
] %}

<div {{ attributes.addClass(classes | raw) }}>
{% include "parts/_camera.twig" only %}
{% include "@bolt-components-device-viewer/parts/_camera.twig" only %}
<div class="screen">
{% if image %}
{{ include('@bolt/image.twig', {'image': image}, with_context = false) }}
{% endif %}
</div>
{% include "parts/_home.twig" only %}
{% include "@bolt-components-device-viewer/parts/_home.twig" only %}
</div>
18 changes: 9 additions & 9 deletions packages/components/bolt-device-viewer/src/devices/_iphone-4s.twig
View file
@@ -1,13 +1,13 @@
{% set content = content | default({}) %}

<div class="marvel-device iphone4s silver">
{% include "parts/_top-bar.twig" only %}
{% include "parts/_sleep.twig" only %}
{% include "parts/_volume.twig" only %}
{% include "parts/_camera.twig" only %}
{% include "parts/_sensor.twig" only %}
{% include "parts/_speaker.twig" only %}
{% include "parts/_screen.twig" with content only %}
{% include "parts/_home.twig" only %}
{% include "parts/_bottom-bar.twig" only %}
{% include "@bolt-components-device-viewer/parts/_top-bar.twig" only %}
{% include "@bolt-components-device-viewer/parts/_sleep.twig" only %}
{% include "@bolt-components-device-viewer/parts/_volume.twig" only %}
{% include "@bolt-components-device-viewer/parts/_camera.twig" only %}
{% include "@bolt-components-device-viewer/parts/_sensor.twig" only %}
{% include "@bolt-components-device-viewer/parts/_speaker.twig" only %}
{% include "@bolt-components-device-viewer/parts/_screen.twig" with content only %}
{% include "@bolt-components-device-viewer/parts/_home.twig" only %}
{% include "@bolt-components-device-viewer/parts/_bottom-bar.twig" only %}
</div>
18 changes: 9 additions & 9 deletions packages/components/bolt-device-viewer/src/devices/_iphone-5s.twig
View file
@@ -1,13 +1,13 @@
{% set content = content | default({}) %}

<div class="marvel-device iphone5s">
{% include "parts/_top-bar.twig" %}
{% include "parts/_sleep.twig" %}
{% include "parts/_volume.twig" %}
{% include "parts/_camera.twig" %}
{% include "parts/_sensor.twig" %}
{% include "parts/_speaker.twig" %}
{% include "parts/_screen.twig" %}
{% include "parts/_home.twig" %}
{% include "parts/_bottom-bar.twig" %}
{% include "@bolt-components-device-viewer/parts/_top-bar.twig" %}
{% include "@bolt-components-device-viewer/parts/_sleep.twig" %}
{% include "@bolt-components-device-viewer/parts/_volume.twig" %}
{% include "@bolt-components-device-viewer/parts/_camera.twig" %}
{% include "@bolt-components-device-viewer/parts/_sensor.twig" %}
{% include "@bolt-components-device-viewer/parts/_speaker.twig" %}
{% include "@bolt-components-device-viewer/parts/_screen.twig" %}
{% include "@bolt-components-device-viewer/parts/_home.twig" %}
{% include "@bolt-components-device-viewer/parts/_bottom-bar.twig" %}
</div>
18 changes: 9 additions & 9 deletions packages/components/bolt-device-viewer/src/devices/_iphone-8.twig
View file
Expand Up @@ -3,13 +3,13 @@ iphone8plus
{% set content = content | default({}) %}

<div class="marvel-device iphone8 black landscape">
{% include "parts/_top-bar.twig" %}
{% include "parts/_sleep.twig" %}
{% include "parts/_volume.twig" %}
{% include "parts/_camera.twig" %}
{% include "parts/_sensor.twig" %}
{% include "parts/_speaker.twig" %}
{% include "parts/_screen.twig" %}
{% include "parts/_home.twig" %}
{% include "parts/_bottom-bar.twig" %}
{% include "@bolt-components-device-viewer/parts/_top-bar.twig" %}
{% include "@bolt-components-device-viewer/parts/_sleep.twig" %}
{% include "@bolt-components-device-viewer/parts/_volume.twig" %}
{% include "@bolt-components-device-viewer/parts/_camera.twig" %}
{% include "@bolt-components-device-viewer/parts/_sensor.twig" %}
{% include "@bolt-components-device-viewer/parts/_speaker.twig" %}
{% include "@bolt-components-device-viewer/parts/_screen.twig" %}
{% include "@bolt-components-device-viewer/parts/_home.twig" %}
{% include "@bolt-components-device-viewer/parts/_bottom-bar.twig" %}
</div>
14 changes: 7 additions & 7 deletions packages/components/bolt-device-viewer/src/devices/_iphone-x.twig
View file
Expand Up @@ -2,19 +2,19 @@

<div class="marvel-device iphone-x landscape">
<div class="notch">
{% include "parts/_camera.twig" %}
{% include "parts/_speaker.twig" %}
{% include "@bolt-components-device-viewer/parts/_camera.twig" %}
{% include "@bolt-components-device-viewer/parts/_speaker.twig" %}
</div>
{% include "parts/_top-bar.twig" %}
{% include "parts/_sleep.twig" %}
{% include "parts/_bottom-bar.twig" %}
{% include "parts/_volume.twig" %}
{% include "@bolt-components-device-viewer/parts/_top-bar.twig" %}
{% include "@bolt-components-device-viewer/parts/_sleep.twig" %}
{% include "@bolt-components-device-viewer/parts/_bottom-bar.twig" %}
{% include "@bolt-components-device-viewer/parts/_volume.twig" %}
<div class="overflow">
<div class="shadow shadow--tr"></div>
<div class="shadow shadow--tl"></div>
<div class="shadow shadow--br"></div>
<div class="shadow shadow--bl"></div>
</div>
<div class="inner-shadow"></div>
{% include "parts/_screen.twig" %}
{% include "@bolt-components-device-viewer/parts/_screen.twig" %}
</div>
8 changes: 4 additions & 4 deletions packages/components/bolt-device-viewer/src/devices/_macbook.twig
View file
@@ -1,8 +1,8 @@
{% set content = content | default({}) %}

<div class="marvel-device macbook">
{% include "parts/_top-bar.twig" %}
{% include "parts/_camera.twig" %}
{% include "parts/_screen.twig" %}
{% include "parts/_bottom-bar.twig" %}
{% include "@bolt-components-device-viewer/parts/_top-bar.twig" %}
{% include "@bolt-components-device-viewer/parts/_camera.twig" %}
{% include "@bolt-components-device-viewer/parts/_screen.twig" %}
{% include "@bolt-components-device-viewer/parts/_bottom-bar.twig" %}
</div>
10 changes: 5 additions & 5 deletions packages/components/bolt-device-viewer/src/devices/_nexus-6.twig
View file
@@ -1,9 +1,9 @@
{% set content = content | default({}) %}

<div class="marvel-device nexus5">
{% include "parts/_top-bar.twig" %}
{% include "parts/_sleep.twig" %}
{% include "parts/_volume.twig" %}
{% include "parts/_camera.twig" %}
{% include "parts/_screen.twig" %}
{% include "@bolt-components-device-viewer/parts/_top-bar.twig" %}
{% include "@bolt-components-device-viewer/parts/_sleep.twig" %}
{% include "@bolt-components-device-viewer/parts/_volume.twig" %}
{% include "@bolt-components-device-viewer/parts/_camera.twig" %}
{% include "@bolt-components-device-viewer/parts/_screen.twig" %}
</div>
10 changes: 5 additions & 5 deletions packages/components/bolt-device-viewer/src/devices/_note-8.twig
View file
Expand Up @@ -5,11 +5,11 @@
<div class="overflow">
<div class="shadow"></div>
</div>
{% include "parts/_speaker.twig" only %}
{% include "@bolt-components-device-viewer/parts/_speaker.twig" only %}
<div class="sensors"></div>
<div class="more-sensors"></div>
{% include "parts/_sleep.twig" only %}
{% include "parts/_volume.twig" only %}
{% include "parts/_camera.twig" only %}
{% include "parts/_screen.twig" with content only %}
{% include "@bolt-components-device-viewer/parts/_sleep.twig" only %}
{% include "@bolt-components-device-viewer/parts/_volume.twig" only %}
{% include "@bolt-components-device-viewer/parts/_camera.twig" only %}
{% include "@bolt-components-device-viewer/parts/_screen.twig" with content only %}
</div>
4 changes: 4 additions & 0 deletions packages/components/bolt-figure/package.json
View file
Expand Up @@ -35,6 +35,10 @@
"access": "public"
},
"dependencies": {
"@bolt/components-table": "^2.5.2",
"@bolt/components-icon": "^2.5.2",
"@bolt/components-image": "^2.5.2",
"@bolt/components-video": "^2.5.2",
"@bolt/core": "^2.5.2"
},
"style": "index.scss",
Expand Down
2 changes: 2 additions & 0 deletions packages/components/bolt-form/package.json
View file
Expand Up @@ -20,6 +20,8 @@
"access": "public"
},
"dependencies": {
"@bolt/components-icon": "^2.5.2",
"@bolt/components-headline": "^2.5.2",
"@bolt/components-button": "^2.5.2",
"@bolt/core": "^2.5.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/components/bolt-form/src/inputs/form-checkboxes.twig
View file
Expand Up @@ -15,7 +15,7 @@
!!!! WARNING !!!!
This template is currently extended verbatim in form-radios.twig. If you need
to add checkbox-specific styling here, please refactor radios first-- consider
using something like a shared "container.twig" file (see Drupal form templates).
using something like a shared container twig file (see Drupal form templates).
#}

{% set attributes = create_attribute(attributes | default({})) %}
Expand Down
2 changes: 2 additions & 0 deletions packages/components/bolt-headline/package.json
View file
Expand Up @@ -19,6 +19,8 @@
"access": "public"
},
"dependencies": {
"@bolt/components-link": "^2.5.2",
"@bolt/components-icon": "^2.5.2",
"@bolt/core": "^2.5.2"
},
"schema": "headline.schema.yml",
Expand Down
1 change: 1 addition & 0 deletions packages/components/bolt-link/package.json
View file
Expand Up @@ -18,6 +18,7 @@
"access": "public"
},
"dependencies": {
"@bolt/components-icon": "^2.5.2",
"@bolt/core": "^2.5.2",
"ajv": "^6.5.4"
},
Expand Down
8 changes: 8 additions & 0 deletions packages/components/bolt-modal/__tests__/__snapshots__/modal.js.snap
View file
Expand Up @@ -328,6 +328,14 @@ exports[`<bolt-modal> Component modal width: auto 1`] = `
</bolt-modal>
`;
exports[`<bolt-modal> Component modal width: auto 2`] = `
<bolt-modal width="auto"
uuid="12345"
>
This is a modal
</bolt-modal>
`;
exports[`<bolt-modal> Component modal width: full 1`] = `
<bolt-modal width="full"
uuid="12345"
Expand Down
1 change: 1 addition & 0 deletions packages/components/bolt-nav-priority/package.json
View file
Expand Up @@ -31,6 +31,7 @@
"access": "public"
},
"dependencies": {
"@bolt/components-navlink": "^2.5.2",
"@bolt/core": "^2.5.2"
},
"gitHead": "3d198feea5f73c63913a956a2a077e229ad8d462"
Expand Down
1 change: 1 addition & 0 deletions packages/components/bolt-navbar/package.json
View file
Expand Up @@ -32,6 +32,7 @@
"access": "public"
},
"dependencies": {
"@bolt/components-icon": "^2.5.2",
"@bolt/components-nav-indicator": "^2.5.2",
"@bolt/components-nav-priority": "^2.5.2",
"@bolt/components-navlink": "^2.5.2",
Expand Down
1 change: 1 addition & 0 deletions packages/components/bolt-navlink/package.json
View file
Expand Up @@ -31,6 +31,7 @@
"main": "index.js",
"schema": "navlink.schema.yml",
"dependencies": {
"@bolt/components-icon": "^2.5.2",
"@bolt/components-smooth-scroll": "^2.5.2",
"@bolt/core": "^2.5.2",
"is-visible": "^2.2.0"
Expand Down
1 change: 1 addition & 0 deletions packages/components/bolt-share/package.json
View file
Expand Up @@ -37,6 +37,7 @@
"access": "public"
},
"dependencies": {
"@bolt/components-list": "^2.5.2",
"@bolt/components-copy-to-clipboard": "^2.5.2",
"@bolt/components-icon": "^2.5.2",
"@bolt/core": "^2.5.2"
Expand Down
3 changes: 2 additions & 1 deletion packages/components/bolt-smooth-scroll/demo/smooth-scroll.demo.twig
View file
@@ -1,4 +1,5 @@
{% extends "@utils/theme-demo.twig" %}
{# @todo consider deleting - the file below does not exist; using `~` so dependency mapper does not try to find it #}
{% extends "@utils/" ~ "theme-demo.twig" %}
{% block demo_content %}
<a class="test" href="#anchor-1">Link 1</a>
<a href="#anchor-2">Link 2</a>
Expand Down
2 changes: 2 additions & 0 deletions packages/components/bolt-teaser/package.json
View file
Expand Up @@ -20,6 +20,8 @@
"access": "public"
},
"dependencies": {
"@bolt/components-headline": "^2.5.2",
"@bolt/components-logo": "^2.5.2",
"@bolt/core": "^2.5.2"
},
"schema": "teaser.schema.yml",
Expand Down

0 comments on commit d9de9c0

Please sign in to comment.