Skip to content

Commit

Permalink
Merge pull request #804 from GrabarzUndPartner/main
Browse files Browse the repository at this point in the history
update
  • Loading branch information
ThornWalli committed May 2, 2023
2 parents 8785a6d + b5cd1e4 commit e85f8c3
Show file tree
Hide file tree
Showing 11 changed files with 650 additions and 856 deletions.
22 changes: 22 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
{
"name": "Node.js",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/javascript-node:0-18"

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
43 changes: 34 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- main

jobs:
install:
installPlayground:
if: "!contains(github.event.head_commit.message, 'skip ci')"
name: Install
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -35,19 +35,36 @@ jobs:
run: npm ci
- name: Test
run: npm run test

installDocs:
if: "!contains(github.event.head_commit.message, 'skip ci')"
name: Install (Docs)
runs-on: ${{ matrix.os }}

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

steps:
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- name: Checkout Repo
uses: actions/checkout@v3
- name: cache node_modules (Docs)
uses: actions/cache@v3
id: cacheDocs
id: cache
with:
path: docs/node_modules
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/docs/package-lock.json')) }}-docs
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/docs/package-lock.json')) }}
- name: Install Dependencies (Docs)
if: steps.cacheDocs.outputs.cache-hit != 'true'
if: steps.cache.outputs.cache-hit != 'true'
run: cd docs && npm ci

semantic-version:
name: Semantic Release
needs: install
needs: [installPlayground, installDocs]
runs-on: ${{ matrix.os }}

strategy:
Expand All @@ -61,13 +78,21 @@ jobs:
node-version: ${{ matrix.node }}
- name: Checkout Repo
uses: actions/checkout@v3
- name: cache node_modules
uses: actions/cache@v3
id: cache
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: Versioning
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
rsync -r --exclude ./src ./src/* .
npx -p pinst -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-playground:
Expand Down Expand Up @@ -127,15 +152,15 @@ jobs:
uses: actions/checkout@v3
- name: cache docs/node_modules
uses: actions/cache@v3
id: cacheDocs
id: cache
with:
path: docs/node_modules
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/docs/package-lock.json')) }}-docs
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/docs/package-lock.json')) }}
- name: Build
run: |
cd ./docs
npm run generate
touch docs/.output/public/.nojekyll
touch .output/public/.nojekyll
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Archive Production Artifact
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"

# npx branch-name-lint .branchlintrc
npx branch-name-lint .branchlintrc
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,55 @@
# Project Changelog

# [2.2.0](https://github.com/GrabarzUndPartner/nuxt-speedkit/compare/v2.1.7...v2.2.0) (2023-04-21)


### Features

* **codespace:** added codespace config ([9a155a9](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/9a155a99c1de0ae19754931aae263319a942ad41))

## [2.1.7](https://github.com/GrabarzUndPartner/nuxt-speedkit/compare/v2.1.6...v2.1.7) (2023-04-20)


### Bug Fixes

* **build:** fix semantic-release task ([28153c9](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/28153c9296442ffb8ac94cbc6c3d838438fd14f3))

## [2.1.6](https://github.com/GrabarzUndPartner/nuxt-speedkit/compare/v2.1.5...v2.1.6) (2023-04-20)


### Bug Fixes

* **build:** split install task ([727d9bf](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/727d9bf13d56806950a75bc1286e669bdd61074d))

## [2.1.5](https://github.com/GrabarzUndPartner/nuxt-speedkit/compare/v2.1.4...v2.1.5) (2023-04-20)


### Bug Fixes

* **ci:** fix task ([960f1ae](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/960f1aee671c71087d36230182b5f2b818456e3c))
* **ci:** test 1 ([6301cd6](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/6301cd6ebc5eaa1aebb726defd58a54a4565bf96))
* **ci:** test 1 ([1f85332](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/1f853326723cec1283848bf9bc37aca9e8b419cf))
* **ci:** test 2 ([094ce9c](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/094ce9ccf832e5db9210330edb3e4a52a68305fa))
* **ci:** test 2 ([5e3fc79](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/5e3fc79fe4dcf1f5de9188978261b953621845ce))
* **ci:** test 3 ([10837bc](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/10837bc406b9bb193f07212ab0773e9f8c7ac007))
* **ci:** test 4 ([1dbe58a](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/1dbe58a42180f04163e25ab8157af0727d198c55))
* **ci:** test 5 ([7323ea8](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/7323ea80b4f8a3d0b43743e03a82ae160d5f35bd))
* **ci:** test 5 ([76f047c](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/76f047c4af60c697ed2e52b2acec1c782a1bcb9b))
* **ci:** test 6 ([b3c615b](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/b3c615b2dc36c78ee602a4b3e4b73bb009497dc1))
* **ci:** test 6 ([34b6455](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/34b6455899d50acd02fcaf2cc0ab674f2a94db84))
* **ci:** test 7 ([54e7049](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/54e70498607748aef7e5c9cc470f04df212de13e))
* **ci:** test 8 ([2f59e63](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/2f59e63ce28c0142c1c8009f5fc2d656217ed0d3))
* **docs:** fix colors ([3c13d4e](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/3c13d4e241f873e0d9696ef9070554d8e2b41e25))
* **module:** fix transpiles ([cbb3cb3](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/cbb3cb350345b534369243fd1c00de56d9cf626f))
* **module:** prepare for rollout ([33bf9b1](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/33bf9b193919c9684bdaecb2a5196212a39607e8))
* **publish:** force publish ([d92ef7b](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/d92ef7b79ee50afc4f54f51a6dd984d4c4aeb60e))
* **test:** fix test ([a0bad9e](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/a0bad9ef1e68bb7c77b2469485eb7b341537cc48))
* **update:** added rollup; repalced docs with docus ([597ad15](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/597ad151e4f8eac38e462dc01dbd35ffb7bdb4ab))
* **update:** improve prepack ([d7b4c6a](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/d7b4c6ab73ae2f6d7e07050725c1d68560363826))
* **update:** replaced module build ([49b1c97](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/49b1c97976c477e393fce0a8922bcf015773bd69))
* **update:** update dependencies ([0f4202c](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/0f4202c8d229667cc8dbde17eb9193a2a1b705e1))
* **update:** update package-lock ([49be02c](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/49be02cc9260e0931bbb8a778be25d10d9b72a7d))

## [2.1.5-beta.14](https://github.com/GrabarzUndPartner/nuxt-speedkit/compare/v2.1.5-beta.13...v2.1.5-beta.14) (2023-04-19)


Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ All used components and resources are loaded on demand based on the viewport.

- [Grabarz & Partner](https://grabarzundpartner.de/) ([Lighthouse](https://pagespeed.web.dev/report?url=https%3A%2F%2Fgrabarzundpartner.de%2F), [Sitespeed](https://nuxt-speedkit.grabarzundpartner.dev/reports/sitespeed/grabarzundpartner/))
- [Grabarz Group](https://grabarz-group.de/) ([Lighthouse](https://pagespeed.web.dev/report?url=https%3A%2F%2Fgrabarz-group.de%2F), [Sitespeed](https://nuxt-speedkit.grabarzundpartner.dev/reports/sitespeed/grabarz-group/))
- [Nuxt Speedkit Example](https://nuxt-speedkit.grabarzundpartner.dev/example/) ([Lighthouse](https://pagespeed.web.dev/report?url=https%3A%2F%2Fnuxt-speedkit.grabarzundpartner.dev%2Fexample%2F), [Sitespeed](https://nuxt-speedkit.grabarzundpartner.dev/reports/sitespeed/nuxt-speedkit/))
- [Nuxt Speedkit Example](https://nuxt-speedkit.grabarzundpartner.dev/playground/) ([Lighthouse](https://pagespeed.web.dev/report?url=https%3A%2F%2Fnuxt-speedkit.grabarzundpartner.dev%2Fexample%2F), [Sitespeed](https://nuxt-speedkit.grabarzundpartner.dev/reports/sitespeed/nuxt-speedkit/))

## Getting Started

Expand Down Expand Up @@ -102,10 +102,10 @@ Please follow the [馃摉   **Documentation**](https://nuxt-speedkit.gra

or look here

- [Preview](https://nuxt-speedkit.grabarzundpartner.dev/example)
- [Report Client](https://nuxt-speedkit.grabarzundpartner.dev/example/reports/webpack/client.html)
- [Report Modern](https://nuxt-speedkit.grabarzundpartner.dev/example/reports/webpack/modern.html)
- [Report Server](https://nuxt-speedkit.grabarzundpartner.dev/example/reports/webpack/server.html)
- [Preview](https://nuxt-speedkit.grabarzundpartner.dev/playground)
- [Report Client](https://nuxt-speedkit.grabarzundpartner.dev/playground/reports/webpack/client.html)
- [Report Modern](https://nuxt-speedkit.grabarzundpartner.dev/playground/reports/webpack/modern.html)
- [Report Server](https://nuxt-speedkit.grabarzundpartner.dev/playground/reports/webpack/server.html)

## Consulting & Support

Expand Down
2 changes: 1 addition & 1 deletion docs/content/0.index.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ We provide the following CMS-friendly features:

- [Grabarz & Partner](https://grabarzundpartner.de/) ([Lighthouse](https://pagespeed.web.dev/report?url=https%3A%2F%2Fgrabarzundpartner.de%2F), [Sitespeed](https://nuxt-speedkit.grabarzundpartner.dev/reports/sitespeed/grabarzundpartner/))
- [Grabarz Group](https://grabarz-group.de/) ([Lighthouse](https://pagespeed.web.dev/report?url=https%3A%2F%2Fgrabarz-group.de%2F), [Sitespeed](https://nuxt-speedkit.grabarzundpartner.dev/reports/sitespeed/grabarz-group/))
- [Nuxt Speedkit Example](https://nuxt-speedkit.grabarzundpartner.dev/example/) ([Lighthouse](https://pagespeed.web.dev/report?url=https%3A%2F%2Fnuxt-speedkit.grabarzundpartner.dev%2Fexample%2F), [Sitespeed](https://nuxt-speedkit.grabarzundpartner.dev/reports/sitespeed/nuxt-speedkit/))
- [Nuxt Speedkit Example](https://nuxt-speedkit.grabarzundpartner.dev/playground/) ([Lighthouse](https://pagespeed.web.dev/report?url=https%3A%2F%2Fnuxt-speedkit.grabarzundpartner.dev%2Fplayground%2F), [Sitespeed](https://nuxt-speedkit.grabarzundpartner.dev/reports/sitespeed/nuxt-speedkit/))
Loading

0 comments on commit e85f8c3

Please sign in to comment.