Skip to content

Commit 640eca7

Browse files
author
Oğuzhan Aslan
committed
fix: conflict resolved
2 parents 01d3a17 + beb78c2 commit 640eca7

File tree

13 files changed

+387
-21
lines changed

13 files changed

+387
-21
lines changed

‎.eslintrc.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ module.exports = {
66
document: true,
77
window: true,
88
hepsiBus: true,
9-
global: true
9+
global: true,
10+
jest: true,
1011
},
1112
parserOptions: {
1213
ecmaFeatures: {

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎CHANGELOG.md‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
# Changelog
2+
3+
## [1.0.10](https://github.com/hepsiburada/VoltranJS/compare/1.0.9...1.0.10)
4+
5+
### Merged
6+
7+
- feat: add changelog generator service [`#18`](https://github.com/hepsiburada/VoltranJS/pull/18)
8+
- use @babel/polyfill/noConflict instead @babel/polyfill [`#16`](https://github.com/hepsiburada/VoltranJS/pull/16)
9+
10+
## [1.0.9](https://github.com/hepsiburada/VoltranJS/compare/1.0.8...1.0.9) - 2021-04-29
11+
12+
## [1.0.8](https://github.com/hepsiburada/VoltranJS/compare/1.0.7...1.0.8) - 2021-04-29
13+
14+
### Merged
15+
16+
- Promise catch chain fixed [`#15`](https://github.com/hepsiburada/VoltranJS/pull/15)
17+
18+
## [1.0.7](https://github.com/hepsiburada/VoltranJS/compare/1.0.6...1.0.7) - 2021-04-28
19+
20+
### Merged
21+
22+
- Partial content server response feature [`#14`](https://github.com/hepsiburada/VoltranJS/pull/14)
23+
24+
## [1.0.6](https://github.com/hepsiburada/VoltranJS/compare/1.0.5...1.0.6) - 2021-04-26
25+
26+
### Merged
27+
28+
- Internal cache remove endpoint created, [`#13`](https://github.com/hepsiburada/VoltranJS/pull/13)
29+
30+
### Commits
31+
32+
- Version upgrade 1.0.6 [`6642d19`](https://github.com/hepsiburada/VoltranJS/commit/6642d19e99a8d772d8dff1325e8078c653fc7d29)
33+
34+
## [1.0.5](https://github.com/hepsiburada/VoltranJS/compare/1.0.4...1.0.5) - 2021-04-26
35+
36+
### Merged
37+
38+
- Update README.md [`#12`](https://github.com/hepsiburada/VoltranJS/pull/12)
39+
- feat: esbuild loader integration [`#10`](https://github.com/hepsiburada/VoltranJS/pull/10)
40+
41+
### Commits
42+
43+
- fix: conflict resolved [`b7d3893`](https://github.com/hepsiburada/VoltranJS/commit/b7d3893f4cdf5281ed443f49a61ab5eb378fa8ee)
44+
- fix: unintelligible code deleted [`d7bdb80`](https://github.com/hepsiburada/VoltranJS/commit/d7bdb800f378d1aa24d91262ca8add0305b0217d)
45+
- added new project logo [`ff89d80`](https://github.com/hepsiburada/VoltranJS/commit/ff89d80c17b6a159f22f4565c26716b043ac7c80)
46+
47+
## [1.0.4](https://github.com/hepsiburada/VoltranJS/compare/1.0.3...1.0.4) - 2021-04-15
48+
49+
### Merged
50+
51+
- fix: client.css passing value problem [`#11`](https://github.com/hepsiburada/VoltranJS/pull/11)
52+
- feat: add close html preview condition to production mode [`#8`](https://github.com/hepsiburada/VoltranJS/pull/8)
53+
- Configured to pass webpack config, from main project [`#9`](https://github.com/hepsiburada/VoltranJS/pull/9)
54+
55+
### Commits
56+
57+
- feat: add comp based isPreview xodndition [`dad29c3`](https://github.com/hepsiburada/VoltranJS/commit/dad29c3b1c6edb6d07af7e697c983be34f3c025e)
58+
- Added parameter for Preview mode. And Fixed some css bugs [`04dec7c`](https://github.com/hepsiburada/VoltranJS/commit/04dec7c4529130400612c4fd1f17292381f48fc1)
59+
60+
## [1.0.3](https://github.com/hepsiburada/VoltranJS/compare/1.0.2...1.0.3) - 2021-04-05
61+
62+
### Commits
63+
64+
- Configured to pass webpack config, from main project [`8f6ce41`](https://github.com/hepsiburada/VoltranJS/commit/8f6ce414035fcb1d850a3417f10bacf46735b691)
65+
66+
## [1.0.2](https://github.com/hepsiburada/VoltranJS/compare/1.0.1...1.0.2) - 2021-01-20
67+
68+
### Merged
69+
70+
- Eslint fixes [`#6`](https://github.com/hepsiburada/VoltranJS/pull/6)
71+
- Update README [`#1`](https://github.com/hepsiburada/VoltranJS/pull/1)
72+
73+
### Commits
74+
75+
- Add type-hint [`f8838e4`](https://github.com/hepsiburada/VoltranJS/commit/f8838e422e3c08ac563bafe7064937c089c0cb4c)
76+
- Minor typos [`1976fce`](https://github.com/hepsiburada/VoltranJS/commit/1976fce2766cb7c2055c6af56dbd3d4a4dafecd1)
77+
- update version 1.0.2 [`81bee9b`](https://github.com/hepsiburada/VoltranJS/commit/81bee9b1865fbf2c8f1926bd8617c180d0995d14)
78+
79+
## [1.0.1](https://github.com/hepsiburada/VoltranJS/compare/1.0.0...1.0.1) - 2021-01-04
80+
81+
### Merged
82+
83+
- Create LICENSE [`#4`](https://github.com/hepsiburada/VoltranJS/pull/4)
84+
85+
### Commits
86+
87+
- Voltran JS 1.0.0 version [`c156f25`](https://github.com/hepsiburada/VoltranJS/commit/c156f254b92cb218a44fad9f0b00cc55213f8096)
88+
- update package json [`afb8d18`](https://github.com/hepsiburada/VoltranJS/commit/afb8d18d540fa9de751bc2ecdcbce5fc7681e7f3)
89+
90+
## 1.0.0 - 2020-12-29
91+
92+
### Commits
93+
94+
- Voltran JS 1.0.0 version [`fedab7a`](https://github.com/hepsiburada/VoltranJS/commit/fedab7a0f70772f91278c2cb752e7c91ee09a7e9)

‎CODE_OF_CONDUCT.md‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
.
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

‎babel.config.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module.exports = api => {
44
const basePlugins = [
55
'babel-plugin-styled-components',
66
'@babel/syntax-dynamic-import',
7+
'@babel/plugin-syntax-jsx',
78
'@babel/plugin-proposal-class-properties',
89
'@babel/plugin-transform-runtime',
910
'@babel/plugin-proposal-optional-chaining',
@@ -13,7 +14,6 @@ module.exports = api => {
1314
];
1415

1516
const basePresets = [];
16-
1717
const presets = [...basePresets];
1818
const plugins = [...basePlugins];
1919

@@ -22,7 +22,7 @@ module.exports = api => {
2222
'@babel/preset-env',
2323
{
2424
useBuiltIns: 'entry',
25-
corejs: '3.0.0'
25+
corejs: '3.0.0',
2626
}
2727
]);
2828
} else {
@@ -46,7 +46,8 @@ module.exports = api => {
4646
corejs: '3.0.0',
4747
targets: {
4848
esmodules: true,
49-
ie: '11'
49+
ie: '11',
50+
node: 'current'
5051
}
5152
}
5253
]);

‎babel.server.config.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
module.exports = function () {
1+
module.exports = function() {
22
const basePlugins = [
33
'babel-plugin-styled-components',
4+
'@babel/plugin-syntax-jsx',
45
'@babel/plugin-proposal-class-properties',
56
'@babel/plugin-transform-runtime',
67
'@babel/plugin-proposal-numeric-separator',
78
'@babel/plugin-proposal-throw-expressions',
8-
'@babel/plugin-proposal-optional-chaining',
9+
'@babel/plugin-proposal-optional-chaining'
910
];
1011

11-
const basePresets = [
12-
'@babel/preset-react',
13-
];
12+
const basePresets = ['@babel/preset-react'];
1413

15-
let presets = [...basePresets];
16-
let plugins = [...basePlugins];
14+
const presets = [...basePresets];
15+
const plugins = [...basePlugins];
1716

1817
return {
1918
presets,
20-
plugins,
19+
plugins
2120
};
2221
};

‎changelog-template.hbs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Changelog
2+
3+
{{#each releases}}
4+
{{#if href}}
5+
## [{{title}}]({{href}}){{#if tag}} - {{isoDate}}{{/if}}
6+
{{else}}
7+
## {{title}}{{#if tag}} - {{isoDate}}{{/if}}
8+
{{/if}}
9+
10+
{{#if summary}}
11+
{{summary}}
12+
{{/if}}
13+
14+
{{#if merges}}
15+
### Merged
16+
17+
{{#each merges}}
18+
- {{#if commit.breaking}}**Breaking change:** {{/if}}{{message}} {{#if href}}[`#{{id}}`]({{href}}){{/if}}
19+
{{/each}}
20+
{{/if}}
21+
22+
{{#if fixes}}
23+
### Fixed
24+
25+
{{#each fixes}}
26+
- {{#if commit.breaking}}**Breaking change:** {{/if}}{{commit.subject}}{{#each fixes}} {{#if href}}[`#{{id}}`]({{href}}){{/if}}{{/each}}
27+
{{/each}}
28+
{{/if}}
29+
30+
{{#commit-list commits heading='### Commits'}}
31+
- {{#if breaking}}**Breaking change:** {{/if}}{{subject}} {{#if href}}[`{{shorthash}}`]({{href}}){{/if}}
32+
{{/commit-list}}
33+
34+
{{/each}}

‎fileMock.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = 'test-file-stub';

0 commit comments

Comments
 (0)