Skip to content

Commit

Permalink
build: use npm instead (#39)
Browse files Browse the repository at this point in the history
  • Loading branch information
schwannden authored Dec 20, 2024
1 parent ad6e64e commit 271c932
Show file tree
Hide file tree
Showing 14 changed files with 14,568 additions and 13,719 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"memory": "8gb"
},
"waitFor": "onCreateCommand",
"updateContentCommand": "yarn",
"updateContentCommand": "npm ci",
"postCreateCommand": "",
"postAttachCommand": "yarn dev",
"postAttachCommand": "npm run dev",
"customizations": {
"codespaces": {
"openFiles": ["data/prayer/code-sample.mdx"]
Expand Down
19 changes: 8 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,25 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: yarn

- id: configurepages
uses: actions/configure-pages@v5
cache: npm

- name: Restore cache
uses: actions/cache@v4
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
restore-keys: |
${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
- name: Install dependencies
run: yarn
run: npm ci

- name: Run linter
run: yarn lint
run: npm run lint

- name: Build project
run: yarn build
run: npm run build
env:
EXPORT: 1
UNOPTIMIZED: 1
BASE_PATH: ${{ steps.configurepages.outputs.base_path }}
BASE_PATH: ""
10 changes: 5 additions & 5 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: '20'
cache: yarn
cache: npm
- id: configurepages
uses: actions/configure-pages@v5
- name: Restore cache
uses: actions/cache@v4
with:
path: .next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
restore-keys: |
${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-
- run: yarn
- run: yarn build
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
- run: npm ci
- run: npm run build
env:
EXPORT: 1
UNOPTIMIZED: 1
Expand Down
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
/node_modules
/.pnp
.pnp.js
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# testing
/coverage
Expand All @@ -36,8 +30,6 @@ public/sitemap.xml
# debug
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env.local
Expand Down
934 changes: 0 additions & 934 deletions .yarn/releases/yarn-4.5.3.cjs

This file was deleted.

2 changes: 0 additions & 2 deletions .yarnrc.yml

This file was deleted.

78 changes: 36 additions & 42 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,58 @@

## [1.1.1](https://github.com/schwannden/prayer-blog/compare/v1.1.0...v1.1.1) (2024-12-17)


### Bug Fixes

* typo in site metadata ([9df3e57](https://github.com/schwannden/prayer-blog/commit/9df3e57033c0f8edb906737ae64bc95af57f35a8))
- typo in site metadata ([9df3e57](https://github.com/schwannden/prayer-blog/commit/9df3e57033c0f8edb906737ae64bc95af57f35a8))

## [1.1.0](https://github.com/schwannden/prayer-blog/compare/v1.0.0...v1.1.0) (2024-12-17)


### Features

* **about:** add george herber's prayer ([0f2d4f7](https://github.com/schwannden/prayer-blog/commit/0f2d4f71c8788c965b8c1f413224873689058621))
* **ci:** adding linter ([#9](https://github.com/schwannden/prayer-blog/issues/9)) ([d01fecf](https://github.com/schwannden/prayer-blog/commit/d01fecfe85a9b2f4d9d36e3eb99c5ac3beb9a842))
* **config:** add analytics ([#8](https://github.com/schwannden/prayer-blog/issues/8)) ([6f06022](https://github.com/schwannden/prayer-blog/commit/6f06022cb881dff0a330ad417251e867d1b2f005))
* **config:** custom domain and icon ([6d29580](https://github.com/schwannden/prayer-blog/commit/6d29580b69f8495a4531ab470421f7bc9cdd62d2))
* **config:** fix logo and tags ([#3](https://github.com/schwannden/prayer-blog/issues/3)) ([0fa8179](https://github.com/schwannden/prayer-blog/commit/0fa8179a4117e617cb41f423a92cd3f5a7fe2ff2))
* **layout:** rework blog layout to prayer book ([11ad1b6](https://github.com/schwannden/prayer-blog/commit/11ad1b65a9a1ceb561db36c045dc82388a4fa99c))
* **prayer:** add prayer for husband ([#7](https://github.com/schwannden/prayer-blog/issues/7)) ([92c0a25](https://github.com/schwannden/prayer-blog/commit/92c0a2586b619c1dc9b5488addb7b55fdcb44c8e))
* **prayer:** add prayer for kid and wife ([a01a449](https://github.com/schwannden/prayer-blog/commit/a01a4495c7a9e367abb1b4d4fb7fb0c72255b759))
* **prayer:** adding luke's prayer ([#6](https://github.com/schwannden/prayer-blog/issues/6)) ([3d63c4f](https://github.com/schwannden/prayer-blog/commit/3d63c4f3eb8b2bc3939c2b63611c15bd108ab4bc))
* **prayer:** adding prayer for family ([#10](https://github.com/schwannden/prayer-blog/issues/10)) ([67a6dbc](https://github.com/schwannden/prayer-blog/commit/67a6dbc1fedcd97a106660597ab482e4357bb7b4))
* **prayer:** complete prayer for wife and child ([#5](https://github.com/schwannden/prayer-blog/issues/5)) ([eaa3f6a](https://github.com/schwannden/prayer-blog/commit/eaa3f6a7929062ddfa91b053d4c3d8af6fe2a019))

- **about:** add george herber's prayer ([0f2d4f7](https://github.com/schwannden/prayer-blog/commit/0f2d4f71c8788c965b8c1f413224873689058621))
- **ci:** adding linter ([#9](https://github.com/schwannden/prayer-blog/issues/9)) ([d01fecf](https://github.com/schwannden/prayer-blog/commit/d01fecfe85a9b2f4d9d36e3eb99c5ac3beb9a842))
- **config:** add analytics ([#8](https://github.com/schwannden/prayer-blog/issues/8)) ([6f06022](https://github.com/schwannden/prayer-blog/commit/6f06022cb881dff0a330ad417251e867d1b2f005))
- **config:** custom domain and icon ([6d29580](https://github.com/schwannden/prayer-blog/commit/6d29580b69f8495a4531ab470421f7bc9cdd62d2))
- **config:** fix logo and tags ([#3](https://github.com/schwannden/prayer-blog/issues/3)) ([0fa8179](https://github.com/schwannden/prayer-blog/commit/0fa8179a4117e617cb41f423a92cd3f5a7fe2ff2))
- **layout:** rework blog layout to prayer book ([11ad1b6](https://github.com/schwannden/prayer-blog/commit/11ad1b65a9a1ceb561db36c045dc82388a4fa99c))
- **prayer:** add prayer for husband ([#7](https://github.com/schwannden/prayer-blog/issues/7)) ([92c0a25](https://github.com/schwannden/prayer-blog/commit/92c0a2586b619c1dc9b5488addb7b55fdcb44c8e))
- **prayer:** add prayer for kid and wife ([a01a449](https://github.com/schwannden/prayer-blog/commit/a01a4495c7a9e367abb1b4d4fb7fb0c72255b759))
- **prayer:** adding luke's prayer ([#6](https://github.com/schwannden/prayer-blog/issues/6)) ([3d63c4f](https://github.com/schwannden/prayer-blog/commit/3d63c4f3eb8b2bc3939c2b63611c15bd108ab4bc))
- **prayer:** adding prayer for family ([#10](https://github.com/schwannden/prayer-blog/issues/10)) ([67a6dbc](https://github.com/schwannden/prayer-blog/commit/67a6dbc1fedcd97a106660597ab482e4357bb7b4))
- **prayer:** complete prayer for wife and child ([#5](https://github.com/schwannden/prayer-blog/issues/5)) ([eaa3f6a](https://github.com/schwannden/prayer-blog/commit/eaa3f6a7929062ddfa91b053d4c3d8af6fe2a019))

### Bug Fixes

* next 15 async api ([5f717a6](https://github.com/schwannden/prayer-blog/commit/5f717a66662144980ff9267b3ae6f930d5a0a5d7))
* prettier, yarn, next config ([dac66b1](https://github.com/schwannden/prayer-blog/commit/dac66b14acbc80a585684d2d4edb9b607f9ef620))
* **tags:** fix project links ([#4](https://github.com/schwannden/prayer-blog/issues/4)) ([b3d51e6](https://github.com/schwannden/prayer-blog/commit/b3d51e6100e280f6a652ffc9b9b90a1e66e4b1ed))

- next 15 async api ([5f717a6](https://github.com/schwannden/prayer-blog/commit/5f717a66662144980ff9267b3ae6f930d5a0a5d7))
- prettier, npm, next config ([dac66b1](https://github.com/schwannden/prayer-blog/commit/dac66b14acbc80a585684d2d4edb9b607f9ef620))
- **tags:** fix project links ([#4](https://github.com/schwannden/prayer-blog/issues/4)) ([b3d51e6](https://github.com/schwannden/prayer-blog/commit/b3d51e6100e280f6a652ffc9b9b90a1e66e4b1ed))

### Build Related

* adding dependabot ([a33a209](https://github.com/schwannden/prayer-blog/commit/a33a20967b75fd9778ea6809d76d9c2013846f29))
* **deps-dev:** bump @types/node from 22.10.1 to 22.10.2 ([#30](https://github.com/schwannden/prayer-blog/issues/30)) ([2b87bee](https://github.com/schwannden/prayer-blog/commit/2b87bee01d524e2b3ddfe2406959456b07d21a1a))
* **deps-dev:** bump @typescript-eslint/eslint-plugin ([#27](https://github.com/schwannden/prayer-blog/issues/27)) ([fb656ce](https://github.com/schwannden/prayer-blog/commit/fb656cee6162b45037558763377bb71c04d8940b))
* **deps-dev:** bump @typescript-eslint/parser from 8.16.0 to 8.17.0 ([#16](https://github.com/schwannden/prayer-blog/issues/16)) ([54f2c46](https://github.com/schwannden/prayer-blog/commit/54f2c46f0782f094987806e64abd5713ee1eac08))
* **deps-dev:** bump @typescript-eslint/parser from 8.17.0 to 8.18.0 ([#21](https://github.com/schwannden/prayer-blog/issues/21)) ([277a892](https://github.com/schwannden/prayer-blog/commit/277a89213f3fa1e7bc86ba6bd7ce49521ee963c9))
* **deps-dev:** bump eslint from 9.16.0 to 9.17.0 ([#33](https://github.com/schwannden/prayer-blog/issues/33)) ([6d1306c](https://github.com/schwannden/prayer-blog/commit/6d1306cfb9ea25c26359fe91b07861437b45be88))
* **deps-dev:** bump eslint-config-next from 15.0.3 to 15.0.4 ([#25](https://github.com/schwannden/prayer-blog/issues/25)) ([5da84b3](https://github.com/schwannden/prayer-blog/commit/5da84b3aa6846c4d9e84bef7a2bd6d759d1c8bd8))
* **deps-dev:** bump eslint-config-next from 15.0.4 to 15.1.0 ([#34](https://github.com/schwannden/prayer-blog/issues/34)) ([d712f3c](https://github.com/schwannden/prayer-blog/commit/d712f3ca21bba53ffca3a4e3c78ff5c19d92519c))
* **deps-dev:** bump lint-staged from 15.2.10 to 15.2.11 ([#31](https://github.com/schwannden/prayer-blog/issues/31)) ([6119e1b](https://github.com/schwannden/prayer-blog/commit/6119e1b31810e4ce020abe0a3fc93264559e46a9))
* **deps-dev:** bump prettier from 3.4.1 to 3.4.2 ([#32](https://github.com/schwannden/prayer-blog/issues/32)) ([72d625e](https://github.com/schwannden/prayer-blog/commit/72d625ede1bd334e95cdbac8db22499c63c915a8))
* **deps:** bump @grpc/grpc-js from 1.12.3 to 1.12.4 ([#24](https://github.com/schwannden/prayer-blog/issues/24)) ([2bb2ae4](https://github.com/schwannden/prayer-blog/commit/2bb2ae4bb13bbec37010e05561a685e01ca48365))
* **deps:** bump @next/bundle-analyzer from 15.0.3 to 15.0.4 ([#22](https://github.com/schwannden/prayer-blog/issues/22)) ([8d34d02](https://github.com/schwannden/prayer-blog/commit/8d34d0252ffee60cd04c3c3f04ac08a479959421))
* **deps:** bump @next/bundle-analyzer from 15.0.4 to 15.1.0 ([#35](https://github.com/schwannden/prayer-blog/issues/35)) ([e5ece30](https://github.com/schwannden/prayer-blog/commit/e5ece302f6a8371b78d71b8c7a9c6e81a692bc4c))
* **deps:** bump nanoid from 3.3.7 to 3.3.8 in the npm_and_yarn group ([#28](https://github.com/schwannden/prayer-blog/issues/28)) ([e158b9a](https://github.com/schwannden/prayer-blog/commit/e158b9a32cb0ac80fa0eb7dae62f85f4a9ecc97d))
* **deps:** bump next from 15.0.3 to 15.1.0 ([#29](https://github.com/schwannden/prayer-blog/issues/29)) ([3a02382](https://github.com/schwannden/prayer-blog/commit/3a0238262fd4bf98182d3dc5f72af33d634e9586))
* **deps:** bump next-themes from 0.4.3 to 0.4.4 ([#20](https://github.com/schwannden/prayer-blog/issues/20)) ([8f62093](https://github.com/schwannden/prayer-blog/commit/8f620937b07015c9dd1944d04b658832eb07f215))
* **deps:** bump tailwindcss from 3.4.15 to 3.4.16 ([#18](https://github.com/schwannden/prayer-blog/issues/18)) ([46e1a70](https://github.com/schwannden/prayer-blog/commit/46e1a7073e9dffa4772baea59a06cfdf9d94817c))
* **deps:** version updates ([fafef59](https://github.com/schwannden/prayer-blog/commit/fafef59ed653b16b57a78d5f0dc380d957b103f6))
* update release process ([ab0b1ba](https://github.com/schwannden/prayer-blog/commit/ab0b1babedd48bf1a6a0deb18de3ba46deac5f6c))

- adding dependabot ([a33a209](https://github.com/schwannden/prayer-blog/commit/a33a20967b75fd9778ea6809d76d9c2013846f29))
- **deps-dev:** bump @types/node from 22.10.1 to 22.10.2 ([#30](https://github.com/schwannden/prayer-blog/issues/30)) ([2b87bee](https://github.com/schwannden/prayer-blog/commit/2b87bee01d524e2b3ddfe2406959456b07d21a1a))
- **deps-dev:** bump @typescript-eslint/eslint-plugin ([#27](https://github.com/schwannden/prayer-blog/issues/27)) ([fb656ce](https://github.com/schwannden/prayer-blog/commit/fb656cee6162b45037558763377bb71c04d8940b))
- **deps-dev:** bump @typescript-eslint/parser from 8.16.0 to 8.17.0 ([#16](https://github.com/schwannden/prayer-blog/issues/16)) ([54f2c46](https://github.com/schwannden/prayer-blog/commit/54f2c46f0782f094987806e64abd5713ee1eac08))
- **deps-dev:** bump @typescript-eslint/parser from 8.17.0 to 8.18.0 ([#21](https://github.com/schwannden/prayer-blog/issues/21)) ([277a892](https://github.com/schwannden/prayer-blog/commit/277a89213f3fa1e7bc86ba6bd7ce49521ee963c9))
- **deps-dev:** bump eslint from 9.16.0 to 9.17.0 ([#33](https://github.com/schwannden/prayer-blog/issues/33)) ([6d1306c](https://github.com/schwannden/prayer-blog/commit/6d1306cfb9ea25c26359fe91b07861437b45be88))
- **deps-dev:** bump eslint-config-next from 15.0.3 to 15.0.4 ([#25](https://github.com/schwannden/prayer-blog/issues/25)) ([5da84b3](https://github.com/schwannden/prayer-blog/commit/5da84b3aa6846c4d9e84bef7a2bd6d759d1c8bd8))
- **deps-dev:** bump eslint-config-next from 15.0.4 to 15.1.0 ([#34](https://github.com/schwannden/prayer-blog/issues/34)) ([d712f3c](https://github.com/schwannden/prayer-blog/commit/d712f3ca21bba53ffca3a4e3c78ff5c19d92519c))
- **deps-dev:** bump lint-staged from 15.2.10 to 15.2.11 ([#31](https://github.com/schwannden/prayer-blog/issues/31)) ([6119e1b](https://github.com/schwannden/prayer-blog/commit/6119e1b31810e4ce020abe0a3fc93264559e46a9))
- **deps-dev:** bump prettier from 3.4.1 to 3.4.2 ([#32](https://github.com/schwannden/prayer-blog/issues/32)) ([72d625e](https://github.com/schwannden/prayer-blog/commit/72d625ede1bd334e95cdbac8db22499c63c915a8))
- **deps:** bump @grpc/grpc-js from 1.12.3 to 1.12.4 ([#24](https://github.com/schwannden/prayer-blog/issues/24)) ([2bb2ae4](https://github.com/schwannden/prayer-blog/commit/2bb2ae4bb13bbec37010e05561a685e01ca48365))
- **deps:** bump @next/bundle-analyzer from 15.0.3 to 15.0.4 ([#22](https://github.com/schwannden/prayer-blog/issues/22)) ([8d34d02](https://github.com/schwannden/prayer-blog/commit/8d34d0252ffee60cd04c3c3f04ac08a479959421))
- **deps:** bump @next/bundle-analyzer from 15.0.4 to 15.1.0 ([#35](https://github.com/schwannden/prayer-blog/issues/35)) ([e5ece30](https://github.com/schwannden/prayer-blog/commit/e5ece302f6a8371b78d71b8c7a9c6e81a692bc4c))
- **deps:** bump nanoid from 3.3.7 to 3.3.8 in the npm_and_yarn group ([#28](https://github.com/schwannden/prayer-blog/issues/28)) ([e158b9a](https://github.com/schwannden/prayer-blog/commit/e158b9a32cb0ac80fa0eb7dae62f85f4a9ecc97d))
- **deps:** bump next from 15.0.3 to 15.1.0 ([#29](https://github.com/schwannden/prayer-blog/issues/29)) ([3a02382](https://github.com/schwannden/prayer-blog/commit/3a0238262fd4bf98182d3dc5f72af33d634e9586))
- **deps:** bump next-themes from 0.4.3 to 0.4.4 ([#20](https://github.com/schwannden/prayer-blog/issues/20)) ([8f62093](https://github.com/schwannden/prayer-blog/commit/8f620937b07015c9dd1944d04b658832eb07f215))
- **deps:** bump tailwindcss from 3.4.15 to 3.4.16 ([#18](https://github.com/schwannden/prayer-blog/issues/18)) ([46e1a70](https://github.com/schwannden/prayer-blog/commit/46e1a7073e9dffa4772baea59a06cfdf9d94817c))
- **deps:** version updates ([fafef59](https://github.com/schwannden/prayer-blog/commit/fafef59ed653b16b57a78d5f0dc380d957b103f6))
- update release process ([ab0b1ba](https://github.com/schwannden/prayer-blog/commit/ab0b1babedd48bf1a6a0deb18de3ba46deac5f6c))

### Chores

* remove newsletter api ([cb054e3](https://github.com/schwannden/prayer-blog/commit/cb054e3c08b575ecd1cfb22714cf86d81d65e2ac))

- remove newsletter api ([cb054e3](https://github.com/schwannden/prayer-blog/commit/cb054e3c08b575ecd1cfb22714cf86d81d65e2ac))

### Documentation

* adding contributor guide ([82179c1](https://github.com/schwannden/prayer-blog/commit/82179c1abcc039eb383d99220c22fb1653314898))
- adding contributor guide ([82179c1](https://github.com/schwannden/prayer-blog/commit/82179c1abcc039eb383d99220c22fb1653314898))
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ npx degit 'schwannden/prayer-blog'
## Installation

```bash
yarn
npm install
npm run prepare
```

Please note, that if you are using Windows, you may need to run:
Expand All @@ -79,7 +80,7 @@ $env:PWD = $(Get-Location).Path
First, run the development server:

```bash
yarn dev
npm run dev
```

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
Expand Down
8 changes: 4 additions & 4 deletions app/tag-data.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"luke-prayer": 6,
"spiritual-formation": 6,
"family": 2,
"child": 30,
"blessing": 92,
"wife": 31,
"husband": 31,
"family": 2
"luke-prayer": 6,
"spiritual-formation": 6,
"wife": 31
}
1 change: 0 additions & 1 deletion layouts/ListLayoutWithTags.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable jsx-a11y/anchor-is-valid */
'use client'

import { usePathname } from 'next/navigation'
Expand Down
2 changes: 1 addition & 1 deletion next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
Loading

0 comments on commit 271c932

Please sign in to comment.