Skip to content

UI fixes #1397

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 29, 2018
Merged

UI fixes #1397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ac4f30
fix: ERROR AssertionError [ERR_ASSERTION]: missing path
May 29, 2018
669e58a
refactor(ui): export portfinder and graphql-server from @vue/cli-ui a…
May 29, 2018
83e5f9d
fix(ui): invoke: force load package.json
May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@vue/cli-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint",
"graphql-api": "cross-env VUE_CLI_DEBUG=true vue-cli-service graphql-api",
"graphql-api": "cross-env VUE_CLI_DEBUG=true VUE_CLI_UI_DEV=true vue-cli-service graphql-api",
"run-graphql-api": "vue-cli-service run-graphql-api",
"run-test-graphql-api": "cross-env NODE_ENV=test VUE_APP_GRAPHQL_PORT=4040 VUE_APP_CLI_UI_URL=ws://localhost:4040/graphql yarn run graphql-api",
"prepublishOnly": "yarn run lint --no-fix && yarn run build",
Expand Down
2 changes: 2 additions & 0 deletions packages/@vue/cli-ui/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
exports.server = require('vue-cli-plugin-apollo/graphql-server')
exports.portfinder = require('portfinder')
2 changes: 1 addition & 1 deletion packages/@vue/cli-ui/src/graphql-api/connectors/locales.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function _loadFolder (root, context) {

function loadFolder (root, context) {
const folder = path.join(root, './locales')
if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test' && !watchedTrees.get(root) && fs.existsSync(folder)) {
if (process.env.VUE_CLI_UI_DEV && !watchedTrees.get(root) && fs.existsSync(folder)) {
watchedTrees.set(root, true)
const watch = require('watch')
watch.watchTree(folder, () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-ui/src/graphql-api/utils/logger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const chalk = require('chalk')

exports.log = (...args) => {
if (process.env.NODE_ENV === 'production') return
if (!process.env.VUE_CLI_UI_DEV) return
const date = new Date()
const timestamp = `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}.${date.getSeconds().toString().padStart(2, '0')}`
const first = args.shift()
Expand All @@ -15,7 +15,7 @@ const simpleTypes = [
]

exports.dumpObject = (obj) => {
if (process.env.NODE_ENV === 'production') return
if (!process.env.VUE_CLI_UI_DEV) return
const result = {}
Object.keys(obj).forEach(key => {
const value = obj[key]
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli/lib/invoke.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function getPkg (context) {
if (!fs.existsSync(pkgPath)) {
throw new Error(`package.json not found in ${chalk.yellow(context)}`)
}
return require(pkgPath)
return loadModule(pkgPath, context, true)
}

async function invoke (pluginName, options = {}, context = process.cwd()) {
Expand Down
16 changes: 9 additions & 7 deletions packages/@vue/cli/lib/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { log, error, openBrowser } = require('@vue/cli-shared-utils')
const portfinder = require('portfinder')
const { portfinder, server } = require('@vue/cli-ui/server')

async function ui (options = {}, context = process.cwd()) {
let port = options.port
Expand All @@ -10,14 +10,15 @@ async function ui (options = {}, context = process.cwd()) {
// Config
process.env.VUE_APP_CLI_UI_URL = ''

if (!options.dev) {
// Optimize express
process.env.NODE_ENV = 'production'
// Optimize express
process.env.NODE_ENV = 'production'

// Dev mode
if (options.dev) {
process.env.VUE_CLI_UI_DEV = true
}

if (!options.quiet) log(`🚀 Starting GUI...`)
let server = require('vue-cli-plugin-apollo/graphql-server')
server = server.default || server

const opts = {
port,
Expand All @@ -34,7 +35,8 @@ async function ui (options = {}, context = process.cwd()) {
resolvers: require.resolve('@vue/cli-ui/src/graphql-api/resolvers.js'),
context: require.resolve('@vue/cli-ui/src/graphql-api/context.js'),
pubsub: require.resolve('@vue/cli-ui/src/graphql-api/pubsub.js'),
server: require.resolve('@vue/cli-ui/src/graphql-api/server.js')
server: require.resolve('@vue/cli-ui/src/graphql-api/server.js'),
directives: require.resolve('@vue/cli-ui/src/graphql-api/directives.js')
}
}

Expand Down