Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-30 09:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

global name is wrongly set to nuxt-edge (#6736)

Browse Source 
[release]
This commit is contained in:
Xin Du (Clark) 2019-11-27 19:51:48 +00:00 committed by Pooya Parsa
parent e8aca9eb11
commit 75a29c8b13
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintrc.js
View File

@ -15,7 +15,8 @@ module.exports = {
}, },
rules: { rules: {
'no-console': 'error', 'no-console': 'error',
'no-debugger': 'error' 'no-debugger': 'error',
quotes: ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }]
}, },
overrides: [{ overrides: [{
files: [ 'test/fixtures/*/.nuxt*/**' ], files: [ 'test/fixtures/*/.nuxt*/**' ],

3
packages/config/src/config/_common.js
View File

@ -12,8 +12,7 @@ export default () => ({
mode: 'universal', mode: 'universal',
modern: undefined, modern: undefined,
// Globals globalName: undefined,
globalName: 'nuxt',
globals: { globals: {
id: globalName => `__${globalName}`, id: globalName => `__${globalName}`,
nuxt: globalName => `$${globalName}`, nuxt: globalName => `$${globalName}`,

3
packages/config/src/options.js
View File

@ -63,7 +63,8 @@ export function getNuxtConfig (_options) {
options.globalName = (isNonEmptyString(options.globalName) && /^[a-zA-Z]+$/.test(options.globalName)) options.globalName = (isNonEmptyString(options.globalName) && /^[a-zA-Z]+$/.test(options.globalName))
? options.globalName.toLowerCase() ? options.globalName.toLowerCase()
: 'nuxt' // use `` for preventing replacing to nuxt-edge
: `nuxt`
// Resolve rootDir // Resolve rootDir
options.rootDir = isNonEmptyString(options.rootDir) ? path.resolve(options.rootDir) : process.cwd() options.rootDir = isNonEmptyString(options.rootDir) ? path.resolve(options.rootDir) : process.cwd()

4
packages/config/test/config/__snapshots__/index.test.js.snap
View File

@ -177,7 +177,7 @@ Object {
"routes": Array [], "routes": Array [],
"subFolders": true, "subFolders": true,
}, },
"globalName": "nuxt", "globalName": undefined,
"globals": Object { "globals": Object {
"context": [Function], "context": [Function],
"id": [Function], "id": [Function],
@ -531,7 +531,7 @@ Object {
"routes": Array [], "routes": Array [],
"subFolders": true, "subFolders": true,
}, },
"globalName": "nuxt", "globalName": undefined,
"globals": Object { "globals": Object {
"context": [Function], "context": [Function],
"id": [Function], "id": [Function],

2
scripts/package
View File

@ -4,7 +4,7 @@ import consola from 'consola'
import Package from './package.js' import Package from './package.js'
async function main() { async function main () {
// Read package at current directory // Read package at current directory
const rootPackage = new Package() const rootPackage = new Package()
const workspacePackages = await rootPackage.getWorkspacePackages() const workspacePackages = await rootPackage.getWorkspacePackages()