Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
amoutonbrady committed Jun 28, 2021
2 parents 4550cbf + 752e47e commit 6d26d87
Show file tree
Hide file tree
Showing 6 changed files with 845 additions and 781 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

<a name="2.0.0-rc.1"></a>
## 2.0.0-rc.1 (2021-06-02)

### Changed

- ⬆️ Update to solid 1.0.0-rc.2 [[b4795bd](https://github.com/amoutonbrady/vite-plugin-solid/commit/b4795bdd7f6dd688ea7bc3f7e63e0b934886bf14)]

### Miscellaneous

- 📝 Update changelog [[c2bf813](https://github.com/amoutonbrady/vite-plugin-solid/commit/c2bf81380628b5696ca8c5a6f336d0e9613f5e35)]


<a name="1.8.0"></a>
## 1.8.0 (2021-05-13)

Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vite-plugin-solid",
"version": "1.9.0",
"version": "2.0.0",
"description": "solid-js integration plugin for vite 2",
"type": "module",
"files": [
Expand All @@ -23,7 +23,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/amoutonbrady/vite-plugin-solid.git"
"url": "git+https://github.com/solidjs/vite-plugin-solid.git"
},
"keywords": [
"vite",
Expand All @@ -38,28 +38,28 @@
"bugs": {
"url": "https://github.com/amoutonbrady/vite-plugin-solid/issues"
},
"homepage": "https://github.com/amoutonbrady/vite-plugin-solid#readme",
"homepage": "https://github.com/solidjs/vite-plugin-solid#readme",
"dependencies": {
"@babel/core": "^7.14.2",
"@babel/preset-typescript": "^7.13.0",
"babel-preset-solid": "^0.26.5",
"@babel/core": "^7.14.6",
"@babel/preset-typescript": "^7.14.5",
"babel-preset-solid": "^1.0.0",
"merge-anything": "^4.0.1",
"solid-js": "^0.26.5",
"solid-refresh": "^0.1.2",
"vite": "^2.3.2"
"solid-js": "^1.0.0",
"solid-refresh": "^0.2.0",
"vite": "^2.3.8"
},
"devDependencies": {
"@babel/plugin-transform-typescript": "^7.13.0",
"@babel/preset-env": "^7.14.2",
"@babel/plugin-transform-typescript": "^7.14.6",
"@babel/preset-env": "^7.14.7",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^19.0.0",
"@rollup/plugin-node-resolve": "^13.0.0",
"@skypack/package-check": "^0.2.2",
"@types/babel__core": "^7.1.14",
"@types/node": "^15.0.3",
"prettier": "^2.3.0",
"rollup": "^2.47.0",
"@types/node": "^15.12.5",
"prettier": "^2.3.2",
"rollup": "^2.52.3",
"rollup-plugin-cleaner": "^1.0.0",
"typescript": "^4.2.4"
"typescript": "^4.3.4"
}
}
12 changes: 6 additions & 6 deletions playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
},
"license": "MIT",
"devDependencies": {
"@babel/plugin-syntax-top-level-await": "^7.12.13",
"vite": "^2.2.4",
"@babel/plugin-syntax-top-level-await": "^7.14.5",
"vite": "^2.3.8",
"vite-plugin-solid": "link:.."
},
"dependencies": {
"solid-app-router": "^0.0.39",
"solid-js": "^0.26.5",
"solid-meta": "^0.26.5",
"solid-utils": "^0.7.0"
"solid-app-router": "^0.0.50-rc.0",
"solid-js": "^1.0.0",
"solid-meta": "^0.27.0",
"solid-utils": "^0.8.1"
}
}
108 changes: 55 additions & 53 deletions playground/pnpm-lock.yaml

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

0 comments on commit 6d26d87

Please sign in to comment.