Skip to content

Commit 381851a

Browse files
authored
Revert "pnpm (#47)" (#48)
* Revert "pnpm (#47)" This reverts commit 7832f09. * Readd docusaurus example CI * Removed exampels * regen lock * Build fixes
1 parent 7832f09 commit 381851a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+85810
-22117
lines changed

.github/workflows/docs-md.yaml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,18 @@ jobs:
1717
- name: Set up Node.js
1818
uses: actions/setup-node@v4
1919
with:
20-
node-version: "22"
21-
- name: Install pnpm
22-
uses: pnpm/action-setup@v4
23-
with:
24-
version: 9
25-
- name: Get pnpm store directory
26-
shell: bash
27-
run: |
28-
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
29-
- name: Setup pnpm cache
30-
uses: actions/cache@v4
31-
with:
32-
path: ${{ env.STORE_PATH }}
33-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
34-
restore-keys: |
35-
${{ runner.os }}-pnpm-store-
20+
node-version: "24"
3621
- name: Install dependencies
37-
run: pnpm install --frozen-lockfile
22+
run: npm ci
3823
- name: Lint
3924
working-directory: ./packages/docs-md
40-
run: pnpm run lint
25+
run: npm run lint
26+
- name: Type check
27+
working-directory: ./packages/docs-md
28+
run: npm run type-check
29+
- name: Test
30+
working-directory: ./packages/docs-md
31+
run: npm run test
4132
- name: Build
4233
working-directory: ./packages/docs-md
43-
run: pnpm run build
34+
run: npm run build
Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Docusaurus Petstore Example
1+
name: Docusaurus Example
22

33
on:
44
push:
@@ -9,24 +9,20 @@ on:
99

1010
jobs:
1111
build-and-test:
12-
name: Docusaurus Petstore Example Build and Test
12+
name: Docusaurus Example Build
1313
runs-on: ubuntu-latest
1414

1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Set up Node.js
1818
uses: actions/setup-node@v4
1919
with:
20-
node-version: "22"
21-
- name: Install pnpm
22-
uses: pnpm/action-setup@v4
23-
with:
24-
version: 9
20+
node-version: "24"
2521
- name: Install dependencies
26-
run: pnpm install --frozen-lockfile
22+
run: npm ci
2723
- name: Build Docs MD
2824
working-directory: ./packages/docs-md
29-
run: pnpm run build
25+
run: npm run build
3026
- name: Build Docusaurus
3127
working-directory: ./examples/docusaurus/petstore
32-
run: pnpm run build
28+
run: npm run build

.npmrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

Makefile

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
type-check:
2-
pnpm run type-check --recursive
2+
npm run type-check --workspaces
33

44
lint:
5-
pnpm run lint --recursive
5+
npm run lint --workspaces
66

77
test: type-check lint
8-
pnpm test --recursive
8+
npm test --workspaces
99

1010
format:
11-
pnpm run format --recursive
11+
npm run format --workspaces
1212

1313
install:
14-
pnpm install
14+
npm install
15+
npm install --workspaces
1516

1617
build: install
17-
pnpm run build --recursive
18+
npm run build --workspaces
1819

1920
start:
20-
pnpm dlx concurrently \
21-
"pnpm run dev --filter=server" \
22-
"pnpm run dev --filter=client/web" \
23-
"pnpm run dev --filter=demos" \
24-
"pnpm run dev --filter=asset-proxy"
21+
npx concurrently \
22+
"npm run dev --workspace=server" \
23+
"npm run dev --workspace=client/web" \
24+
"npm run dev --workspace=demos" \
25+
"npm run dev --workspace=asset-proxy"
2526

2627
add-demo:
27-
pnpm run add-demo --filter="@speakeasy-api/codewords-demos"
28+
npm run add-demo --workspace="@speakeasy-api/codewords-demos"
2829

2930
.PHONY: interactive
3031

3132
interactive:
32-
pnpm run interactive --filter=server -- --spec=$(spec) --lang=$(lang) --token=$(token) --command=$(command)
33+
npm run interactive --workspace=server -- --spec=$(spec) --lang=$(lang) --token=$(token) --command=$(command)

examples/docusaurus/petstore/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"@docusaurus/theme-common": "^3.8.1",
2222
"@mdx-js/react": "^3.0.0",
2323
"@radix-ui/colors": "^3.0.0",
24-
"@speakeasy-api/docs-md": "workspace:*",
2524
"clsx": "^2.0.0",
2625
"http-server": "^14.1.1",
2726
"jotai": "^2.12.5",

examples/docusaurus/petstore/src/components/HomepageFeatures/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import type {ReactNode} from 'react';
2+
import clsx from 'clsx';
3+
import Heading from '@theme/Heading';
24
import styles from './styles.module.css';
35

46
export default function HomepageFeatures(): ReactNode {
57
return (
68
<section className={styles.features}>
79
<div className="container">
810
<div className="row">
9-
We have some cool features.
11+
We have some cool features
1012
</div>
1113
</div>
1214
</section>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) Microsoft Corporation.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Installation
2+
> `npm install --save @types/node`
3+
4+
# Summary
5+
This package contains type definitions for node (https://nodejs.org/).
6+
7+
# Details
8+
Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node.
9+
10+
### Additional Details
11+
* Last updated: Mon, 28 Apr 2025 06:43:21 GMT
12+
* Dependencies: [undici-types](https://npmjs.com/package/undici-types)
13+
14+
# Credits
15+
These definitions were written by [Microsoft TypeScript](https://github.com/Microsoft), [Alberto Schiabel](https://github.com/jkomyno), [Alvis HT Tang](https://github.com/alvis), [Andrew Makarov](https://github.com/r3nya), [Benjamin Toueg](https://github.com/btoueg), [Chigozirim C.](https://github.com/smac89), [David Junger](https://github.com/touffy), [Deividas Bakanas](https://github.com/DeividasBakanas), [Eugene Y. Q. Shen](https://github.com/eyqs), [Hannes Magnusson](https://github.com/Hannes-Magnusson-CK), [Huw](https://github.com/hoo29), [Kelvin Jin](https://github.com/kjin), [Klaus Meinhardt](https://github.com/ajafff), [Lishude](https://github.com/islishude), [Mariusz Wiktorczyk](https://github.com/mwiktorczyk), [Mohsen Azimi](https://github.com/mohsen1), [Nikita Galkin](https://github.com/galkin), [Parambir Singh](https://github.com/parambirs), [Sebastian Silbermann](https://github.com/eps1lon), [Thomas den Hollander](https://github.com/ThomasdenH), [Wilco Bakker](https://github.com/WilcoBakker), [wwwy3y3](https://github.com/wwwy3y3), [Samuel Ainsworth](https://github.com/samuela), [Kyle Uehlein](https://github.com/kuehlein), [Thanik Bhongbhibhat](https://github.com/bhongy), [Marcin Kopacz](https://github.com/chyzwar), [Trivikram Kamat](https://github.com/trivikr), [Junxiao Shi](https://github.com/yoursunny), [Ilia Baryshnikov](https://github.com/qwelias), [ExE Boss](https://github.com/ExE-Boss), [Piotr Błażejewicz](https://github.com/peterblazejewicz), [Anna Henningsen](https://github.com/addaleax), [Victor Perin](https://github.com/victorperin), [NodeJS Contributors](https://github.com/NodeJS), [Linus Unnebäck](https://github.com/LinusU), [wafuwafu13](https://github.com/wafuwafu13), [Matteo Collina](https://github.com/mcollina), [Dmitry Semigradsky](https://github.com/Semigradsky), and [René](https://github.com/Renegade334).

0 commit comments

Comments
 (0)