From 53f0f698aee7a48ac7f154ce66743e8beea68f79 Mon Sep 17 00:00:00 2001 From: iamcco Date: Wed, 16 Jan 2019 20:02:56 +0800 Subject: [PATCH] fix packages --- app/lib/app/index.js | 2 +- app/lib/app/load.js | 11 ++--------- app/lib/app/preloadmodules.d.ts | 1 + app/lib/app/preloadmodules.js | 4 +++- app/lib/vim-node-rpc/lib/index.js | 1 - app/out/404.html | 2 +- .../pages/404.js | 0 .../pages/_app.js | 0 .../pages/_error.js | 0 .../pages/index.js | 0 app/out/index.html | 2 +- package.json | 2 +- src/app/index.ts | 2 +- src/app/load.ts | 1 + src/app/preloadmodules.ts | 4 +++- 15 files changed, 15 insertions(+), 17 deletions(-) rename app/out/_next/static/{m8mLe3bgnbJBQe82yuoK9 => 7ucuy2QOU5SXjP1rAf88U}/pages/404.js (100%) rename app/out/_next/static/{m8mLe3bgnbJBQe82yuoK9 => 7ucuy2QOU5SXjP1rAf88U}/pages/_app.js (100%) rename app/out/_next/static/{m8mLe3bgnbJBQe82yuoK9 => 7ucuy2QOU5SXjP1rAf88U}/pages/_error.js (100%) rename app/out/_next/static/{m8mLe3bgnbJBQe82yuoK9 => 7ucuy2QOU5SXjP1rAf88U}/pages/index.js (100%) diff --git a/app/lib/app/index.js b/app/lib/app/index.js index 11b7807..008d8fb 100644 --- a/app/lib/app/index.js +++ b/app/lib/app/index.js @@ -11,5 +11,5 @@ if (param === PATH) { } else if (param === VERSION) { // tslint:disable-next-line - console.log('0.0.8'); + console.log('0.0.9'); } diff --git a/app/lib/app/load.js b/app/lib/app/load.js index dfdd1bd..09b08ca 100644 --- a/app/lib/app/load.js +++ b/app/lib/app/load.js @@ -12,10 +12,7 @@ function load(scriptPath) { userModule.paths = module_1.default._nodeModulePaths(path_1.default.dirname(scriptPath)); const moduleCode = fs_1.default.readFileSync(userModule.filename, 'utf-8'); userModule.require = userModule.require.bind(userModule); - const sanbox = vm_1.default.createContext({ - exports: userModule.exports, - module: userModule, - require: name => { + const sanbox = vm_1.default.createContext(Object.assign({}, global, { exports: userModule.exports, module: userModule, require: name => { if (preloadmodules_1.default[name]) { return preloadmodules_1.default[name]; } @@ -32,11 +29,7 @@ function load(scriptPath) { } return load(loadScript); } - }, - __filename: userModule.filename, - __dirname: path_1.default.dirname(scriptPath), - process, - }); + }, __filename: userModule.filename, __dirname: path_1.default.dirname(scriptPath), process })); vm_1.default.runInContext(moduleCode, sanbox, { filename: userModule.filename }); return userModule.exports; } diff --git a/app/lib/app/preloadmodules.d.ts b/app/lib/app/preloadmodules.d.ts index c44b497..fef24e7 100644 --- a/app/lib/app/preloadmodules.d.ts +++ b/app/lib/app/preloadmodules.d.ts @@ -3,5 +3,6 @@ declare const _default: { log4js: any; tslib: any; 'socket.io': any; + 'msgpack-lite': any; }; export default _default; diff --git a/app/lib/app/preloadmodules.js b/app/lib/app/preloadmodules.js index de80867..2acb816 100644 --- a/app/lib/app/preloadmodules.js +++ b/app/lib/app/preloadmodules.js @@ -4,9 +4,11 @@ const neovim = require('neovim'); const log4js = require('log4js'); const tslib = require('tslib'); const socketIO = require('socket.io'); +const msgpackLite = require('msgpack-lite'); exports.default = { neovim, log4js, tslib, - 'socket.io': socketIO + 'socket.io': socketIO, + 'msgpack-lite': msgpackLite }; diff --git a/app/lib/vim-node-rpc/lib/index.js b/app/lib/vim-node-rpc/lib/index.js index 65942cc..5c3268d 100755 --- a/app/lib/vim-node-rpc/lib/index.js +++ b/app/lib/vim-node-rpc/lib/index.js @@ -1,4 +1,3 @@ -#!/usr/bin/env node 'use strict' Object.defineProperty(exports, '__esModule', { value: true }) const tslib_1 = require('tslib') diff --git a/app/out/404.html b/app/out/404.html index 1e730eb..e02dd63 100644 --- a/app/out/404.html +++ b/app/out/404.html @@ -1 +1 @@ -
404
\ No newline at end of file +
404
\ No newline at end of file diff --git a/app/out/_next/static/m8mLe3bgnbJBQe82yuoK9/pages/404.js b/app/out/_next/static/7ucuy2QOU5SXjP1rAf88U/pages/404.js similarity index 100% rename from app/out/_next/static/m8mLe3bgnbJBQe82yuoK9/pages/404.js rename to app/out/_next/static/7ucuy2QOU5SXjP1rAf88U/pages/404.js diff --git a/app/out/_next/static/m8mLe3bgnbJBQe82yuoK9/pages/_app.js b/app/out/_next/static/7ucuy2QOU5SXjP1rAf88U/pages/_app.js similarity index 100% rename from app/out/_next/static/m8mLe3bgnbJBQe82yuoK9/pages/_app.js rename to app/out/_next/static/7ucuy2QOU5SXjP1rAf88U/pages/_app.js diff --git a/app/out/_next/static/m8mLe3bgnbJBQe82yuoK9/pages/_error.js b/app/out/_next/static/7ucuy2QOU5SXjP1rAf88U/pages/_error.js similarity index 100% rename from app/out/_next/static/m8mLe3bgnbJBQe82yuoK9/pages/_error.js rename to app/out/_next/static/7ucuy2QOU5SXjP1rAf88U/pages/_error.js diff --git a/app/out/_next/static/m8mLe3bgnbJBQe82yuoK9/pages/index.js b/app/out/_next/static/7ucuy2QOU5SXjP1rAf88U/pages/index.js similarity index 100% rename from app/out/_next/static/m8mLe3bgnbJBQe82yuoK9/pages/index.js rename to app/out/_next/static/7ucuy2QOU5SXjP1rAf88U/pages/index.js diff --git a/app/out/index.html b/app/out/index.html index cae3961..48334d5 100644 --- a/app/out/index.html +++ b/app/out/index.html @@ -1 +1 @@ -「」

\ No newline at end of file +「」

\ No newline at end of file diff --git a/package.json b/package.json index cf3379d..40b8fc6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "markdown-preview.vim", - "version": "0.0.8", + "version": "0.0.9", "description": "markdown preview plugin for (neo)vim", "bin": "./app/server.js", "repository": "https://github.com/iamcco/markdown-preview.vim.git", diff --git a/src/app/index.ts b/src/app/index.ts index 7822566..f49d622 100644 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -11,5 +11,5 @@ if (param === PATH) { load(argv[3]).run() } else if (param === VERSION) { // tslint:disable-next-line - console.log('0.0.8') + console.log('0.0.9') } diff --git a/src/app/load.ts b/src/app/load.ts index b89bd23..ddf9dd6 100644 --- a/src/app/load.ts +++ b/src/app/load.ts @@ -15,6 +15,7 @@ export default function load(scriptPath) { userModule.require = userModule.require.bind(userModule) const sanbox = vm.createContext({ + ...global, exports: userModule.exports, module: userModule, require: name => { diff --git a/src/app/preloadmodules.ts b/src/app/preloadmodules.ts index 369fe39..e6718a1 100644 --- a/src/app/preloadmodules.ts +++ b/src/app/preloadmodules.ts @@ -2,10 +2,12 @@ const neovim = require('neovim') const log4js = require('log4js') const tslib = require('tslib') const socketIO = require('socket.io') +const msgpackLite = require('msgpack-lite') export default { neovim, log4js, tslib, - 'socket.io': socketIO + 'socket.io': socketIO, + 'msgpack-lite': msgpackLite }