@@ -114,7 +114,7 @@ function status() {
114
114
async function build ( ) {
115
115
console . info ( "Building..." )
116
116
let t0 = Date . now ( )
117
- await require ( "@codemirror/buildhelper " ) . build ( buildPackages . map ( p => p . main ) )
117
+ await require ( "@marijn/buildtool " ) . build ( buildPackages . map ( p => p . main ) , require ( "@codemirror/buildhelper/src/options" ) . options )
118
118
console . info ( `Done in ${ ( ( Date . now ( ) - t0 ) / 1000 ) . toFixed ( 2 ) } s` )
119
119
}
120
120
@@ -128,7 +128,7 @@ function startServer() {
128
128
} )
129
129
require ( "http" ) . createServer ( ( req , resp ) => {
130
130
if ( / ^ \/ t e s t \/ ? ( $ | \? ) / . test ( req . url ) ) {
131
- let runTests = require ( "@codemirror/buildhelper/src/runtests " )
131
+ let runTests = require ( "@marijn/testtool " )
132
132
let { browserTests} = runTests . gatherTests ( buildPackages . map ( p => p . dir ) )
133
133
resp . writeHead ( 200 , { "content-type" : "text/html" } )
134
134
resp . end ( runTests . testHTML ( browserTests . map ( f => path . relative ( serve , f ) ) , false ) )
@@ -144,9 +144,10 @@ function startServer() {
144
144
145
145
function devserver ( ...args ) {
146
146
let options = {
147
- sourceMap : args . includes ( '--source-map' )
147
+ sourceMap : args . includes ( '--source-map' ) ,
148
+ ...require ( "@codemirror/buildhelper/src/options" ) . options
148
149
}
149
- require ( "@codemirror/buildhelper " ) . watch ( buildPackages . map ( p => p . main ) . filter ( f => f ) , [ join ( root , "demo/demo.ts" ) ] , options )
150
+ require ( "@marijn/buildtool " ) . watch ( buildPackages . map ( p => p . main ) . filter ( f => f ) , [ join ( root , "demo/demo.ts" ) ] , options )
150
151
startServer ( )
151
152
}
152
153
@@ -339,7 +340,7 @@ function buildReadme(name) {
339
340
}
340
341
341
342
function test ( ...args ) {
342
- let runTests = require ( "@codemirror/buildhelper/src/runtests " )
343
+ let runTests = require ( "@marijn/testtool " )
343
344
let { tests, browserTests} = runTests . gatherTests ( buildPackages . map ( p => p . dir ) )
344
345
let browsers = [ ] , grep , noBrowser = false
345
346
for ( let i = 0 ; i < args . length ; i ++ ) {
0 commit comments