Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pnpm/pnpm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.1.4
Choose a base ref
...
head repository: pnpm/pnpm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.0.0
Choose a head ref
Loading
Showing 1,011 changed files with 44,392 additions and 19,984 deletions.
8 changes: 8 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"$schema": "https://unpkg.com/@changesets/config@1.0.3/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": false,
"linked": [],
"access": "public",
"baseBranch": "master"
}
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
open_collective: pnpm
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ If your issue is a bug, please follow the format below:
### Code to reproduce the issue:

<!--
If there was a fatal error also include a gist of your pnpm-debug.log file.
If there was a fatal error also include a gist of your node_modules/.pnpm-debug.log file.
-->

### Expected behavior:
40 changes: 40 additions & 0 deletions .github/workflows/node-windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Node

on: [push, pull_request]

jobs:
build:

runs-on: windows-2019

strategy:
matrix:
node: [ '14' ]

name: ${{ matrix.node }} (Windows)
steps:
- name: Configure Git
run: |
git config --global core.autocrlf false
git config --global user.name "xyz"
git config --global user.email "x@y.z"
- name: Checkout Commit
uses: actions/checkout@v1
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}
- name: checkout master
run: git branch -f master origin/master
- name: install pnpm
run: |
npm install pnpm@next -g
pnpm --version
- name: pnpm install
run: pnpm recursive install
- name: run tests (master)
if: github.ref == 'refs/heads/master'
run: pnpm run test-master
- name: run tests (branch)
if: github.ref != 'refs/heads/master'
run: pnpm run test-branch
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ coverage
_docpress

lib
tsconfig.tsbuildinfo

# Visual Studio Code configs
.vscode/
@@ -30,3 +31,6 @@ __package_previews__
.store

privatePackages/store

## Verdaccio storage
storage
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
git-checks = true
hoist = false
link-workspace-packages = true
save-exact = true
shared-workspace-lockfile = true
use-beta-cli = true

14 changes: 9 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
language: node_js
node_js:
- 10.0
- 10.13
- 12
git:
depth: 5
sudo: false
before_install:
- npm set verify-store-integrity false
- git fetch --unshallow
- curl -L https://unpkg.com/@pnpm/self-installer | PNPM_VERSION=1.33.2 node
- curl -L https://raw.githubusercontent.com/pnpm/self-installer/master/install.js | PNPM_VERSION=1.33.2 node
# Testing whether pnpm can upgrade itself
- npm install --global npm@latest
- pnpm i -g pnpm@next
- pnpm -v
install:
- pnpm install --no-lock --force
- pnpm install --force
script:
- set -e # Fail on first error
# TODO: fix commitlint
# - /bin/bash lint-commits.sh
# - ./tools/node_modules/.bin/commitlint --from=$TRAVIS_COMMIT
- pnpm t
- if [ "$TRAVIS_BRANCH" = "master" ]; then pnpm run test-master; fi
- if [ "$TRAVIS_BRANCH" != "master" ]; then pnpm run test-branch; fi
- set +e
after_success:
- if [ "$TRAVIS_NODE_VERSION" = "12" ]; then pnpm run coveralls; fi;
cache:
npm: false
directories:
- storage
env:
global:
- CC=clang CXX=clang++ npm_config_clang=1
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -17,9 +17,9 @@

## Setting Up the Environment

1. Run `pnpm recursive install` in the root of the repository to install all dependencies.
2. For compiling all packages in the repo, run `pnpm recursive run tsc` or `npm run build` in the root of the repo.
3. To run tests, run `pnpm test` in the root of the repo.
1. Run `pnpm install` in the root of the repository to install all dependencies.
2. For compiling all projects, run `pnpm run compile` in the root of the repository. To run a task that will recompile the projects on change, run `pnpm run watch`.
3. In order to run all the tests in the repository, run `pnpm run test-master`. You may also run tests of specific projects by running `pnpm test` inside a project's directory or using `pnpm --filter <project name> test`.

## Submitting a Pull Request (PR)

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The MIT License (MIT)

Copyright (c) 2015-2016 Rico Sta. Cruz <rico@ricostacruz.com>
Copyright (c) 2016-2019 Zoltan Kochan <z@kochan.io>
Copyright (c) 2016-2020 Zoltan Kochan <z@kochan.io>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
139 changes: 0 additions & 139 deletions README.md

This file was deleted.

1 change: 1 addition & 0 deletions README.md
19 changes: 0 additions & 19 deletions appveyor.yml

This file was deleted.

1 change: 0 additions & 1 deletion docs/about-the-package-store.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/how-peers-are-resolved.md

This file was deleted.

30 changes: 0 additions & 30 deletions docs/pnpm-vs-npm.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/recipes/continuous-integration.md

This file was deleted.

11 changes: 0 additions & 11 deletions docs/recipes/releasing-apps.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/symlinked-node-modules-structure.md

This file was deleted.

File renamed without changes.
1 change: 1 addition & 0 deletions fixtures/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shared-workspace-lockfile = false
File renamed without changes.
File renamed without changes.
21 changes: 21 additions & 0 deletions fixtures/has-major-outdated-deps/node_modules/.pnpm/lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions fixtures/has-major-outdated-deps/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "wanted-shrinkwrap",
"version": "1.0.0",
"dependencies": {
"is-negative": "^1.0.0"
},
"devDependencies": {
"is-positive": "2.0.0"
}
}
Loading