Comparing version 0.4.0 to 0.5.0
@@ -6,2 +6,13 @@ # Change Log | ||
# [0.5.0](https://github.com/nuxt/framework/compare/@nuxt/kit@0.4.0...@nuxt/kit@0.5.0) (2021-04-16) | ||
### Features | ||
* improve dev experience ([#89](https://github.com/nuxt/framework/issues/89)) ([e224818](https://github.com/nuxt/framework/commit/e224818395cd366f2a338ce3da4aaae993f641b7)) | ||
# [0.4.0](https://github.com/nuxt/framework/compare/@nuxt/kit@0.3.0...@nuxt/kit@0.4.0) (2021-04-12) | ||
@@ -8,0 +19,0 @@ |
@@ -6,2 +6,3 @@ 'use strict'; | ||
const path = require('path'); | ||
const fs = require('fs'); | ||
const defu = require('defu'); | ||
@@ -11,3 +12,2 @@ const untyped = require('untyped'); | ||
const jiti = require('jiti'); | ||
const fs = require('fs'); | ||
const ufo = require('ufo'); | ||
@@ -23,3 +23,3 @@ const env = require('std-env'); | ||
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } | ||
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e['default'] : e; } | ||
@@ -31,22 +31,14 @@ function _interopNamespace(e) { | ||
Object.keys(e).forEach(function (k) { | ||
if (k !== 'default') { | ||
var d = Object.getOwnPropertyDescriptor(e, k); | ||
Object.defineProperty(n, k, d.get ? d : { | ||
enumerable: true, | ||
get: function () { | ||
return e[k]; | ||
} | ||
}); | ||
} | ||
n[k] = e[k]; | ||
}); | ||
} | ||
n['default'] = e; | ||
return Object.freeze(n); | ||
return n; | ||
} | ||
const path__default = /*#__PURE__*/_interopDefaultLegacy(path); | ||
const fs__default = /*#__PURE__*/_interopDefaultLegacy(fs); | ||
const defu__default = /*#__PURE__*/_interopDefaultLegacy(defu); | ||
const rc__namespace = /*#__PURE__*/_interopNamespace(rc); | ||
const jiti__default = /*#__PURE__*/_interopDefaultLegacy(jiti); | ||
const fs__default = /*#__PURE__*/_interopDefaultLegacy(fs); | ||
const env__default = /*#__PURE__*/_interopDefaultLegacy(env); | ||
@@ -58,3 +50,3 @@ const createRequire__default = /*#__PURE__*/_interopDefaultLegacy(createRequire); | ||
const _require = jiti__default['default'](process.cwd()); | ||
const _require = jiti__default(process.cwd()); | ||
function isNodeModules(id) { | ||
@@ -106,3 +98,3 @@ return /[/\\]node_modules[/\\]/.test(id); | ||
return _require.resolve(id, { | ||
paths: opts.paths | ||
paths: [].concat(global.__NUXT_PREPATHS__, opts.paths, process.cwd(), global.__NUXT_PATHS__).filter(Boolean) | ||
}); | ||
@@ -164,3 +156,3 @@ } | ||
const isRelativePublicPath = ufo.isRelative(get("build.publicPath")); | ||
return defu__default['default'](val, { | ||
return defu__default(val, { | ||
basePath: get("router.base"), | ||
@@ -186,5 +178,2 @@ assetsPath: isRelativePublicPath ? get("build.publicPath") : useCDN ? "/" : ufo.joinURL(get("router.base"), get("build.publicPath")), | ||
}, | ||
debug: { | ||
$resolve: (val, get) => val != null ? val : get("dev") | ||
}, | ||
vueMeta: null, | ||
@@ -288,5 +277,7 @@ head: { | ||
}, | ||
dev: Boolean(env__default['default'].dev), | ||
test: Boolean(env__default['default'].test), | ||
debug: void 0, | ||
dev: Boolean(env__default.dev), | ||
test: Boolean(env__default.test), | ||
debug: { | ||
$resolve: (val, get) => val != null ? val : get("dev") | ||
}, | ||
env: { | ||
@@ -307,6 +298,6 @@ $resolve: (val) => { | ||
if (val === "jiti") { | ||
return (p) => jiti__default['default'](typeof p === "string" ? p : p.filename); | ||
return (p) => jiti__default(typeof p === "string" ? p : p.filename); | ||
} | ||
if (val === "native") { | ||
return (p) => createRequire__default['default'](typeof p === "string" ? p : p.filename); | ||
return (p) => createRequire__default(typeof p === "string" ? p : p.filename); | ||
} | ||
@@ -387,3 +378,6 @@ return val; | ||
watch: { | ||
$resolve: (val, get) => [].concat(val, get("_nuxtConfigFiles")).filter(Boolean) | ||
$resolve: (val, get) => { | ||
const rootDir = get("rootDir"); | ||
return Array.from(new Set([].concat(val, get("_nuxtConfigFiles")).filter(Boolean).map((p) => path.resolve(rootDir, p)))); | ||
} | ||
}, | ||
@@ -406,3 +400,4 @@ watchers: { | ||
} | ||
} | ||
}, | ||
vite: false | ||
}; | ||
@@ -420,8 +415,7 @@ | ||
_nuxtConfigFiles: [], | ||
appDir: "", | ||
vite: false | ||
appDir: "" | ||
}; | ||
const build = { | ||
quiet: Boolean(env__default['default'].ci || env__default['default'].test), | ||
quiet: Boolean(env__default.ci || env__default.test), | ||
analyze: false, | ||
@@ -575,3 +569,3 @@ profile: process.argv.includes("--profile"), | ||
stats: { | ||
$resolve: (val, get) => val === "none" || get("build.quite") ? false : val, | ||
$resolve: (val, get) => val === "none" || get("build.quiet") ? false : val, | ||
excludeAssets: [ | ||
@@ -804,3 +798,3 @@ /.map$/, | ||
let nuxtConfig = {}; | ||
if (nuxtConfigFile) { | ||
if (nuxtConfigFile && fs.existsSync(nuxtConfigFile)) { | ||
nuxtConfig = requireModule(nuxtConfigFile, {clearCache: true}); | ||
@@ -811,3 +805,3 @@ nuxtConfig = __assign({}, nuxtConfig); | ||
} | ||
nuxtConfig = defu__default['default'](opts.config, nuxtConfig, rc__namespace.read({name: ".nuxtrc", dir: rootDir}), rc__namespace.readUser(".nuxtrc")); | ||
nuxtConfig = defu__default(opts.config, nuxtConfig, rc__namespace.read({name: ".nuxtrc", dir: rootDir}), rc__namespace.readUser(".nuxtrc")); | ||
if (!nuxtConfig.rootDir) { | ||
@@ -820,3 +814,3 @@ nuxtConfig.rootDir = rootDir; | ||
async function loadEnv(rootDir) { | ||
const env = await loalDotenv({ | ||
const env = await loadDotenv({ | ||
rootDir, | ||
@@ -833,7 +827,7 @@ dotenvFile: ".env", | ||
} | ||
async function loalDotenv(opts) { | ||
async function loadDotenv(opts) { | ||
const env = Object.create(null); | ||
const dotenvFile = path.resolve(opts.rootDir, opts.dotenvFile); | ||
if (await fs.existsSync(dotenvFile)) { | ||
const parsed = dotenv__default['default'].parse(await fs.promises.readFile(dotenvFile, "utf-8")); | ||
if (fs.existsSync(dotenvFile)) { | ||
const parsed = dotenv__default.parse(await fs.promises.readFile(dotenvFile, "utf-8")); | ||
Object.assign(env, parsed); | ||
@@ -889,2 +883,25 @@ } | ||
} | ||
async function loadNuxt(opts) { | ||
if (opts.version !== 2) { | ||
const {loadNuxt: loadNuxt3} = requireModule("nuxt3", {paths: opts.rootDir}); | ||
const nuxt2 = await loadNuxt3(opts); | ||
return nuxt2; | ||
} | ||
const {loadNuxt: loadNuxt2} = requireModule("nuxt", {paths: opts.rootDir}); | ||
const nuxt = await loadNuxt2({ | ||
rootDir: opts.rootDir, | ||
for: opts.dev ? "dev" : "build", | ||
configOverrides: opts.config, | ||
ready: opts.ready | ||
}); | ||
return nuxt; | ||
} | ||
function buildNuxt(nuxt) { | ||
if (nuxt.options._majorVersion === 3) { | ||
const {build: build2} = requireModule("nuxt3", {paths: nuxt.options.rootDir}); | ||
return build2(nuxt); | ||
} | ||
const {build} = requireModule("nuxt", {paths: nuxt.options.rootDir}); | ||
return build(nuxt); | ||
} | ||
@@ -908,3 +925,3 @@ function defineNuxtModule(input) { | ||
const configKey = mod.configKey || mod.name; | ||
const userOptions = defu__default['default'](inlineOptions, nuxt.options[configKey]); | ||
const userOptions = defu__default(inlineOptions, nuxt.options[configKey]); | ||
const resolvedOptions = untyped.applyDefaults(mod.defaults, userOptions); | ||
@@ -988,7 +1005,7 @@ return nuxtCtx.call(nuxt, () => mod.setup.call(null, resolvedOptions, nuxt)); | ||
const srcPath = path.parse(src); | ||
if (typeof src !== "string" || !fs__default['default'].existsSync(src)) { | ||
if (typeof src !== "string" || !fs__default.existsSync(src)) { | ||
throw new Error("tmpl src not found: " + src); | ||
} | ||
const fileName = typeof tmpl === "string" ? "" : tmpl.fileName || tmpl.filename; | ||
const dst = fileName || `${path.basename(srcPath.dir)}.${srcPath.name}.${hash__default['default'](src)}${srcPath.ext}`; | ||
const dst = fileName || `${path.basename(srcPath.dir)}.${srcPath.name}.${hash__default(src)}${srcPath.ext}`; | ||
const tmplObj = { | ||
@@ -1009,3 +1026,3 @@ src, | ||
nuxt.options.plugins.unshift({ | ||
src: path__default['default'].join(nuxt.options.buildDir, dst), | ||
src: path__default.join(nuxt.options.buildDir, dst), | ||
mode: tmpl.mode | ||
@@ -1017,6 +1034,6 @@ }); | ||
const {dst, src} = addTemplate(tmpl); | ||
const layoutName = name || path__default['default'].parse(src).name; | ||
const layoutName = name || path__default.parse(src).name; | ||
const layout = nuxt.options.layouts[layoutName]; | ||
if (layout) { | ||
consola__default['default'].warn(`Duplicate layout registration, "${layoutName}" has been registered as "${layout}"`); | ||
consola__default.warn(`Duplicate layout registration, "${layoutName}" has been registered as "${layout}"`); | ||
} | ||
@@ -1030,3 +1047,3 @@ nuxt.options.layouts[layoutName] = `./${dst}`; | ||
const nuxt = useNuxt(); | ||
const relativeBuildDir = path__default['default'].relative(nuxt.options.rootDir, nuxt.options.buildDir); | ||
const relativeBuildDir = path__default.relative(nuxt.options.rootDir, nuxt.options.buildDir); | ||
nuxt.options.ErrorPage = `~/${relativeBuildDir}/${dst}`; | ||
@@ -1059,3 +1076,3 @@ } | ||
addVendor() { | ||
console.warn("addVendor has been deprecated"); | ||
console.warn("addVendor has been deprecated and has no effect."); | ||
} | ||
@@ -1143,2 +1160,3 @@ addTemplate(tmpl) { | ||
exports.addTemplate = addTemplate; | ||
exports.buildNuxt = buildNuxt; | ||
exports.clearRequireCache = clearRequireCache; | ||
@@ -1152,5 +1170,6 @@ exports.defineNuxtConfig = defineNuxtConfig; | ||
exports.isNodeModules = isNodeModules; | ||
exports.loadDotenv = loadDotenv; | ||
exports.loadEnv = loadEnv; | ||
exports.loadNuxt = loadNuxt; | ||
exports.loadNuxtConfig = loadNuxtConfig; | ||
exports.loalDotenv = loalDotenv; | ||
exports.nuxtCtx = nuxtCtx; | ||
@@ -1157,0 +1176,0 @@ exports.requireModule = requireModule; |
{ | ||
"name": "@nuxt/kit", | ||
"version": "0.4.0", | ||
"version": "0.5.0", | ||
"repository": "nuxt/framework", | ||
@@ -15,3 +15,3 @@ "license": "MIT", | ||
"devDependencies": { | ||
"unbuild": "^0.1.12" | ||
"unbuild": "^0.1.13" | ||
}, | ||
@@ -33,3 +33,3 @@ "dependencies": { | ||
}, | ||
"gitHead": "6a30a6fd10063b6b42cd9e0fae5b7dcc983bbc5a" | ||
"gitHead": "c06dbd6c6e150217318a567495daa0efdaaf857b" | ||
} |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
154160
5041