Skip to content

Commit

Permalink
Merge branch 'master' into pr/zcf0508/192
Browse files Browse the repository at this point in the history
  • Loading branch information
antfu committed Jun 21, 2023
2 parents 2ee89d6 + a0f237f commit 0e99645
Show file tree
Hide file tree
Showing 14 changed files with 7,478 additions and 7,051 deletions.
18 changes: 10 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,38 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
node: [14, 16]
node: [16, 18]

steps:
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}

- name: checkout
uses: actions/checkout@master
uses: actions/checkout@v3

- name: cache node_modules
uses: actions/cache@v3
with:
path: node_modules
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/pnpm-lock.yaml')) }}

- run: corepack enable

- name: Install dependencies
run: yarn
run: pnpm install

- name: Prepare TypeScript environment
run: yarn dev:prepare
run: pnpm run dev:prepare

- name: Lint
run: yarn lint
run: pnpm run lint

- name: Test
run: yarn test
run: pnpm run test

- name: Build project
run: yarn prepack
run: pnpm run prepack

- name: Coverage
uses: codecov/codecov-action@v3
2 changes: 1 addition & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn commitlint --edit $1
pnpm commitlint --edit $1
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn lint
pnpm lint
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn lint
pnpm lint
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shamefully-hoist=true
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [3.3.0](https://github.com/nuxt-community/color-mode-module/compare/v3.2.0...v3.3.0) (2023-06-21)


### Features

* **docs:** upgrade to latest Docus ([#178](https://github.com/nuxt-community/color-mode-module/issues/178)) ([303d5f7](https://github.com/nuxt-community/color-mode-module/commit/303d5f7762b0f1afa0edf81bd36bcef32de66b27))


### Bug Fixes

* wrap injected script with iife ([#196](https://github.com/nuxt-community/color-mode-module/issues/196)) ([b03873b](https://github.com/nuxt-community/color-mode-module/commit/b03873b78cd22d1d6a7e9a279279fbbbfd77a25f))

## [3.2.0](https://github.com/nuxt-community/color-mode-module/compare/v3.1.8...v3.2.0) (2022-11-24)


Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ You can contribute to this module online with CodeSandBox:
Or locally:

1. Clone this repository
2. Install dependencies using `yarn install` or `npm install`
3. Start development server using `yarn dev` or `npm run dev`
2. Install dependencies using `pnpm install`
3. Start development server using `pnpm dev`

## License

Expand Down
4 changes: 2 additions & 2 deletions docs/content/1.index.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ You can contribute to this module online with CodeSandBox:
Or locally:

1. Clone this repository
2. Install dependencies using `yarn install` or `npm install`
3. Start development server using `yarn dev` or `npm run dev`
2. Install dependencies using `pnpm install`
3. Start development server using `pnpm dev`

## License

Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"preview": "nuxi preview"
},
"devDependencies": {
"@nuxt-themes/docus": "^1.1.8",
"nuxt": "^3.0.0",
"@nuxt-themes/docus": "^1.12.3",
"nuxt": "^3.5.3",
"nuxt-plausible": "^0.1.2"
}
}
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "@nuxtjs/color-mode",
"version": "3.2.0",
"version": "3.3.0",
"description": "Dark and Light mode for Nuxt with auto detection",
"repository": "nuxt-community/color-mode-module",
"license": "MIT",
"packageManager": "pnpm@8.6.3",
"contributors": [
{
"name": "Nuxt Team"
Expand All @@ -23,36 +24,35 @@
],
"scripts": {
"prepack": "nuxt-module-build && esbuild --minify dist/script.mjs --outfile=dist/script.min.js",
"build": "pnpm run prepack",
"dev": "nuxi dev playground",
"dev:build": "nuxi build playground",
"dev:prepare": "nuxt-module-build --stub && nuxi prepare playground",
"lint": "eslint --ext .js,.vue,.ts .",
"release": "yarn test && standard-version && git push --follow-tags && npm publish",
"test": "yarn vitest run --coverage"
"prepublishOnly": "pnpm run prepack",
"release": "pnpm test && standard-version && git push --follow-tags && npm publish",
"test": "vitest run --coverage"
},
"dependencies": {
"@nuxt/kit": "^3.0.0",
"@nuxt/kit": "^3.5.3",
"lodash.template": "^4.5.0",
"pathe": "^1.0.0"
"pathe": "^1.1.1"
},
"devDependencies": {
"@commitlint/cli": "^17.3.0",
"@commitlint/config-conventional": "^17.3.0",
"@nuxt/module-builder": "^0.2.1",
"@nuxt/schema": "^3.0.0",
"@nuxt/test-utils": "^3.0.0",
"@commitlint/cli": "^17.6.5",
"@commitlint/config-conventional": "^17.6.5",
"@nuxt/module-builder": "^0.4.0",
"@nuxt/schema": "^3.5.3",
"@nuxt/test-utils": "^3.5.3",
"@nuxtjs/eslint-config-typescript": "^12.0.0",
"@types/lodash.template": "^4.5.1",
"@typescript-eslint/parser": "^5.34.0",
"@vitest/coverage-c8": "^0.25.3",
"eslint": "^8.28.0",
"husky": "8.0.2",
"nuxt": "3.0.0",
"@typescript-eslint/parser": "^5.60.0",
"@vitest/coverage-v8": "^0.32.2",
"eslint": "^8.43.0",
"husky": "8.0.3",
"nuxt": "3.5.3",
"standard-version": "^9.5.0",
"typescript": "^5.0.2",
"vitest": "^0.25.3"
},
"publishConfig": {
"access": "public"
"typescript": "^5.1.3",
"vitest": "^0.32.2"
}
}
Loading

0 comments on commit 0e99645

Please sign in to comment.