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.

Sign up for GitHub

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

Jump to bottom

editorconfig update #218

Merged
merged 3 commits into from
Jan 20, 2021
Merged

editorconfig update #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38f3e6b
chore(editorconfig): declare the charset
RebeccaStevens Nov 11, 2020
dcf1ac3
chore(editorconfig): use space instead of tabs for yaml files
RebeccaStevens Nov 17, 2020
22b88a8
style(package.json): swap out spaces for tabs
RebeccaStevens Dec 19, 2020
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
5 changes: 5 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,10 @@ root = true
[*]
indent_style = tab
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.yml]
indent_style = space
indent_size = 2
96 changes: 48 additions & 48 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
{
"name": "deepmerge",
"version": "4.2.2",
"description": "A library for deep (recursive) merging of Javascript objects",
"keywords": [
"merge",
"deep",
"extend",
"copy",
"clone",
"recursive"
],
"homepage": "https://github.com/TehShrike/deepmerge",
"repository": {
"type": "git",
"url": "git://github.com/TehShrike/deepmerge.git"
},
"license": "MIT",
"main": "dist/cjs.js",
"files": [
"/dist",
"index.d.ts",
"changelog.md",
"license.txt",
"readme.md"
],
"scripts": {
"build": "rollup -c",
"size": "npm run build && terser --compress --mangle -- ./dist/umd.js | gzip -c | wc -c",
"test": "npm run build && tape test/*.js && jsmd readme.md && npm run test:typescript",
"test:typescript": "tsc --noEmit test/typescript.ts && ts-node test/typescript.ts"
},
"dependencies": {},
"devDependencies": {
"@rollup/plugin-commonjs": "^16.0.0",
"@rollup/plugin-node-resolve": "^10.0.0",
"@types/node": "^8.10.54",
"is-mergeable-object": "1.1.0",
"is-plain-obj": "^3.0.0",
"jsmd": "^1.0.2",
"rollup": "^2.33.1",
"tape": "^5.0.1",
"terser": "^5.5.1",
"ts-node": "^9.0.0",
"typescript": "^4.1.2"
},
"engines": {
"node": ">=10"
}
"name": "deepmerge",
"version": "4.2.2",
"description": "A library for deep (recursive) merging of Javascript objects",
"keywords": [
"merge",
"deep",
"extend",
"copy",
"clone",
"recursive"
],
"homepage": "https://github.com/TehShrike/deepmerge",
"repository": {
"type": "git",
"url": "git://github.com/TehShrike/deepmerge.git"
},
"license": "MIT",
"main": "dist/cjs.js",
"files": [
"/dist",
"index.d.ts",
"changelog.md",
"license.txt",
"readme.md"
],
"scripts": {
"build": "rollup -c",
"size": "npm run build && terser --compress --mangle -- ./dist/umd.js | gzip -c | wc -c",
"test": "npm run build && tape test/*.js && jsmd readme.md && npm run test:typescript",
"test:typescript": "tsc --noEmit test/typescript.ts && ts-node test/typescript.ts"
},
"dependencies": {},
"devDependencies": {
"@rollup/plugin-commonjs": "^16.0.0",
"@rollup/plugin-node-resolve": "^10.0.0",
"@types/node": "^8.10.54",
"is-mergeable-object": "1.1.0",
"is-plain-obj": "^3.0.0",
"jsmd": "^1.0.2",
"rollup": "^2.33.1",
"tape": "^5.0.1",
"terser": "^5.5.1",
"ts-node": "^9.0.0",
"typescript": "^4.1.2"
},
"engines": {
"node": ">=10"
}
}