Skip to content

Commit

Permalink
chore(repo): Merge pull request #513 from rollup/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
shellscape authored Jul 31, 2020
2 parents 9ad41a0 + 943f528 commit 4c65d01
Show file tree
Hide file tree
Showing 71 changed files with 2,415 additions and 4,969 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
!.eslintrc.js
.eslintrc.js
52 changes: 25 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"ci:lint": "node scripts/run-changed.js ci:lint",
"ci:test": "node scripts/run-changed.js ci:test",
"lint": "pnpm run lint:docs && npm run lint:json && pnpm run lint:package && node scripts/run-changed.js lint",
"lint:docs": "prettier --single-quote --write README.md",
"lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md",
"lint:js": "eslint scripts util",
"lint:json": "prettier --single-quote --write tsconfig.*.json codecov.yml pnpm-workspace.yaml",
"lint:json": "prettier --write tsconfig.*.json codecov.yml pnpm-workspace.yaml",
"lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
"preinstall": "node scripts/disallow-npm.js",
"pub": "node scripts/pub.js",
Expand All @@ -19,30 +19,31 @@
},
"dependencies": {
"conventional-commits-parser": "^3.1.0",
"semver": "^7.1.1",
"semver": "^7.3.2",
"write-pkg": "^4.0.0"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^3.5.0",
"@typescript-eslint/parser": "^3.5.0",
"ava": "^2.4.0",
"chalk": "^2.4.2",
"codecov-lite": "^0.3.1",
"del-cli": "^3.0.0",
"@ava/babel": "^1.0.1",
"@typescript-eslint/eslint-plugin": "^3.7.1",
"@typescript-eslint/parser": "^3.7.1",
"ava": "^3.11.0",
"chalk": "^4.1.0",
"codecov-lite": "^1.0.3",
"del-cli": "^3.0.1",
"eslint-config-rollup": "^0.1.0",
"execa": "^2.1.0",
"globby": "^10.0.1",
"husky": "^3.1.0",
"lint-staged": "^9.5.0",
"nyc": "^14.1.1",
"pnpm": "^4.13.0",
"prettier": "^1.19.1",
"prettier-plugin-package": "^0.3.1",
"ts-node": "^8.5.4",
"execa": "^4.0.3",
"globby": "^11.0.1",
"husky": "^4.2.5",
"lint-staged": "^10.2.11",
"nyc": "^15.1.0",
"pnpm": "^5.4.6",
"prettier": "^2.0.5",
"prettier-plugin-package": "^1.0.0",
"ts-node": "^8.10.2",
"tsconfig-paths": "^3.9.0",
"tslib": "^1.10.0",
"typescript": "^3.7.4",
"yaml": "^1.7.2"
"tslib": "^2.0.0",
"typescript": "^3.9.7",
"yaml": "^1.10.0"
},
"ava": {
"files": [
Expand All @@ -59,16 +60,13 @@
},
"lint-staged": {
"*.{ts,js}": [
"eslint --fix",
"git add"
"eslint --fix"
],
"*.md": [
"prettier --single-quote --write",
"git add"
"prettier --single-quote --write"
],
"*package.json": [
"prettier --write --plugin=prettier-plugin-package",
"git add"
"prettier --write --plugin=prettier-plugin-package"
]
},
"nyc": {
Expand Down
20 changes: 11 additions & 9 deletions packages/alias/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"homepage": "https://github.com/rollup/plugins/tree/master/packages/alias#readme",
"bugs": "https://github.com/rollup/plugins/issues",
"main": "dist/index.js",
"module": "dist/index.es.js",
"engines": {
"node": ">=8.0.0"
},
Expand All @@ -21,7 +22,7 @@
"ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}",
"ci:test": "pnpm run test -- --verbose",
"lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
"lint:docs": "prettier --single-quote --write README.md",
"lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md",
"lint:js": "eslint --fix --cache src test types --ext .js,.ts",
"lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
"prebuild": "del-cli dist",
Expand Down Expand Up @@ -49,13 +50,16 @@
"slash": "^3.0.0"
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^7.0.0",
"@rollup/plugin-typescript": "^3.0.0",
"del-cli": "^3.0.0",
"rollup": "^2.0.0"
"@rollup/plugin-node-resolve": "^8.4.0",
"@rollup/plugin-typescript": "^5.0.2",
"del-cli": "^3.0.1",
"rollup": "^2.23.0"
},
"types": "types/index.d.ts",
"ava": {
"compileEnhancements": false,
"babel": {
"compileEnhancements": false
},
"extensions": [
"ts"
],
Expand All @@ -69,7 +73,5 @@
"!**/recipes/**",
"!**/types.ts"
]
},
"module": "dist/index.es.js",
"types": "types/index.d.ts"
}
}
4 changes: 2 additions & 2 deletions packages/alias/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ export default {
input: 'src/index.ts',
external: [...Object.keys(pkg.dependencies), 'os'],
output: [
{ file: pkg.main, format: 'cjs' },
{ file: pkg.main, format: 'cjs', exports: 'auto' },
{ file: pkg.module, format: 'es' }
],
plugins: [typescript()]
plugins: [typescript({ sourceMap: false })]
};
99 changes: 81 additions & 18 deletions packages/alias/test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,22 @@ test('RegExp aliasing', (t) =>
{
entries: [
{ find: /f(o+)bar/, replacement: 'f$1bar2019' },
{ find: new RegExp('.*pony.*'), replacement: 'i/am/a/barbie/girl' },
{
find: new RegExp('.*pony.*'),
replacement: 'i/am/a/barbie/girl'
},
{ find: /^test\/$/, replacement: 'this/is/strict' }
]
},
[
{ source: 'fooooooooobar', importer: '/src/importer.js' },
{ source: 'im/a/little/pony/yes', importer: '/src/importer.js' },
{
source: 'fooooooooobar',
importer: '/src/importer.js'
},
{
source: 'im/a/little/pony/yes',
importer: '/src/importer.js'
},
{ source: './test', importer: '/src/importer.js' },
{ source: 'test', importer: '/src/importer.js' },
{ source: 'test/', importer: '/src/importer.js' }
Expand All @@ -143,8 +152,14 @@ test('Will not confuse modules with similar names', (t) =>
},
[
{ source: 'foo2', importer: '/src/importer.js' },
{ source: './fooze/bar', importer: '/src/importer.js' },
{ source: './someFile.foo', importer: '/src/importer.js' }
{
source: './fooze/bar',
importer: '/src/importer.js'
},
{
source: './someFile.foo',
importer: '/src/importer.js'
}
]
).then((result) => t.deepEqual(result, [null, null, null])));

