From 940aff7ef423f239546b17dc3f45cb83a8d8fa87 Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Wed, 17 Jun 2020 14:42:46 -0700
Subject: [PATCH] Enable globIgnorePaths by default

---
 .github/workflows/ci.yml |  8 +-------
 CHANGELOG.md             |  2 ++
 Cargo.toml               |  3 ---
 src/project.rs           |  1 -
 tests/tests/build.rs     | 10 +++-------
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 004858c7..02a6af3e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,10 +36,4 @@ jobs:
       run: |
         cargo fmt -- --check
         cargo clippy
-      if: matrix.rust_version == 'stable'
-
-    - name: Build (All Features)
-      run: cargo build --locked --verbose --all-features
-
-    - name: Run tests (All Features)
-      run: cargo test --locked --verbose --all-features
\ No newline at end of file
+      if: matrix.rust_version == 'stable'
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a445f299..f31ae289 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 * Fixed incorrect string escaping when producing Lua code from JSON files. ([#314](https://github.com/rojo-rbx/rojo/issues/314))
 * Fixed performance issues introduced in Rojo 6.0.0-rc.1. ([#317](https://github.com/rojo-rbx/rojo/issues/317))
 * Updated default place template to take advantage of [#210](https://github.com/rojo-rbx/rojo/pull/210).
+* Enabled glob ignore patterns by default and removed the `unstable_glob_ignore` feature.
+    * `globIgnorePaths` can be set on a project to a list of globs to ignore.
 
 ## [6.0.0 Release Candidate 1](https://github.com/rojo-rbx/rojo/releases/tag/v6.0.0-rc.1) (March 29, 2020)
 This release jumped from 0.6.0 to 6.0.0. Rojo has been in use in production for many users for quite a long times, and so 6.0 is a more accurate reflection of Rojo's version than a pre-1.0 version.
diff --git a/Cargo.toml b/Cargo.toml
index 96723065..57a08e35 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,9 +23,6 @@ panic = "abort"
 [features]
 default = []
 
-# Turn on support for specifying glob ignore path rules in the project format.
-unstable_glob_ignore_paths = []
-
 # Enable this feature to live-reload assets from the web UI.
 dev_live_assets = []
 
diff --git a/src/project.rs b/src/project.rs
index 12134dc9..4d29c72a 100644
--- a/src/project.rs
+++ b/src/project.rs
@@ -61,7 +61,6 @@ pub struct Project {
     /// A list of globs, relative to the folder the project file is in, that
     /// match files that should be excluded if Rojo encounters them.
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    #[cfg_attr(not(feature = "unstable_glob_ignore_paths"), serde(skip))]
     pub glob_ignore_paths: Vec<Glob>,
 
     /// The path to the file that this project came from. Relative paths in the
diff --git a/tests/tests/build.rs b/tests/tests/build.rs
index 2f5fc76a..3cb286eb 100644
--- a/tests/tests/build.rs
+++ b/tests/tests/build.rs
@@ -28,6 +28,9 @@ gen_build_tests! {
     csv_in_folder,
     deep_nesting,
     gitkeep,
+    ignore_glob_inner,
+    ignore_glob_nested,
+    ignore_glob_spec,
     infer_service_name,
     infer_starter_player,
     init_meta_class_name,
@@ -48,13 +51,6 @@ gen_build_tests! {
     txt_in_folder,
 }
 
-#[cfg(feature = "unstable_glob_ignore_paths")]
-gen_build_tests! {
-    ignore_glob_inner,
-    ignore_glob_nested,
-    ignore_glob_spec,
-}
-
 fn run_build_test(test_name: &str) {
     let working_dir = get_working_dir_path();