DEV: Merge package.json files (#21172)

This means: a single yarn.lock and removing one of the package.json files

app/assets/javascripts/.licensee.json

@@ -1,32 +0,0 @@
-{
-  "licenses": {
-    "blueOak": "bronze",
-    "spdx": [
-      "CC0-1.0",
-      "CC-BY-3.0",
-      "CC-BY-4.0",
-      "Apache-2.0 WITH LLVM-exception",
-      "ISC"
-    ]
-  },
-  "packages": {
-    "component-bind": "1.0.0",
-    "component-inherit": "0.0.3",
-    "duplex": "1.0.0",
-    "glob": "3.1.21",
-    "indexof": "0.0.1",
-    "inherits": "1.0.2",
-    "jsonify": "0.0.0",
-    "messageformat": "0.1.5",
-    "line-stream": "0.0.0",
-    "regenerator-transform": "0.10.1",
-    "source-map": "0.1.43",
-    "sourcemap-validator": "1.1.1"
-  },
-  "corrections": true,
-  "ignore": [
-    {
-      "author": "Discourse"
-    }
-  ]
-}

app/assets/javascripts/discourse/lib/pretty-text-engine.js

@@ -18,7 +18,7 @@ module.exports = function prettyTextEngine(app) {
 
   const engineTree = babelAddon.transpileTree(namespacedTree);
 
-  let markdownIt = funnel("../node_modules/markdown-it/dist", {
+  let markdownIt = funnel("../../../../node_modules/markdown-it/dist", {
     files: ["markdown-it.js"],
   });
   return concat(mergeTrees([engineTree, markdownIt]), {

app/assets/javascripts/discourse/package.json

@@ -14,7 +14,7 @@
     "build": "ember build",
     "start": "ember serve",
     "test": "ember test",
-    "postinstall": "yarn --silent --cwd .. patch-package"
+    "postinstall": "yarn --silent --cwd ../../../.. patch-package --patch-dir app/assets/javascripts/patches"
   },
   "dependencies": {
     "@babel/core": "^7.21.4",
@@ -103,6 +103,11 @@
     "wizard": "1.0.0",
     "xss": "^1.0.14"
   },
+  "devDependencies": {
+    "ember-cached-decorator-polyfill": "^1.0.1",
+    "ember-cli-deprecation-workflow": "^2.1.0",
+    "ember-exam": "^8.0.0"
+  },
   "engines": {
     "node": "16.* || >= 18",
     "npm": "please-use-yarn",
@@ -110,10 +115,5 @@
   },
   "ember": {
     "edition": "default"
-  },
-  "devDependencies": {
-    "ember-cached-decorator-polyfill": "^1.0.1",
-    "ember-cli-deprecation-workflow": "^2.1.0",
-    "ember-exam": "^8.0.0"
   }
 }

app/assets/javascripts/package.json

@@ -1,34 +0,0 @@
-{
-  "private": true,
-  "scripts": {
-    "postinstall": "patch-package"
-  },
-  "workspaces": [
-    "admin",
-    "bootstrap-json",
-    "dialog-holder",
-    "discourse",
-    "discourse-common",
-    "discourse-hbr",
-    "discourse-plugins",
-    "discourse-widget-hbs",
-    "ember-cli-progress-ci",
-    "ember-production-deprecations",
-    "pretty-text",
-    "select-kit",
-    "truth-helpers",
-    "wizard"
-  ],
-  "resolutions": {
-    "**/babel-plugin-debug-macros": "npm:@discourse/babel-plugin-debug-macros@0.4.0-pre1",
-    "**/babel-plugin-ember-template-compilation": "2.0.0"
-  },
-  "dependencies": {
-    "patch-package": "^6.5.1",
-    "postinstall-postinstall": "^2.1.0"
-  },
-  "devDependencies": {},
-  "notes": {
-    "deps vs devDeps": "this project doesn't use dev dependencies when building the app, so all dependencies affecting the build of the UI (ember-cli, webpack, etc), need to be in 'dependencies', not 'devDependencies' (yarn install --production is used)"
-  }
-}