Skip to content

Commit f117ff3

Browse files
kaisermannkaisermann
committed
chore: 🤖 fix merge conflict
1 parent 6e76597 commit f117ff3

File tree

1 file changed

+24
-83
lines changed

1 file changed

+24
-83
lines changed

‎CHANGELOG.md

Lines changed: 24 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,70 @@
11
# [4.0.0-alpha.2](https://github.com/sveltejs/svelte-preprocess/compare/v3.9.12...v4.0.0-alpha.2) (2020-07-06)
22

3-
43
### Bug Fixes
54

6-
* 🐛 bump minimum node version to 9.11.2 ([0befa7f](https://github.com/sveltejs/svelte-preprocess/commit/0befa7f4ff2aa3ba9f0129c3ed3994dd29fb991b))
7-
* 🐛 prevent globalify to wrongly split escaped selectors ([f461320](https://github.com/sveltejs/svelte-preprocess/commit/f461320ec05a534021afbe20de0fe097d1016871)), closes [#191](https://github.com/sveltejs/svelte-preprocess/issues/191)
8-
* 🐛 rename scss prepend option from `data` to `prependData` ([16b1325](https://github.com/sveltejs/svelte-preprocess/commit/16b13253bdf19073c084cb1590ed527695133836))
9-
5+
- 🐛 bump minimum node version to 9.11.2 ([0befa7f](https://github.com/sveltejs/svelte-preprocess/commit/0befa7f4ff2aa3ba9f0129c3ed3994dd29fb991b))
6+
- 🐛 prevent globalify to wrongly split escaped selectors ([f461320](https://github.com/sveltejs/svelte-preprocess/commit/f461320ec05a534021afbe20de0fe097d1016871)), closes [#191](https://github.com/sveltejs/svelte-preprocess/issues/191)
7+
- 🐛 rename scss prepend option from `data` to `prependData` ([16b1325](https://github.com/sveltejs/svelte-preprocess/commit/16b13253bdf19073c084cb1590ed527695133836))
108

119
### Code Refactoring
1210

13-
* 💡 remove deprecated autoProcess props ([3dce7e4](https://github.com/sveltejs/svelte-preprocess/commit/3dce7e432fb15fc27914f5e1524b46929d84bd2c))
14-
11+
- 💡 remove deprecated autoProcess props ([3dce7e4](https://github.com/sveltejs/svelte-preprocess/commit/3dce7e432fb15fc27914f5e1524b46929d84bd2c))
1512

1613
### Features
1714

18-
* 🎸 add sourceMap prop to configuration object ([a2505da](https://github.com/sveltejs/svelte-preprocess/commit/a2505da88ba025040d7069fd499c4d759a1fcb72))
19-
* 🎸 support defining default languages ([d86122f](https://github.com/sveltejs/svelte-preprocess/commit/d86122f41a5616b7053dce26d7cf7c58ee025e1d)), closes [#189](https://github.com/sveltejs/svelte-preprocess/issues/189)
20-
* 🎸 support markup preprocessing with no tags ([290ef98](https://github.com/sveltejs/svelte-preprocess/commit/290ef98aad8a218880f5c511d11ad562e1869b35))
21-
* 🎸 support prependData for almost every preprocessor ([ef5272e](https://github.com/sveltejs/svelte-preprocess/commit/ef5272eceae1237af26d18aaf209ec68c6c43c6e))
22-
15+
- 🎸 add sourceMap prop to configuration object ([a2505da](https://github.com/sveltejs/svelte-preprocess/commit/a2505da88ba025040d7069fd499c4d759a1fcb72))
16+
- 🎸 support defining default languages ([d86122f](https://github.com/sveltejs/svelte-preprocess/commit/d86122f41a5616b7053dce26d7cf7c58ee025e1d)), closes [#189](https://github.com/sveltejs/svelte-preprocess/issues/189)
17+
- 🎸 support markup preprocessing with no tags ([290ef98](https://github.com/sveltejs/svelte-preprocess/commit/290ef98aad8a218880f5c511d11ad562e1869b35))
18+
- 🎸 support prependData for almost every preprocessor ([ef5272e](https://github.com/sveltejs/svelte-preprocess/commit/ef5272eceae1237af26d18aaf209ec68c6c43c6e))
2319

2420
### BREAKING CHANGES
2521

26-
* 🧨 This is a general evolution of the specific `scss.data` property that
27-
was used to prepend data to components written in scss.
28-
`{preprocessorOptions}.prependData` is now the way to prepend some
29-
string to any preprocessor.
30-
* 🧨 Node versions below 9.11.2 won't be supported anymore
31-
* 🧨 Uses Lookbehind assertions, so Node 9.11.2+ is needed
32-
* 🧨 Content passed through the `data` property won't be prepended anymore.
33-
* 🧨 `onBefore` and `transformers` were removed
34-
22+
- 🧨 This is a general evolution of the specific `scss.data` property that
23+
was used to prepend data to components written in scss.
24+
`{preprocessorOptions}.prependData` is now the way to prepend some
25+
string to any preprocessor.
26+
- 🧨 Node versions below 9.11.2 won't be supported anymore
27+
- 🧨 Uses Lookbehind assertions, so Node 9.11.2+ is needed
28+
- 🧨 Content passed through the `data` property won't be prepended anymore.
29+
- 🧨 `onBefore` and `transformers` were removed
3530

36-
37-
<<<<<<< HEAD
3831
## [3.9.12](https://github.com/kaisermann/svelte-preprocess/compare/v3.9.11...v3.9.12) (2020-07-05)
39-
=======
40-
# [4.0.0-alpha.1](https://github.com/sveltejs/svelte-preprocess/compare/v3.9.11...v4.0.0-alpha.1) (2020-07-05)
41-
>>>>>>> chore(release): v4.0.0-alpha.1 :tada:
42-
4332

4433
### Bug Fixes
4534

46-
<<<<<<< HEAD
47-
* 🐛 set bare option to true ([312bbb9](https://github.com/kaisermann/svelte-preprocess/commit/312bbb9bbf2668e1750296dbfc8b83bb39f291e8))
48-
=======
49-
* 🐛 bump minimum node version to 9.11.2 ([74ea309](https://github.com/sveltejs/svelte-preprocess/commit/74ea3093b5cc27d07de5c0f39d7b39497c2c4960))
50-
* 🐛 prevent globalify to wrongly split escaped selectors ([64d734d](https://github.com/sveltejs/svelte-preprocess/commit/64d734dfb4c4b9c9dcc0fd4fca86fa86f25df963)), closes [#191](https://github.com/sveltejs/svelte-preprocess/issues/191)
51-
* 🐛 rename scss prepend option from `data` to `prependData` ([7a69f08](https://github.com/sveltejs/svelte-preprocess/commit/7a69f0834abc9cb9836430ed1dfc59804684d04f))
52-
53-
54-
### Code Refactoring
55-
56-
* 💡 remove deprecated autoProcess props ([fcccccc](https://github.com/sveltejs/svelte-preprocess/commit/fcccccc47c4ae99e230031dd85978867db6353db))
57-
58-
59-
### Features
60-
61-
* 🎸 add sourceMap prop to configuration object ([45e9fea](https://github.com/sveltejs/svelte-preprocess/commit/45e9feaf06d0009c6eba675ea9a1c1ff322771e9))
62-
* 🎸 support defining default languages ([b329dcd](https://github.com/sveltejs/svelte-preprocess/commit/b329dcd23d8b231d41c3aacf971a60ffb5056994)), closes [#189](https://github.com/sveltejs/svelte-preprocess/issues/189)
63-
* 🎸 support markup preprocessing with no tags ([f299c6a](https://github.com/sveltejs/svelte-preprocess/commit/f299c6a40fe87b8cc06852657c804d4e15cc2f93))
64-
* 🎸 support prependData for almost every preprocessor ([41d55ca](https://github.com/sveltejs/svelte-preprocess/commit/41d55ca71de03d61c87f8770e1a4293e99b555df))
65-
66-
67-
### BREAKING CHANGES
68-
69-
* 🧨 This is a general evolution of the specific `scss.data` property that
70-
was used to prepend data to components written in scss.
71-
`{preprocessorOptions}.prependData` is now the way to prepend some
72-
string to any preprocessor.
73-
* 🧨 Node versions below 9.11.2 won't be supported anymore
74-
* 🧨 Uses Lookbehind assertions, so Node 9.11.2+ is needed
75-
* 🧨 Content passed through the `data` property won't be prepended anymore.
76-
* 🧨 `onBefore` and `transformers` were removed
77-
>>>>>>> chore(release): v4.0.0-alpha.1 :tada:
78-
79-
35+
- 🐛 set bare option to true ([312bbb9](https://github.com/kaisermann/svelte-preprocess/commit/312bbb9bbf2668e1750296dbfc8b83bb39f291e8))
8036

8137
## [3.9.11](https://github.com/kaisermann/svelte-preprocess/compare/v3.9.10...v3.9.11) (2020-07-01)
8238

83-
8439
### Bug Fixes
8540

86-
* 🐛 log a warning if local external file is not found ([774aece](https://github.com/kaisermann/svelte-preprocess/commit/774aece08a5279a51707d3f428836169fc7735de)), closes [#174](https://github.com/kaisermann/svelte-preprocess/issues/174)
87-
88-
41+
- 🐛 log a warning if local external file is not found ([774aece](https://github.com/kaisermann/svelte-preprocess/commit/774aece08a5279a51707d3f428836169fc7735de)), closes [#174](https://github.com/kaisermann/svelte-preprocess/issues/174)
8942

9043
## [3.9.10](https://github.com/kaisermann/svelte-preprocess/compare/v3.9.9...v3.9.10) (2020-06-22)
9144

92-
9345
### Bug Fixes
9446

95-
* remove extra identation for sass content ([7d0f437](https://github.com/kaisermann/svelte-preprocess/commit/7d0f4376037d1ff6b426e2d6882adb6b08d95464))
96-
97-
47+
- remove extra identation for sass content ([7d0f437](https://github.com/kaisermann/svelte-preprocess/commit/7d0f4376037d1ff6b426e2d6882adb6b08d95464))
9848

9949
## [3.9.9](https://github.com/kaisermann/svelte-preprocess/compare/v3.9.7...v3.9.9) (2020-06-19)
10050

101-
10251
### Bug Fixes
10352

104-
* 🐛 prevent including external file if content is not empty ([24e90d1](https://github.com/kaisermann/svelte-preprocess/commit/24e90d101103b043d4b9e9789d2d6582ecf31ae8)), closes [#183](https://github.com/kaisermann/svelte-preprocess/issues/183)
105-
* 🐛 throw if type errors are found ([6545a5c](https://github.com/kaisermann/svelte-preprocess/commit/6545a5c13ff81a568714cbd83ae2d6127d4f61a4)), closes [#182](https://github.com/kaisermann/svelte-preprocess/issues/182)
106-
107-
53+
- 🐛 prevent including external file if content is not empty ([24e90d1](https://github.com/kaisermann/svelte-preprocess/commit/24e90d101103b043d4b9e9789d2d6582ecf31ae8)), closes [#183](https://github.com/kaisermann/svelte-preprocess/issues/183)
54+
- 🐛 throw if type errors are found ([6545a5c](https://github.com/kaisermann/svelte-preprocess/commit/6545a5c13ff81a568714cbd83ae2d6127d4f61a4)), closes [#182](https://github.com/kaisermann/svelte-preprocess/issues/182)
10855

10956
## [3.9.8](https://github.com/kaisermann/svelte-preprocess/compare/v3.9.7...v3.9.8) (2020-06-17)
11057

111-
11258
### Bug Fixes
11359

114-
* 🐛 prevent including external file if content is not empty ([fd1b55a](https://github.com/kaisermann/svelte-preprocess/commit/fd1b55a557eb4db43adb4af3a3c8be63584f7288)), closes [#183](https://github.com/kaisermann/svelte-preprocess/issues/183)
115-
116-
60+
- 🐛 prevent including external file if content is not empty ([fd1b55a](https://github.com/kaisermann/svelte-preprocess/commit/fd1b55a557eb4db43adb4af3a3c8be63584f7288)), closes [#183](https://github.com/kaisermann/svelte-preprocess/issues/183)
11761

11862
## [3.9.7](https://github.com/kaisermann/svelte-preprocess/compare/v3.9.6...v3.9.7) (2020-06-10)
11963

120-
12164
### Bug Fixes
12265

123-
* 🐛 attributes not being passed to transformers ([840239d](https://github.com/kaisermann/svelte-preprocess/commit/840239d225f1ef0b7b642830093a8b6745d11ceb)), closes [#175](https://github.com/kaisermann/svelte-preprocess/issues/175)
124-
* quotes in the release script ([#173](https://github.com/kaisermann/svelte-preprocess/issues/173)) ([5550b3e](https://github.com/kaisermann/svelte-preprocess/commit/5550b3eea390148e9e5683ec214bddae7531a405))
125-
126-
66+
- 🐛 attributes not being passed to transformers ([840239d](https://github.com/kaisermann/svelte-preprocess/commit/840239d225f1ef0b7b642830093a8b6745d11ceb)), closes [#175](https://github.com/kaisermann/svelte-preprocess/issues/175)
67+
- quotes in the release script ([#173](https://github.com/kaisermann/svelte-preprocess/issues/173)) ([5550b3e](https://github.com/kaisermann/svelte-preprocess/commit/5550b3eea390148e9e5683ec214bddae7531a405))
12768

12869
## [3.9.6](https://github.com/kaisermann/svelte-preprocess/compare/v3.9.4...v3.9.6) (2020-06-06)
12970

0 commit comments

Comments
 (0)