Expand Down Expand Up @@ -175,7 +190,12 @@ test('Windows absolute path aliasing', (t) =>
}
]
},
[{ source: 'resolve', importer: posix.resolve(DIRNAME, './fixtures/index.js') }]
[
{
source: 'resolve',
importer: posix.resolve(DIRNAME, './fixtures/index.js')
}
]
).then((result) =>
t.deepEqual(result, [normalizePath('E:\\react\\node_modules\\fbjs\\lib\\warning')])
));
Expand Down Expand Up @@ -211,9 +231,15 @@ test('Works in rollup with non fake input', (t) =>
alias({
entries: [
{ find: 'fancyNumber', replacement: './aliasMe' },
{ find: './anotherFancyNumber', replacement: './localAliasMe' },
{
find: './anotherFancyNumber',
replacement: './localAliasMe'
},
{ find: 'numberFolder', replacement: './folder' },
{ find: './numberFolder', replacement: './folder' }
{
find: './numberFolder',
replacement: './folder'
}
]
})
]
Expand Down Expand Up @@ -252,7 +278,12 @@ test('Global customResolver function', (t) => {
],
customResolver: () => customResult
},
[{ source: 'test', importer: posix.resolve(DIRNAME, './files/index.js') }]
[
{
source: 'test',
importer: posix.resolve(DIRNAME, './files/index.js')
}
]
).then((result) => t.deepEqual(result, [customResult]));
});

Expand All @@ -271,7 +302,12 @@ test('Local customResolver function', (t) => {
],
customResolver: () => customResult
},
[{ source: 'test', importer: posix.resolve(DIRNAME, './files/index.js') }]
[
{
source: 'test',
importer: posix.resolve(DIRNAME, './files/index.js')
}
]
).then((result) => t.deepEqual(result, [localCustomResult]));
});

Expand All @@ -288,7 +324,12 @@ test('Global customResolver plugin-like object', (t) => {
],
customResolver: { resolveId: () => customResult }
},
[{ source: 'test', importer: posix.resolve(DIRNAME, './files/index.js') }]
[
{
source: 'test',
importer: posix.resolve(DIRNAME, './files/index.js')
}
]
).then((result) => t.deepEqual(result, [customResult]));
});

