v2.6.3

2024-11-26 15:42:09 +00:00 · 2019-04-25 13:13:50 +04:30 · 2019-04-25 13:13:50 +04:30 · a5cf705ed8
commit a5cf705ed8
parent 4b1bb2086e
23 changed files with 81 additions and 64 deletions
--- a/distributions/nuxt-start/package.json
+++ b/distributions/nuxt-start/package.json
@ -1,6 +1,6 @@
 {
  "name": "nuxt-start",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "description": "Starts Nuxt.js Application in production mode",
  "keywords": [
    "nuxt",
@ -55,8 +55,8 @@
  "main": "dist/nuxt-start.js",
  "bin": "bin/nuxt-start.js",
  "dependencies": {
-    "@nuxt/cli": "2.6.2",
-    "@nuxt/core": "2.6.2",
+    "@nuxt/cli": "2.6.3",
+    "@nuxt/core": "2.6.3",
    "node-fetch": "^2.3.0",
    "vue": "^2.6.10",
    "vue-meta": "^1.6.0",
--- a/distributions/nuxt-ts/package.json
+++ b/distributions/nuxt-ts/package.json
@ -1,6 +1,6 @@
 {
  "name": "nuxt-ts",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "description": "Nuxt With Runtime Typescript Support",
  "keywords": [
    "nuxt",
@ -59,14 +59,14 @@
    "nuxts": "bin/nuxt-ts.js"
  },
  "dependencies": {
-    "@nuxt/builder": "2.6.2",
-    "@nuxt/cli": "2.6.2",
-    "@nuxt/core": "2.6.2",
-    "@nuxt/generator": "2.6.2",
-    "@nuxt/loading-screen": "^0.3.0",
+    "@nuxt/builder": "2.6.3",
+    "@nuxt/cli": "2.6.3",
+    "@nuxt/core": "2.6.3",
+    "@nuxt/generator": "2.6.3",
+    "@nuxt/loading-screen": "^0.5.0",
    "@nuxt/opencollective": "^0.2.2",
-    "@nuxt/typescript": "2.6.2",
-    "@nuxt/webpack": "2.6.2"
+    "@nuxt/typescript": "2.6.3",
+    "@nuxt/webpack": "2.6.3"
  },
  "engines": {
    "node": ">=6.0.0",
--- a/distributions/nuxt/README.md
+++ b/distributions/nuxt/README.md
--- a/distributions/nuxt/package.json
+++ b/distributions/nuxt/package.json
@ -1,6 +1,6 @@
 {
  "name": "nuxt",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
  "keywords": [
    "nuxt",
@ -57,13 +57,13 @@
    "postinstall": "opencollective || exit 0"
  },
  "dependencies": {
-    "@nuxt/builder": "2.6.2",
-    "@nuxt/cli": "2.6.2",
-    "@nuxt/core": "2.6.2",
-    "@nuxt/generator": "2.6.2",
-    "@nuxt/loading-screen": "^0.3.0",
+    "@nuxt/builder": "2.6.3",
+    "@nuxt/cli": "2.6.3",
+    "@nuxt/core": "2.6.3",
+    "@nuxt/generator": "2.6.3",
+    "@nuxt/loading-screen": "^0.5.0",
    "@nuxt/opencollective": "^0.2.2",
-    "@nuxt/webpack": "2.6.2"
+    "@nuxt/webpack": "2.6.3"
  },
  "engines": {
    "node": ">=8.0.0",
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "2.6.2",
+  "version": "2.6.3",
  "npmClient": "yarn",
  "useWorkspaces": true,
  "conventionalCommits": true,
--- a/packages/babel-preset-app/package.json
+++ b/packages/babel-preset-app/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/babel-preset-app",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "description": "babel-preset-app for nuxt.js",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/builder",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
@ -9,8 +9,8 @@
  "main": "dist/builder.js",
  "dependencies": {
    "@nuxt/devalue": "^1.2.3",
-    "@nuxt/utils": "2.6.2",
-    "@nuxt/vue-app": "2.6.2",
+    "@nuxt/utils": "2.6.3",
+    "@nuxt/vue-app": "2.6.3",
    "chokidar": "^2.1.5",
    "consola": "^2.6.0",
    "fs-extra": "^7.0.1",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/cli",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
@ -12,8 +12,8 @@
    "nuxt-cli": "bin/nuxt-cli.js"
  },
  "dependencies": {
-    "@nuxt/config": "2.6.2",
-    "@nuxt/utils": "2.6.2",
+    "@nuxt/config": "2.6.3",
+    "@nuxt/utils": "2.6.3",
    "boxen": "^3.1.0",
    "chalk": "^2.4.2",
    "consola": "^2.6.0",
--- a/packages/config/package.json
+++ b/packages/config/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/config",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
@ -10,7 +10,7 @@
  "main": "dist/config.js",
  "typings": "types/index.d.ts",
  "dependencies": {
-    "@nuxt/utils": "2.6.2",
+    "@nuxt/utils": "2.6.3",
    "consola": "^2.6.0",
    "std-env": "^2.2.1"
  },
--- a/packages/core/package.json
+++ b/packages/core/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/core",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
@ -8,11 +8,11 @@
  ],
  "main": "dist/core.js",
  "dependencies": {
-    "@nuxt/config": "2.6.2",
+    "@nuxt/config": "2.6.3",
    "@nuxt/devalue": "^1.2.3",
-    "@nuxt/server": "2.6.2",
-    "@nuxt/utils": "2.6.2",
-    "@nuxt/vue-renderer": "2.6.2",
+    "@nuxt/server": "2.6.3",
+    "@nuxt/utils": "2.6.3",
+    "@nuxt/vue-renderer": "2.6.3",
    "consola": "^2.6.0",
    "debug": "^4.1.1",
    "esm": "3.2.20",
--- a/packages/generator/package.json
+++ b/packages/generator/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/generator",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
@ -8,7 +8,7 @@
  ],
  "main": "dist/generator.js",
  "dependencies": {
-    "@nuxt/utils": "2.6.2",
+    "@nuxt/utils": "2.6.3",
    "chalk": "^2.4.2",
    "consola": "^2.6.0",
    "fs-extra": "^7.0.1",
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/server",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
@ -8,8 +8,8 @@
  ],
  "main": "dist/server.js",
  "dependencies": {
-    "@nuxt/config": "2.6.2",
-    "@nuxt/utils": "2.6.2",
+    "@nuxt/config": "2.6.3",
+    "@nuxt/utils": "2.6.3",
    "@nuxtjs/youch": "^4.2.3",
    "chalk": "^2.4.2",
    "compression": "^1.7.4",
--- a/packages/typescript/package.json
+++ b/packages/typescript/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/typescript",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/utils",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
--- a/packages/vue-app/package.json
+++ b/packages/vue-app/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/vue-app",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
--- a/packages/vue-renderer/package.json
+++ b/packages/vue-renderer/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/vue-renderer",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
@ -9,7 +9,7 @@
  "main": "dist/vue-renderer.js",
  "dependencies": {
    "@nuxt/devalue": "^1.2.3",
-    "@nuxt/utils": "2.6.2",
+    "@nuxt/utils": "2.6.3",
    "consola": "^2.6.0",
    "fs-extra": "^7.0.1",
    "lru-cache": "^5.1.1",
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/webpack",
-  "version": "2.6.2",
+  "version": "2.6.3",
  "repository": "nuxt/nuxt.js",
  "license": "MIT",
  "files": [
@ -9,9 +9,9 @@
  "main": "dist/webpack.js",
  "dependencies": {
    "@babel/core": "^7.4.3",
-    "@nuxt/babel-preset-app": "2.6.2",
+    "@nuxt/babel-preset-app": "2.6.3",
    "@nuxt/friendly-errors-webpack-plugin": "^2.4.0",
-    "@nuxt/utils": "2.6.2",
+    "@nuxt/utils": "2.6.3",
    "babel-loader": "^8.0.5",
    "cache-loader": "^3.0.0",
    "caniuse-lite": "^1.0.30000962",
--- a/scripts/changelog.js
+++ b/scripts/changelog.js
@ -35,8 +35,12 @@ async function main() {
  // Get last git tag
  const lastGitTag = await getLastGitTag()

-  // Get all commits from last release to current dev
-  let commits = await getGitDiff(lastGitTag, 'dev')
+  // Get current branch
+  const currentGitBranch = await getCurrentGitBranch()
+
+  // Get all commits from last release to current branch
+  consola.log(`${currentGitBranch}...${lastGitTag}`)
+  let commits = await getGitDiff(currentGitBranch, lastGitTag)

  // Parse commits as conventional commits
  commits = parseCommits(commits)
@ -63,6 +67,11 @@ async function getLastGitTag() {
  return /^[^-]+/.exec(r)[0]
 }

+async function getCurrentGitBranch() {
+  const r = await execCommand('git', ['rev-parse', '--abbrev-ref', 'HEAD'])
+  return r
+}
+
 async function getGitDiff(from, to) {
  // # https://git-scm.com/docs/pretty-formats
  const r = await execCommand('git', ['--no-pager', 'log', `${from}...${to}`, '--pretty=%s|%h|%an|%ae'])
--- a/scripts/publish
+++ b/scripts/publish
@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-
-yarn lerna version --no-changelog
-yarn build
--- a/scripts/release-publish
+++ b/scripts/release-publish
@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+if [ ! "$1" ]; then
+  echo "Usage $0 [version]"
+  exit 1
+fi
+
+yarn build
+
+./scripts/workspace-run npm publish -q
+
+git tag -a v$1 -m v$1
+git push --tags
--- a/scripts/release-version
+++ b/scripts/release-version
@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+yarn lerna version --no-changelog --no-git-tag-version --no-push --force-publish "*"
--- a/scripts/version
+++ b/scripts/version
@ -1,4 +0,0 @@
-#!/bin/bash
-set -e
-
-./scripts/workspace-run npm publish -q
--- a/yarn.lock
+++ b/yarn.lock
@ -1493,10 +1493,10 @@
    error-stack-parser "^2.0.0"
    string-width "^2.0.0"

-"@nuxt/loading-screen@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/@nuxt/loading-screen/-/loading-screen-0.3.0.tgz#ec438337690efffea9508cebcca35675f5445110"
-  integrity sha512-h0Z5g2MxJCXyeRmzx3Niwkv+/HRQEkKYpL54cN9cHYc4FUG/NBxeIIJgqbh1ih7y5cg0jdDboL0izZrbFsBtiA==
+"@nuxt/loading-screen@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.npmjs.org/@nuxt/loading-screen/-/loading-screen-0.5.0.tgz#b2c9289fe5247c222125e87f1df3cac19735096d"
+  integrity sha512-rMQfCywYklVUpeWvIGzRrqT1odsH1LvmisWwORNyqPaMpKxX8bBxFZ56FZUT5HS9xRRlUy37KvBHiirWfIpVEw==
  dependencies:
    connect "^3.6.6"
    fs-extra "^7.0.1"