From 99dfdf70e8b5ab4c9448333dfe52f71b82c38604 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 16 Nov 2022 16:43:45 +0100 Subject: [PATCH] DEV: Make dialog-holder a monorepo package (#19051) --- .../addon/components/dialog-holder.hbs | 0 .../addon/components/dialog-holder.js | 0 .../dialog-holder/addon/services/dialog.js | 0 .../app/components/dialog-holder.js | 0 .../dialog-holder/app/services/dialog.js | 0 .../lib => }/dialog-holder/index.js | 0 .../javascripts/dialog-holder/package.json | 24 +++++++++++++++++++ .../lib => }/dialog-holder/yarn.lock | 0 .../discourse/lib/dialog-holder/package.json | 15 ------------ app/assets/javascripts/discourse/package.json | 6 +---- app/assets/javascripts/package.json | 1 + 11 files changed, 26 insertions(+), 20 deletions(-) rename app/assets/javascripts/{discourse/lib => }/dialog-holder/addon/components/dialog-holder.hbs (100%) rename app/assets/javascripts/{discourse/lib => }/dialog-holder/addon/components/dialog-holder.js (100%) rename app/assets/javascripts/{discourse/lib => }/dialog-holder/addon/services/dialog.js (100%) rename app/assets/javascripts/{discourse/lib => }/dialog-holder/app/components/dialog-holder.js (100%) rename app/assets/javascripts/{discourse/lib => }/dialog-holder/app/services/dialog.js (100%) rename app/assets/javascripts/{discourse/lib => }/dialog-holder/index.js (100%) create mode 100644 app/assets/javascripts/dialog-holder/package.json rename app/assets/javascripts/{discourse/lib => }/dialog-holder/yarn.lock (100%) delete mode 100644 app/assets/javascripts/discourse/lib/dialog-holder/package.json diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/addon/components/dialog-holder.hbs b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs similarity index 100% rename from app/assets/javascripts/discourse/lib/dialog-holder/addon/components/dialog-holder.hbs rename to app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/addon/components/dialog-holder.js b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.js similarity index 100% rename from app/assets/javascripts/discourse/lib/dialog-holder/addon/components/dialog-holder.js rename to app/assets/javascripts/dialog-holder/addon/components/dialog-holder.js diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/addon/services/dialog.js b/app/assets/javascripts/dialog-holder/addon/services/dialog.js similarity index 100% rename from app/assets/javascripts/discourse/lib/dialog-holder/addon/services/dialog.js rename to app/assets/javascripts/dialog-holder/addon/services/dialog.js diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/app/components/dialog-holder.js b/app/assets/javascripts/dialog-holder/app/components/dialog-holder.js similarity index 100% rename from app/assets/javascripts/discourse/lib/dialog-holder/app/components/dialog-holder.js rename to app/assets/javascripts/dialog-holder/app/components/dialog-holder.js diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/app/services/dialog.js b/app/assets/javascripts/dialog-holder/app/services/dialog.js similarity index 100% rename from app/assets/javascripts/discourse/lib/dialog-holder/app/services/dialog.js rename to app/assets/javascripts/dialog-holder/app/services/dialog.js diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/index.js b/app/assets/javascripts/dialog-holder/index.js similarity index 100% rename from app/assets/javascripts/discourse/lib/dialog-holder/index.js rename to app/assets/javascripts/dialog-holder/index.js diff --git a/app/assets/javascripts/dialog-holder/package.json b/app/assets/javascripts/dialog-holder/package.json new file mode 100644 index 0000000000..d441078497 --- /dev/null +++ b/app/assets/javascripts/dialog-holder/package.json @@ -0,0 +1,24 @@ +{ + "name": "dialog-holder", + "version": "1.0.0", + "description": "TODO", + "author": "Discourse", + "license": "GPL-2.0-only", + "keywords": [ + "ember-addon" + ], + "dependencies": { + "a11y-dialog": "7.5.2", + "ember-auto-import": "^2.4.3", + "ember-cli-babel": "^7.26.10", + "ember-cli-htmlbars": "^6.1.1" + }, + "devDependencies": { + "webpack": "^5.75.0" + }, + "engines": { + "node": "16.* || >= 18", + "npm": "please-use-yarn", + "yarn": ">= 1.21.1" + } +} diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/yarn.lock b/app/assets/javascripts/dialog-holder/yarn.lock similarity index 100% rename from app/assets/javascripts/discourse/lib/dialog-holder/yarn.lock rename to app/assets/javascripts/dialog-holder/yarn.lock diff --git a/app/assets/javascripts/discourse/lib/dialog-holder/package.json b/app/assets/javascripts/discourse/lib/dialog-holder/package.json deleted file mode 100644 index b82d6b7da3..0000000000 --- a/app/assets/javascripts/discourse/lib/dialog-holder/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "dialog-holder", - "keywords": [ - "ember-addon" - ], - "dependencies": { - "a11y-dialog": "7.5.0", - "ember-auto-import": "^2.4.2", - "ember-cli-babel": "^7.26.10", - "ember-cli-htmlbars": "^6.1.0" - }, - "devDependencies": { - "webpack": "^5.73.0" - } -} diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index 4a064caeea..7a3d8f8f5b 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -42,6 +42,7 @@ "bootstrap-json": "1.0.0", "broccoli-asset-rev": "^3.0.0", "deepmerge": "^4.2.2", + "dialog-holder": "1.0.0", "discourse-common": "1.0.0", "discourse-ensure-deprecation-order": "1.0.0", "discourse-hbr": "1.0.0", @@ -104,11 +105,6 @@ "ember": { "edition": "default" }, - "ember-addon": { - "paths": [ - "lib/dialog-holder" - ] - }, "devDependencies": { "ember-cached-decorator-polyfill": "^1.0.1", "ember-cli-deprecation-workflow": "^2.1.0", diff --git a/app/assets/javascripts/package.json b/app/assets/javascripts/package.json index a620159283..b1a281a0ed 100644 --- a/app/assets/javascripts/package.json +++ b/app/assets/javascripts/package.json @@ -3,6 +3,7 @@ "workspaces": [ "admin", "bootstrap-json", + "dialog-holder", "discourse", "discourse-common", "discourse-ensure-deprecation-order",