Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.13.1 #7592

Merged
merged 16 commits into from
Jun 24, 2020
Merged

v2.13.1 #7592

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 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.13.0",
"version": "2.13.1",
"description": "Starts Nuxt.js Application in production mode",
"keywords": [
"nuxt",
Expand Down Expand Up @@ -55,9 +55,9 @@
"dist"
],
"dependencies": {
"@nuxt/cli": "2.13.0",
"@nuxt/core": "2.13.0",
"@nuxt/telemetry": "^1.0.1",
"@nuxt/cli": "2.13.1",
"@nuxt/core": "2.13.1",
"@nuxt/telemetry": "^1.1.0",
"node-fetch": "^2.6.0",
"vue": "^2.6.11",
"vue-client-only": "^2.0.0",
Expand Down
18 changes: 9 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.13.0",
"version": "2.13.1",
"description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
"keywords": [
"nuxt",
Expand Down Expand Up @@ -58,15 +58,15 @@
"postinstall": "opencollective || exit 0"
},
"dependencies": {
"@nuxt/builder": "2.13.0",
"@nuxt/cli": "2.13.0",
"@nuxt/components": "^1.0.0",
"@nuxt/core": "2.13.0",
"@nuxt/generator": "2.13.0",
"@nuxt/loading-screen": "^2.0.0",
"@nuxt/builder": "2.13.1",
"@nuxt/cli": "2.13.1",
"@nuxt/components": "^1.0.4",
"@nuxt/core": "2.13.1",
"@nuxt/generator": "2.13.1",
"@nuxt/loading-screen": "^2.0.1",
"@nuxt/opencollective": "^0.3.0",
"@nuxt/telemetry": "^1.0.1",
"@nuxt/webpack": "2.13.0"
"@nuxt/telemetry": "^1.1.0",
"@nuxt/webpack": "2.13.1"
},
"engines": {
"node": ">=8.9.0",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.13.0",
"version": "2.13.1",
"npmClient": "yarn",
"useWorkspaces": true,
"conventionalCommits": true,
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@
"babel-eslint/@babel/parser": "7.7.5"
},
"devDependencies": {
"@babel/core": "^7.10.2",
"@babel/preset-env": "^7.10.2",
"@babel/core": "^7.10.3",
"@babel/preset-env": "^7.10.3",
"@ls-lint/ls-lint": "^1.8.1",
"@nuxtjs/eslint-config": "^3.0.0",
"@rollup/plugin-alias": "^3.1.1",
"@rollup/plugin-commonjs": "^13.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.0.1",
"@rollup/plugin-node-resolve": "^8.1.0",
"@rollup/plugin-replace": "^2.3.3",
"@vue/server-test-utils": "^1.0.3",
"@vue/test-utils": "^1.0.3",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.0.1",
"babel-jest": "^26.1.0",
"consola": "^2.13.0",
"create-require": "^1.0.2",
"cross-spawn": "^7.0.3",
"eslint": "^7.2.0",
"eslint": "^7.3.1",
"eslint-multiplexer": "^2.0.0",
"esm": "^3.2.25",
"execa": "^3.4.0",
Expand All @@ -64,8 +64,8 @@
"got": "^11.3.0",
"improved-yarn-audit": "^2.2.1",
"is-wsl": "^2.2.0",
"jest": "^26.0.1",
"jiti": "^0.1.9",
"jest": "^26.1.0",
"jiti": "^0.1.11",
"jsdom": "^16.2.2",
"klaw-sync": "^6.0.0",
"lerna": "^3.22.1",
Expand All @@ -75,7 +75,7 @@
"puppeteer-core": "^4.0.0",
"request": "^2.88.2",
"rimraf": "^3.0.2",
"rollup": "~2.16.1",
"rollup": "2.18.0",
"rollup-plugin-license": "^2.1.0",
"sass-loader": "^8.0.2",
"sort-package-json": "^1.44.0",
Expand Down
12 changes: 6 additions & 6 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.13.0",
"version": "2.13.1",
"description": "babel-preset-app for nuxt.js",
"repository": "nuxt/nuxt.js",
"license": "MIT",
Expand All @@ -10,13 +10,13 @@
],
"main": "src/index.js",
"dependencies": {
"@babel/core": "^7.10.2",
"@babel/core": "^7.10.3",
"@babel/helper-compilation-targets": "^7.10.2",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-decorators": "^7.10.1",
"@babel/plugin-transform-runtime": "^7.10.1",
"@babel/preset-env": "^7.10.2",
"@babel/runtime": "^7.10.2",
"@babel/plugin-proposal-decorators": "^7.10.3",
"@babel/plugin-transform-runtime": "^7.10.3",
"@babel/preset-env": "^7.10.3",
"@babel/runtime": "^7.10.3",
"@vue/babel-preset-jsx": "^1.1.2",
"core-js": "^2.6.5"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/builder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/builder",
"version": "2.13.0",
"version": "2.13.1",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/builder.js",
Expand All @@ -9,9 +9,9 @@
],
"dependencies": {
"@nuxt/devalue": "^1.2.4",
"@nuxt/utils": "2.13.0",
"@nuxt/vue-app": "2.13.0",
"@nuxt/webpack": "2.13.0",
"@nuxt/utils": "2.13.1",
"@nuxt/vue-app": "2.13.1",
"@nuxt/webpack": "2.13.1",
"chalk": "^3.0.0",
"chokidar": "^3.4.0",
"consola": "^2.13.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/cli",
"version": "2.13.0",
"version": "2.13.1",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/cli.js",
Expand All @@ -12,8 +12,8 @@
"dist"
],
"dependencies": {
"@nuxt/config": "2.13.0",
"@nuxt/utils": "2.13.0",
"@nuxt/config": "2.13.1",
"@nuxt/utils": "2.13.1",
"boxen": "^4.2.0",
"chalk": "^3.0.0",
"compression": "^1.7.4",
Expand Down
6 changes: 3 additions & 3 deletions packages/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/config",
"version": "2.13.0",
"version": "2.13.1",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/config.js",
Expand All @@ -10,14 +10,14 @@
"index.d.ts"
],
"dependencies": {
"@nuxt/utils": "2.13.0",
"@nuxt/utils": "2.13.1",
"consola": "^2.13.0",
"create-require": "^1.0.2",
"defu": "^2.0.4",
"destr": "^1.0.0",
"dotenv": "^8.2.0",
"esm": "^3.2.25",
"jiti": "^0.1.9",
"jiti": "^0.1.11",
"rc9": "^1.0.0",
"std-env": "^2.2.1"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "@nuxt/core",
"version": "2.13.0",
"version": "2.13.1",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/core.js",
"files": [
"dist"
],
"dependencies": {
"@nuxt/config": "2.13.0",
"@nuxt/config": "2.13.1",
"@nuxt/devalue": "^1.2.4",
"@nuxt/server": "2.13.0",
"@nuxt/utils": "2.13.0",
"@nuxt/vue-renderer": "2.13.0",
"@nuxt/server": "2.13.1",
"@nuxt/utils": "2.13.1",
"@nuxt/vue-renderer": "2.13.1",
"consola": "^2.13.0",
"debug": "^4.1.1",
"esm": "^3.2.25",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/nuxt.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default class Nuxt extends Hookable {
}

static get version () {
return (global.__NUXT && global.__NUXT.version) || `v${version}`
return `v${version}` + (global.__NUXT_DEV__ ? '-development' : '')
}

ready () {
Expand Down
10 changes: 0 additions & 10 deletions packages/core/test/nuxt.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,6 @@ describe('core: nuxt', () => {
expect(Nuxt.version).toEqual(`v${version}`)
})

test('should return nuxt version from global.__NUXT', () => {
global.__NUXT = {
version: 'latest'
}

expect(Nuxt.version).toEqual('latest')

delete global.__NUXT
})

test('should call module/server ready in nuxt.ready', async () => {
const nuxt = new Nuxt()

Expand Down
6 changes: 3 additions & 3 deletions packages/generator/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "@nuxt/generator",
"version": "2.13.0",
"version": "2.13.1",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/generator.js",
"files": [
"dist"
],
"dependencies": {
"@nuxt/utils": "2.13.0",
"@nuxt/utils": "2.13.1",
"chalk": "^3.0.0",
"consola": "^2.13.0",
"fs-extra": "^8.1.0",
"html-minifier": "^4.0.0",
"node-html-parser": "^1.2.19"
"node-html-parser": "^1.2.20"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 4 additions & 4 deletions packages/server/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@nuxt/server",
"version": "2.13.0",
"version": "2.13.1",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/server.js",
"files": [
"dist"
],
"dependencies": {
"@nuxt/config": "2.13.0",
"@nuxt/utils": "2.13.0",
"@nuxt/vue-renderer": "2.13.0",
"@nuxt/config": "2.13.1",
"@nuxt/utils": "2.13.1",
"@nuxt/vue-renderer": "2.13.1",
"@nuxtjs/youch": "^4.2.3",
"chalk": "^3.0.0",
"compression": "^1.7.4",
Expand Down
1 change: 1 addition & 0 deletions packages/types/config/generate.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ type NuxtOptionsGenerateRoutesFunctionWithCallback = (callback: (err: Error, rou

export interface NuxtOptionsGenerate {
concurrency?: number
crawler?: boolean
devtools?: boolean
dir?: string
exclude?: RegExp[]
Expand Down
18 changes: 9 additions & 9 deletions packages/types/config/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { NuxtOptionsModule } from './module'
import { NuxtOptionsPlugin } from './plugin'
import { NuxtOptionsRender } from './render'
import { NuxtOptionsRouter } from './router'
import { NuxtConfigurationRuntimeConfig } from './runtime'
import { NuxtOptionsRuntimeConfig } from './runtime'
import { NuxtOptionsServer } from './server'
import { NuxtOptionsServerMiddleware } from './server-middleware'
import { NuxtOptionsVueConfiguration } from './vue-configuration'
Expand All @@ -22,7 +22,12 @@ import { NuxtOptionsWatchers } from './watchers'
export { Module } from './module'
export { ServerMiddleware } from './server-middleware'

export interface NuxtOptions extends Record<string, any> {
/**
* @deprecated Use NuxtConfig instead
*/
export interface Configuration extends Record<string, any> {}

export interface NuxtOptions extends Configuration {
build: NuxtOptionsBuild
buildDir: string
buildModules: NuxtOptionsModule[]
Expand Down Expand Up @@ -51,8 +56,8 @@ export interface NuxtOptions extends Record<string, any> {
modules: NuxtOptionsModule[]
modulesDir: string[]
plugins: NuxtOptionsPlugin[]
privateRuntimeConfig?: NuxtConfigurationRuntimeConfig
publicRuntimeConfig?: NuxtConfigurationRuntimeConfig
privateRuntimeConfig: NuxtOptionsRuntimeConfig
publicRuntimeConfig: NuxtOptionsRuntimeConfig
render: NuxtOptionsRender
rootDir: string
router: NuxtOptionsRouter
Expand All @@ -66,8 +71,3 @@ export interface NuxtOptions extends Record<string, any> {
}

export type NuxtConfig = Partial<NuxtOptions>

/**
* @deprecated Use NuxtConfig instead
*/
export type Configuration = NuxtConfig // Legacy alias
4 changes: 2 additions & 2 deletions packages/types/config/runtime.d.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
* NuxtConfigurationRuntimeConfig
* NuxtOptionsRuntimeConfig
* NuxtRuntimeConfig interface can be extended by users to enable intellisense on $config
*/

export interface NuxtRuntimeConfig {
[key: string]: any
}

export type NuxtConfigurationRuntimeConfig = NuxtRuntimeConfig | ((env: typeof process.env) => NuxtRuntimeConfig)
export type NuxtOptionsRuntimeConfig = NuxtRuntimeConfig | ((env: typeof process.env) => NuxtRuntimeConfig)
9 changes: 7 additions & 2 deletions packages/types/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import './process'

export * from './app'
export * from './config'
/**
* Note: `export * from './app'` does not work well with TypeScript < 3.9
* TODO: When 3.9 considered stable with Nuxt, require it and use `export *`
*/

export { Context, Middleware, NuxtAppOptions, NuxtError, Plugin, Transition } from './app'
export { Configuration, Module, NuxtConfig, NuxtOptions, ServerMiddleware } from './config'
6 changes: 3 additions & 3 deletions packages/types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/types",
"version": "2.13.0",
"version": "2.13.1",
"description": "Nuxt.js types",
"repository": "nuxt/nuxt.js",
"license": "MIT",
Expand All @@ -10,12 +10,12 @@
],
"dependencies": {
"@types/autoprefixer": "^9.7.2",
"@types/babel__core": "^7.1.8",
"@types/babel__core": "^7.1.9",
"@types/compression": "^1.7.0",
"@types/connect": "^3.4.33",
"@types/etag": "^1.8.0",
"@types/file-loader": "^4.2.0",
"@types/html-minifier": "^3.5.3",
"@types/html-minifier": "^4.0.0",
"@types/less": "^3.0.1",
"@types/node": "^12.12.47",
"@types/node-sass": "^4.11.1",
Expand Down