diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | BUILD.gn | 22 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | Roadmap.md | 2 | ||||
| -rw-r--r-- | deno.gni | 2 | ||||
| -rw-r--r-- | js/deno.d.ts (renamed from src/js/deno.d.ts) | 0 | ||||
| -rw-r--r-- | js/main.ts (renamed from src/js/main.ts) | 0 | ||||
| -rw-r--r-- | js/mock_runtime.js (renamed from src/js/mock_runtime.js) | 0 | ||||
| -rw-r--r-- | js/msg.pb.d.ts (renamed from src/js/msg.pb.d.ts) | 0 | ||||
| -rw-r--r-- | js/msg.pb.js (renamed from src/js/msg.pb.js) | 0 | ||||
| -rw-r--r-- | js/package.json (renamed from src/js/package.json) | 0 | ||||
| -rwxr-xr-x | js/pbjs_hack.py (renamed from src/js/pbjs_hack.py) | 0 | ||||
| -rwxr-xr-x | js/run_node.py (renamed from src/js/run_node.py) | 0 | ||||
| -rw-r--r-- | js/yarn.lock (renamed from src/js/yarn.lock) | 0 | ||||
| -rwxr-xr-x | tools/format.sh | 14 | ||||
| -rw-r--r-- | tsconfig.json (renamed from src/js/tsconfig.json) | 4 |
16 files changed, 25 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index c73da8c94..d6a947810 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ branches: cache: ccache: true directories: - - src/js/node_modules/ + - js/node_modules/ - $DEPOT_TOOLS_PATH - $BUILD_PATH env: @@ -28,7 +28,7 @@ install: - curl -sSf https://sh.rustup.rs | sh -s -- -y - export PATH=$HOME/.cargo/bin:$PATH - rustc --version - - (cd src/js; yarn) + - (cd js; yarn) - gclient sync -j2 --no-history # ccache needs the custom LLVM to be in PATH and other variables. - export PATH=`pwd`/third_party/llvm-build/Release+Asserts/bin:$PATH @@ -98,10 +98,10 @@ proto_library("msg_proto") { run_node("bundle") { out_dir = "$target_gen_dir/bundle/" sources = [ - "src/js/main.ts", - "src/js/msg.pb.d.ts", - "src/js/msg.pb.js", - "src/js/package.json", # The `browserslist` field controls Babel behavior. + "js/main.ts", + "js/msg.pb.d.ts", + "js/msg.pb.js", + "js/package.json", # The `browserslist` field controls Babel behavior. ] outputs = [ out_dir + "main.js", @@ -116,19 +116,19 @@ run_node("bundle") { "--no-minify", "--out-dir", rebase_path(out_dir, root_build_dir), - rebase_path("src/js/main.ts", root_build_dir), + rebase_path("js/main.ts", root_build_dir), ] } # Due to bugs in Parcel we must run TSC independently in order to catch errors. # https://github.com/parcel-bundler/parcel/issues/954 run_node("run_tsc") { - main = "src/js/main.ts" - tsconfig = "src/js/tsconfig.json" + main = "js/main.ts" + tsconfig = "tsconfig.json" out_dir = "$target_gen_dir/tsc_dist/" sources = [ - "src/js/msg.pb.d.ts", - "src/js/msg.pb.js", + "js/msg.pb.d.ts", + "js/msg.pb.js", main, tsconfig, ] @@ -156,7 +156,7 @@ run_node("run_tsc") { # be removed at some point. If msg.proto is changed, commit changes to the # generated JS files. The stamp file is just to make gn work. action("protobufjs") { - script = "src/js/pbjs_hack.py" + script = "js/pbjs_hack.py" sources = [ "src/msg.proto", ] @@ -180,6 +180,6 @@ create_snapshot("deno") { # Generates $target_gen_dir/snapshot_mock_runtime.cc create_snapshot("mock_runtime") { testonly = true - js = "src/js/mock_runtime.js" + js = "js/mock_runtime.js" deps = [] } @@ -80,7 +80,7 @@ gclient sync --no-history Install the javascript deps. - (cd src/js; yarn install) + (cd js; yarn install) gn gen out/Debug --args='cc_wrapper="ccache" is_debug=true ' diff --git a/Roadmap.md b/Roadmap.md index 6728c4a4a..bfcd1d08e 100644 --- a/Roadmap.md +++ b/Roadmap.md @@ -157,7 +157,7 @@ infrastructure. The current implementation is out of sync with this document: -https://github.com/ry/deno/blob/master/src/js/deno.d.ts +https://github.com/ry/deno/blob/master/js/deno.d.ts #### L1 Examples @@ -1,7 +1,7 @@ template("run_node") { action(target_name) { forward_variables_from(invoker, "*") - script = "src/js/run_node.py" + script = "js/run_node.py" } } diff --git a/src/js/deno.d.ts b/js/deno.d.ts index 4f8a7bc3d..4f8a7bc3d 100644 --- a/src/js/deno.d.ts +++ b/js/deno.d.ts diff --git a/src/js/main.ts b/js/main.ts index d2d61f419..d2d61f419 100644 --- a/src/js/main.ts +++ b/js/main.ts diff --git a/src/js/mock_runtime.js b/js/mock_runtime.js index bb814e7c8..bb814e7c8 100644 --- a/src/js/mock_runtime.js +++ b/js/mock_runtime.js diff --git a/src/js/msg.pb.d.ts b/js/msg.pb.d.ts index 1bfb94f38..1bfb94f38 100644 --- a/src/js/msg.pb.d.ts +++ b/js/msg.pb.d.ts diff --git a/src/js/msg.pb.js b/js/msg.pb.js index 6cfd473ba..6cfd473ba 100644 --- a/src/js/msg.pb.js +++ b/js/msg.pb.js diff --git a/src/js/package.json b/js/package.json index 60199e609..60199e609 100644 --- a/src/js/package.json +++ b/js/package.json diff --git a/src/js/pbjs_hack.py b/js/pbjs_hack.py index 19b7c1691..19b7c1691 100755 --- a/src/js/pbjs_hack.py +++ b/js/pbjs_hack.py diff --git a/src/js/run_node.py b/js/run_node.py index 506f2be4c..506f2be4c 100755 --- a/src/js/run_node.py +++ b/js/run_node.py diff --git a/src/js/yarn.lock b/js/yarn.lock index 412b8c005..412b8c005 100644 --- a/src/js/yarn.lock +++ b/js/yarn.lock diff --git a/tools/format.sh b/tools/format.sh index 40531748e..eb5a0b307 100755 --- a/tools/format.sh +++ b/tools/format.sh @@ -7,14 +7,14 @@ gn format BUILD.gn gn format deno.gni gn format .gn -yapf -i src/js/*.py +yapf -i js/*.py prettier --write \ - src/js/deno.d.ts \ - src/js/main.ts \ - src/js/mock_runtime.js \ - src/js/tsconfig.json + js/deno.d.ts \ + js/main.ts \ + js/mock_runtime.js \ + tsconfig.json # Do not format these. -# src/js/msg.pb.js -# src/js/msg.pb.d.ts +# js/msg.pb.js +# js/msg.pb.d.ts rustfmt --write-mode overwrite src/*.rs diff --git a/src/js/tsconfig.json b/tsconfig.json index e9d42d62d..3a5161c55 100644 --- a/src/js/tsconfig.json +++ b/tsconfig.json @@ -13,6 +13,6 @@ "allowUnreachableCode": false, "experimentalDecorators": true }, - "include": ["**/*.ts", "**/*.js"], - "exclude": ["mock_runtime.js", "node_modules"] + "include": ["js/**/*.ts", "js/**/*.js"], + "exclude": ["js/mock_runtime.js", "js/node_modules"] } |