Skip to content

Commit

Permalink
refactor: repository is renamed from namics to merkle
Browse files Browse the repository at this point in the history
  • Loading branch information
Jurian Mergenthal committed May 17, 2021
1 parent 5bcbebd commit 477d6d8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EditorConfig. Frontend. Default. Namics.
# EditorConfig. Frontend. Default. Mekrle.
# @see: http://EditorConfig.org
# install a plugin to your editor: http://editorconfig.org/#download
# mark: not all plugins supports the same EditorConfig properties
Expand Down Expand Up @@ -35,4 +35,4 @@ indent_size = 2
### Specific files
[{package,bower,lerna}.json]
indent_style = space
indent_size = 2
indent_size = 2
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016-2018 Namics AG
Copyright (c) 2015 Merkle Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# ESLint config Namics
# ESLint config

[![Build Status](https://github.com/namics/eslint-config-namics/workflows/ci/badge.svg)](https://github.com/namics/eslint-config-namics/actions)
[![Build Status](https://github.com/merkle-open/eslint-config/workflows/ci/badge.svg)](https://github.com/merkle-open/eslint-config/actions)
[![npm](https://img.shields.io/npm/v/@namics/eslint-config.svg)](https://www.npmjs.com/package/@namics/eslint-config)
[![Codestyle](https://img.shields.io/badge/codestyle-namics-green.svg)](https://github.com/namics/eslint-config-namics)
[![Codestyle](https://img.shields.io/badge/codestyle-namics-green.svg)](https://github.com/merkle-open/eslint-config)

## Installation

Expand Down Expand Up @@ -116,6 +116,7 @@ then run `npm run lint`

## Thanks to

* [Merkle.](https://www.merkleinc.com/)
* [Namics.](https://www.namics.com/en/)
* [ESLint](https://github.com/eslint/eslint) for ESLint and the documentation [eslint.org](http://eslint.org/)
* [Walmart](https://github.com/walmartlabs) for sharing their config in [eslint-config-walmart](https://github.com/walmartlabs/eslint-config-walmart)
Expand All @@ -127,4 +128,4 @@ then run `npm run lint`

## Changelog

Please see the [Releases](https://github.com/namics/eslint-config-namics/releases)
Please see the [Releases](https://github.com/merkle-open/eslint-config/releases)
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
"name": "@namics/eslint-config",
"version": "9.0.5",
"description": "Default configurations for eslint",
"author": "Namics AG",
"author": "Merkle Inc.",
"contributors": [
"Ernst Ammann <ernst.ammann@namics.com>",
"Simon Mollweide <simon.mollweide@namics.com>"
"Ernst Ammann <ernst.ammann@emea.merkleinc.com>",
"Simon Mollweide"
],
"license": "MIT",
"private": false,
"repository": {
"type": "git",
"url": "https://github.com/namics/eslint-config-namics.git"
"url": "https://github.com/merkle-open/eslint-config.git"
},
"bugs": {
"url": "https://github.com/namics/eslint-config-namics/issues"
"url": "https://github.com/merkle-open/eslint-config/issues"
},
"main": "configurations/es6-browser.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion rules/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {
// require trailing commas in multiline object literals
'comma-dangle': [2, 'always-multiline'],
// [13.07.2016] enabled
// [20.09.2016] always-multiline -> https://github.com/namics/eslint-config-namics/issues/1
// [20.09.2016] always-multiline -> https://github.com/merkle-open/eslint-config/issues/1

// disallow assignment in conditional expressions
'no-cond-assign': [2, 'always'],
Expand Down

0 comments on commit 477d6d8

Please sign in to comment.