MORPH
SIGN IN SIGN UP
yarnpkg / yarn UNCLAIMED

The 1.x line is frozen - features and bugfixes now happen on https://github.com/yarnpkg/berry

41528 0 1 JavaScript
Normal View History Raw
remove patents and facebook license headers
2016-09-16 20:27:37 +01:00
/* @flow */
fix lint errors
2016-02-15 07:32:43 +00:00
/* eslint quotes: 0 */
add PATENTS, CODE_OF_CONDUCT, LICENSE files
2016-02-10 23:00:56 +00:00
Update: Separate lockfile into its own npm package (#4114) **Summary** Fixes #3879. Separates the lockfile parser as a separate npm package. **Test plan** Existing unit tests.
2017-08-19 19:53:54 -04:00
import Lockfile from '../src/lockfile';
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
import stringify from '../src/lockfile/stringify.js';
import parse from '../src/lockfile/parse.js';
import nullify from '../src/util/map.js';
feat(checksums): add integrity field with sha512 authentication to yarn.lock (#5042) * test(fixtures): adjust yarn.lock and snapshots with integrity field as needed * test(integrity): adjust existing cases to integrity field authentication * test(fixtures): integrity field authentication cases * test(integrity): integration and unit tests for the lockfile integrity field * chore(deps): add ssri module * feat(checksums): add integrity field with sha512 authentication to yarn.lock * test(integrity): additional sri string options * fix(checksums): better error when algorithms are not supported * fix(checksums): proper error message for bad hash in node <= 6 * chore(integrity): fixed new flow issues * test(integrity): adjust additional test case * test(fixtures): additional integrity field authentication cases * fix(integrity): update integrity for offline-mirror cases * style(integrity): clarify conditional for flow * fix(integrity): throw sync error rather than rejecting it * Update yarn.lock with new integrity field * Upgrade ssri * Use the latest version of the SSRI package * Optimize integrity matching from lockfile a bit * Refactor digest support determination * test(error): fixed expected error wording * fix(checksum): fail validation on malformed hash or integrity * fix(test): verify integrity failure on malformed integrity string * test(fixtures): add install auth malformed integrity fixture * chore(deps): update dependency eslint-config-fb-strict to ^22.0.0 (#5570) **Summary** This Pull Request updates dependency eslint-config-fb-strict from ^20.1.0-delta.3 to ^22.0.0 **Test plan** `yarn lint` should pass. * chore(jest): Upgrade Jest flow types (#5573) **Summary** Follow up to #5569. **Test plan** `yarn lint` should pass without errors. * ci(appveyor): Fix AppVeyor tests (#5574) * ci(appveyor): Fix AppVeyor tests **Summary** Jest 22.4.x mocks the process object without a proper stub for `process.mainModule`. In our lifecycle code, we try to set `env.npm_execpath` when it is not defined by using `process.mainModule.filename`. When running tests on AppVeyor, we run Jest directly, thus we don't have `env.npm_execpath` set, triggering the `process.mainModule` code path which is also not set, causing tests to fail. **Test plan** AppVeyor builds should pass. * Fix tests * Add missing package cache * Bring --update-checksums back * Fix tests * Bring --update-checksums back * Fix Flow error * Fix error w/ updateChecksums * Update ssri semver in package.json * Stabilize TarballFetcher.fetch tests * Moar test fixes * test(update-checksums): make sure the flag works when integrity is malformed * fix(updateChecksums): minor issues and edge cases * Revert unrelated change ahead of 'imsnif/master' by 1 commit. * Slight refactor in lockfile parser * test(fixtures): update integrity and dep versions * fix(checksums): create integrity when importing from node_modules * test(fixtures): add integrity field to expected yarn.lock * Fixes error reporting * Fixes error reporting * Fixes tests
2018-08-01 17:26:34 +02:00
const ssri = require('ssri');
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
const objs = [{foo: 'bar'}, {foo: {}}, {foo: 'foo', bar: 'bar'}, {foo: 5}];
flesh out analysis more
2016-02-10 20:20:49 +00:00
add support for numbers to lockfile format
2016-03-07 12:17:37 -08:00
let i = 0;
let -> const
2016-10-05 16:56:53 +01:00
for (const obj of objs) {
Update to Jest 14. (#171) * Move fixtures. * Update to Jest 14. * Don’t track temporary files because of permission errors. * Fix flow errors. * Use node4 transforms for tests so they work on travis.
2016-07-29 18:57:22 +09:00
test(`parse/stringify ${++i}`, () => {
Auto detect and merge lockfile conflicts (#3544) * auto detect and merge lockfile conflicts * Skip over common ancestors when using diff3. * Small code cleanups * Nits
2017-07-07 14:06:39 +01:00
expect(parse(stringify(obj)).object).toEqual(nullify(obj));
add support for numbers to lockfile format
2016-03-07 12:17:37 -08:00
});
}
flesh out analysis more
2016-02-10 20:20:49 +00:00
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
test('parse', () => {
Adds support for parsing Yaml files (#7300) * Adds support for parsing Yaml files * Adds a test * Removes debug * Fixes test * Update CHANGELOG.md
2019-05-24 08:58:47 +02:00
// Yaml
expect(parse('foo:\n bar\n').object).toEqual(nullify({foo: 'bar'}));
Auto detect and merge lockfile conflicts (#3544) * auto detect and merge lockfile conflicts * Skip over common ancestors when using diff3. * Small code cleanups * Nits
2017-07-07 14:06:39 +01:00
expect(parse('foo "bar"').object).toEqual(nullify({foo: 'bar'}));
expect(parse('"foo" "bar"').object).toEqual(nullify({foo: 'bar'}));
expect(parse('foo "bar"').object).toEqual(nullify({foo: 'bar'}));
expect(parse(`foo:\n bar "bar"`).object).toEqual(nullify({foo: {bar: 'bar'}}));
expect(parse(`foo:\n bar:\n foo "bar"`).object).toEqual(nullify({foo: {bar: {}, foo: 'bar'}}));
expect(parse(`foo:\n bar:\n foo "bar"`).object).toEqual(nullify({foo: {bar: {foo: 'bar'}}}));
Fix: make lockfile parser tolerant to CRLF (#4495) **Summary** Lockfile parser fails when the lockfile had Windows-style line endings with an "Invalid token" error. This is default on Windows and, say when editing the file using vim, it is not obvious or trivial that the file endings are in Windows-style. This patch makes the parser tolareate potential "\r" chars before "\n" while keeping the existing parsing logic the same. **Test plan** Added three new unit tests.
2017-09-19 10:18:29 +01:00
expect(parse(`foo:\r\n bar:\r\n foo "bar"`).object).toEqual(nullify({foo: {bar: {foo: 'bar'}}}));
Auto detect and merge lockfile conflicts (#3544) * auto detect and merge lockfile conflicts * Skip over common ancestors when using diff3. * Small code cleanups * Nits
2017-07-07 14:06:39 +01:00
expect(parse('foo:\n bar:\n yes no\nbar:\n yes no').object).toEqual(
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
nullify({
foo: {
bar: {
yes: 'no',
},
},
more tests
2016-02-17 06:59:47 +00:00
bar: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
yes: 'no',
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
},
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
}),
);
Fix: make lockfile parser tolerant to CRLF (#4495) **Summary** Lockfile parser fails when the lockfile had Windows-style line endings with an "Invalid token" error. This is default on Windows and, say when editing the file using vim, it is not obvious or trivial that the file endings are in Windows-style. This patch makes the parser tolareate potential "\r" chars before "\n" while keeping the existing parsing logic the same. **Test plan** Added three new unit tests.
2017-09-19 10:18:29 +01:00
expect(parse('foo:\r\n bar:\r\n yes no\r\nbar:\r\n yes no').object).toEqual(
nullify({
foo: {
bar: {
yes: 'no',
},
},
bar: {
yes: 'no',
},
}),
);
add tests for lockfile
2016-01-31 22:58:39 +00:00
});
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
test('stringify', () => {
const obj = {foo: 'bar'};
expect(stringify({a: obj, b: obj}, true)).toEqual('a, b:\n foo bar\n');
more tests
2016-02-17 06:59:47 +00:00
});
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
test('Lockfile.fromDirectory', () => {});
more tests
2016-02-17 06:59:47 +00:00
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
test('Lockfile.getLocked', () => {
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const lockfile = new Lockfile({
Fix: Lockfile should be updated when merge conflcits are resolved (#4195) **Summary** Follow up to #3544. Currently, `yarn` happily keeps moving if it detects merge conflicts and is able to resolve them in the lockfile. That said it doesn't persist the resolution by saving the lockfile to disk again. This patch ensures writing the lockfile if it is "dirty". This patch also causes `yarn` to throw an error if there are merge conflicts in the file and `--frozen-lockfile` option is true. **Test plan** Existing unit tests. Also try running `yarn install` with the following files: `package.json` ``` { "name": "yarnlock-auto-merge", "version": "1.0.0", "main": "index.js", "author": "Burak Yigit Kaya <byk@fb.com>", "license": "MIT", "dependencies": { "left-pad": "^1.1.3", "right-pad": "^1.0.1" } } ``` `yarn.lock` ``` <<<<<<< HEAD left-pad@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a" ======= right-pad@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0" >>>>>>> right-pad ``` Without the patch, `yarn` won't update the lockfile. With the patch, the lockfile is replaced with the merged version.
2017-08-18 16:10:15 +01:00
cache: {
foo: 'bar',
bar: {},
},
more tests
2016-02-17 06:59:47 +00:00
});
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
expect(!!lockfile.getLocked('foo')).toBeTruthy();
more tests
2016-02-17 06:59:47 +00:00
});
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
test('Lockfile.getLocked pointer', () => {
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const lockfile = new Lockfile({
Fix: Lockfile should be updated when merge conflcits are resolved (#4195) **Summary** Follow up to #3544. Currently, `yarn` happily keeps moving if it detects merge conflicts and is able to resolve them in the lockfile. That said it doesn't persist the resolution by saving the lockfile to disk again. This patch ensures writing the lockfile if it is "dirty". This patch also causes `yarn` to throw an error if there are merge conflicts in the file and `--frozen-lockfile` option is true. **Test plan** Existing unit tests. Also try running `yarn install` with the following files: `package.json` ``` { "name": "yarnlock-auto-merge", "version": "1.0.0", "main": "index.js", "author": "Burak Yigit Kaya <byk@fb.com>", "license": "MIT", "dependencies": { "left-pad": "^1.1.3", "right-pad": "^1.0.1" } } ``` `yarn.lock` ``` <<<<<<< HEAD left-pad@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a" ======= right-pad@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0" >>>>>>> right-pad ``` Without the patch, `yarn` won't update the lockfile. With the patch, the lockfile is replaced with the merged version.
2017-08-18 16:10:15 +01:00
cache: {
foo: 'bar',
bar: {},
},
more tests
2016-02-17 06:59:47 +00:00
});
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
expect(!!lockfile.getLocked('foo')).toBeTruthy();
more tests
2016-02-17 06:59:47 +00:00
});
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
test('Lockfile.getLocked no cache', () => {
expect(!new Lockfile().getLocked('foobar')).toBeTruthy();
more tests
2016-02-17 06:59:47 +00:00
});
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
test('Lockfile.getLocked defaults', () => {
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const pattern = new Lockfile({
Fix: Lockfile should be updated when merge conflcits are resolved (#4195) **Summary** Follow up to #3544. Currently, `yarn` happily keeps moving if it detects merge conflicts and is able to resolve them in the lockfile. That said it doesn't persist the resolution by saving the lockfile to disk again. This patch ensures writing the lockfile if it is "dirty". This patch also causes `yarn` to throw an error if there are merge conflicts in the file and `--frozen-lockfile` option is true. **Test plan** Existing unit tests. Also try running `yarn install` with the following files: `package.json` ``` { "name": "yarnlock-auto-merge", "version": "1.0.0", "main": "index.js", "author": "Burak Yigit Kaya <byk@fb.com>", "license": "MIT", "dependencies": { "left-pad": "^1.1.3", "right-pad": "^1.0.1" } } ``` `yarn.lock` ``` <<<<<<< HEAD left-pad@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a" ======= right-pad@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0" >>>>>>> right-pad ``` Without the patch, `yarn` won't update the lockfile. With the patch, the lockfile is replaced with the merged version.
2017-08-18 16:10:15 +01:00
cache: {
foobar: {
version: '0.0.0',
},
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
},
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
}).getLocked('foobar');
expect(pattern.registry).toBe('npm');
expect(pattern.uid).toBe('0.0.0');
expect(pattern.version).toBe('0.0.0');
more tests
2016-02-17 06:59:47 +00:00
});
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
test('Lockfile.getLocked unknown', () => {
Fix: Lockfile should be updated when merge conflcits are resolved (#4195) **Summary** Follow up to #3544. Currently, `yarn` happily keeps moving if it detects merge conflicts and is able to resolve them in the lockfile. That said it doesn't persist the resolution by saving the lockfile to disk again. This patch ensures writing the lockfile if it is "dirty". This patch also causes `yarn` to throw an error if there are merge conflicts in the file and `--frozen-lockfile` option is true. **Test plan** Existing unit tests. Also try running `yarn install` with the following files: `package.json` ``` { "name": "yarnlock-auto-merge", "version": "1.0.0", "main": "index.js", "author": "Burak Yigit Kaya <byk@fb.com>", "license": "MIT", "dependencies": { "left-pad": "^1.1.3", "right-pad": "^1.0.1" } } ``` `yarn.lock` ``` <<<<<<< HEAD left-pad@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a" ======= right-pad@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0" >>>>>>> right-pad ``` Without the patch, `yarn` won't update the lockfile. With the patch, the lockfile is replaced with the merged version.
2017-08-18 16:10:15 +01:00
new Lockfile({cache: {}}).getLocked('foobar');
more tests
2016-02-17 06:59:47 +00:00
});
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
test('Lockfile.getLockfile', () => {
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const patterns = {
more tests
2016-02-17 06:59:47 +00:00
foobar: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
name: 'foobar',
version: '0.0.0',
_uid: '0.0.0',
more tests
2016-02-17 06:59:47 +00:00
dependencies: {},
optionalDependencies: {},
fix tests/lint
2016-08-22 16:37:11 +01:00
_reference: {
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
permissions: {},
more tests
2016-02-17 06:59:47 +00:00
},
fix tests/lint
2016-08-22 16:37:11 +01:00
_remote: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
resolved: 'http://example.com/foobar',
registry: 'npm',
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
},
more tests
2016-02-17 06:59:47 +00:00
},
barfoo: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
name: 'barfoo',
version: '0.0.1',
_uid: '0.1.0',
more tests
2016-02-17 06:59:47 +00:00
dependencies: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
yes: 'no',
more tests
2016-02-17 06:59:47 +00:00
},
optionalDependencies: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
no: 'yes',
more tests
2016-02-17 06:59:47 +00:00
},
fix tests/lint
2016-08-22 16:37:11 +01:00
_reference: {
more tests
2016-02-17 06:59:47 +00:00
permissions: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
foo: 'bar',
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
},
more tests
2016-02-17 06:59:47 +00:00
},
fix tests/lint
2016-08-22 16:37:11 +01:00
_remote: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
resolved: 'http://example.com/barfoo',
registry: 'yarn',
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
},
Enable Flow types on tests (#140) * enable flow types on tests * add ava.babel = "inherit" config
2016-07-21 11:35:13 +01:00
},
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
'foobar@2': {},
more tests
2016-02-17 06:59:47 +00:00
};
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
patterns['foobar@2'] = patterns.foobar;
more tests
2016-02-17 06:59:47 +00:00
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const actual = new Lockfile().getLockfile(patterns);
more tests
2016-02-17 06:59:47 +00:00
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const expectedFoobar = {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
version: '0.0.0',
collapse duplicate objects in lockfile to single line
2016-07-18 15:20:10 +01:00
uid: undefined,
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
resolved: 'http://example.com/foobar',
collapse duplicate objects in lockfile to single line
2016-07-18 15:20:10 +01:00
registry: undefined,
dependencies: undefined,
optionalDependencies: undefined,
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
permissions: undefined,
collapse duplicate objects in lockfile to single line
2016-07-18 15:20:10 +01:00
};
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const expected = {
more tests
2016-02-17 06:59:47 +00:00
barfoo: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
version: '0.0.1',
uid: '0.1.0',
resolved: 'http://example.com/barfoo',
registry: 'yarn',
dependencies: {yes: 'no'},
optionalDependencies: {no: 'yes'},
permissions: {foo: 'bar'},
more tests
2016-02-17 06:59:47 +00:00
},
fix tests
2016-08-24 04:12:53 +01:00
foobar: expectedFoobar,
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
'foobar@2': expectedFoobar,
more tests
2016-02-17 06:59:47 +00:00
};
Update to Jest 14. (#171) * Move fixtures. * Update to Jest 14. * Don’t track temporary files because of permission errors. * Fix flow errors. * Use node4 transforms for tests so they work on travis.
2016-07-29 18:57:22 +09:00
expect(actual).toEqual(expected);
more tests
2016-02-17 06:59:47 +00:00
});
fixes lockfile inconsistency between runs (#109) * fixes lockfile inconsistency between runs * nits and comments for Shayne
2016-07-13 17:59:04 +01:00
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
test('Lockfile.getLockfile (sorting)', () => {
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const patterns = {
fixes lockfile inconsistency between runs (#109) * fixes lockfile inconsistency between runs * nits and comments for Shayne
2016-07-13 17:59:04 +01:00
foobar2: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
name: 'foobar',
version: '0.0.0',
uid: '0.0.0',
fixes lockfile inconsistency between runs (#109) * fixes lockfile inconsistency between runs * nits and comments for Shayne
2016-07-13 17:59:04 +01:00
dependencies: {},
optionalDependencies: {},
fix tests/lint
2016-08-22 16:37:11 +01:00
_reference: {
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
permissions: {},
fixes lockfile inconsistency between runs (#109) * fixes lockfile inconsistency between runs * nits and comments for Shayne
2016-07-13 17:59:04 +01:00
},
fix tests/lint
2016-08-22 16:37:11 +01:00
_remote: {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
resolved: 'http://example.com/foobar',
registry: 'npm',
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
},
fixes lockfile inconsistency between runs (#109) * fixes lockfile inconsistency between runs * nits and comments for Shayne
2016-07-13 17:59:04 +01:00
},
Enable Flow types on tests (#140) * enable flow types on tests * add ava.babel = "inherit" config
2016-07-21 11:35:13 +01:00
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
foobar1: {},
fixes lockfile inconsistency between runs (#109) * fixes lockfile inconsistency between runs * nits and comments for Shayne
2016-07-13 17:59:04 +01:00
};
patterns.foobar1 = patterns.foobar2;
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const actual = new Lockfile().getLockfile(patterns);
fixes lockfile inconsistency between runs (#109) * fixes lockfile inconsistency between runs * nits and comments for Shayne
2016-07-13 17:59:04 +01:00
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const expectedFoobar = {
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
name: 'foobar',
version: '0.0.0',
collapse duplicate objects in lockfile to single line
2016-07-18 15:20:10 +01:00
uid: undefined,
add prettier and prettying everything (#3401) * add prettier and prettying everything * fix scripts and run yarn prettier * fix scripts again and run yarn prettier * use eslint-plugin-prettify instead of custom scripts
2017-05-16 20:12:03 +02:00
resolved: 'http://example.com/foobar',
collapse duplicate objects in lockfile to single line
2016-07-18 15:20:10 +01:00
registry: undefined,
dependencies: undefined,
optionalDependencies: undefined,
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
permissions: undefined,
collapse duplicate objects in lockfile to single line
2016-07-18 15:20:10 +01:00
};
fixes lockfile inconsistency between runs (#109) * fixes lockfile inconsistency between runs * nits and comments for Shayne
2016-07-13 17:59:04 +01:00
var/let -> const (#505)
2016-10-05 21:05:44 +09:00
const expected = {
collapse duplicate objects in lockfile to single line
2016-07-18 15:20:10 +01:00
foobar1: expectedFoobar,
Switch to Facebook code style - closes #172
2016-08-16 23:05:13 +01:00
foobar2: expectedFoobar,
fixes lockfile inconsistency between runs (#109) * fixes lockfile inconsistency between runs * nits and comments for Shayne
2016-07-13 17:59:04 +01:00
};
Update to Jest 14. (#171) * Move fixtures. * Update to Jest 14. * Don’t track temporary files because of permission errors. * Fix flow errors. * Use node4 transforms for tests so they work on travis.
2016-07-29 18:57:22 +09:00
expect(actual).toEqual(expected);
fixes lockfile inconsistency between runs (#109) * fixes lockfile inconsistency between runs * nits and comments for Shayne
2016-07-13 17:59:04 +01:00
});
Auto detect and merge lockfile conflicts (#3544) * auto detect and merge lockfile conflicts * Skip over common ancestors when using diff3. * Small code cleanups * Nits
2017-07-07 14:06:39 +01:00
feat(checksums): add integrity field with sha512 authentication to yarn.lock (#5042) * test(fixtures): adjust yarn.lock and snapshots with integrity field as needed * test(integrity): adjust existing cases to integrity field authentication * test(fixtures): integrity field authentication cases * test(integrity): integration and unit tests for the lockfile integrity field * chore(deps): add ssri module * feat(checksums): add integrity field with sha512 authentication to yarn.lock * test(integrity): additional sri string options * fix(checksums): better error when algorithms are not supported * fix(checksums): proper error message for bad hash in node <= 6 * chore(integrity): fixed new flow issues * test(integrity): adjust additional test case * test(fixtures): additional integrity field authentication cases * fix(integrity): update integrity for offline-mirror cases * style(integrity): clarify conditional for flow * fix(integrity): throw sync error rather than rejecting it * Update yarn.lock with new integrity field * Upgrade ssri * Use the latest version of the SSRI package * Optimize integrity matching from lockfile a bit * Refactor digest support determination * test(error): fixed expected error wording * fix(checksum): fail validation on malformed hash or integrity * fix(test): verify integrity failure on malformed integrity string * test(fixtures): add install auth malformed integrity fixture * chore(deps): update dependency eslint-config-fb-strict to ^22.0.0 (#5570) **Summary** This Pull Request updates dependency eslint-config-fb-strict from ^20.1.0-delta.3 to ^22.0.0 **Test plan** `yarn lint` should pass. * chore(jest): Upgrade Jest flow types (#5573) **Summary** Follow up to #5569. **Test plan** `yarn lint` should pass without errors. * ci(appveyor): Fix AppVeyor tests (#5574) * ci(appveyor): Fix AppVeyor tests **Summary** Jest 22.4.x mocks the process object without a proper stub for `process.mainModule`. In our lifecycle code, we try to set `env.npm_execpath` when it is not defined by using `process.mainModule.filename`. When running tests on AppVeyor, we run Jest directly, thus we don't have `env.npm_execpath` set, triggering the `process.mainModule` code path which is also not set, causing tests to fail. **Test plan** AppVeyor builds should pass. * Fix tests * Add missing package cache * Bring --update-checksums back * Fix tests * Bring --update-checksums back * Fix Flow error * Fix error w/ updateChecksums * Update ssri semver in package.json * Stabilize TarballFetcher.fetch tests * Moar test fixes * test(update-checksums): make sure the flag works when integrity is malformed * fix(updateChecksums): minor issues and edge cases * Revert unrelated change ahead of 'imsnif/master' by 1 commit. * Slight refactor in lockfile parser * test(fixtures): update integrity and dep versions * fix(checksums): create integrity when importing from node_modules * test(fixtures): add integrity field to expected yarn.lock * Fixes error reporting * Fixes error reporting * Fixes tests
2018-08-01 17:26:34 +02:00
test('Lockfile.getLockfile handles integrity field', () => {
const integrity = ssri.parse('sha1-foo sha512-bar');
const patterns = {
foobar: {
name: 'foobar',
version: '0.0.0',
uid: '0.0.0',
dependencies: {},
optionalDependencies: {},
_reference: {
permissions: {},
},
_remote: {
resolved: 'http://example.com/foobar',
registry: 'npm',
integrity,
},
},
};
const actual = new Lockfile().getLockfile(patterns);
const expected = {
foobar: {
version: '0.0.0',
uid: undefined,
resolved: 'http://example.com/foobar',
registry: undefined,
dependencies: undefined,
optionalDependencies: undefined,
permissions: undefined,
integrity: integrity.toString().split(' ').sort().join(' '),
},
};
expect(actual).toEqual(expected);
});
Auto detect and merge lockfile conflicts (#3544) * auto detect and merge lockfile conflicts * Skip over common ancestors when using diff3. * Small code cleanups * Nits
2017-07-07 14:06:39 +01:00
test('parse single merge conflict', () => {
const file = `
a:
no "yes"
<<<<<<< HEAD
b:
foo "bar"
=======
c:
bar "foo"
>>>>>>> branch-a
d:
yes "no"
`;
const {type, object} = parse(file);
expect(type).toEqual('merge');
expect(object).toEqual({
a: {no: 'yes'},
b: {foo: 'bar'},
c: {bar: 'foo'},
d: {yes: 'no'},
});
});
Fix: make lockfile parser tolerant to CRLF (#4495) **Summary** Lockfile parser fails when the lockfile had Windows-style line endings with an "Invalid token" error. This is default on Windows and, say when editing the file using vim, it is not obvious or trivial that the file endings are in Windows-style. This patch makes the parser tolareate potential "\r" chars before "\n" while keeping the existing parsing logic the same. **Test plan** Added three new unit tests.
2017-09-19 10:18:29 +01:00
test('parse single merge conflict with CRLF', () => {
const file =
'a:\r\n no "yes"\r\n\r\n<<<<<<< HEAD\r\nb:\r\n foo "bar"' +
'\r\n=======\r\nc:\r\n bar "foo"\r\n>>>>>>> branch-a' +
'\r\n\r\nd:\r\n yes "no"\r\n';
const {type, object} = parse(file);
expect(type).toEqual('merge');
expect(object).toEqual({
a: {no: 'yes'},
b: {foo: 'bar'},
c: {bar: 'foo'},
d: {yes: 'no'},
});
});
Auto detect and merge lockfile conflicts (#3544) * auto detect and merge lockfile conflicts * Skip over common ancestors when using diff3. * Small code cleanups * Nits
2017-07-07 14:06:39 +01:00
test('parse multiple merge conflicts', () => {
const file = `
a:
no "yes"
<<<<<<< HEAD
b:
foo "bar"
=======
c:
bar "foo"
>>>>>>> branch-a
d:
yes "no"
<<<<<<< HEAD
e:
foo "bar"
=======
f:
bar "foo"
>>>>>>> branch-b
`;
const {type, object} = parse(file);
expect(type).toEqual('merge');
expect(object).toEqual({
a: {no: 'yes'},
b: {foo: 'bar'},
c: {bar: 'foo'},
d: {yes: 'no'},
e: {foo: 'bar'},
f: {bar: 'foo'},
});
});
test('parse merge conflict fail', () => {
const file = `
<<<<<<< HEAD
b:
Adds support for parsing Yaml files (#7300) * Adds support for parsing Yaml files * Adds a test * Removes debug * Fixes test * Update CHANGELOG.md
2019-05-24 08:58:47 +02:00
foo: "bar
Auto detect and merge lockfile conflicts (#3544) * auto detect and merge lockfile conflicts * Skip over common ancestors when using diff3. * Small code cleanups * Nits
2017-07-07 14:06:39 +01:00
=======
c:
bar "foo"
>>>>>>> branch-a
`;
const {type, object} = parse(file);
expect(type).toEqual('conflict');
expect(Object.keys(object).length).toEqual(0);
});
test('discards common ancestors in merge conflicts', () => {
const file = `
<<<<<<< HEAD
b:
foo "bar"
||||||| common ancestor
d:
yes "no"
=======
c:
bar "foo"
>>>>>>> branch-a
`;
const {type, object} = parse(file);
expect(type).toEqual('merge');
expect(object).toEqual({
b: {foo: 'bar'},
c: {bar: 'foo'},
});
expect(object.d).toBe(undefined);
});
Reference in New Issue Copy Permalink