fix(core): update

This commit is contained in:
2019-02-24 23:14:47 +01:00
parent 4e6738daad
commit cd1c41b513
10 changed files with 336 additions and 105 deletions

View File

@ -1,21 +1,21 @@
import * as through2 from 'through2';
import * as through2 from 'through2';
import { cache } from './injection';
import { Transform } from 'stream'; // needed for types
export let gulpPipe = function() {
return through2.obj(function(file, enc, cb) {
export const gulpPipe = () => {
return through2.obj((file, enc, cb) => {
cache[file.path] = file;
return cb(null, file);
});
};
export interface fileObject {
export interface IFileObject {
path: string;
contents: Buffer;
}
export let injectFileArray = async (fileArray: fileObject[]) => {
for (let fileObject of fileArray) {
export const injectFileArray = async (fileArray: IFileObject[]) => {
for (const fileObject of fileArray) {
/* if (/[yourTestFilenameHere.js]/.test(request)) {
// console.log('injected:' + fileObject.path)
} */
@ -24,8 +24,8 @@ export let injectFileArray = async (fileArray: fileObject[]) => {
return fileArray;
};
export let getFileString = (filePathArg: string) => {
export const getFileString = (filePathArg: string) => {
if (cache[filePathArg]) {
return cache[filePathArg].contents.toString();
}
};
};

View File

@ -1,18 +1,18 @@
let Module = require('module');
const Module = require('module');
import path = require('path');
import sourceMap = require('source-map-support');
import vm = require('vm');
export const cache = {};
export const extensionMap: {[key: string]: () => string} = {}
let originalLoader = Module._extensions['.js'];
export const extensionMap: { [key: string]: () => string } = {};
const originalLoader = Module._extensions['.js'];
/**
* ensure sourcemap support works with the cache
*/
sourceMap.install({
retrieveFile: function(path) {
retrieveFile: (path) => {
if (cache[path]) {
return cache[path].contents.toString();
} else if (cache[path + '.js']) {
@ -22,8 +22,8 @@ sourceMap.install({
});
Module._extensions['.js'] = function(module, filename) {
let file = cache[filename];
let file2 = cache[filename + '.js'];
const file = cache[filename];
const file2 = cache[filename + '.js'];
if (file) {
module._compile(file.contents.toString(), filename);
} else if (file2) {
@ -33,11 +33,11 @@ Module._extensions['.js'] = function(module, filename) {
}
};
for (let extension in extensionMap) {
if(extensionMap[extension]) {
for (const extension in extensionMap) {
if (extensionMap[extension]) {
Module._extensions[extension] = function(module, filename) {
let file = cache[filename];
let file2 = cache[filename + '.ts'];
const file = cache[filename];
const file2 = cache[filename + '.ts'];
if (file) {
module._compile(file.contents.toString(), filename);
} else if (file2) {
@ -49,12 +49,12 @@ for (let extension in extensionMap) {
}
}
let originalModuleResolve = Module._resolveFilename;
const originalModuleResolve = Module._resolveFilename;
Module._resolveFilename = function(request, parent, isMain) {
let resolvedRequest: string;
if (parent && /^\./.test(request)) {
let resolvedDir = path.parse(parent.filename).dir;
const resolvedDir = path.parse(parent.filename).dir;
resolvedRequest = path.join('/', resolvedDir, request);
} else {
resolvedRequest = request;
@ -66,8 +66,8 @@ Module._resolveFilename = function(request, parent, isMain) {
console.log(parent)
} */
let file = cache[resolvedRequest];
let file2 = cache[resolvedRequest + '.js'];
const file = cache[resolvedRequest];
const file2 = cache[resolvedRequest + '.js'];
if (file || file2) {
return resolvedRequest;
} else {

View File

@ -1,5 +1,5 @@
import {extensionMap} from './injection';
import { extensionMap } from './injection';
export const registerExtension = (extensionName: string, compilerFunction) => {
extensionMap[extensionName] = compilerFunction;
}
};