Skip to content

Commit 38ffac8

Browse files
committed
Move to @codemirror/buildhelper 1.0.0
1 parent 906aaef commit 38ffac8

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

bin/cm.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function status() {
114114
async function build() {
115115
console.info("Building...")
116116
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)
118118
console.info(`Done in ${((Date.now() - t0) / 1000).toFixed(2)}s`)
119119
}
120120

@@ -128,7 +128,7 @@ function startServer() {
128128
})
129129
require("http").createServer((req, resp) => {
130130
if (/^\/test\/?($|\?)/.test(req.url)) {
131-
let runTests = require("@codemirror/buildhelper/src/runtests")
131+
let runTests = require("@marijn/testtool")
132132
let {browserTests} = runTests.gatherTests(buildPackages.map(p => p.dir))
133133
resp.writeHead(200, {"content-type": "text/html"})
134134
resp.end(runTests.testHTML(browserTests.map(f => path.relative(serve, f)), false))
@@ -144,9 +144,10 @@ function startServer() {
144144

145145
function devserver(...args) {
146146
let options = {
147-
sourceMap : args.includes('--source-map')
147+
sourceMap : args.includes('--source-map'),
148+
...require("@codemirror/buildhelper/src/options").options
148149
}
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)
150151
startServer()
151152
}
152153

@@ -339,7 +340,7 @@ function buildReadme(name) {
339340
}
340341

341342
function test(...args) {
342-
let runTests = require("@codemirror/buildhelper/src/runtests")
343+
let runTests = require("@marijn/testtool")
343344
let {tests, browserTests} = runTests.gatherTests(buildPackages.map(p => p.dir))
344345
let browsers = [], grep, noBrowser = false
345346
for (let i = 0; i < args.length; i++) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"author": "Marijn Haverbeke <[email protected]>",
1010
"license": "MIT",
1111
"devDependencies": {
12-
"@codemirror/buildhelper": "^0.1.5",
12+
"@codemirror/buildhelper": "^1.0.0",
1313
"esmoduleserve": "^0.2.0",
1414
"serve-static": "^1.14.1",
1515
"getdocs-ts": "^0.1.0",

0 commit comments

Comments
 (0)