Skip to content

Commit 0de8beb

Browse files
authored
Updated npm dependencies (#3582)
1 parent a7e4547 commit 0de8beb

File tree

10 files changed

+429
-218
lines changed

10 files changed

+429
-218
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.idea/
22
.ionide/
33

4+
build/
45
node_modules/
56
temp*/
67
*.fs.js

.vscode/launch.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,17 @@
264264
"FABLE_LIBRARY",
265265
"--noCache"
266266
]
267+
},
268+
{
269+
"name": "Fable.Cli on ../fable-test",
270+
"type": "coreclr",
271+
"request": "launch",
272+
"preLaunchTask": "build",
273+
"program": "${workspaceRoot}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
274+
"args": ["--outDir", "${workspaceRoot}/../fable-test", "--fableLib", "../../Fable/build/fable-library-rust", "--exclude", "Fable.Core", "--lang", "Rust", "--noCache"],
275+
"cwd": "${workspaceRoot}/../fable-test",
276+
"stopAtEntry": false,
277+
"console": "internalConsole"
267278
}
268279
]
269280
}

build_old.fsx

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,12 @@ let buildWorker (opts: {| minify: bool; watch: bool |}) =
328328

329329
let projectDir = "src/fable-standalone/src"
330330
let buildDir = "build/fable-standalone"
331+
let fableLib = "./build/fable-library"
331332
let distDir = "src/fable-standalone/dist"
332333

333334
runFableWithArgs (projectDir + "/Worker") [
334335
"--outDir " + buildDir + "/worker"
336+
"--fableLib " + fableLib
335337
]
336338

337339
let rollupTarget =
@@ -360,6 +362,7 @@ let buildStandalone (opts: {| minify: bool; watch: bool |}) =
360362

361363
let projectDir = "src/fable-standalone/src"
362364
let buildDir = "build/fable-standalone"
365+
let fableLib = "./build/fable-library"
363366
let distDir = "src/fable-standalone/dist"
364367

365368
let rollupTarget =
@@ -386,6 +389,7 @@ let buildStandalone (opts: {| minify: bool; watch: bool |}) =
386389
// build standalone bundle
387390
runFableWithArgs projectDir [
388391
"--outDir " + buildDir </> "bundle"
392+
"--fableLib " + fableLib
389393
if opts.watch then
390394
"--watch"
391395
"--run rollup"
@@ -413,6 +417,7 @@ let buildStandalone (opts: {| minify: bool; watch: bool |}) =
413417
let buildCompilerJs(minify: bool) =
414418
let projectDir = "src/fable-compiler-js/src"
415419
let buildDir = "build/fable-compiler-js"
420+
let fableLib = "./build/fable-library"
416421
let distDir = "src/fable-compiler-js/dist"
417422

418423
if not (pathExists "build/fable-standalone") then
@@ -423,6 +428,7 @@ let buildCompilerJs(minify: bool) =
423428

424429
runFableWithArgs projectDir [
425430
"--outDir " + buildDir
431+
"--fableLib " + fableLib
426432
"--exclude Fable.Core"
427433
]
428434

@@ -468,12 +474,14 @@ let testReact() =
468474
let compileAndRunTestsWithMocha clean projectName =
469475
let projectDir = "tests/Js/" + projectName
470476
let buildDir = "build/tests/Js/" + projectName
477+
let fableLib = "./build/fable-library"
471478

472479
if clean then
473480
cleanDirs [buildDir]
474481

475482
runFableWithArgs projectDir [
476483
"--outDir " + buildDir
484+
"--fableLib " + fableLib
477485
"--exclude Fable.Core"
478486
]
479487

@@ -487,10 +495,12 @@ let testProjectConfigs() =
487495
]
488496
|> List.iter (fun (projectDir, configuration) ->
489497
let buildDir = "build/"+ projectDir
498+
let fableLib = "./build/fable-library"
490499

491500
cleanDirs [ buildDir ]
492501
runFableWithArgs projectDir [
493502
"--outDir " + buildDir
503+
"--fableLib " + fableLib
494504
"--exclude Fable.Core"
495505
if not(String.IsNullOrEmpty configuration) then
496506
"--configuration " + configuration
@@ -526,6 +536,7 @@ let testTypeScript isWatch =
526536
let projectDir = "tests/TypeScript"
527537
let buildDir = "build/tests/TypeScript"
528538
let buildDir2 = "build/tests/TypeScriptCompiled"
539+
let fableLib = "fable-library-ts"
529540

530541
cleanDirs [buildDir; buildDir2]
531542

@@ -535,6 +546,7 @@ let testTypeScript isWatch =
535546
projectDir
536547
"--lang ts"
537548
"--outDir " + buildDir
549+
"--fableLib " + fableLib
538550
"--exclude Fable.Core"
539551
if isWatch then
540552
"--watch"
@@ -548,11 +560,13 @@ let testPython() =
548560

549561
let projectDir = "tests/Python"
550562
let buildDir = "build/tests/Python"
563+
let fableLib = "fable-library-py"
551564

552565
cleanDirs [buildDir]
553566
runInDir projectDir "dotnet test -c Release"
554567
runFableWithArgs projectDir [
555568
"--outDir " + buildDir
569+
"--fableLib " + fableLib
556570
"--exclude Fable.Core"
557571
"--lang Python"
558572
]
@@ -573,6 +587,7 @@ let testRust testMode =
573587
let testAstDir = "src/Fable.Transforms/Rust/AST/Tests"
574588
let projectDir = "tests/Rust"
575589
let buildDir = "build/tests/Rust"
590+
let fableLib = "fable-library-rust"
576591

577592
// limited cleanup to reduce IO churn, speed up rebuilds,
578593
// and save the ssd (target folder can get huge)
@@ -593,7 +608,7 @@ let testRust testMode =
593608
"--outDir " + buildDir
594609
"--exclude Fable.Core"
595610
"--lang Rust"
596-
"--fableLib fable-library-rust"
611+
"--fableLib " + fableLib
597612
"--noCache"
598613
if testMode = NoStd then "--define NO_STD_NO_EXCEPTIONS"
599614
]

0 commit comments

Comments
 (0)