Skip to content

Commit 484309c

Browse files
authored
Merge pull request #528 from PrestaShop/develop
Release 0.1.6
2 parents f9839bf + 76b884c commit 484309c

File tree

138 files changed

+39457
-30675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+39457
-30675
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
name: Build ZIP File
3-
on:
3+
on:
44
pull_request:
55
push:
66
workflow_dispatch:
@@ -16,10 +16,10 @@ jobs:
1616
- name: Setup node env
1717
uses: actions/setup-node@v3
1818
with:
19-
node-version: 14
19+
node-version: 16
2020

2121
- name: Install dependencies
22-
run: npm i
22+
run: npm ci
2323

2424
- name: Copy Webpack config
2525
run: cp ./webpack/.env-example ./webpack/.env
@@ -50,7 +50,7 @@ jobs:
5050
rm postcss.config.js
5151
rm tsconfig.json
5252
rm webpack.config.js
53-
53+
5454
- name: Create & Upload artifact
5555
uses: actions/upload-artifact@v1
5656
with:
@@ -65,17 +65,17 @@ jobs:
6565
uses: actions/download-artifact@v1
6666
with:
6767
name: ${{ github.event.repository.name }}
68-
68+
6969
- id: release_info
7070
uses: toolmantim/release-drafter@v5
7171
env:
7272
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
73-
73+
7474
- name: Prepare for Release
7575
run: |
7676
cd ${{ github.event.repository.name }}
7777
zip -r ${{ github.event.repository.name }}.zip ${{ github.event.repository.name }}
78-
78+
7979
- name: Clean existing assets
8080
shell: bash
8181
run: |
@@ -87,7 +87,7 @@ jobs:
8787
done
8888
env:
8989
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
90-
90+
9191
- name: Publish to GitHub Release
9292
uses: actions/upload-release-asset@v1.0.1
9393
env:

.github/workflows/cd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest]
15-
node: [14]
15+
node: [16]
1616

1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@master
2020

2121
- name: Setup node env
22-
uses: actions/setup-node@v2.1.2
22+
uses: actions/setup-node@v3
2323
with:
2424
node-version: ${{ matrix.node }}
2525

2626
- name: Install dependencies
27-
run: npm i
27+
run: npm ci
2828

2929
- name: Generate
3030
run: npm run build-storybook

.github/workflows/lint.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ jobs:
88
- uses: actions/checkout@v2
99

1010
- name: Setup Node
11-
uses: actions/setup-node@v1
11+
uses: actions/setup-node@v3
1212
with:
13-
node-version: '14.x'
13+
node-version: 16
1414

1515
- name: Lint scss
16-
run: npm install && npm run scss-lint
16+
run: npm ci && npm run scss-lint
1717
eslint:
1818
name: ESLint
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@v2
2222

2323
- name: Setup Node
24-
uses: actions/setup-node@v1
24+
uses: actions/setup-node@v3
2525
with:
26-
node-version: '14.x'
26+
node-version: 16
2727

2828
- name: Lint js
29-
run: touch ./webpack/.env && npm install && npm run lint
29+
run: touch ./webpack/.env && npm ci && npm run lint

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66
name: Run unit tests
77
strategy:
88
matrix:
9-
js: [ '14' ]
9+
js: [ '16' ]
1010
steps:
1111
- name: Setup Node
12-
uses: actions/setup-node@v2
12+
uses: actions/setup-node@v3
1313
with:
1414
node-version: ${{ matrix.js }}
1515

@@ -24,5 +24,5 @@ jobs:
2424
restore-keys: ${{ runner.os }}-node-
2525

2626
- name: Run tests
27-
run: npm install && npm run test
27+
run: npm ci && npm run test
2828
working-directory: ./

.github/workflows/typecheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
- uses: actions/checkout@v2
99

1010
- name: Setup Node
11-
uses: actions/setup-node@v1
11+
uses: actions/setup-node@v3
1212
with:
13-
node-version: '14.x'
13+
node-version: 16
1414

1515
- name: Build and check types
16-
run: touch ./webpack/.env && npm install && npm run build
16+
run: touch ./webpack/.env && npm ci && npm run build

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ There are few things to do before you are ready to contribute.
2424

2525
First you need to install every node module:
2626

27-
`npm i`
27+
`npm ci`
2828

2929
then create a `.env` file inside the *webpack* folder by copying `webpack/.env-example` and complete it with your environment's informations. Please use a free tcp port.
3030

@@ -35,7 +35,7 @@ then build assets:
3535
### Good practices
3636

3737
- Follow the BEM convention
38-
- Be careful about creating SCSS files in the right folder, refer to the [documentation](https://build.prestashop.com/hummingbird/) for further informations.
38+
- Be careful about creating SCSS files in the right folder, refer to the [documentation](https://build.prestashop.com/hummingbird/) for further informations.
3939
- When you want to submit a PR, please make sure that you ran both linters using `npm run lint-fix && npm run scss-fix` and fixed every lint issues.
4040
- If your PR is a work in progress, make sure that you use the Github draft mode.
4141
- Fill the PR template as much as possible, it's important to speed the process of testing, reviewing...

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Same as the PrestaShop project, you need at least **NodeJS 14.x** and **NPM 7**
1313

1414
First you need to install every node module:
1515

16-
`npm i`
16+
`npm ci`
1717

1818
then create a `.env` file inside the *webpack* folder by copying `webpack/.env-example` and complete it with your environment's informations. Please use a free tcp port.
1919

@@ -39,6 +39,6 @@ When develop is merged into master, the Storybook is delivered almost instantly
3939

4040
## License
4141

42-
This theme is released under the [Academic Free License 3.0][AFL-3.0]
42+
This theme is released under the [Academic Free License 3.0][AFL-3.0]
4343

4444
[AFL-3.0]: https://opensource.org/licenses/AFL-3.0

config/theme.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author:
88

99
meta:
1010
compatibility:
11-
from: 8.0.0
11+
from: 8.1.0
1212
to: ~
1313

1414
available_layouts:

modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="modal-dialog modal-dialog-centered" role="document">
2020
<div class="modal-content">
2121
<div class="modal-header px-3">
22-
<h5 class="modal-title">{l s='Add to wishlist' d='Modules.Blockwishlist.Shop'}</h5>
22+
<p class="h5 modal-title">{l s='Add to wishlist' d='Modules.Blockwishlist.Shop'}</p>
2323
<button
2424
type="button"
2525
class="btn-close"
@@ -45,7 +45,7 @@
4545

4646
<div class="modal-footer">
4747
<a @click="openNewWishlistModal" class="wishlist-add-to-new text-primary">
48-
<i class="material-icons text-primary">add_circle_outline</i> {$newWishlistCTA}
48+
<i class="material-icons text-primary" aria-hidden="true">add_circle_outline</i> {$newWishlistCTA}
4949
</a>
5050
</div>
5151
</div>

modules/blockwishlist/views/templates/components/modals/create.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<div class="modal-dialog modal-dialog-centered" role="document">
2626
<div class="modal-content">
2727
<div class="modal-header px-3">
28-
<h5 class="modal-title">((title))</h5>
28+
<p class="h5 modal-title">((title))</p>
2929
<button
3030
type="button"
3131
class="btn-close"

0 commit comments

Comments
 (0)