summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2023-02-23 20:43:18 +0100
committerGitHub <noreply@github.com>2023-02-23 20:43:18 +0100
commit4773d07974167b565ba84d5603a6d6f70cd12660 (patch)
treeb28247a630c8077be25cc66524d36f37c1dfca5b
parent451b45ee3a26ed6e393c3deba86937e1a6dc5649 (diff)
feat(task): adjust warning (#17904)
Put it on a single line and remove coloring.
-rw-r--r--cli/tests/testdata/task/both/package_json_selected.out3
-rw-r--r--cli/tests/testdata/task/npx/non_existent.out3
-rw-r--r--cli/tests/testdata/task/npx/on_own.out3
-rw-r--r--cli/tests/testdata/task/package_json/bin.out3
-rw-r--r--cli/tools/task.rs3
5 files changed, 5 insertions, 10 deletions
diff --git a/cli/tests/testdata/task/both/package_json_selected.out b/cli/tests/testdata/task/both/package_json_selected.out
index 1d6c7dade..435145deb 100644
--- a/cli/tests/testdata/task/both/package_json_selected.out
+++ b/cli/tests/testdata/task/both/package_json_selected.out
@@ -1,7 +1,6 @@
Download http://localhost:4545/npm/registry/@denotest/bin
Download http://localhost:4545/npm/registry/@denotest/bin/1.0.0.tgz
-Warning Currently only basic package.json `scripts` are supported.
-Programs like `rimraf` or `cross-env` will not work correctly. This will be fixed in the upcoming release.
+Warning Currently only basic package.json `scripts` are supported. Programs like `rimraf` or `cross-env` will not work correctly. This will be fixed in the upcoming release.
Task bin cli-esm testing this out "asdf"
testing
this
diff --git a/cli/tests/testdata/task/npx/non_existent.out b/cli/tests/testdata/task/npx/non_existent.out
index 666435787..b08d29ece 100644
--- a/cli/tests/testdata/task/npx/non_existent.out
+++ b/cli/tests/testdata/task/npx/non_existent.out
@@ -1,4 +1,3 @@
-Warning Currently only basic package.json `scripts` are supported.
-Programs like `rimraf` or `cross-env` will not work correctly. This will be fixed in the upcoming release.
+Warning Currently only basic package.json `scripts` are supported. Programs like `rimraf` or `cross-env` will not work correctly. This will be fixed in the upcoming release.
Task non-existent npx this-command-should-not-exist-for-you
npx: could not resolve command 'this-command-should-not-exist-for-you'
diff --git a/cli/tests/testdata/task/npx/on_own.out b/cli/tests/testdata/task/npx/on_own.out
index 9d4184fbf..80d8ed9db 100644
--- a/cli/tests/testdata/task/npx/on_own.out
+++ b/cli/tests/testdata/task/npx/on_own.out
@@ -1,4 +1,3 @@
-Warning Currently only basic package.json `scripts` are supported.
-Programs like `rimraf` or `cross-env` will not work correctly. This will be fixed in the upcoming release.
+Warning Currently only basic package.json `scripts` are supported. Programs like `rimraf` or `cross-env` will not work correctly. This will be fixed in the upcoming release.
Task on-own npx
npx: missing command
diff --git a/cli/tests/testdata/task/package_json/bin.out b/cli/tests/testdata/task/package_json/bin.out
index bc4687e30..d8594a243 100644
--- a/cli/tests/testdata/task/package_json/bin.out
+++ b/cli/tests/testdata/task/package_json/bin.out
@@ -1,8 +1,7 @@
Download http://localhost:4545/npm/registry/@denotest/bin
Download http://localhost:4545/npm/registry/@denotest/bin/0.5.0.tgz
Download http://localhost:4545/npm/registry/@denotest/bin/1.0.0.tgz
-Warning Currently only basic package.json `scripts` are supported.
-Programs like `rimraf` or `cross-env` will not work correctly. This will be fixed in the upcoming release.
+Warning Currently only basic package.json `scripts` are supported. Programs like `rimraf` or `cross-env` will not work correctly. This will be fixed in the upcoming release.
Task bin @denotest/bin hi && cli-esm testing this out && npx cli-cjs test "extra"
hi
testing
diff --git a/cli/tools/task.rs b/cli/tools/task.rs
index 0eb0d14e3..721c47696 100644
--- a/cli/tools/task.rs
+++ b/cli/tools/task.rs
@@ -72,10 +72,9 @@ pub async fn execute_script(
};
let script = get_script_with_args(script, &ps);
log::info!(
- "{} Currently only basic package.json `scripts` are supported.",
+ "{} Currently only basic package.json `scripts` are supported. Programs like `rimraf` or `cross-env` will not work correctly. This will be fixed in the upcoming release.",
colors::yellow("Warning"),
);
- log::info!("{}", colors::gray("Programs like `rimraf` or `cross-env` will not work correctly. This will be fixed in the upcoming release."));
output_task(task_name, &script);
let seq_list = deno_task_shell::parser::parse(&script)
.with_context(|| format!("Error parsing script '{task_name}'."))?;