Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
8376e329
Commit
8376e329
authored
Sep 12, 2018
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't browserify signale
parent
9ad8db99
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
27 deletions
+28
-27
compiler.js
remix-solidity/src/compiler/compiler.js
+1
-1
compiler.js
remix-tests/src/compiler.js
+5
-3
index.js
remix-tests/src/index.js
+22
-23
No files found.
remix-solidity/src/compiler/compiler.js
View file @
8376e329
...
@@ -73,7 +73,7 @@ function Compiler (handleImportCall) {
...
@@ -73,7 +73,7 @@ function Compiler (handleImportCall) {
function
onInternalCompilerLoaded
()
{
function
onInternalCompilerLoaded
()
{
if
(
worker
===
null
)
{
if
(
worker
===
null
)
{
var
compiler
var
compiler
var
userAgent
=
(
typeof
(
navigator
)
!=
'undefined'
)
&&
navigator
.
userAgent
?
navigator
.
userAgent
.
toLowerCase
()
:
"-"
var
userAgent
=
(
typeof
(
navigator
)
!=
=
'undefined'
)
&&
navigator
.
userAgent
?
navigator
.
userAgent
.
toLowerCase
()
:
'-'
if
(
typeof
(
window
)
===
'undefined'
||
userAgent
.
indexOf
(
' electron/'
)
>
-
1
)
{
if
(
typeof
(
window
)
===
'undefined'
||
userAgent
.
indexOf
(
' electron/'
)
>
-
1
)
{
compiler
=
require
(
'solc'
)
compiler
=
require
(
'solc'
)
}
else
{
}
else
{
...
...
remix-tests/src/compiler.js
View file @
8376e329
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
let
fs
=
require
(
'fs'
)
let
fs
=
require
(
'fs'
)
var
async
=
require
(
'async'
)
var
async
=
require
(
'async'
)
var
path
=
require
(
'path'
)
var
path
=
require
(
'path'
)
const
signale
=
require
(
'signale'
)
let
RemixCompiler
=
require
(
'remix-solidity'
).
Compiler
let
RemixCompiler
=
require
(
'remix-solidity'
).
Compiler
String
.
prototype
.
regexIndexOf
=
function
(
regex
,
startpos
)
{
String
.
prototype
.
regexIndexOf
=
function
(
regex
,
startpos
)
{
...
@@ -10,6 +9,9 @@ String.prototype.regexIndexOf = function (regex, startpos) {
...
@@ -10,6 +9,9 @@ String.prototype.regexIndexOf = function (regex, startpos) {
return
(
indexOf
>=
0
)
?
(
indexOf
+
(
startpos
||
0
))
:
indexOf
return
(
indexOf
>=
0
)
?
(
indexOf
+
(
startpos
||
0
))
:
indexOf
}
}
var
userAgent
=
(
typeof
(
navigator
)
!==
'undefined'
)
&&
navigator
.
userAgent
?
navigator
.
userAgent
.
toLowerCase
()
:
'-'
var
isBrowser
=
!
(
typeof
(
window
)
===
'undefined'
||
userAgent
.
indexOf
(
' electron/'
)
>
-
1
)
// TODO: replace this with remix's own compiler code
// TODO: replace this with remix's own compiler code
function
compileFileOrFiles
(
filename
,
isDirectory
,
cb
)
{
function
compileFileOrFiles
(
filename
,
isDirectory
,
cb
)
{
let
compiler
,
filepath
let
compiler
,
filepath
...
@@ -52,7 +54,7 @@ function compileFileOrFiles (filename, isDirectory, cb) {
...
@@ -52,7 +54,7 @@ function compileFileOrFiles (filename, isDirectory, cb) {
],
function
(
err
,
result
)
{
],
function
(
err
,
result
)
{
let
errors
=
(
result
.
errors
||
[]).
filter
((
e
)
=>
e
.
type
===
'Error'
||
e
.
severity
===
'error'
)
let
errors
=
(
result
.
errors
||
[]).
filter
((
e
)
=>
e
.
type
===
'Error'
||
e
.
severity
===
'error'
)
if
(
errors
.
length
>
0
)
{
if
(
errors
.
length
>
0
)
{
signale
.
fatal
(
errors
)
if
(
!
isBrowser
)
require
(
'signale'
)
.
fatal
(
errors
)
return
cb
(
new
Error
(
'errors compiling'
))
return
cb
(
new
Error
(
'errors compiling'
))
}
}
cb
(
err
,
result
.
contracts
)
cb
(
err
,
result
.
contracts
)
...
@@ -91,7 +93,7 @@ function compileContractSources (sources, importFileCb, cb) {
...
@@ -91,7 +93,7 @@ function compileContractSources (sources, importFileCb, cb) {
],
function
(
err
,
result
)
{
],
function
(
err
,
result
)
{
let
errors
=
(
result
.
errors
||
[]).
filter
((
e
)
=>
e
.
type
===
'Error'
||
e
.
severity
===
'error'
)
let
errors
=
(
result
.
errors
||
[]).
filter
((
e
)
=>
e
.
type
===
'Error'
||
e
.
severity
===
'error'
)
if
(
errors
.
length
>
0
)
{
if
(
errors
.
length
>
0
)
{
signale
.
fatal
(
errors
)
if
(
!
isBrowser
)
require
(
'signale'
)
.
fatal
(
errors
)
return
cb
(
new
Error
(
'errors compiling'
))
return
cb
(
new
Error
(
'errors compiling'
))
}
}
cb
(
err
,
result
.
contracts
)
cb
(
err
,
result
.
contracts
)
...
...
remix-tests/src/index.js
View file @
8376e329
const
async
=
require
(
'async'
)
const
async
=
require
(
'async'
)
const
path
=
require
(
'path'
)
const
path
=
require
(
'path'
)
const
fs
=
require
(
'fs'
)
const
fs
=
require
(
'fs'
)
const
{
Signale
}
=
require
(
'signale'
)
require
(
'colors'
)
require
(
'colors'
)
let
Compiler
=
require
(
'./compiler.js'
)
let
Compiler
=
require
(
'./compiler.js'
)
...
@@ -17,28 +16,6 @@ var createWeb3Provider = function () {
...
@@ -17,28 +16,6 @@ var createWeb3Provider = function () {
return
web3
return
web3
}
}
// signale configuration
const
options
=
{
types
:
{
result
:
{
badge
:
'
\
t✓'
,
label
:
''
,
color
:
'greenBright'
},
name
:
{
badge
:
'
\
n
\
t◼'
,
label
:
''
,
color
:
'white'
},
error
:
{
badge
:
'
\
t✘'
,
label
:
''
,
color
:
'redBright'
}
}
}
const
signale
=
new
Signale
(
options
)
var
runTestSources
=
function
(
contractSources
,
testCallback
,
resultCallback
,
finalCallback
,
importFileCb
)
{
var
runTestSources
=
function
(
contractSources
,
testCallback
,
resultCallback
,
finalCallback
,
importFileCb
)
{
async
.
waterfall
([
async
.
waterfall
([
function
compile
(
next
)
{
function
compile
(
next
)
{
...
@@ -119,6 +96,28 @@ var runTestSources = function (contractSources, testCallback, resultCallback, fi
...
@@ -119,6 +96,28 @@ var runTestSources = function (contractSources, testCallback, resultCallback, fi
}
}
var
runTestFiles
=
function
(
filepath
,
isDirectory
,
web3
)
{
var
runTestFiles
=
function
(
filepath
,
isDirectory
,
web3
)
{
const
{
Signale
}
=
require
(
'signale'
)
// signale configuration
const
options
=
{
types
:
{
result
:
{
badge
:
'
\
t✓'
,
label
:
''
,
color
:
'greenBright'
},
name
:
{
badge
:
'
\
n
\
t◼'
,
label
:
''
,
color
:
'white'
},
error
:
{
badge
:
'
\
t✘'
,
label
:
''
,
color
:
'redBright'
}
}
}
const
signale
=
new
Signale
(
options
)
async
.
waterfall
([
async
.
waterfall
([
function
compile
(
next
)
{
function
compile
(
next
)
{
Compiler
.
compileFileOrFiles
(
filepath
,
isDirectory
,
next
)
Compiler
.
compileFileOrFiles
(
filepath
,
isDirectory
,
next
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment