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.15.3 #8966

Merged
merged 32 commits into from
Mar 10, 2021
Merged

v2.15.3 #8966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a893367
chore(deps): update all non-major dependencies (#8861)
renovate[bot] Feb 20, 2021
55b522c
chore(deps): update dependency lodash to ^4.17.21 (#8865)
renovate[bot] Feb 20, 2021
4a60a19
chore(lint): fix vue/html-self-closing
clarkdo Feb 20, 2021
4e3613f
fix(babel-preset-app): avoid rely on preset-env utils (#8883)
JLHwung Feb 23, 2021
308fd42
chore(deps): update all non-major dependencies (#8870)
renovate[bot] Feb 23, 2021
3ad1165
chore: update lockfile
pi0 Feb 23, 2021
173f48b
fix(babel-preset-app): pin @babel/preset-env to ~7.12
pi0 Feb 23, 2021
93bd9dc
chore: fix eslint issue
pi0 Feb 23, 2021
b7f9cdc
v2.15.2 [release]
pi0 Feb 23, 2021
756b16a
chore(build): add preventAssignment option for replace plugin
pi0 Feb 23, 2021
931d1cf
fix: update @babel/preset-env to 2.13.x (#8887)
pi0 Feb 24, 2021
380ffb6
feat(generator): add nojekyll option (#8813)
amotarao Feb 24, 2021
4d8077f
feat(webpack): use watchpack2 (#8890)
pi0 Feb 24, 2021
af63361
chore(deps): update all non-major dependencies (#8889)
renovate[bot] Feb 24, 2021
59fa54f
chore(deps): update dependency caniuse-lite to ^1.0.30001192 (#8902)
renovate[bot] Feb 25, 2021
880fe4a
chore(deps): update all non-major dependencies (#8909)
renovate[bot] Mar 1, 2021
07e97f1
fix(vue-renderer): respect injectScripts for target:static (#8912)
hanneskuettner Mar 1, 2021
e9c70cf
chore(deps): update devdependency puppeteer-core to v8 (#8910)
renovate[bot] Mar 1, 2021
0bcf5b8
chore(deps): update all non-major dependencies (#8917)
renovate[bot] Mar 5, 2021
5d4867a
chore(deps): update devdependency lerna to v4 (#8926)
renovate[bot] Mar 5, 2021
f56a2c6
chore(deps): lock file maintenance (#8913)
renovate[bot] Mar 5, 2021
94fff62
fix: allow force overriding resolve paths (#8936)
pi0 Mar 5, 2021
2f55638
chore(deps): update devdependency vue-jest to ^4.0.1 (#8940)
renovate[bot] Mar 6, 2021
908d252
chore(lint): remove usage of this in template
clarkdo Mar 6, 2021
c610d95
chore(deps): upgrade to @nuxtjs/eslint-config v6 (#8942)
clarkdo Mar 7, 2021
7841bd0
fix(webpack): update hmr option for `extract-css-chunks-webpack-plugi…
danielroe Mar 8, 2021
0d68679
fix(types): export interface for `NuxtConfig` instead of type (#8953)
danielroe Mar 8, 2021
3fd9a65
chore(deps): update all non-major dependencies (#8944)
renovate[bot] Mar 9, 2021
d55864d
chore(deps): lock file maintenance (#8948)
renovate[bot] Mar 9, 2021
69b5264
fix: allow relative public paths (#8935)
danielroe Mar 10, 2021
f4417ee
chore(deps): update dependency caniuse-lite to ^1.0.30001198 (#8965)
renovate[bot] Mar 10, 2021
665e924
revert 380ffb6481ad9c4f68b7d0a4927bd61aaf27a9e7 a and 4d8077f8fee5b1d…
pi0 Mar 9, 2021
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
14 changes: 7 additions & 7 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.15.1",
"version": "2.15.2",
"description": "Starts Nuxt Application in production mode",
"keywords": [
"nuxt",
Expand All @@ -26,13 +26,13 @@
"dist"
],
"dependencies": {
"@nuxt/cli": "2.15.1",
"@nuxt/config": "2.15.1",
"@nuxt/core": "2.15.1",
"@nuxt/server": "2.15.1",
"@nuxt/cli": "2.15.2",
"@nuxt/config": "2.15.2",
"@nuxt/core": "2.15.2",
"@nuxt/server": "2.15.2",
"@nuxt/telemetry": "^1.3.3",
"@nuxt/utils": "2.15.1",
"@nuxt/vue-renderer": "2.15.1",
"@nuxt/utils": "2.15.2",
"@nuxt/vue-renderer": "2.15.2",
"node-fetch": "^2.6.1",
"vue": "^2.6.12",
"vue-client-only": "^2.0.0",
Expand Down
26 changes: 13 additions & 13 deletions distributions/nuxt/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nuxt",
"version": "2.15.1",
"version": "2.15.2",
"description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
"keywords": [
"nuxt",
Expand Down Expand Up @@ -31,21 +31,21 @@
"postinstall": "opencollective || exit 0"
},
"dependencies": {
"@nuxt/babel-preset-app": "2.15.1",
"@nuxt/builder": "2.15.1",
"@nuxt/cli": "2.15.1",
"@nuxt/components": "^2.1.1",
"@nuxt/config": "2.15.1",
"@nuxt/core": "2.15.1",
"@nuxt/generator": "2.15.1",
"@nuxt/babel-preset-app": "2.15.2",
"@nuxt/builder": "2.15.2",
"@nuxt/cli": "2.15.2",
"@nuxt/components": "^2.1.2",
"@nuxt/config": "2.15.2",
"@nuxt/core": "2.15.2",
"@nuxt/generator": "2.15.2",
"@nuxt/loading-screen": "^2.0.3",
"@nuxt/opencollective": "^0.3.2",
"@nuxt/server": "2.15.1",
"@nuxt/server": "2.15.2",
"@nuxt/telemetry": "^1.3.3",
"@nuxt/utils": "2.15.1",
"@nuxt/vue-app": "2.15.1",
"@nuxt/vue-renderer": "2.15.1",
"@nuxt/webpack": "2.15.1"
"@nuxt/utils": "2.15.2",
"@nuxt/vue-app": "2.15.2",
"@nuxt/vue-renderer": "2.15.2",
"@nuxt/webpack": "2.15.2"
},
"collective": {
"url": "https://opencollective.com/nuxtjs",
Expand Down
2 changes: 2 additions & 0 deletions examples/vue-class-component/components/Base.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ export default
})
class Base extends Vue {
// initial data
// TODO: Remove when upgrade babel-preset-env
// eslint-disable-next-line no-undef
msg = 123

// lifecycle hook
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.15.1",
"version": "2.15.2",
"npmClient": "yarn",
"useWorkspaces": true,
"conventionalCommits": true,
Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@
"test:unit": "jest packages --forceExit"
},
"devDependencies": {
"@babel/core": "^7.12.17",
"@babel/preset-env": "^7.12.17",
"@babel/core": "^7.13.10",
"@babel/preset-env": "^7.13.10",
"@ls-lint/ls-lint": "^1.9.2",
"@nuxtjs/eslint-config": "^5.0.0",
"@nuxtjs/eslint-config-typescript": "^5.0.0",
"@nuxtjs/eslint-config": "^6.0.0",
"@nuxtjs/eslint-config-typescript": "^6.0.0",
"@rollup/plugin-alias": "^3.1.2",
"@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^11.2.0",
"@rollup/plugin-replace": "^2.3.4",
"@typescript-eslint/eslint-plugin": "^4.15.1",
"@typescript-eslint/parser": "^4.15.1",
"@rollup/plugin-replace": "^2.4.1",
"@typescript-eslint/eslint-plugin": "^4.17.0",
"@typescript-eslint/parser": "^4.17.0",
"@vue/server-test-utils": "^1.1.3",
"@vue/test-utils": "^1.1.3",
"babel-eslint": "^10.1.0",
Expand All @@ -53,33 +53,33 @@
"consola": "^2.15.3",
"create-require": "^1.1.1",
"cross-spawn": "^7.0.3",
"eslint": "^7.20.0",
"eslint": "^7.21.0",
"eslint-multiplexer": "^2.0.0",
"execa": "^5.0.0",
"express": "^4.17.1",
"finalhandler": "^1.1.2",
"fs-extra": "^9.1.0",
"get-port": "^5.1.1",
"glob": "^7.1.6",
"got": "^11.8.1",
"got": "^11.8.2",
"improved-yarn-audit": "^2.3.2",
"jest": "^26.6.3",
"jiti": "^1.3.0",
"jsdom": "^16.4.0",
"jiti": "^1.6.3",
"jsdom": "^16.5.0",
"jsonfile": "^6.1.0",
"klaw-sync": "^6.0.0",
"lerna": "^3.22.1",
"lodash": "^4.17.20",
"lerna": "^4.0.0",
"lodash": "^4.17.21",
"node-fetch": "^2.6.1",
"puppeteer-core": "^7.1.0",
"puppeteer-core": "^8.0.0",
"request": "^2.88.2",
"rimraf": "^3.0.2",
"rollup": "2.39.0",
"rollup-plugin-license": "^2.2.0",
"rollup": "2.41.0",
"rollup-plugin-license": "^2.3.0",
"sass": "^1.32.8",
"sass-loader": "^10.1.1",
"sort-package-json": "^1.49.0",
"typescript": "~4.1",
"vue-jest": "^4.0.0-rc.1"
"typescript": "~4.2",
"vue-jest": "^4.0.1"
}
}
25 changes: 13 additions & 12 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.15.1",
"version": "2.15.2",
"description": "babel-preset-app for nuxt",
"repository": "nuxt/nuxt.js",
"license": "MIT",
Expand All @@ -10,19 +10,20 @@
],
"main": "src/index.js",
"dependencies": {
"@babel/compat-data": "^7.12.13",
"@babel/core": "^7.12.17",
"@babel/helper-compilation-targets": "^7.12.17",
"@babel/plugin-proposal-class-properties": "^7.12.13",
"@babel/plugin-proposal-decorators": "^7.12.13",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.13",
"@babel/plugin-proposal-optional-chaining": "^7.12.17",
"@babel/plugin-transform-runtime": "^7.12.17",
"@babel/preset-env": "^7.12.17",
"@babel/runtime": "^7.12.18",
"@babel/compat-data": "^7.13.8",
"@babel/core": "^7.13.10",
"@babel/helper-compilation-targets": "^7.13.10",
"@babel/helper-module-imports": "^7.12.13",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-decorators": "^7.13.5",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
"@babel/plugin-proposal-optional-chaining": "^7.13.8",
"@babel/plugin-transform-runtime": "^7.13.10",
"@babel/preset-env": "^7.13.10",
"@babel/runtime": "^7.13.10",
"@vue/babel-preset-jsx": "^1.2.4",
"core-js": "^2.6.5",
"core-js-compat": "^3.9.0",
"core-js-compat": "^3.9.1",
"regenerator-runtime": "^0.13.7"
},
"publishConfig": {
Expand Down
15 changes: 14 additions & 1 deletion packages/babel-preset-app/src/polyfills-plugin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
// Add polyfill imports to the first file encountered.
const { addSideEffect } = require('@babel/helper-module-imports')

const modulePathMap = {
'regenerator-runtime': 'regenerator-runtime/runtime.js'
}

function getModulePath (mod) {
return modulePathMap[mod] || 'core-js/modules/' + mod + '.js'
}

function createImport (path, mod) {
return addSideEffect(path, getModulePath(mod))
}

module.exports = ({ types }) => {
let entryFile
return {
Expand All @@ -12,7 +26,6 @@ module.exports = ({ types }) => {
}

const { polyfills } = state.opts
const { createImport } = require('@babel/preset-env/lib/utils')

// Imports are injected in reverse order
polyfills.slice().reverse().forEach((p) => {
Expand Down
10 changes: 5 additions & 5 deletions packages/builder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/builder",
"version": "2.15.1",
"version": "2.15.2",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/builder.js",
Expand All @@ -9,17 +9,17 @@
],
"dependencies": {
"@nuxt/devalue": "^1.2.5",
"@nuxt/utils": "2.15.1",
"@nuxt/vue-app": "2.15.1",
"@nuxt/webpack": "2.15.1",
"@nuxt/utils": "2.15.2",
"@nuxt/vue-app": "2.15.2",
"@nuxt/webpack": "2.15.2",
"chalk": "^4.1.0",
"chokidar": "^3.5.1",
"consola": "^2.15.3",
"fs-extra": "^9.1.0",
"glob": "^7.1.6",
"hash-sum": "^2.0.0",
"ignore": "^5.1.8",
"lodash": "^4.17.20",
"lodash": "^4.17.21",
"pify": "^5.0.0",
"serialize-javascript": "^5.0.1",
"upath": "^2.0.1"
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/cli",
"version": "2.15.1",
"version": "2.15.2",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/cli.js",
Expand All @@ -12,8 +12,8 @@
"dist"
],
"dependencies": {
"@nuxt/config": "2.15.1",
"@nuxt/utils": "2.15.1",
"@nuxt/config": "2.15.2",
"@nuxt/utils": "2.15.2",
"boxen": "^5.0.0",
"chalk": "^4.1.0",
"compression": "^1.7.4",
Expand All @@ -27,10 +27,10 @@
"fs-extra": "^9.1.0",
"globby": "^11.0.2",
"hable": "^3.0.0",
"lodash": "^4.17.20",
"lodash": "^4.17.21",
"minimist": "^1.2.5",
"opener": "1.5.2",
"pretty-bytes": "^5.5.0",
"pretty-bytes": "^5.6.0",
"semver": "^7.3.4",
"serve-static": "^1.14.1",
"std-env": "^2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/test/unit/run.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ describe('run', () => {

test('throws error if external command not found', async () => {
execa.mockImplementationOnce(() => {
const e = new Error()
const e = new Error('ENOENT')
e.exitCode = 2
e.exitName = 'ENOENT'
throw e
Expand Down
8 changes: 4 additions & 4 deletions packages/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxt/config",
"version": "2.15.1",
"version": "2.15.2",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/config.js",
Expand All @@ -10,15 +10,15 @@
"index.d.ts"
],
"dependencies": {
"@nuxt/utils": "2.15.1",
"@nuxt/utils": "2.15.2",
"consola": "^2.15.3",
"defu": "^3.2.2",
"destr": "^1.1.0",
"dotenv": "^8.2.0",
"lodash": "^4.17.20",
"lodash": "^4.17.21",
"rc9": "^1.2.0",
"std-env": "^2.3.0",
"ufo": "^0.6.6"
"ufo": "^0.6.10"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 4 additions & 2 deletions packages/config/src/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import defu from 'defu'
import consola from 'consola'
import destr from 'destr'
import { TARGETS, MODES, createRequire, guardDir, isNonEmptyString, isPureObject, isUrl, getMainModule, getPKG } from '@nuxt/utils'
import { joinURL, normalizeURL, withTrailingSlash } from 'ufo'
import { isRelative, joinURL, normalizeURL, withTrailingSlash } from 'ufo'
import { defaultNuxtConfigFile, getDefaultNuxtConfig } from './config'

export function getNuxtConfig (_options) {
Expand Down Expand Up @@ -452,9 +452,11 @@ export function getNuxtConfig (_options) {

// App config (internal for nuxt2 at this stage)
const useCDN = isUrl(options.build.publicPath) && !options.dev
const isRelativePublicPath = isRelative(options.build.publicPath)

options.app = defu(options.app, {
basePath: options.router.base,
assetsPath: useCDN ? '/' : joinURL(options.router.base, options.build.publicPath),
assetsPath: isRelativePublicPath ? options.build.publicPath : useCDN ? '/' : joinURL(options.router.base, options.build.publicPath),
cdnURL: useCDN ? options.build.publicPath : null
})
// Expose app config to $config.app
Expand Down
10 changes: 5 additions & 5 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"name": "@nuxt/core",
"version": "2.15.1",
"version": "2.15.2",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"main": "dist/core.js",
"files": [
"dist"
],
"dependencies": {
"@nuxt/config": "2.15.1",
"@nuxt/server": "2.15.1",
"@nuxt/utils": "2.15.1",
"@nuxt/config": "2.15.2",
"@nuxt/server": "2.15.2",
"@nuxt/utils": "2.15.2",
"consola": "^2.15.3",
"fs-extra": "^9.1.0",
"hable": "^3.0.0",
"hash-sum": "^2.0.0",
"lodash": "^4.17.20"
"lodash": "^4.17.21"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class Resolver {
resolveModule (path, { paths } = {}) {
try {
return this._require.resolve(path, {
paths: [].concat(paths || [], this.options.modulesDir, global.__NUXT_PATHS__ || [], process.cwd())
paths: [].concat(global.__NUXT_PREPATHS__ || [], paths || [], this.options.modulesDir, global.__NUXT_PATHS__ || [], process.cwd())
})
} catch (error) {
if (error.code !== 'MODULE_NOT_FOUND') {
Expand Down