Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
trim down what is used from bytenode
- Loading branch information
1 parent
4a9bcc0
commit 8aafe38
Showing
5 changed files
with
386 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,381 @@ | ||
| diff --git a/node_modules/bytenode/lib/compileFile.js b/node_modules/bytenode/lib/compileFile.js | ||
| new file mode 100644 | ||
| index 0000000..314eeee | ||
| --- /dev/null | ||
| +++ b/node_modules/bytenode/lib/compileFile.js | ||
| @@ -0,0 +1,138 @@ | ||
| +'use strict'; | ||
| + | ||
| +const fs = require('fs'); | ||
| +const path = require('path'); | ||
| +const Module = require('module'); | ||
| +const fork = require('child_process').fork; | ||
| +const { compileCode } = require('./index'); | ||
| + | ||
| +const COMPILED_EXTNAME = '.jsc'; | ||
| + | ||
| +/** | ||
| + * This function runs the compileCode() function (above) | ||
| + * via a child process usine Electron as Node | ||
| + * @param {string} javascriptCode | ||
| + * @returns {Promise<Buffer>} - returns a Promise which resolves in the generated bytecode. | ||
| + */ | ||
| +const compileElectronCode = function (javascriptCode) { | ||
| + return new Promise((resolve, reject) => { | ||
| + let data = Buffer.from([]); | ||
| + | ||
| + const electronPath = path.join(path.dirname(require.resolve('electron')), 'cli.js'); | ||
| + if (!fs.existsSync(electronPath)) { | ||
| + throw new Error('Electron not installed'); | ||
| + } | ||
| + const bytenodePath = path.join(__dirname, 'cli.js'); | ||
| + | ||
| + // create a subprocess in which we run Electron as our Node and V8 engine | ||
| + // running Bytenode to compile our code through stdin/stdout | ||
| + const proc = fork(electronPath, [bytenodePath, '--compile', '--no-module', '-'], { | ||
| + env: { ELECTRON_RUN_AS_NODE: '1' }, | ||
| + stdio: ['pipe', 'pipe', 'pipe', 'ipc'] | ||
| + }); | ||
| + | ||
| + if (proc.stdin) { | ||
| + proc.stdin.write(javascriptCode); | ||
| + proc.stdin.end(); | ||
| + } | ||
| + | ||
| + if (proc.stdout) { | ||
| + proc.stdout.on('data', (chunk) => { | ||
| + data = Buffer.concat([data, chunk]); | ||
| + }); | ||
| + proc.stdout.on('error', (err) => { | ||
| + console.error(err); | ||
| + }); | ||
| + proc.stdout.on('end', () => { | ||
| + resolve(data); | ||
| + }); | ||
| + } | ||
| + | ||
| + if (proc.stderr) { | ||
| + proc.stderr.on('data', (chunk) => { | ||
| + console.error('Error: ', chunk.toString()); | ||
| + }); | ||
| + proc.stderr.on('error', (err) => { | ||
| + console.error('Error: ', err); | ||
| + }); | ||
| + } | ||
| + | ||
| + proc.addListener('message', (message) => console.log(message)); | ||
| + proc.addListener('error', err => console.error(err)); | ||
| + | ||
| + proc.on('error', (err) => reject(err)); | ||
| + proc.on('exit', () => { resolve(data); }); | ||
| + }); | ||
| +}; | ||
| + | ||
| +/** | ||
| + * Compiles JavaScript file to .jsc file. | ||
| + * @param {object|string} args | ||
| + * @param {string} args.filename The JavaScript source file that will be compiled | ||
| + * @param {boolean} [args.compileAsModule=true] If true, the output will be a commonjs module | ||
| + * @param {string} [args.output=filename.jsc] The output filename. Defaults to the same path and name of the original file, but with `.jsc` extension. | ||
| + * @param {boolean} [args.electron=false] If true, compile code for Electron (which needs to be installed) | ||
| + * @param {boolean} [args.createLoader=false] If true, create a loader file. | ||
| + * @param {boolean} [args.loaderFilename='%.loader.js'] Filename or pattern for generated loader files. Defaults to originalFilename.loader.js. Use % as a substitute for originalFilename. | ||
| + * @param {string} [output] The output filename. (Deprecated: use args.output instead) | ||
| + * @returns {Promise<string>} A Promise which returns the compiled filename | ||
| + */ | ||
| + const compileFile = async function (args, output) { | ||
| + let filename, compileAsModule, electron, createLoader, loaderFilename; | ||
| + | ||
| + if (typeof args === 'string') { | ||
| + filename = args; | ||
| + compileAsModule = true; | ||
| + electron = false; | ||
| + createLoader = false; | ||
| + } else if (typeof args === 'object') { | ||
| + filename = args.filename; | ||
| + compileAsModule = args.compileAsModule !== false; | ||
| + electron = args.electron; | ||
| + createLoader = args.createLoader; | ||
| + loaderFilename = args.loaderFilename; | ||
| + if (loaderFilename) createLoader = true; | ||
| + } | ||
| + | ||
| + if (typeof filename !== 'string') { | ||
| + throw new Error(`filename must be a string. ${typeof filename} was given.`); | ||
| + } | ||
| + | ||
| + // @ts-ignore | ||
| + const compiledFilename = args.output || output || filename.slice(0, -3) + COMPILED_EXTNAME; | ||
| + | ||
| + if (typeof compiledFilename !== 'string') { | ||
| + throw new Error(`output must be a string. ${typeof compiledFilename} was given.`); | ||
| + } | ||
| + | ||
| + const javascriptCode = fs.readFileSync(filename, 'utf-8'); | ||
| + | ||
| + let code; | ||
| + | ||
| + if (compileAsModule) { | ||
| + code = Module.wrap(javascriptCode.replace(/^#!.*/, '')); | ||
| + } else { | ||
| + code = javascriptCode.replace(/^#!.*/, ''); | ||
| + } | ||
| + | ||
| + let bytecodeBuffer; | ||
| + | ||
| + if (electron) { | ||
| + bytecodeBuffer = await compileElectronCode(code); | ||
| + } else { | ||
| + bytecodeBuffer = compileCode(code); | ||
| + } | ||
| + | ||
| + fs.writeFileSync(compiledFilename, bytecodeBuffer); | ||
| + | ||
| + if (createLoader) { | ||
| + addLoaderFile(compiledFilename, loaderFilename); | ||
| + } | ||
| + | ||
| + return compiledFilename; | ||
| +}; | ||
| + | ||
| +module.exports = { | ||
| + compileFile, | ||
| + compileElectronCode, | ||
| +}; | ||
| diff --git a/node_modules/bytenode/lib/index.js b/node_modules/bytenode/lib/index.js | ||
| index cdd98cc..3f451d8 100644 | ||
| --- a/node_modules/bytenode/lib/index.js | ||
| +++ b/node_modules/bytenode/lib/index.js | ||
| @@ -5,7 +5,6 @@ const vm = require('vm'); | ||
| const v8 = require('v8'); | ||
| const path = require('path'); | ||
| const Module = require('module'); | ||
| -const fork = require('child_process').fork; | ||
|
|
||
| v8.setFlagsFromString('--no-lazy'); | ||
|
|
||
| @@ -36,63 +35,6 @@ const compileCode = function (javascriptCode) { | ||
| return bytecodeBuffer; | ||
| }; | ||
|
|
||
| -/** | ||
| - * This function runs the compileCode() function (above) | ||
| - * via a child process usine Electron as Node | ||
| - * @param {string} javascriptCode | ||
| - * @returns {Promise<Buffer>} - returns a Promise which resolves in the generated bytecode. | ||
| - */ | ||
| -const compileElectronCode = function (javascriptCode) { | ||
| - return new Promise((resolve, reject) => { | ||
| - let data = Buffer.from([]); | ||
| - | ||
| - const electronPath = path.join(path.dirname(require.resolve('electron')), 'cli.js'); | ||
| - if (!fs.existsSync(electronPath)) { | ||
| - throw new Error('Electron not installed'); | ||
| - } | ||
| - const bytenodePath = path.join(__dirname, 'cli.js'); | ||
| - | ||
| - // create a subprocess in which we run Electron as our Node and V8 engine | ||
| - // running Bytenode to compile our code through stdin/stdout | ||
| - const proc = fork(electronPath, [bytenodePath, '--compile', '--no-module', '-'], { | ||
| - env: { ELECTRON_RUN_AS_NODE: '1' }, | ||
| - stdio: ['pipe', 'pipe', 'pipe', 'ipc'] | ||
| - }); | ||
| - | ||
| - if (proc.stdin) { | ||
| - proc.stdin.write(javascriptCode); | ||
| - proc.stdin.end(); | ||
| - } | ||
| - | ||
| - if (proc.stdout) { | ||
| - proc.stdout.on('data', (chunk) => { | ||
| - data = Buffer.concat([data, chunk]); | ||
| - }); | ||
| - proc.stdout.on('error', (err) => { | ||
| - console.error(err); | ||
| - }); | ||
| - proc.stdout.on('end', () => { | ||
| - resolve(data); | ||
| - }); | ||
| - } | ||
| - | ||
| - if (proc.stderr) { | ||
| - proc.stderr.on('data', (chunk) => { | ||
| - console.error('Error: ', chunk.toString()); | ||
| - }); | ||
| - proc.stderr.on('error', (err) => { | ||
| - console.error('Error: ', err); | ||
| - }); | ||
| - } | ||
| - | ||
| - proc.addListener('message', (message) => console.log(message)); | ||
| - proc.addListener('error', err => console.error(err)); | ||
| - | ||
| - proc.on('error', (err) => reject(err)); | ||
| - proc.on('exit', () => { resolve(data); }); | ||
| - }); | ||
| -}; | ||
| - | ||
| // TODO: rewrite this function | ||
| const fixBytecode = function (bytecodeBuffer) { | ||
| if (!Buffer.isBuffer(bytecodeBuffer)) { | ||
| @@ -136,119 +78,6 @@ const readSourceHash = function (bytecodeBuffer) { | ||
| } | ||
| }; | ||
|
|
||
| -/** | ||
| - * Runs v8 bytecode buffer and returns the result. | ||
| - * @param {Buffer} bytecodeBuffer The buffer object that was created using compileCode function. | ||
| - * @returns {any} The result of the very last statement executed in the script. | ||
| - */ | ||
| -const runBytecode = function (bytecodeBuffer) { | ||
| - if (!Buffer.isBuffer(bytecodeBuffer)) { | ||
| - throw new Error('bytecodeBuffer must be a buffer object.'); | ||
| - } | ||
| - | ||
| - fixBytecode(bytecodeBuffer); | ||
| - | ||
| - const length = readSourceHash(bytecodeBuffer); | ||
| - | ||
| - let dummyCode = ''; | ||
| - | ||
| - if (length > 1) { | ||
| - dummyCode = '"' + '\u200b'.repeat(length - 2) + '"'; // "\u200b" Zero width space | ||
| - } | ||
| - | ||
| - const script = new vm.Script(dummyCode, { | ||
| - cachedData: bytecodeBuffer | ||
| - }); | ||
| - | ||
| - if (script.cachedDataRejected) { | ||
| - throw new Error('Invalid or incompatible cached data (cachedDataRejected)'); | ||
| - } | ||
| - | ||
| - return script.runInThisContext(); | ||
| -}; | ||
| - | ||
| -/** | ||
| - * Compiles JavaScript file to .jsc file. | ||
| - * @param {object|string} args | ||
| - * @param {string} args.filename The JavaScript source file that will be compiled | ||
| - * @param {boolean} [args.compileAsModule=true] If true, the output will be a commonjs module | ||
| - * @param {string} [args.output=filename.jsc] The output filename. Defaults to the same path and name of the original file, but with `.jsc` extension. | ||
| - * @param {boolean} [args.electron=false] If true, compile code for Electron (which needs to be installed) | ||
| - * @param {boolean} [args.createLoader=false] If true, create a loader file. | ||
| - * @param {boolean} [args.loaderFilename='%.loader.js'] Filename or pattern for generated loader files. Defaults to originalFilename.loader.js. Use % as a substitute for originalFilename. | ||
| - * @param {string} [output] The output filename. (Deprecated: use args.output instead) | ||
| - * @returns {Promise<string>} A Promise which returns the compiled filename | ||
| - */ | ||
| -const compileFile = async function (args, output) { | ||
| - let filename, compileAsModule, electron, createLoader, loaderFilename; | ||
| - | ||
| - if (typeof args === 'string') { | ||
| - filename = args; | ||
| - compileAsModule = true; | ||
| - electron = false; | ||
| - createLoader = false; | ||
| - } else if (typeof args === 'object') { | ||
| - filename = args.filename; | ||
| - compileAsModule = args.compileAsModule !== false; | ||
| - electron = args.electron; | ||
| - createLoader = args.createLoader; | ||
| - loaderFilename = args.loaderFilename; | ||
| - if (loaderFilename) createLoader = true; | ||
| - } | ||
| - | ||
| - if (typeof filename !== 'string') { | ||
| - throw new Error(`filename must be a string. ${typeof filename} was given.`); | ||
| - } | ||
| - | ||
| - // @ts-ignore | ||
| - const compiledFilename = args.output || output || filename.slice(0, -3) + COMPILED_EXTNAME; | ||
| - | ||
| - if (typeof compiledFilename !== 'string') { | ||
| - throw new Error(`output must be a string. ${typeof compiledFilename} was given.`); | ||
| - } | ||
| - | ||
| - const javascriptCode = fs.readFileSync(filename, 'utf-8'); | ||
| - | ||
| - let code; | ||
| - | ||
| - if (compileAsModule) { | ||
| - code = Module.wrap(javascriptCode.replace(/^#!.*/, '')); | ||
| - } else { | ||
| - code = javascriptCode.replace(/^#!.*/, ''); | ||
| - } | ||
| - | ||
| - let bytecodeBuffer; | ||
| - | ||
| - if (electron) { | ||
| - bytecodeBuffer = await compileElectronCode(code); | ||
| - } else { | ||
| - bytecodeBuffer = compileCode(code); | ||
| - } | ||
| - | ||
| - fs.writeFileSync(compiledFilename, bytecodeBuffer); | ||
| - | ||
| - if (createLoader) { | ||
| - addLoaderFile(compiledFilename, loaderFilename); | ||
| - } | ||
| - | ||
| - return compiledFilename; | ||
| -}; | ||
| - | ||
| -/** | ||
| - * Runs .jsc file and returns the result. | ||
| - * @param {string} filename | ||
| - * @returns {any} The result of the very last statement executed in the script. | ||
| - */ | ||
| -const runBytecodeFile = function (filename) { | ||
| - if (typeof filename !== 'string') { | ||
| - throw new Error(`filename must be a string. ${typeof filename} was given.`); | ||
| - } | ||
| - | ||
| - const bytecodeBuffer = fs.readFileSync(filename); | ||
| - | ||
| - return runBytecode(bytecodeBuffer); | ||
| -}; | ||
| - | ||
| Module._extensions[COMPILED_EXTNAME] = function (fileModule, filename) { | ||
| const bytecodeBuffer = fs.readFileSync(filename); | ||
|
|
||
| @@ -308,39 +137,6 @@ Module._extensions[COMPILED_EXTNAME] = function (fileModule, filename) { | ||
| return compiledWrapper.apply(fileModule.exports, args); | ||
| }; | ||
|
|
||
| -/** | ||
| - * Add a loader file for a given .jsc file | ||
| - * @param {String} fileToLoad path of the .jsc file we're loading | ||
| - * @param {String} loaderFilename - optional pattern or name of the file to write - defaults to filename.loader.js. Patterns: "%" represents the root name of .jsc file. | ||
| - */ | ||
| -const addLoaderFile = function (fileToLoad, loaderFilename) { | ||
| - let loaderFilePath; | ||
| - if (typeof loaderFilename === 'boolean' || loaderFilename === undefined || loaderFilename === '') { | ||
| - loaderFilePath = fileToLoad.replace('.jsc', '.loader.js'); | ||
| - } else { | ||
| - loaderFilename = loaderFilename.replace('%', path.parse(fileToLoad).name); | ||
| - loaderFilePath = path.join(path.dirname(fileToLoad), loaderFilename); | ||
| - } | ||
| - const relativePath = path.relative(path.dirname(loaderFilePath), fileToLoad); | ||
| - const code = loaderCode('./' + relativePath); | ||
| - fs.writeFileSync(loaderFilePath, code); | ||
| -}; | ||
| - | ||
| -const loaderCode = function (targetPath) { | ||
| - return ` | ||
| - require('bytenode'); | ||
| - require('${targetPath}'); | ||
| - `; | ||
| -}; | ||
| - | ||
| -global.bytenode = { | ||
| +module.exports = { | ||
| compileCode, | ||
| - compileFile, | ||
| - compileElectronCode, | ||
| - runBytecode, | ||
| - runBytecodeFile, | ||
| - addLoaderFile, | ||
| - loaderCode | ||
| }; | ||
| - | ||
| -module.exports = global.bytenode; |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
8aafe38There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Circle has built the
linux x64version of the Test Runner.Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.
Run this command to install the pre-release locally:
8aafe38There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Circle has built the
linux arm64version of the Test Runner.Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.
Run this command to install the pre-release locally:
8aafe38There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Circle has built the
darwin arm64version of the Test Runner.Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.
Run this command to install the pre-release locally:
8aafe38There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Circle has built the
darwin x64version of the Test Runner.Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.
Run this command to install the pre-release locally:
8aafe38There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Circle has built the
win32 x64version of the Test Runner.Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.
Run this command to install the pre-release locally: