Skip to content

Commit

Permalink
Merge branch 'next' into feature/entry-battery-level-check
Browse files Browse the repository at this point in the history
  • Loading branch information
ThornWalli committed Nov 15, 2023
2 parents 565125b + f338a7b commit 8da3062
Show file tree
Hide file tree
Showing 25 changed files with 293 additions and 364 deletions.
59 changes: 57 additions & 2 deletions .github/workflows/next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ jobs:
with:
path: |
node_modules
~/.cache/ms-playwright/
~\AppData\Local\ms-playwright\
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package-lock.json')) }}

- name: Install Dependencies
Expand Down Expand Up @@ -76,3 +74,60 @@ jobs:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
npx -p pinst -p @nuxt/module-builder -p semantic-release -p @semantic-release/git -p @semantic-release/changelog -p @semantic-release/exec -p @semantic-release/github semantic-release --provider=github --debug=true
build-docs:
name: Build (Docs)
needs: semantic-version
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ubuntu-latest]
node: [19]

steps:
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Checkout Repo
uses: actions/checkout@v4
- name: cache docs/node_modules
uses: actions/cache@v3
id: cache
with:
path: |
node_modules
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package-lock.json')) }}
- name: Build
run: |
npm run docs:build
touch docs/.vitepress/dist/.nojekyll
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Archive Production Artifact
uses: actions/upload-artifact@master
with:
name: docsArtifact
path: docs/.vitepress/dist

deploy-ghpages:
name: Deploy (GH-Pages)
needs: [build-docs]
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
node: [19]
steps:
- name: Download Artifact (Docs)
uses: actions/download-artifact@master
with:
name: docsArtifact
path: public/docs
- name: Deploy to GH-Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: public
cname: nuxt-speedkit.grabarzundpartner.dev
keep_files: true
2 changes: 1 addition & 1 deletion .github/workflows/sonar-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [16]
node: [19]

steps:
- uses: actions/setup-node@v4
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# Project Changelog

# [3.0.0-next.36](https://github.com/GrabarzUndPartner/nuxt-speedkit/compare/v3.0.0-next.35...v3.0.0-next.36) (2023-11-15)


### Bug Fixes

* **module:** added deprecation notifications ([41b1108](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/41b1108289f79da6a96024aa6175d0d93a5018c9))
* **module:** removed `@nuxt/critters` ([be9f3e6](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/be9f3e683d71e61c98b573b2fd095c0fcb342e18))
* **webpack:** added workaround for ssr styles ([663318d](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/663318d34ad9b9ec64251b9a8ac9a81fb5e57a8a))

# [3.0.0-next.35](https://github.com/GrabarzUndPartner/nuxt-speedkit/compare/v3.0.0-next.34...v3.0.0-next.35) (2023-11-13)


### Bug Fixes

* **source:** `@nuxt/image` `densities` definition ([8adfa89](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/8adfa8932fc1aedd6d54858b46ef1c794e404610))
* **source:** added `densities` option ([c8a5c55](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/c8a5c55b8f04d4d61d73af3da4548a7cf863a6b7))

# [3.0.0-next.34](https://github.com/GrabarzUndPartner/nuxt-speedkit/compare/v3.0.0-next.33...v3.0.0-next.34) (2023-11-12)


Expand Down
1 change: 0 additions & 1 deletion build.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export default {

// package
'@nuxt/image',
'@nuxtjs/critters',
'browserslist-useragent-regexp',
'cheerio',
'defu',
Expand Down
24 changes: 18 additions & 6 deletions docs/src/components/speedkit-image.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ If `true` the `SpeedkitImage` is initialized.
sizes: { … },
modifiers: { … },
preset: { … },
provider: '<provider>'
provider: '<provider>',
densities: '<densities>'
}
````

Expand Down Expand Up @@ -148,31 +149,42 @@ This overwrites the global ones of the preset if available.

Learn more about `modifiers`:

- <https://image.nuxtjs.org/configuration//#presets>
- <https://image.nuxt.com/usage/nuxt-img#modifiers>

#### `preset`

- Type: `Object`

If a preset is set on a source, the globally defined one is ignored.
If a `preset` is set on a source, the globally defined one is ignored.

This means that a separate preset can be specified for each source.

Learn more about `preset`:

- <https://image.nuxtjs.org/configuration//#presets>
- <https://image.nuxt.com/usage/nuxt-img#preset>

#### `provider`

- Type: `String`

If a provider is set on a source, the globally defined one is ignored.
If a `provider` is set on a source, the globally defined one is ignored.

This means that a separate provider can be specified for each source.

Learn more about `provider`:

- <https://image.nuxtjs.org/configuration//#providers>
- <https://image.nuxt.com/usage/nuxt-img#provider>

#### `densities`

- Type: `String`
- Default: 'x1 x2'

If a `densities` is set on a source, the globally defined one is ignored.

Learn more about `densities`:

- <https://image.nuxt.com/usage/nuxt-img#densities>

### `alt`

Expand Down
15 changes: 0 additions & 15 deletions docs/src/guide/options.md
Original file line number Diff line number Diff line change
Expand Up @@ -256,21 +256,6 @@ Global option for the [`IntersectionObserver`](https://developer.mozilla.org/en-
| `component` | `String` | yes | [`rootMargin`](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver/rootMargin) value for [`SpeedkitHydrate`](/guide/usage#import-components). | `0%` |
| `asset` | `String` | yes | [`rootMargin`](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver/rootMargin) value for all static ressources (`v-font`, `SpeedkitPicture` & `SpeedkitImage`). | `0%` |

## `disableNuxtCritters`

- Type: `Boolean`
- Default: `false`

If set, `@nuxtjs/critters` will not be integrated.

::: danger
⚠️ Note that CSS is not embedded in the page.
:::

::: info
For more information: <https://github.com/nuxt-modules/critters>
:::

## `disableNuxtFontaine`

- Type: `Boolean`
Expand Down
1 change: 0 additions & 1 deletion docs/src/public/CNAME

This file was deleted.

Loading

0 comments on commit 8da3062

Please sign in to comment.