diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json index 199c83d4f81..2d26ca55ef2 100644 --- a/app/assets/javascripts/admin/package.json +++ b/app/assets/javascripts/admin/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json index 61de38645e7..f804413fd24 100644 --- a/app/assets/javascripts/discourse-common/package.json +++ b/app/assets/javascripts/discourse-common/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-hbr/package.json b/app/assets/javascripts/discourse-hbr/package.json index f443450f2a8..41517f42de7 100644 --- a/app/assets/javascripts/discourse-hbr/package.json +++ b/app/assets/javascripts/discourse-hbr/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json index 4787f2640ae..fae09160933 100644 --- a/app/assets/javascripts/discourse-widget-hbs/package.json +++ b/app/assets/javascripts/discourse-widget-hbs/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/package.json b/app/assets/javascripts/discourse/lib/bootstrap-json/package.json index 50d5b34ef2c..5c86ee721a6 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/package.json +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/package.json @@ -11,7 +11,7 @@ ] }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" } diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index 9bfd19569ba..550b1594f5b 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -66,7 +66,7 @@ "virtual-dom": "^2.1.1" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json index f2823ac6fa1..1ec1e8c21b6 100644 --- a/app/assets/javascripts/pretty-text/package.json +++ b/app/assets/javascripts/pretty-text/package.json @@ -45,7 +45,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json index 67f0723434c..3dd5bf0f1e3 100644 --- a/app/assets/javascripts/select-kit/package.json +++ b/app/assets/javascripts/select-kit/package.json @@ -44,7 +44,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json index 68668bf3295..36d50100c24 100644 --- a/app/assets/javascripts/truth-helpers/package.json +++ b/app/assets/javascripts/truth-helpers/package.json @@ -44,7 +44,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/bin/ember-cli b/bin/ember-cli index a646b639705..713876680f9 100755 --- a/bin/ember-cli +++ b/bin/ember-cli @@ -46,7 +46,7 @@ if !args.include?("test") && !args.include?("--proxy") args << PROXY end -system "yarn -s install --cwd #{yarn_dir}" +exit 1 if !system "yarn -s install --cwd #{yarn_dir}" if ARGV.include?("-u") || ARGV.include?("--unicorn") unicorn_env = { "DISCOURSE_PORT" => ENV["DISCOURSE_PORT"] || "4200" } @@ -72,7 +72,6 @@ if ARGV.include?("-u") || ARGV.include?("--unicorn") end Process.wait(unicorn_pid) - else exec "yarn", *args.to_a.flatten end diff --git a/package.json b/package.json index 316c1f65653..ac6869dd30a 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "postinstall": "yarn --cwd app/assets/javascripts/discourse" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }