Skip to content

Commit

Permalink
Merge pull request #218 from RebeccaStevens/editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
TehShrike authored Jan 20, 2021
2 parents c260fb2 + 22b88a8 commit 6a173d0
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 48 deletions.
5 changes: 5 additions & 0 deletions .editorconfig
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
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"
}
}

0 comments on commit 6a173d0

Please sign in to comment.