github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Dropping the namespace prefix and relying on relative pathing

Browse Source
pull/21378/head
Phil Renaud 5 months ago
parent cb53d9f383
commit 8d13103fd9
10 changed files with 52 additions and 68 deletions
Show Stats Download Patch File Download Diff File

2
ui/package.json
Unescape View File

@ -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 '@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'"
"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'"
},
"devDependencies": {

2
ui/packages/consul-acls/package.json
Unescape View File

@ -1,5 +1,5 @@
{
"name": "@hashicorp/consul-acls",
"name": "consul-acls",
"version": "0.1.0",
"private": true
}

2
ui/packages/consul-lock-sessions/package.json
Unescape View File

@ -1,5 +1,5 @@
{
"name": "@hashicorp/consul-lock-sessions",
"name": "consul-lock-sessions",
"version": "0.1.0",
"private": true
}

2
ui/packages/consul-nspaces/package.json
Unescape View File

@ -1,5 +1,5 @@
{
"name": "@hashicorp/consul-nspaces",
"name": "consul-nspaces",
"version": "0.1.0",
"private": true
}

2
ui/packages/consul-partitions/package.json
Unescape View File

@ -1,5 +1,5 @@
{
"name": "@hashicorp/consul-partitions",
"name": "consul-partitions",
"version": "0.1.0",
"private": true
}

2
ui/packages/consul-peerings/package.json
Unescape View File

@ -1,5 +1,5 @@
{
"name": "@hashicorp/consul-peerings",
"name": "consul-peerings",
"version": "0.1.0",
"private": true
}

20
ui/packages/consul-ui/.docfy-config.js
Unescape View File

@ -108,41 +108,31 @@ module.exports = {
urlPrefix: 'docs/providers',
},
{
root: `${path.dirname(
require.resolve('@hashicorp/consul-acls/package.json')
)}/app/components`,
root: `${path.dirname(require.resolve('consul-acls/package.json'))}/app/components`,
pattern: '**/README.mdx',
urlSchema: 'auto',
urlPrefix: 'docs/consul-acls',
},
{
root: `${path.dirname(
require.resolve('@hashicorp/consul-lock-sessions/package.json')
)}/app/components`,
root: `${path.dirname(require.resolve('consul-lock-sessions/package.json'))}/app/components`,
pattern: '**/README.mdx',
urlSchema: 'auto',
urlPrefix: 'docs/consul-lock-sessions',
},
{
root: `${path.dirname(
require.resolve('@hashicorp/consul-peerings/package.json')
)}/app/components`,
root: `${path.dirname(require.resolve('consul-peerings/package.json'))}/app/components`,
pattern: '**/README.mdx',
urlSchema: 'auto',
urlPrefix: 'docs/consul-peerings',
},
{
root: `${path.dirname(
require.resolve('@hashicorp/consul-partitions/package.json')
)}/app/components`,
root: `${path.dirname(require.resolve('consul-partitions/package.json'))}/app/components`,
pattern: '**/README.mdx',
urlSchema: 'auto',
urlPrefix: 'docs/consul-partitions',
},
{
root: `${path.dirname(
require.resolve('@hashicorp/consul-nspaces/package.json')
)}/app/components`,
root: `${path.dirname(require.resolve('consul-nspaces/package.json'))}/app/components`,
pattern: '**/README.mdx',
urlSchema: 'auto',
urlPrefix: 'docs/consul-nspaces',

34
ui/packages/consul-ui/ember-cli-build.js
Unescape View File

@ -40,11 +40,9 @@ module.exports = function (defaults, $ = process.env) {
'consul-partitions',
'consul-nspaces',
].map((item) => {
const namespacedName = `@hashicorp/${item}`;
const packagePath = path.dirname(require.resolve(`${namespacedName}/package.json`));
return {
name: namespacedName,
path: packagePath,
name: item,
path: path.dirname(require.resolve(`${item}/package.json`)),
};
});
@ -112,9 +110,7 @@ module.exports = function (defaults, $ = process.env) {
[new Funnel('app', { exclude: excludeFiles })].concat(
apps
.filter((item) => exists(`${item.path}/app`))
.map((item) => {
return new Funnel(`${item.path}/app`, { exclude: excludeFiles });
})
.map((item) => new Funnel(`${item.path}/app`, { exclude: excludeFiles }))
),
{
overwrite: true,
@ -131,28 +127,26 @@ module.exports = function (defaults, $ = process.env) {
].concat(
apps
.filter((item) => exists(`${item.path}/app`))
.map((item) => {
return new Funnel(`${item.path}/app`, {
include: ['**/*.{scss,css}'],
destDir: 'consul-ui',
});
})
.map(
(item) =>
new Funnel(`${item.path}/app`, {
include: ['**/*.{scss,css}'],
destDir: 'consul-ui',
})
)
),
{
overwrite: true,
}
);
trees.vendor = mergeTrees(
[new Funnel('vendor')].concat(
apps.map((item) => {
return new Funnel(`${item.path}/vendor`, { overwrite: true });
})
),
{ overwrite: true }
[new Funnel('vendor')].concat(apps.map((item) => new Funnel(`${item.path}/vendor`)))
);
})(
// consul-ui will eventually be a separate app just like the others
// at which point we can remove this filter/extra scope
})(apps.filter((item) => item.name !== '@hashicorp/consul-ui'));
apps.filter((item) => item.name !== 'consul-ui')
);
//
let app = new EmberApp(

12
ui/packages/consul-ui/package.json
Unescape View File

@ -1,5 +1,5 @@
{
"name": "@hashicorp/consul-ui",
"name": "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",
"@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",
"consul-acls": "file:../consul-acls",
"consul-lock-sessions": "file:../consul-lock-sessions",
"consul-nspaces": "file:../consul-nspaces",
"consul-partitions": "file:../consul-partitions",
"consul-peerings": "file:../consul-peerings",
"css": "^3.0.0",
"css.escape": "^1.5.1",
"d3-array": "^2.8.0",

42
ui/yarn.lock
Unescape View File

@ -1923,21 +1923,6 @@
faker "^4.1.0"
js-yaml "^3.13.1"
"@hashicorp/consul-acls@file:packages/consul-acls":
version "0.1.0"
"@hashicorp/consul-lock-sessions@file:packages/consul-lock-sessions":
version "0.1.0"
"@hashicorp/consul-nspaces@file:packages/consul-nspaces":
version "0.1.0"
"@hashicorp/consul-partitions@file:packages/consul-partitions":
version "0.1.0"
"@hashicorp/consul-peerings@file:packages/consul-peerings":
version "0.1.0"
"@hashicorp/design-system-components@^3.0.2":
version "3.6.0"
resolved "https://registry.npmjs.org/@hashicorp/design-system-components/-/design-system-components-3.6.0.tgz#e678123f9d88eef7df2edfdf1666997214fe3273"
@ -3121,9 +3106,9 @@ asn1.js@^4.10.1:
minimalistic-assert "^1.0.0"
assert-never@^1.1.0, assert-never@^1.2.1:
version "1.2.1"
resolved "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
version "1.3.0"
resolved "https://registry.npmjs.org/assert-never/-/assert-never-1.3.0.tgz#c53cf3ad8fcdb67f400a941dea66dac7fe82dd2e"
integrity sha512-9Z3vxQ+berkL/JJo0dK+EY3Lp0s3NtSnP3VCLsh5HDcZPrh0M+KQRK5sWhUeyPPH+/RCxZqOxLMR+YC6vlviEQ==
assert@^1.1.1:
version "1.5.1"
@ -5528,6 +5513,21 @@ constants-browserify@^1.0.0:
resolved "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==
"consul-acls@file:packages/consul-acls":
version "0.1.0"
"consul-lock-sessions@file:packages/consul-lock-sessions":
version "0.1.0"
"consul-nspaces@file:packages/consul-nspaces":
version "0.1.0"
"consul-partitions@file:packages/consul-partitions":
version "0.1.0"
"consul-peerings@file:packages/consul-peerings":
version "0.1.0"
content-disposition@0.5.4:
version "0.5.4"
resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@ -8167,9 +8167,9 @@ esprima@~3.0.0:
integrity sha512-xoBq/MIShSydNZOkjkoCEjqod963yHNXTLC40ypBhop6yPqflPz/vTinmCfSrGcywVLnSftRf6a0kJLdFdzemw==
esquery@^1.4.0:
version "1.5.0"
resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
version "1.6.0"
resolved "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
dependencies:
estraverse "^5.1.0"

Write Preview
Loading…
Cancel
Save