Skip to content

Commit

Permalink
feat(pnpm): switch to pnpm (local / ci)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tahul committed Jan 30, 2023
1 parent 0c91a38 commit 20522d6
Show file tree
Hide file tree
Showing 16 changed files with 11,260 additions and 16,052 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: '16'
cache: yarn
- run: yarn install
- run: yarn dev:prepare
- run: yarn lint
- run: yarn build
- run: yarn test
- uses: pnpm/action-setup@v2.2.2
name: Install pnpm
id: pnpm-install
with:
version: 7
- run: pnpm install
- run: pnpm dev:prepare
- run: pnpm lint
- run: pnpm build
- run: pnpm test
- name: Release Edge
if: |
github.event_name == 'push' &&
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ node_modules
jspm_packages

package-lock.json
# */**/yarn.lock

examples/*/**/yarn.lock

Expand Down
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ignore-workspace-root-check=true
shamefully-hoist=true
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ Nuxt 2 is supported with Content v1, documentation is on https://content.nuxtjs.
## 💻 Development

- Clone repository
- Install dependencies using `yarn install`
- Prepare using `yarn dev:prepare`
- Try playground using `yarn dev`
- Install dependencies using `pnpm install`
- Prepare using `pnpm dev:prepare`
- Try playground using `pnpm dev`

## License

Expand Down
6 changes: 3 additions & 3 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ This documentation uses [Docus](https://github.com/nuxt-themes/docus).

## 💻 Development

- Install dependencies using `yarn install`
- Start using `yarn dev`
- Build using `yarn build`
- Install dependencies using `pnpm install`
- Start using `pnpm dev`
- Build using `pnpm build`
4 changes: 4 additions & 0 deletions docs/content-v1/ru/1.getting-started/6.configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,10 @@ export default {
Автоматически ставит тему PrismJS из вашего файла конфигурации Nuxt.js config, поэтому вы можете использовать различные темы, список [тем для prism](https://github.com/PrismJS/prism-themes):

::code-group
```bash [PNPM]
pnpm add prism-themes
```

```bash [Yarn]
yarn add prism-themes
```
Expand Down
27 changes: 16 additions & 11 deletions docs/content/2.get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Before getting started, please **make sure to have installed the recommended set
```bash [npx]
npx nuxi init content-app -t content
```

```bash [pnpm]
pnpm dlx nuxi init content-app -t content
```
Expand All @@ -40,21 +41,27 @@ Before getting started, please **make sure to have installed the recommended set
2. Install the dependencies in the `content-app` folder:

::code-group
```bash [pnpm]
pnpm install --shamefully-hoist
```

```bash [yarn]
yarn install
```

```bash [npm]
npm install
```
```bash [pnpm]
pnpm install --shamefully-hoist
```
::

3. Now you'll be able to use `yarn dev` to start your Nuxt content app in development mode:
3. Now you'll be able to use `pnpm dev` to start your Nuxt content app in development mode:

::code-group

```bash [pnpm]
pnpm run dev
```

```bash [yarn]
yarn dev
```
Expand All @@ -63,10 +70,6 @@ yarn dev
npm run dev
```

```bash [pnpm]
pnpm run dev
```

::

::alert{type="success"}
Expand All @@ -82,15 +85,17 @@ pnpm run dev
You can add Nuxt Content at anytime during your Nuxt project development by installing the `@nuxt/content` module:

::code-group
```bash [pnpm]
pnpm add -D @nuxt/content
```

```bash [yarn]
yarn add --dev @nuxt/content
```

```bash [npm]
npm install --save-dev @nuxt/content
```
```bash [pnpm]
pnpm add -D @nuxt/content
```
::

Then, add `@nuxt/content` to the `modules` section of `nuxt.config.ts`:
Expand Down
8 changes: 5 additions & 3 deletions docs/content/3.guide/3.recipes/1.sitemap.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ A sitemap file is useful for helping Google to better index your website, ensuri
This can be created by utilising the `sitemap` library, which can be installed as follows:

::code-group
```bash [pnpm]
pnpm add --save-dev sitemap
```

```bash [yarn]
yarn add --dev sitemap
```

```bash [npm]
npm install --save-dev sitemap
```
```bash [pnpm]
pnpm add --save-dev sitemap
```
::

## Server Route
Expand Down
4 changes: 2 additions & 2 deletions docs/content/3.guide/5.migration/1.from-v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Learn how to upgrade from Nuxt Content V1 to Nuxt Content V2 for Nuxt 3.

- Make sure your dev server (`nuxt dev`) isn't running and remove any package lock files (`package-lock.json` and `yarn.lock`)
- Make sure your dev server (`nuxt dev`) isn't running and remove any package lock files (`package-lock.json`, `yarn.lock`, or `pnpm-lock.yaml`)

- Upgrade to Nuxt 3 (check out the [Nuxt 3 migration guide](https://v3.nuxtjs.org/getting-started/migration))

Expand All @@ -21,7 +21,7 @@ Learn how to upgrade from Nuxt Content V1 to Nuxt Content V2 for Nuxt 3.
- Then, reinstall your dependencies:

```bash
yarn install
npm install
```

## Global Components
Expand Down
Loading

0 comments on commit 20522d6

Please sign in to comment.