Merge branch 'master' into feat-test-coverage

.dprintrc.json

@@ -14,6 +14,7 @@
   "excludes": [
     ".cargo_home",
     "cli/dts",
+    "cli/tests/encoding",
     "cli/tsc/*typescript.js",
     "gh-pages",
     "std/**/testdata",
@@ -24,8 +25,8 @@
     "third_party"
   ],
   "plugins": [
-    "https://plugins.dprint.dev/typescript-0.19.9.wasm",
-    "https://plugins.dprint.dev/json-0.4.1.wasm",
-    "https://plugins.dprint.dev/markdown-0.2.4.wasm"
+    "https://plugins.dprint.dev/typescript-0.29.0.wasm",
+    "https://plugins.dprint.dev/json-0.7.0.wasm",
+    "https://plugins.dprint.dev/markdown-0.4.0.wasm"
   ]
 }

.gitattributes

@@ -2,7 +2,13 @@
 * text=auto eol=lf
 *.png -text
 
+/cli/tests/encoding/* -text
+
 # Tell git which symlinks point to files, and which ones point to directories.
 # This is relevant for Windows only, and requires git >= 2.19.2 to work.
-/core/libdeno/* symlink=dir
 /cli/tests/symlink_to_subdir symlink=dir
+
+# Tell github these are vendored files.
+# Doesn't include them in the language statistics.
+/cli/tsc/00_typescript.js linguist-vendored
+/cli/dts/* linguist-vendored

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         config:
-          - os: macOS-latest
+          - os: macos-10.15
             kind: test_release
           - os: windows-2019
             kind: test_release
@@ -61,12 +61,12 @@ jobs:
           !startsWith(github.ref, 'refs/tags/std/')
         run: |
           mkdir -p target/release
-          tar --exclude=.cargo_home --exclude=".git*" --exclude=target --exclude=deno_typescript/typescript/tests --exclude=third_party/cpplint --exclude=third_party/node_modules --exclude=third_party/python_packages --exclude=third_party/prebuilt -czvf target/release/deno_src.tar.gz -C .. deno
+          tar --exclude=.cargo_home --exclude=".git*" --exclude=target --exclude=third_party/node_modules --exclude=third_party/python_packages --exclude=third_party/prebuilt -czvf target/release/deno_src.tar.gz -C .. deno
 
       - name: Install rust
         uses: hecrj/setup-rust-action@v1
         with:
-          rust-version: 1.45.0
+          rust-version: 1.45.2
 
       - name: Install rust targets
         run: |
@@ -233,9 +233,10 @@ jobs:
         run: |
           cd core
           cargo publish
-          cd ../deno_typescript
           sleep 30
+          cd ../op_crates/web
           cargo publish
-          cd ../cli
+          sleep 30
+          cd ../../cli
           sleep 30
           cargo publish