Namespaced and file-specified deps

dhiaayachi · Jul 8, 2024 · 74792f6 · 74792f6
1 parent a251f8a
commit 74792f6
Show file tree

Hide file tree

Showing 10 changed files with 4,319 additions and 3,820 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -11,7 +11,7 @@
   "scripts": {
     "doc:toc": "doctoc README.md",
     "compliance": "npm-run-all compliance:*",
-    "compliance:licenses": "license-checker --summary --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'consul-ui@2.2.0;consul-acls@0.1.0;consul-lock-sessions@0.1.0;consul-partitions@0.1.0;consul-nspaces@0.1.0;consul-peerings@0.1.0'"
+    "compliance:licenses": "license-checker --summary --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages '@hashicorp/consul-ui@2.2.0;@hashicorp/consul-acls@0.1.0;@hashicorp/consul-lock-sessions@0.1.0;@hashicorp/consul-partitions@0.1.0;@hashicorp/consul-nspaces@0.1.0;@hashicorp/consul-peerings@0.1.0'"
 
   },
   "devDependencies": {

diff --git a/ui/packages/consul-acls/package.json b/ui/packages/consul-acls/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "consul-acls",
+  "name": "@hashicorp/consul-acls",
   "version": "0.1.0",
   "private": true
 }
diff --git a/ui/packages/consul-lock-sessions/package.json b/ui/packages/consul-lock-sessions/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "consul-lock-sessions",
+  "name": "@hashicorp/consul-lock-sessions",
   "version": "0.1.0",
   "private": true
 }
diff --git a/ui/packages/consul-nspaces/package.json b/ui/packages/consul-nspaces/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "consul-nspaces",
+  "name": "@hashicorp/consul-nspaces",
   "version": "0.1.0",
   "private": true
 }
diff --git a/ui/packages/consul-partitions/package.json b/ui/packages/consul-partitions/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "consul-partitions",
+  "name": "@hashicorp/consul-partitions",
   "version": "0.1.0",
   "private": true
 }
diff --git a/ui/packages/consul-peerings/package.json b/ui/packages/consul-peerings/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "consul-peerings",
+  "name": "@hashicorp/consul-peerings",
   "version": "0.1.0",
   "private": true
 }
diff --git a/ui/packages/consul-ui/.docfy-config.js b/ui/packages/consul-ui/.docfy-config.js
@@ -108,31 +108,41 @@ module.exports = {
       urlPrefix: 'docs/providers',
     },
     {
-      root: `${path.dirname(require.resolve('consul-acls/package.json'))}/app/components`,
+      root: `${path.dirname(
+        require.resolve('@hashicorp/consul-acls/package.json')
+      )}/app/components`,
       pattern: '**/README.mdx',
       urlSchema: 'auto',
       urlPrefix: 'docs/consul-acls',
     },
     {
-      root: `${path.dirname(require.resolve('consul-lock-sessions/package.json'))}/app/components`,
+      root: `${path.dirname(
+        require.resolve('@hashicorp/consul-lock-sessions/package.json')
+      )}/app/components`,
       pattern: '**/README.mdx',
       urlSchema: 'auto',
       urlPrefix: 'docs/consul-lock-sessions',
     },
     {
-      root: `${path.dirname(require.resolve('consul-peerings/package.json'))}/app/components`,
+      root: `${path.dirname(
+        require.resolve('@hashicorp/consul-peerings/package.json')
+      )}/app/components`,
       pattern: '**/README.mdx',
       urlSchema: 'auto',
       urlPrefix: 'docs/consul-peerings',
     },
     {
-      root: `${path.dirname(require.resolve('consul-partitions/package.json'))}/app/components`,
+      root: `${path.dirname(
+        require.resolve('@hashicorp/consul-partitions/package.json')
+      )}/app/components`,
       pattern: '**/README.mdx',
       urlSchema: 'auto',
       urlPrefix: 'docs/consul-partitions',
     },
     {
-      root: `${path.dirname(require.resolve('consul-nspaces/package.json'))}/app/components`,
+      root: `${path.dirname(
+        require.resolve('@hashicorp/consul-nspaces/package.json')
+      )}/app/components`,
       pattern: '**/README.mdx',
       urlSchema: 'auto',
       urlPrefix: 'docs/consul-nspaces',

diff --git a/ui/packages/consul-ui/ember-cli-build.js b/ui/packages/consul-ui/ember-cli-build.js
@@ -33,12 +33,12 @@ module.exports = function (defaults, $ = process.env) {
   let excludeFiles = [];
 
   const apps = [
-    'consul-ui',
-    'consul-acls',
-    'consul-lock-sessions',
-    'consul-peerings',
-    'consul-partitions',
-    'consul-nspaces',
+    '@hashicorp/consul-ui',
+    '@hashicorp/consul-acls',
+    '@hashicorp/consul-lock-sessions',
+    '@hashicorp/consul-peerings',
+    '@hashicorp/consul-partitions',
+    '@hashicorp/consul-nspaces',
   ].map((item) => {
     return {
       name: item,

diff --git a/ui/packages/consul-ui/package.json b/ui/packages/consul-ui/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "consul-ui",
+  "name": "@hashicorp/consul-ui",
   "version": "2.2.0",
   "private": true,
   "description": "The web UI for Consul, by HashiCorp.",
@@ -90,11 +90,11 @@
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.1.0",
     "clipboard": "^2.0.11",
-    "consul-acls": "*",
-    "consul-lock-sessions": "*",
-    "consul-nspaces": "*",
-    "consul-partitions": "*",
-    "consul-peerings": "*",
+    "@hashicorp/consul-acls": "file:../consul-acls",
+    "@hashicorp/consul-lock-sessions": "file:../consul-lock-sessions",
+    "@hashicorp/consul-nspaces": "file:../consul-nspaces",
+    "@hashicorp/consul-partitions": "file:../consul-partitions",
+    "@hashicorp/consul-peerings": "file:../consul-peerings",
     "css": "^3.0.0",
     "css.escape": "^1.5.1",
     "d3-array": "^2.8.0",