Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(config): Use pnpm workspaces #245

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,26 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Setup pnpm
uses: pnpm/action-setup@v4

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.version }}
cache: 'npm'

- name: Cache Node.js modules
uses: actions/cache@v4
with:
path: node_modules
key: ${{ runner.os }}-node-${{ matrix.version }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-${{ matrix.version }}-
cache: 'pnpm'

- name: Installing dependencies
run: npm ci
run: pnpm install --frozen-lockfile

- name: Build packages
run: pnpm -r build

- name: Running tests
run: npm run test
run: pnpm -r test

- name: Running lint
run: npm run lint
run: pnpm -r lint

- name: Running typecheck
run: npm run typecheck
run: pnpm -r typecheck
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
allow_failures:
- node_js: 18

script: npm run quickstart && npm run test
script: pnpm run quickstart && pnpm run test

notifications:
email:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ Other changes

Other changes
-----------------
* Fix svelte npm package file contents
* Fix svelte pnpm package file contents


1.0.0-beta.6 / 2021-05-11
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ Each SDK also contains advanced features in the form of plugins, which extend th
## Development setup
To build and link project:
- clone project
- npm run quickstart
- pnpm run quickstart


## Installation
To get started, install the npm client package of your choice along with our base package.
To get started, install the pnpm client package of your choice along with our base package.
For example, to use Cloudinary in a [React](https://cloudinary.com/documentation/react2_integration) environment, the following packages should be installed:

```bash
Expand Down
14 changes: 7 additions & 7 deletions e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
"description": "",
"main": "wdio.conf.js",
"scripts": {
"test": "npm run setChromeDriverVersion && tsc && wdio ./wdio.conf.js",
"pack:react-sdk": "cd ../frameworks/react && npm run build && npm pack",
"test": "pnpm run setChromeDriverVersion && tsc && wdio ./wdio.conf.js",
"pack:react-sdk": "cd ../frameworks/react && pnpm run build && pnpm pack",
"cpy-react-sdk": "cpy ../frameworks/react/cloudinary-react-*.tgz ./react-test-app --rename=cloudinary-react.tgz",
"build:react-test-app": "cd react-test-app && npm run clean-install && npm run build",
"build:react-test-app": "cd react-test-app && pnpm run clean-install && pnpm run build",
"serve:react-test-app": "ws --directory react-test-app/build",
"prepare:react": "npm run pack:react-sdk && npm run cpy-react-sdk && npm run build:react-test-app && npm run serve:react-test-app",
"prepare:react": "pnpm run pack:react-sdk && pnpm run cpy-react-sdk && pnpm run build:react-test-app && pnpm run serve:react-test-app",
"setChromeDriverVersion": "./scripts/setChromeDriverVersion.sh",
"start-server-and-test:react": "WAIT_ON_TIMEOUT=600000 start-server-and-test prepare:react http://127.0.0.1:8000 test",
"pack:vue-sdk": "cd ../frameworks/vue && npm run build && npm pack",
"pack:vue-sdk": "cd ../frameworks/vue && pnpm run build && pnpm pack",
"cpy-vue-sdk": "cpy ../frameworks/vue/cloudinary-vue-*.tgz ./vue-test-app --rename=cloudinary-vue.tgz",
"build:vue-test-app": "cd vue-test-app && npm run clean-install && npm run build",
"build:vue-test-app": "cd vue-test-app && pnpm run clean-install && pnpm run build",
"serve:vue-test-app": "ws --directory vue-test-app/dist",
"prepare:vue": "npm run pack:vue-sdk && npm run cpy-vue-sdk && npm run build:vue-test-app && npm run serve:vue-test-app",
"prepare:vue": "pnpm run pack:vue-sdk && pnpm run cpy-vue-sdk && pnpm run build:vue-test-app && pnpm run serve:vue-test-app",
"start-server-and-test:vue": "WAIT_ON_TIMEOUT=600000 start-server-and-test prepare:vue http://127.0.0.1:8000 test"
},
"keywords": [],
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/react-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"clean-install": "npm uninstall @cloudinary/react && npm install cloudinary-react.tgz && npm install",
"clean-install": "pnpm uninstall @cloudinary/react && pnpm install cloudinary-react.tgz && pnpm install",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
Expand Down
20 changes: 13 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,24 @@
"engines": {
"node": ">=14.0.0 <19"
},
"packageManager": "pnpm@7",
"scripts": {
"postinstall": "husky install",
"install": "lerna bootstrap --ci --hoist @cloudinary/url-gen",
"build": "lerna run build",
"quickstart": "lerna bootstrap && lerna run build",
"test": "lerna run test",
"lint": "lerna run lint",
"typecheck": "lerna run typecheck",
"build": "pnpm -r build",
"quickstart": "pnpm i && pnpm -r build",
"test": "pnpm -r test",
"lint": "pnpm -r lint",
"typecheck": "pnpm -r typecheck",
"build:docs": "node ./scripts/buildDocs.js",
"start:docs": "live-server --open=public/docs",
"update:urlgen": "npm install @cloudinary/url-gen@latest --prefix packages/html && npm install @cloudinary/url-gen@latest --prefix packages/react && npm install @cloudinary/url-gen@latest --prefix packages/vue && npm install @cloudinary/url-gen@latest --prefix packages/angular && npm install @cloudinary/url-gen@latest --prefix packages/angular/projects/cloudinary-library"
"update:urlgen": "pnpm --filter @cloudinary/html install @cloudinary/url-gen@latest && pnpm install @cloudinary/url-gen@latest --filter @cloudinary/react && pnpm install @cloudinary/url-gen@latest --filter @cloudinary/vue && pnpm install @cloudinary/url-gen@latest --filter @cloudinarys/angular && pnpm install @cloudinary/url-gen@latest --filter @cloudinary/cloudinary-library"
},
"devDependencies": {
"@cloudinary/url-gen": "^1.21.0",
"@commitlint/cli": "^17.6.1",
"@commitlint/config-conventional": "^17.6.1",
"@types/body-parser": "^1.19.5",
"@types/bonjour": "^3.5.13",
"@vue/compiler-sfc": "^3.2.47",
"better-docs": "2.3.2",
"core-js": "^3.39.0",
Expand All @@ -39,5 +41,9 @@
},
"sanitize-html": "2.9.0"
}
},
"volta": {
"node": "18.20.5",
"pnpm": "7"
}
}
Loading
Loading