Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into 4972_BUG_prevent_…
Browse files Browse the repository at this point in the history
…readdir_files

* upstream/master: (34 commits)
  feat(upgrade, add): Separately log added/upgraded dependencies (yarnpkg#5227)
  feat(publish): Publish command uses publishConfig.access in package.json (yarnpkg#5290)
  fix(CLI): Use process exit instead of exitCode for node < 4 (yarnpkg#5291)
  feat(cli): error on missing workspace directory (yarnpkg#5206) (yarnpkg#5222)
  feat: better error when package is not found (yarnpkg#5213)
  Allow scoped package as alias source (yarnpkg#5229)
  fix(cli): Use correct directory for upgrade-interactive (yarnpkg#5272)
  nohoist baseline implementation (yarnpkg#4979)
  1.4.1
  1.4.0
  Show current version, when new version is not supplied on "yarn publish" (yarnpkg#4947)
  fix(install): use node-gyp from homebrew npm (yarnpkg#4994)
  Fix transient symlinks overriding direct ones v2 (yarnpkg#5016)
  fix(auth): Fixes authentication conditions and logic with registries (yarnpkg#5216)
  chore(package): move devDeps to appropriate place (yarnpkg#5166)
  fix(resolution) Eliminate "missing peerDep" warning when dep exists at root level. (yarnpkg#5088)
  fix(cli): improve guessing of package names that contain a dot (yarnpkg#5102) (yarnpkg#5135)
  feat(cli): include notice with license when generating disclaimer (yarnpkg#5072) (yarnpkg#5111)
  feat(cli): group by license in licenses list (yarnpkg#5074) (yarnpkg#5110)
  feat(cli): improve error message when file resolver can't find file (yarnpkg#5134) (yarnpkg#5145)
  ...
  • Loading branch information
agoldis committed Feb 2, 2018
2 parents 9ab2dfb + d68b6c9 commit 3374a84
Show file tree
Hide file tree
Showing 126 changed files with 3,289 additions and 509 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Expand Up @@ -117,7 +117,6 @@ jobs:
command: |
brew uninstall --ignore-dependencies node
HOMEBREW_NO_AUTO_UPDATE=1 brew install node@8
yarn global add node-gyp
- *attach_workspace
- *test_build
- *test_run
Expand All @@ -130,7 +129,6 @@ jobs:
brew uninstall --ignore-dependencies node
HOMEBREW_NO_AUTO_UPDATE=1 brew install node@6
brew link --force node@6
yarn global add node-gyp
- *attach_workspace
- *test_build
- *test_run
Expand Down
10 changes: 10 additions & 0 deletions __tests__/__mocks__/npm-registry.js
@@ -0,0 +1,10 @@
/* @flow */

import Registry from '../../src/registries/base-registry.js';
import type {RegistryRequestOptions} from '../../src/registries/base-registry.js';

export default class NpmRegistry extends Registry {
request(pathname: string, opts?: RegistryRequestOptions = {}, packageName: ?string): Promise<*> {
return new Promise(resolve => resolve());
}
}
78 changes: 78 additions & 0 deletions __tests__/__snapshots__/index.js.snap
@@ -0,0 +1,78 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`should add lockfile package 1`] = `
Array [
"info No lockfile found.",
"[1/4] Resolving packages...",
"[2/4] Fetching packages...",
"[3/4] Linking dependencies...",
"[4/4] Building fresh packages...",
"success Saved lockfile.",
"success Saved 1 new dependency.",
"info Direct dependencies",
"└─ lockfile@1.0.3",
"info All dependencies",
"└─ lockfile@1.0.3",
]
`;

exports[`should add package 1`] = `
Array [
"info No lockfile found.",
"[1/4] Resolving packages...",
"[2/4] Fetching packages...",
"[3/4] Linking dependencies...",
"[4/4] Building fresh packages...",
"success Saved lockfile.",
"success Saved 1 new dependency.",
"info Direct dependencies",
"└─ left-pad@1.2.0",
"info All dependencies",
"└─ left-pad@1.2.0",
]
`;

exports[`should add package with frozen-lockfile option 1`] = `
Array [
"info No lockfile found.",
"[1/4] Resolving packages...",
"[2/4] Fetching packages...",
"[3/4] Linking dependencies...",
"[4/4] Building fresh packages...",
"success Saved 1 new dependency.",
"info Direct dependencies",
"└─ repeating@3.0.0",
"info All dependencies",
"└─ repeating@3.0.0",
]
`;

exports[`should add package with no-lockfile option 1`] = `
Array [
"info No lockfile found.",
"[1/4] Resolving packages...",
"[2/4] Fetching packages...",
"[3/4] Linking dependencies...",
"[4/4] Building fresh packages...",
"success Saved 1 new dependency.",
"info Direct dependencies",
"└─ repeating@3.0.0",
"info All dependencies",
"└─ repeating@3.0.0",
]
`;

exports[`should add package with no-lockfile option in front 1`] = `
Array [
"info No lockfile found.",
"[1/4] Resolving packages...",
"[2/4] Fetching packages...",
"[3/4] Linking dependencies...",
"[4/4] Building fresh packages...",
"success Saved 1 new dependency.",
"info Direct dependencies",
"└─ split-lines@1.1.0",
"info All dependencies",
"└─ split-lines@1.1.0",
]
`;
5 changes: 4 additions & 1 deletion __tests__/__snapshots__/integration.js.snap
Expand Up @@ -8,5 +8,8 @@ exports[`yarnrc-args 1`] = `
{\\"type\\":\\"step\\",\\"data\\":{\\"message\\":\\"Building fresh packages\\",\\"current\\":4,\\"total\\":4}}
{\\"type\\":\\"success\\",\\"data\\":\\"Saved lockfile.\\"}
{\\"type\\":\\"success\\",\\"data\\":\\"Saved 1 new dependency.\\"}
{\\"type\\":\\"tree\\",\\"data\\":{\\"type\\":\\"newDependencies\\",\\"trees\\":[{\\"name\\":\\"left-pad@1.1.3\\",\\"children\\":[],\\"hint\\":null,\\"color\\":null,\\"depth\\":0}]}}"
{\\"type\\":\\"info\\",\\"data\\":\\"Direct dependencies\\"}
{\\"type\\":\\"tree\\",\\"data\\":{\\"type\\":\\"newDirectDependencies\\",\\"trees\\":[{\\"name\\":\\"left-pad@1.1.3\\",\\"children\\":[],\\"hint\\":null,\\"color\\":null,\\"depth\\":0}]}}
{\\"type\\":\\"info\\",\\"data\\":\\"All dependencies\\"}
{\\"type\\":\\"tree\\",\\"data\\":{\\"type\\":\\"newAllDependencies\\",\\"trees\\":[{\\"name\\":\\"left-pad@1.1.3\\",\\"children\\":[],\\"hint\\":null,\\"color\\":null,\\"depth\\":0}]}}"
`;
2 changes: 1 addition & 1 deletion __tests__/commands/__snapshots__/licenses.js.snap
Expand Up @@ -3,7 +3,7 @@
exports[`lists all licenses of the dependencies with the --json argument 1`] = `
"{\\"type\\":\\"warning\\",\\"data\\":\\"package.json: No license field\\"}
{\\"type\\":\\"warning\\",\\"data\\":\\"No license field\\"}
{\\"type\\":\\"tree\\",\\"data\\":{\\"type\\":\\"licenses\\",\\"trees\\":[{\\"name\\":\\"is-plain-obj@1.1.0\\",\\"children\\":[{\\"name\\":\\"License: MIT\\"},{\\"name\\":\\"URL: https://github.com/sindresorhus/is-plain-obj.git\\"}]}]}}
{\\"type\\":\\"tree\\",\\"data\\":{\\"type\\":\\"licenses\\",\\"trees\\":[{\\"name\\":\\"MIT\\",\\"children\\":[{\\"name\\":\\"is-plain-obj@1.1.0\\",\\"children\\":[{\\"name\\":\\"URL: https://github.com/sindresorhus/is-plain-obj.git\\"},{\\"name\\":\\"VendorUrl: sindresorhus.com\\"},{\\"name\\":\\"VendorName: Sindre Sorhus\\"}]}]}]}}
"
`;

Expand Down

0 comments on commit 3374a84

Please sign in to comment.