Expand All @@ -302,12 +343,19 @@ test('Local customResolver plugin-like object', (t) => {
{
find: 'test',
replacement: path.resolve('./test/files/folder/hipster.jsx'),
customResolver: { resolveId: () => localCustomResult }
customResolver: {
resolveId: () => localCustomResult
}
}
],
customResolver: { resolveId: () => customResult }
},
[{ source: 'test', importer: posix.resolve(DIRNAME, './files/index.js') }]
[
{
source: 'test',
importer: posix.resolve(DIRNAME, './files/index.js')
}
]
).then((result) => t.deepEqual(result, [localCustomResult]));
});

Expand All @@ -328,8 +376,14 @@ test('supports node-resolve as a custom resolver', (t) =>
customResolver: nodeResolvePlugin()
},
[
{ source: 'local-resolver', importer: posix.resolve(DIRNAME, './files/index.js') },
{ source: 'global-resolver', importer: posix.resolve(DIRNAME, './files/index.js') }
{
source: 'local-resolver',
importer: posix.resolve(DIRNAME, './files/index.js')
},
{
source: 'global-resolver',
importer: posix.resolve(DIRNAME, './files/index.js')
}
]
).then((result) =>
t.deepEqual(result, [
Expand All @@ -345,9 +399,18 @@ test('Alias + rollup-plugin-node-resolve', (t) =>
alias({
entries: [
{ find: 'fancyNumber', replacement: './aliasMe' },
{ find: './anotherFancyNumber', replacement: './localAliasMe' },
{ find: 'numberFolder/anotherNumber', replacement: './folder' },
{ find: './numberFolder', replacement: './folder' },
{
find: './anotherFancyNumber',
replacement: './localAliasMe'
},
{
find: 'numberFolder/anotherNumber',
replacement: './folder'
},
{
find: './numberFolder',
replacement: './folder'
},
{ find: 'superdeep', replacement: './deep/deep2' }
]
}),
Expand Down
18 changes: 10 additions & 8 deletions packages/auto-install/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@
"homepage": "https://github.com/rollup/plugins/tree/master/packages/auto-install/#readme",
"bugs": "https://github.com/rollup/plugins/issues",
"main": "dist/index.js",
"module": "dist/index.es.js",
"scripts": {
"build": "rollup -c",
"ci:coverage": "nyc pnpm run test && nyc report --reporter=text-lcov > coverage.lcov",
"ci:lint": "pnpm run build && pnpm run lint",
"ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}",
"ci:test": "pnpm run test -- --verbose",
"lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
"lint:docs": "prettier --single-quote --write README.md",
"lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md",
"lint:js": "eslint --fix --cache src test --ext .js,.ts",
"lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
"prebuild": "del-cli dist",
Expand All @@ -45,14 +46,17 @@
"rollup": "^1.20.0||^2.0.0"
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^7.0.0",
"@rollup/plugin-typescript": "^3.0.0",
"@rollup/plugin-node-resolve": "^8.4.0",
"@rollup/plugin-typescript": "^5.0.2",
"del": "^5.1.0",
"node-noop": "^1.0.0",
"rollup": "^2.0.0"
"rollup": "^2.23.0"
},
"types": "types/index.d.ts",
"ava": {
"compileEnhancements": false,
"babel": {
"compileEnhancements": false
},
"extensions": [
"ts"
],
Expand All @@ -66,7 +70,5 @@
"!**/recipes/**",
"!**/types.ts"
]
},
"module": "dist/index.es.js",
"types": "types/index.d.ts"
}
}
4 changes: 2 additions & 2 deletions packages/auto-install/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import pkg from './package.json';

export default {
input: 'src/index.ts',
plugins: [typescript()],
plugins: [typescript({ sourceMap: false })],
external: ['path', 'fs', 'child_process', 'module', 'util'],
output: [
{ format: 'cjs', file: pkg.main },
{ format: 'cjs', file: pkg.main, exports: 'auto' },
{ format: 'esm', file: pkg.module }
]
};
2 changes: 1 addition & 1 deletion packages/auto-install/test/fixtures/input.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import noop from 'node-noop'; // eslint-disable-line
import 'node-noop'; // eslint-disable-line
Loading

0 comments on commit 4c65d01

Please sign in to comment.