Skip to content

Commit

Permalink
Merge branch 'gh-3113' into gh-2086
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich-Harris committed Jul 4, 2019
2 parents aee2c9c + f4ca063 commit a28dfb2
Show file tree
Hide file tree
Showing 34 changed files with 370 additions and 140 deletions.
1 change: 1 addition & 0 deletions .eslintignore
@@ -1,6 +1,7 @@
**/_actual.js
**/expected.js
test/*/samples/*/output.js
node_modules

# output files
animate/*.js
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.json
Expand Up @@ -21,6 +21,7 @@
"prefer-const": [2, { "destructuring": "all" }],
"arrow-spacing": 2,
"no-inner-declarations": 0,
"require-atomic-updates": "off",
"@typescript-eslint/indent": ["error", "tab", {
"SwitchCase": 1,
"ignoredNodes": ["TemplateLiteral"]
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,11 @@
# Svelte changelog

## 3.6.4

* Run `onMount` functions in correct order, and before initial `afterUpdate` functions ([#2281](https://github.com/sveltejs/svelte/issues/2281))
* Fix code transformation for shorthand methods ([#2906](https://github.com/sveltejs/svelte/issues/2906))
* Fix assignments in inline functions ([#3038](https://github.com/sveltejs/svelte/issues/3038))

## 3.6.3

* Fix await block mounting inside removed if block ([#1496](https://github.com/sveltejs/svelte/issues/1496))
Expand Down
157 changes: 96 additions & 61 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "svelte",
"version": "3.6.3",
"version": "3.6.4",
"description": "Cybernetically enhanced web apps",
"module": "index.mjs",
"main": "index",
Expand Down Expand Up @@ -58,16 +58,16 @@
"devDependencies": {
"@types/mocha": "^5.2.0",
"@types/node": "=8",
"@typescript-eslint/eslint-plugin": "^1.9.0",
"@typescript-eslint/parser": "^1.9.0",
"@typescript-eslint/eslint-plugin": "^1.11.0",
"@typescript-eslint/parser": "^1.11.0",
"acorn": "^6.1.1",
"acorn-dynamic-import": "^4.0.0",
"agadoo": "^1.0.1",
"c8": "^3.4.0",
"codecov": "^3.0.0",
"css-tree": "1.0.0-alpha22",
"eslint": "^5.16.0",
"eslint-plugin-import": "^2.17.3",
"eslint": "^6.0.1",
"eslint-plugin-import": "^2.18.0",
"estree-walker": "^0.6.1",
"is-reference": "^1.1.1",
"jsdom": "^12.2.0",
Expand Down

0 comments on commit a28dfb2

Please sign in to comment.