github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Merge root JS packages (#25857)

Browse Source 
Before this commit, we had a yarn package set up in the root directory and also in `app/assets/javascripts`. That meant two `yarn install` calls and two `node_modules` directories. This commit merges them both into the root location, and updates references to node_modules.

A previous attempt can be found at https://github.com/discourse/discourse/pull/21172. This commit re-uses that script to merge the `yarn.lock` files.

Co-authored-by: Jarek Radosz <jradosz@gmail.com>
This commit is contained in:
David Taylor
2024-02-26 13:45:58 +00:00
committed by GitHub
parent b3a1199493
commit 588a79c80c
26 changed files with 8863 additions and 11882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ember_cli.rb
View File

@ -41,8 +41,7 @@ class EmberCli < ActiveSupport::CurrentAttributes
def self.ember_version
@version ||=
begin
ember_source_package_raw =
File.read("#{Rails.root}/app/assets/javascripts/node_modules/ember-source/package.json")
ember_source_package_raw = File.read("#{Rails.root}/node_modules/ember-source/package.json")
JSON.parse(ember_source_package_raw)["version"]
end
end