Skip to content

Commit

Permalink
merge 2.x changes into dev
Browse files Browse the repository at this point in the history
commit 0f28f9c
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Mon Nov 26 21:23:55 2018 +0330

    add simple release script

commit 16c5b89
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Mon Nov 26 21:20:03 2018 +0330

    v2.3.4

commit e4a02a5
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Mon Nov 26 21:17:40 2018 +0330

    whitelist CHANGELOG files

commit c96e9f4
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Mon Nov 26 21:14:29 2018 +0330

    lerna auto tag

commit be126bd
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Mon Nov 26 21:12:22 2018 +0330

    remove extra gitHead

commit eefa130
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Mon Nov 26 21:09:31 2018 +0330

    hotfix: build on prepublish hook

commit d0af6a4
Author: Sébastien Chopin <seb@chopin.io>
Date:   Mon Nov 26 18:37:12 2018 +0100

    bump: Bump to v2.3.3

commit 2e90166
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Mon Nov 26 20:32:11 2018 +0330

    update @nuxtjs/opencollective to 0.2.0

commit f10c982
Author: renovate[bot] <renovate[bot]@users.noreply.github.com>
Date:   Mon Nov 26 20:24:49 2018 +0330

    chore(deps): update dependency vue-meta to ^1.5.6 (#4427)

commit b7285fe
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Mon Nov 26 20:05:18 2018 +0330

    remove build with devtools tests as feature is not merged yet

commit b582e70
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Mon Nov 26 19:58:34 2018 +0330

    update patch-only dependencies

commit 289d30f
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Mon Nov 26 19:55:51 2018 +0330

    remove typings

commit 7e1beed
Author: Dmitry Molotkov <aldarund@gmail.com>
Date:   Sun Nov 25 17:48:13 2018 +0300

    perf(pkg): remove lodash dependency from packages (#4411)

commit 4a85c03
Author: Pooya Parsa <pyapar@gmail.com>
Date:   Sun Nov 25 22:46:19 2018 +0330

    fix(pkg): move opencollective dependency nuxt and nuxt-legacy (#4415)

commit d187793
Author: Dmitry Molotkov <aldarund@gmail.com>
Date:   Sun Nov 25 17:52:37 2018 +0300

    fix(server, vue-app): allow unicode page names (#4402)

commit e1c1240
Author: Alexander Lichter <manniL@gmx.net>
Date:   Sun Nov 25 14:51:32 2018 +0000

    fix(server, jsdom): fix timeout error message (#4412)

    [skip release]

commit 0c6c69b
Author: Alexander Lichter <manniL@gmx.net>
Date:   Sat Nov 24 21:35:43 2018 +0000

    fix(scrollBehavior): emit triggerScroll event after changing layer (#4399)

    resolves: #4080

commit 8030ca1
Author: Alexander Lichter <manniL@gmx.net>
Date:   Sat Nov 24 18:30:28 2018 +0000

    fix(progress-bar): allow 0 for values and remove duplicate defaults (#4397)

commit 54d2737
Author: Clark Du <clark.duxin@gmail.com>
Date:   Sat Nov 24 00:02:13 2018 +0000

    fix: router Expected "0" to be defined (#4394)

commit 47f02ae
Author: Clark Du <clark.duxin@gmail.com>
Date:   Fri Nov 23 22:34:05 2018 +0000

    fix: empty error message in dev mode

commit ff7c083
Author: Clark Du <clark.duxin@gmail.com>
Date:   Thu Nov 22 15:48:26 2018 +0000

    fix: modern=true or false not work as expected (#4378)
  • Loading branch information
pi0 committed Nov 26, 2018
1 parent a24bb08 commit 8cc954d
Show file tree
Hide file tree
Showing 33 changed files with 240 additions and 77 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,3 @@ Temporary Items
# Junit report from jest-junit
*junit.xml

# Don't version control changelogs for now
**/CHANGELOG.md
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)


### Bug Fixes

* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([4a85c03](https://github.com/nuxt/nuxt.js/commit/4a85c03))
* **progress-bar:** allow 0 for values and remove duplicate defaults ([#4397](https://github.com/nuxt/nuxt.js/issues/4397)) ([8030ca1](https://github.com/nuxt/nuxt.js/commit/8030ca1))
* **scrollBehavior:** emit triggerScroll event after changing layer ([#4399](https://github.com/nuxt/nuxt.js/issues/4399)) ([0c6c69b](https://github.com/nuxt/nuxt.js/commit/0c6c69b)), closes [#4080](https://github.com/nuxt/nuxt.js/issues/4080)
* **server, jsdom:** fix timeout error message ([#4412](https://github.com/nuxt/nuxt.js/issues/4412)) ([e1c1240](https://github.com/nuxt/nuxt.js/commit/e1c1240))
* **server, vue-app:** allow unicode page names ([#4402](https://github.com/nuxt/nuxt.js/issues/4402)) ([d187793](https://github.com/nuxt/nuxt.js/commit/d187793))
* empty error message in dev mode ([47f02ae](https://github.com/nuxt/nuxt.js/commit/47f02ae))
* modern=true or false not work as expected ([#4378](https://github.com/nuxt/nuxt.js/issues/4378)) ([ff7c083](https://github.com/nuxt/nuxt.js/commit/ff7c083))
* router Expected "0" to be defined ([#4394](https://github.com/nuxt/nuxt.js/issues/4394)) ([54d2737](https://github.com/nuxt/nuxt.js/commit/54d2737))


### Performance Improvements

* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([7e1beed](https://github.com/nuxt/nuxt.js/commit/7e1beed))
11 changes: 11 additions & 0 deletions distributions/nuxt-legacy/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)


### Bug Fixes

* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([4a85c03](https://github.com/nuxt/nuxt.js/commit/4a85c03))
17 changes: 8 additions & 9 deletions distributions/nuxt-legacy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nuxt-legacy",
"version": "2.3.2",
"version": "2.3.4",
"description": "Legacy build of Nuxt.js for Node.js < 8.0.0",
"keywords": [
"nuxt",
Expand Down Expand Up @@ -48,12 +48,12 @@
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.1.6",
"@babel/register": "^7.0.0",
"@nuxt/builder": "2.3.2",
"@nuxt/cli": "2.3.2",
"@nuxt/common": "2.3.2",
"@nuxt/core": "2.3.2",
"@nuxt/generator": "2.3.2",
"@nuxt/webpack": "2.3.2",
"@nuxt/builder": "2.3.4",
"@nuxt/cli": "2.3.4",
"@nuxt/common": "2.3.4",
"@nuxt/core": "2.3.4",
"@nuxt/generator": "2.3.4",
"@nuxt/webpack": "2.3.4",
"@nuxtjs/opencollective": "^0.2.0"
},
"engines": {
Expand All @@ -63,6 +63,5 @@
"collective": {
"url": "https://opencollective.com/nuxtjs",
"logoUrl": "https://opencollective.com/nuxtjs/logo.txt?reverse=true&variant=variant2"
},
"gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22"
}
}
8 changes: 8 additions & 0 deletions distributions/nuxt-start/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)

**Note:** Version bump only for package nuxt-start
11 changes: 5 additions & 6 deletions distributions/nuxt-start/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nuxt-start",
"version": "2.3.2",
"version": "2.3.4",
"description": "Starts Nuxt.js Application in production mode",
"keywords": [
"nuxt",
Expand Down Expand Up @@ -46,13 +46,12 @@
"main": "dist/nuxt-start.js",
"bin": "bin/nuxt-start.js",
"dependencies": {
"@nuxt/cli": "2.3.2",
"@nuxt/common": "2.3.2",
"@nuxt/core": "2.3.2"
"@nuxt/cli": "2.3.4",
"@nuxt/common": "2.3.4",
"@nuxt/core": "2.3.4"
},
"engines": {
"node": ">=8.0.0",
"npm": ">=5.0.0"
},
"gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22"
}
}
11 changes: 11 additions & 0 deletions distributions/nuxt/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)


### Bug Fixes

* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([4a85c03](https://github.com/nuxt/nuxt.js/commit/4a85c03))
17 changes: 8 additions & 9 deletions distributions/nuxt/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nuxt",
"version": "2.3.2",
"version": "2.3.4",
"description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
"keywords": [
"nuxt",
Expand Down Expand Up @@ -48,12 +48,12 @@
"postinstall": "opencollective || exit 0"
},
"dependencies": {
"@nuxt/builder": "2.3.2",
"@nuxt/cli": "2.3.2",
"@nuxt/common": "2.3.2",
"@nuxt/core": "2.3.2",
"@nuxt/generator": "2.3.2",
"@nuxt/webpack": "2.3.2",
"@nuxt/builder": "2.3.4",
"@nuxt/cli": "2.3.4",
"@nuxt/common": "2.3.4",
"@nuxt/core": "2.3.4",
"@nuxt/generator": "2.3.4",
"@nuxt/webpack": "2.3.4",
"@nuxtjs/opencollective": "^0.2.0"
},
"engines": {
Expand All @@ -63,6 +63,5 @@
"collective": {
"url": "https://opencollective.com/nuxtjs",
"logoUrl": "https://opencollective.com/nuxtjs/logo.txt?reverse=true&variant=variant2"
},
"gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22"
}
}
4 changes: 1 addition & 3 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
{
"version": "2.3.2",
"version": "2.3.4",
"npmClient": "yarn",
"useWorkspaces": true,
"conventionalCommits": true,
"exact": true,
"noPush": true,
"gitTagVersion": false,
"packages": [
"packages/*",
"distributions/*"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"test:unit": "jest test/unit",
"test:types": "tsc -p test/types",
"postinstall": "lerna link && yarn dev",
"release": "lerna version"
"release": "./scripts/release"
},
"devDependencies": {
"@babel/core": "^7.1.6",
Expand Down
8 changes: 8 additions & 0 deletions packages/babel-preset-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)

**Note:** Version bump only for package @nuxt/babel-preset-app
5 changes: 2 additions & 3 deletions packages/babel-preset-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/babel-preset-app",
"version": "2.3.2",
"version": "2.3.4",
"description": "babel-preset-app for nuxt.js",
"repository": "nuxt/nuxt.js",
"license": "MIT",
Expand All @@ -23,6 +23,5 @@
},
"publishConfig": {
"access": "public"
},
"gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22"
}
}
8 changes: 8 additions & 0 deletions packages/builder/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)

**Note:** Version bump only for package @nuxt/builder
9 changes: 4 additions & 5 deletions packages/builder/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@nuxt/builder",
"version": "2.3.2",
"version": "2.3.4",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"files": [
"dist"
],
"main": "dist/builder.js",
"dependencies": {
"@nuxt/common": "2.3.2",
"@nuxt/vue-app": "2.3.2",
"@nuxt/common": "2.3.4",
"@nuxt/vue-app": "2.3.4",
"@nuxtjs/devalue": "^1.1.0",
"chokidar": "^2.0.4",
"consola": "^2.3.0",
Expand All @@ -23,6 +23,5 @@
},
"publishConfig": {
"access": "public"
},
"gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22"
}
}
11 changes: 11 additions & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)


### Bug Fixes

* modern=true or false not work as expected ([#4378](https://github.com/nuxt/nuxt.js/issues/4378)) ([ff7c083](https://github.com/nuxt/nuxt.js/commit/ff7c083))
7 changes: 3 additions & 4 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/cli",
"version": "2.3.2",
"version": "2.3.4",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"files": [
Expand All @@ -12,7 +12,7 @@
"nuxt-cli": "bin/nuxt-cli.js"
},
"dependencies": {
"@nuxt/config": "2.3.2",
"@nuxt/config": "2.3.4",
"boxen": "^2.0.0",
"chalk": "^2.4.1",
"consola": "^2.3.0",
Expand All @@ -24,6 +24,5 @@
},
"publishConfig": {
"access": "public"
},
"gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22"
}
}
11 changes: 11 additions & 0 deletions packages/common/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)


### Performance Improvements

* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([7e1beed](https://github.com/nuxt/nuxt.js/commit/7e1beed))
5 changes: 2 additions & 3 deletions packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/common",
"version": "2.3.2",
"version": "2.3.4",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"files": [
Expand All @@ -12,6 +12,5 @@
},
"publishConfig": {
"access": "public"
},
"gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22"
}
}
11 changes: 11 additions & 0 deletions packages/config/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)


### Performance Improvements

* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([7e1beed](https://github.com/nuxt/nuxt.js/commit/7e1beed))
7 changes: 3 additions & 4 deletions packages/config/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
{
"name": "@nuxt/config",
"version": "2.3.2",
"version": "2.3.4",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"files": [
"dist"
],
"main": "dist/config.js",
"dependencies": {
"@nuxt/common": "2.3.2",
"@nuxt/common": "2.3.4",
"consola": "^2.3.0",
"std-env": "^2.2.1"
},
"publishConfig": {
"access": "public"
},
"gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22"
}
}
16 changes: 16 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)


### Bug Fixes

* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([4a85c03](https://github.com/nuxt/nuxt.js/commit/4a85c03))


### Performance Improvements

* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([7e1beed](https://github.com/nuxt/nuxt.js/commit/7e1beed))
13 changes: 6 additions & 7 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "@nuxt/core",
"version": "2.3.2",
"version": "2.3.4",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"files": [
"dist"
],
"main": "dist/core.js",
"dependencies": {
"@nuxt/common": "2.3.2",
"@nuxt/config": "2.3.2",
"@nuxt/server": "2.3.2",
"@nuxt/vue-renderer": "2.3.2",
"@nuxt/common": "2.3.4",
"@nuxt/config": "2.3.4",
"@nuxt/server": "2.3.4",
"@nuxt/vue-renderer": "2.3.4",
"@nuxtjs/devalue": "^1.1.0",
"consola": "^2.3.0",
"debug": "^4.1.0",
Expand All @@ -22,6 +22,5 @@
},
"publishConfig": {
"access": "public"
},
"gitHead": "6b4a5db7f69bc82099a667be78330b9114e9cb22"
}
}
8 changes: 8 additions & 0 deletions packages/generator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)

**Note:** Version bump only for package @nuxt/generator

0 comments on commit 8cc954d

Please sign in to comment.