File yarn-use-no-production.patch of Package discourse

Overview Repositories Revisions Requests Users Attributes Meta

File yarn-use-no-production.patch of Package discourse (Revision 4731fb2cc3b958fc58f6d83d5f8a7363)

Currently displaying revision 4731fb2cc3b958fc58f6d83d5f8a7363 , Show latest

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index d4ac26e003..274129f8fb 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -12,8 +12,7 @@
   "scripts": {
     "build": "ember build",
     "start": "ember serve",
-    "test": "ember test",
-    "postinstall": "yarn --silent --cwd .. patch-package"
+    "test": "ember test"
   },
   "dependencies": {
     "@glimmer/syntax": "^0.84.3",
diff --git a/app/assets/javascripts/package.json b/app/assets/javascripts/package.json
index c896264ae4..54f79b0675 100644
--- a/app/assets/javascripts/package.json
+++ b/app/assets/javascripts/package.json
@@ -1,8 +1,5 @@
 {
   "private": true,
-  "scripts": {
-    "postinstall": "patch-package"
-  },
   "workspaces": [
     "admin",
     "bootstrap-json",
@@ -26,7 +23,6 @@
     "**/unset-value": "2.0.1"
   },
   "devDependencies": {
-    "patch-package": "^8.0.0",
     "postinstall-postinstall": "^2.1.0"
   }
 }
diff --git a/bin/ember-cli b/bin/ember-cli
index d1c480085c..695ce77458 100755
--- a/bin/ember-cli
+++ b/bin/ember-cli
@@ -56,7 +56,7 @@ if !args.include?("test") && !args.include?("build") && !args.include?("--proxy"
   args << PROXY
 end
 
-exit 1 if !system "yarn -s install --cwd #{YARN_DIR}"
+exit 1 if !system "yarn -s install --cache-folder ../../../../vendor/cache/yarn/ --cwd #{YARN_DIR}"
 
 yarn_env = {}
 if ARGV.include?("--forward-host")
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4d57a99585..efbd3ba054 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -14,7 +14,8 @@ Discourse::Application.configure do
   # Disable Rails's static asset server (Apache or nginx will already do this)
   config.public_file_server.enabled = GlobalSetting.serve_static_assets || false
 
-  config.assets.js_compressor = :uglifier
+  # turn off because it fails with the current code
+  config.assets.js_compressor = nil
 
   # stuff should be pre-compiled
   config.assets.compile = false
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index 46fbe2d7e9..432564d275 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -214,7 +214,7 @@ end
 task "javascript:update" => "clean_up" do
   require "uglifier"
 
-  yarn = system("yarn install")
+  yarn = system("yarn install --cache-folder vendor/cache/yarn/")
   abort('Unable to run "yarn install"') unless yarn
 
   versions = {}
diff --git a/lib/tasks/svg_icons.rake b/lib/tasks/svg_icons.rake
index 7f44344709..1ea46e18c7 100644
--- a/lib/tasks/svg_icons.rake
+++ b/lib/tasks/svg_icons.rake
@@ -9,7 +9,7 @@ def library_src
 end
 
 task "svgicons:update" do
-  yarn = system("yarn install")
+  yarn = system("yarn install --cache-folder vendor/cache/yarn/")
   abort('Unable to run "yarn install"') unless yarn
 
   dependencies = [{ source: "@fortawesome/fontawesome-free/sprites", destination: "fontawesome" }]
diff --git a/package.json b/package.json
index 6a83a93e43..c9790bfc20 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "lttf:ignore": "lint-to-the-future ignore",
     "lttf:output": "lint-to-the-future output -o ./lint-progress/",
     "lint-progress": "yarn lttf:output && npx html-pages ./lint-progress --no-cache",
-    "postinstall": "yarn --cwd app/assets/javascripts $(node -e 'if(JSON.parse(process.env.npm_config_argv).original.includes(`--frozen-lockfile`)){console.log(`--frozen-lockfile`)}')"
+    "postinstall": "yarn --cwd app/assets/javascripts --cache-folder ../../../../vendor/cache/yarn/ --prefer-offline $(node -e 'if(JSON.parse(process.env.npm_config_argv).original.includes(`--frozen-lockfile`)){console.log(`--frozen-lockfile`)}')"
   },
   "engines": {
     "node": "16.* || >= 18",

Places

File yarn-use-no-production.patch of Package discourse (Revision 4731fb2cc3b958fc58f6d83d5f8a7363)

Places