sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch back to our own build script

Browse Source
This commit is contained in:
David Christofas
2022-07-04 14:39:08 +02:00
parent a3f5835a03
commit 29e24ada07
4 changed files with 253 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/idp/Makefile
-10
View File
@@ -56,16 +56,6 @@ yarn-build: node_modules
#yarn test #TODO: activate
yarn build
.PHONY: i18n
i18n:
@$(MAKE) -C ui/i18n
.PHONY: ui-images
ui-images:
@$(MAKE) -C ui/src/images
.PHONY: node_modules
node_modules:
yarn install --immutable
services/idp/package.json
+6 -1
View File
@@ -5,7 +5,7 @@
"homepage": ".",
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
"build": "react-scripts build",
"build": "node scripts/build.js && rm -f build/service-worker.js",
"eject": "react-scripts eject",
"licenses": "NODE_PATH=./node_modules node ../scripts/js-license-ranger.js",
"licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --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 'identifier;kpop;po2json;unicoderegexp'",
@@ -99,11 +99,16 @@
"web-vitals": "^1.0.1"
},
"devDependencies": {
"babel-loader": "8.1.0",
"babel-plugin-named-asset-import": "^0.3.8",
"cldr": "^7.1.1",
"eslint-loader": "^4.0.2",
"eslint-plugin-i18next": "^5.1.2",
"i18next-conv": "^12.1.0",
"i18next-parser": "^5.4.0",
"license-checker-rseidelsohn": "^3.1.0",
"source-map-explorer": "^1.8.0",
"webpack-manifest-plugin": "4.1.1",
"yarn-deduplicate": "^1.1.1"
}
}
services/idp/ui_config/paths.js
+7 -7
View File
@@ -68,18 +68,18 @@ const resolveModule = (resolveFn, filePath) => {
// config after eject: we're in ./config/
module.exports = {
dotenv: resolveApp('.env'),
appPath: resolveApp('ui'),
appPath: resolveApp('.'),
appBuild: resolveApp('assets/identifier'),
appPublic: resolveApp('ui/public'),
appHtml: resolveApp('ui/public/index.html'),
appIndexJs: resolveModule(resolveApp, 'ui/src/index'),
appPublic: resolveApp('public'),
appHtml: resolveApp('public/index.html'),
appIndexJs: resolveModule(resolveApp, 'src/index'),
appPackageJson: resolveApp('package.json'),
appSrc: resolveApp('ui/src'),
appSrc: resolveApp('src'),
appTsConfig: resolveApp('tsconfig.json'),
appJsConfig: resolveApp('jsconfig.json'),
yarnLockFile: resolveApp('yarn.lock'),
testsSetup: resolveModule(resolveApp, 'ui/src/setupTests'),
proxySetup: resolveApp('ui/src/setupProxy.js'),
testsSetup: resolveModule(resolveApp, 'src/setupTests'),
proxySetup: resolveApp('src/setupProxy.js'),
appNodeModules: resolveApp('node_modules'),
publicUrl: getPublicUrl(resolveApp('package.json')),
servedPath: getServedPath(resolveApp('package.json')),
services/idp/yarn.lock
+240 -19
View File
@@ -3554,6 +3554,13 @@ __metadata:
languageName: node
linkType: hard
"array-find-index@npm:^1.0.2":
version: 1.0.2
resolution: "array-find-index@npm:1.0.2"
checksum: aac128bf369e1ac6c06ff0bb330788371c0e256f71279fb92d745e26fb4b9db8920e485b4ec25e841c93146bf71a34dcdbcefa115e7e0f96927a214d237b7081
languageName: node
linkType: hard
"array-flatten@npm:1.1.1":
version: 1.1.1
resolution: "array-flatten@npm:1.1.1"
@@ -3655,7 +3662,7 @@ __metadata:
languageName: node
linkType: hard
"asap@npm:~2.0.6":
"asap@npm:^2.0.0, asap@npm:~2.0.6":
version: 2.0.6
resolution: "asap@npm:2.0.6"
checksum: b296c92c4b969e973260e47523207cd5769abd27c245a68c26dc7a0fe8053c55bb04360237cb51cab1df52be939da77150ace99ad331fb7fb13b3423ed73ff3d
@@ -3895,7 +3902,7 @@ __metadata:
languageName: node
linkType: hard
"babel-plugin-named-asset-import@npm:^0.3.7":
"babel-plugin-named-asset-import@npm:^0.3.7, babel-plugin-named-asset-import@npm:^0.3.8":
version: 0.3.8
resolution: "babel-plugin-named-asset-import@npm:0.3.8"
peerDependencies:
@@ -4712,7 +4719,7 @@ __metadata:
languageName: node
linkType: hard
"chalk@npm:^4.0.0, chalk@npm:^4.1.0":
"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.2":
version: 4.1.2
resolution: "chalk@npm:4.1.2"
dependencies:
@@ -5898,7 +5905,7 @@ __metadata:
languageName: node
linkType: hard
"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.3":
"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3":
version: 4.3.4
resolution: "debug@npm:4.3.4"
dependencies:
@@ -5919,6 +5926,13 @@ __metadata:
languageName: node
linkType: hard
"debuglog@npm:^1.0.1":
version: 1.0.1
resolution: "debuglog@npm:1.0.1"
checksum: 970679f2eb7a73867e04d45b52583e7ec6dee1f33c058e9147702e72a665a9647f9c3d6e7c2f66f6bf18510b23eb5ded1b617e48ac1db23603809c5ddbbb9763
languageName: node
linkType: hard
"decamelize@npm:^1.2.0":
version: 1.2.0
resolution: "decamelize@npm:1.2.0"
@@ -6117,6 +6131,16 @@ __metadata:
languageName: node
linkType: hard
"dezalgo@npm:^1.0.0":
version: 1.0.4
resolution: "dezalgo@npm:1.0.4"
dependencies:
asap: ^2.0.0
wrappy: 1
checksum: 895389c6aead740d2ab5da4d3466d20fa30f738010a4d3f4dcccc9fc645ca31c9d10b7e1804ae489b1eb02c7986f9f1f34ba132d409b043082a86d9a4e745624
languageName: node
linkType: hard
"diff-sequences@npm:^26.6.2":
version: 26.6.2
resolution: "diff-sequences@npm:26.6.2"
@@ -6766,6 +6790,22 @@ __metadata:
languageName: node
linkType: hard
"eslint-loader@npm:^4.0.2":
version: 4.0.2
resolution: "eslint-loader@npm:4.0.2"
dependencies:
find-cache-dir: ^3.3.1
fs-extra: ^8.1.0
loader-utils: ^2.0.0
object-hash: ^2.0.3
schema-utils: ^2.6.5
peerDependencies:
eslint: ^6.0.0 || ^7.0.0
webpack: ^4.0.0 || ^5.0.0
checksum: f090c9adf5c80cf0383bbea83a1f1cece5749f6b0fea8122f442f72436a70b3f40350f9d087e6db6cf4f5412a2050ccac40d27ba86c1c003553812b65a3d31c2
languageName: node
linkType: hard
"eslint-module-utils@npm:^2.7.3":
version: 2.7.3
resolution: "eslint-module-utils@npm:2.7.3"
@@ -8324,6 +8364,15 @@ __metadata:
languageName: node
linkType: hard
"hosted-git-info@npm:^4.0.1":
version: 4.1.0
resolution: "hosted-git-info@npm:4.1.0"
dependencies:
lru-cache: ^6.0.0
checksum: c3f87b3c2f7eb8c2748c8f49c0c2517c9a95f35d26f4bf54b2a8cba05d2e668f3753548b6ea366b18ec8dadb4e12066e19fa382a01496b0ffa0497eb23cbe461
languageName: node
linkType: hard
"hpack.js@npm:^2.1.6":
version: 2.1.6
resolution: "hpack.js@npm:2.1.6"
@@ -8704,8 +8753,11 @@ __metadata:
"@types/react-redux": ^7.1.19
"@types/redux-logger": ^3.0.9
axios: ^0.22.0
babel-loader: 8.1.0
babel-plugin-named-asset-import: ^0.3.8
classnames: ^2.2.6
cldr: ^7.1.1
eslint-loader: ^4.0.2
eslint-plugin-i18next: ^5.1.2
i18next: ^21.6.13
i18next-browser-languagedetector: ^6.1.3
@@ -8714,6 +8766,7 @@ __metadata:
i18next-parser: ^5.4.0
i18next-resources-to-backend: ^1.0.0
kpop: "https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz"
license-checker-rseidelsohn: ^3.1.0
query-string: ^7.1.1
react: ^17.0.2
react-dom: ^17.0.2
@@ -8729,6 +8782,7 @@ __metadata:
source-map-explorer: ^1.8.0
typescript: ^4.1.2
web-vitals: ^1.0.1
webpack-manifest-plugin: 4.1.1
yarn-deduplicate: ^1.1.1
languageName: unknown
linkType: soft
@@ -9089,7 +9143,7 @@ __metadata:
languageName: node
linkType: hard
"is-core-module@npm:^2.0.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
"is-core-module@npm:^2.0.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
version: 2.9.0
resolution: "is-core-module@npm:2.9.0"
dependencies:
@@ -10576,6 +10630,27 @@ __metadata:
languageName: node
linkType: hard
"license-checker-rseidelsohn@npm:^3.1.0":
version: 3.1.0
resolution: "license-checker-rseidelsohn@npm:3.1.0"
dependencies:
chalk: ^4.1.2
debug: ^4.3.2
lodash.clonedeep: ^4.5.0
mkdirp: ^1.0.4
nopt: ^5.0.0
read-installed-packages: ^1.0.0
semver: ^7.3.5
spdx-correct: ^3.1.1
spdx-expression-parse: ^3.0.1
spdx-satisfies: ^5.0.1
treeify: ^1.1.0
bin:
license-checker-rseidelsohn: bin/license-checker-rseidelsohn
checksum: 6f206c93b51719252dedf8e1deae148ec10d51e221883db41ceb32704da0633b38ad5d8e19599a673899fd16d085cf01f6d0809d5a36f8506d708c42061e6b2f
languageName: node
linkType: hard
"lines-and-columns@npm:^1.1.6":
version: 1.2.4
resolution: "lines-and-columns@npm:1.2.4"
@@ -10686,6 +10761,13 @@ __metadata:
languageName: node
linkType: hard
"lodash.clonedeep@npm:^4.5.0":
version: 4.5.0
resolution: "lodash.clonedeep@npm:4.5.0"
checksum: 92c46f094b064e876a23c97f57f81fbffd5d760bf2d8a1c61d85db6d1e488c66b0384c943abee4f6af7debf5ad4e4282e74ff83177c9e63d8ff081a4837c3489
languageName: node
linkType: hard
"lodash.debounce@npm:^4.0.8":
version: 4.0.8
resolution: "lodash.debounce@npm:4.0.8"
@@ -11581,6 +11663,18 @@ __metadata:
languageName: node
linkType: hard
"normalize-package-data@npm:^3.0.0":
version: 3.0.3
resolution: "normalize-package-data@npm:3.0.3"
dependencies:
hosted-git-info: ^4.0.1
is-core-module: ^2.5.0
semver: ^7.3.4
validate-npm-package-license: ^3.0.1
checksum: bbcee00339e7c26fdbc760f9b66d429258e2ceca41a5df41f5df06cc7652de8d82e8679ff188ca095cad8eff2b6118d7d866af2b68400f74602fbcbce39c160a
languageName: node
linkType: hard
"normalize-path@npm:^2.1.1":
version: 2.1.1
resolution: "normalize-path@npm:2.1.1"
@@ -11632,6 +11726,13 @@ __metadata:
languageName: node
linkType: hard
"npm-normalize-package-bin@npm:^1.0.0":
version: 1.0.1
resolution: "npm-normalize-package-bin@npm:1.0.1"
checksum: ae7f15155a1e3ace2653f12ddd1ee8eaa3c84452fdfbf2f1943e1de264e4b079c86645e2c55931a51a0a498cba31f70022a5219d5665fbcb221e99e58bc70122
languageName: node
linkType: hard
"npm-run-path@npm:^2.0.0":
version: 2.0.2
resolution: "npm-run-path@npm:2.0.2"
@@ -11712,6 +11813,13 @@ __metadata:
languageName: node
linkType: hard
"object-hash@npm:^2.0.3":
version: 2.2.0
resolution: "object-hash@npm:2.2.0"
checksum: 55ba841e3adce9c4f1b9b46b41983eda40f854e0d01af2802d3ae18a7085a17168d6b81731d43fdf1d6bcbb3c9f9c56d22c8fea992203ad90a38d7d919bc28f1
languageName: node
linkType: hard
"object-inspect@npm:^1.12.0, object-inspect@npm:^1.9.0":
version: 1.12.2
resolution: "object-inspect@npm:1.12.2"
@@ -13905,6 +14013,35 @@ __metadata:
languageName: node
linkType: hard
"read-installed-packages@npm:^1.0.0":
version: 1.0.0
resolution: "read-installed-packages@npm:1.0.0"
dependencies:
debug: ^4.3.1
graceful-fs: ^4.1.2
read-package-json: ^4.0.0
readdir-scoped-modules: ^1.0.0
semver: 2 || 3 || 4 || 5 || 6 || 7
slide: ~1.1.3
dependenciesMeta:
graceful-fs:
optional: true
checksum: 96319bacad24f4c05ccc2fc3894dcd8955732af5566009d8c27fe7797cc2445f3af336da1daf35ac1619f7d4e73e8ebce43fc1e76ead2ea070bc05f7d61274ba
languageName: node
linkType: hard
"read-package-json@npm:^4.0.0":
version: 4.1.2
resolution: "read-package-json@npm:4.1.2"
dependencies:
glob: ^7.1.1
json-parse-even-better-errors: ^2.3.0
normalize-package-data: ^3.0.0
npm-normalize-package-bin: ^1.0.0
checksum: 729acda12fdbff6cee8cee7b6023a16e85c02406e2427b3cd091948d945940cfb6a6ebe7a8b4df967d483f360d0ec12fb83ab80de3e7bbb2ba2c426d07fd774e
languageName: node
linkType: hard
"read-pkg-up@npm:^7.0.1":
version: 7.0.1
resolution: "read-pkg-up@npm:7.0.1"
@@ -13954,6 +14091,18 @@ __metadata:
languageName: node
linkType: hard
"readdir-scoped-modules@npm:^1.0.0":
version: 1.1.0
resolution: "readdir-scoped-modules@npm:1.1.0"
dependencies:
debuglog: ^1.0.1
dezalgo: ^1.0.0
graceful-fs: ^4.1.2
once: ^1.3.0
checksum: 6d9f334e40dfd0f5e4a8aab5e67eb460c95c85083c690431f87ab2c9135191170e70c2db6d71afcafb78e073d23eb95dcb3fc33ef91308f6ebfe3197be35e608
languageName: node
linkType: hard
"readdirp@npm:^2.2.1":
version: 2.2.1
resolution: "readdirp@npm:2.2.1"
@@ -14734,6 +14883,17 @@ __metadata:
languageName: node
linkType: hard
"semver@npm:2 || 3 || 4 || 5 || 6 || 7, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5":
version: 7.3.7
resolution: "semver@npm:7.3.7"
dependencies:
lru-cache: ^6.0.0
bin:
semver: bin/semver.js
checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232
languageName: node
linkType: hard
"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0":
version: 5.7.1
resolution: "semver@npm:5.7.1"
@@ -14770,17 +14930,6 @@ __metadata:
languageName: node
linkType: hard
"semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.5":
version: 7.3.7
resolution: "semver@npm:7.3.7"
dependencies:
lru-cache: ^6.0.0
bin:
semver: bin/semver.js
checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232
languageName: node
linkType: hard
"send@npm:0.18.0":
version: 0.18.0
resolution: "send@npm:0.18.0"
@@ -15007,6 +15156,13 @@ __metadata:
languageName: node
linkType: hard
"slide@npm:~1.1.3":
version: 1.1.6
resolution: "slide@npm:1.1.6"
checksum: 5768635d227172e215b7a1a91d32f8781f5783b4961feaaf3d536bbf83cc51878928c137508cde7659fea6d7c04074927cab982731302771ee0051518ff24896
languageName: node
linkType: hard
"smart-buffer@npm:^4.2.0":
version: 4.2.0
resolution: "smart-buffer@npm:4.2.0"
@@ -15113,7 +15269,7 @@ __metadata:
languageName: node
linkType: hard
"source-list-map@npm:^2.0.0":
"source-list-map@npm:^2.0.0, source-list-map@npm:^2.0.1":
version: 2.0.1
resolution: "source-list-map@npm:2.0.1"
checksum: 806efc6f75e7cd31e4815e7a3aaf75a45c704871ea4075cb2eb49882c6fca28998f44fc5ac91adb6de03b2882ee6fb02f951fdc85e6a22b338c32bfe19557938
@@ -15214,7 +15370,18 @@ __metadata:
languageName: node
linkType: hard
"spdx-correct@npm:^3.0.0":
"spdx-compare@npm:^1.0.0":
version: 1.0.0
resolution: "spdx-compare@npm:1.0.0"
dependencies:
array-find-index: ^1.0.2
spdx-expression-parse: ^3.0.0
spdx-ranges: ^2.0.0
checksum: 7d8b55b31163ba8e7abeaf69d8d7accba5aee324dd55e22a796a685ec4d5e3c3cbc2683b9a2edff5543ee6f6242f4ec22c15dc2e493eb807690fb65e1051e5eb
languageName: node
linkType: hard
"spdx-correct@npm:^3.0.0, spdx-correct@npm:^3.1.1":
version: 3.1.1
resolution: "spdx-correct@npm:3.1.1"
dependencies:
@@ -15231,7 +15398,7 @@ __metadata:
languageName: node
linkType: hard
"spdx-expression-parse@npm:^3.0.0":
"spdx-expression-parse@npm:^3.0.0, spdx-expression-parse@npm:^3.0.1":
version: 3.0.1
resolution: "spdx-expression-parse@npm:3.0.1"
dependencies:
@@ -15248,6 +15415,24 @@ __metadata:
languageName: node
linkType: hard
"spdx-ranges@npm:^2.0.0":
version: 2.1.1
resolution: "spdx-ranges@npm:2.1.1"
checksum: f807bd915aa2975bcebd9c4b4805661f248efcd4953ee62557626452fcd2933183f5b1a307d65507d8be6b9519b4e46dce05b61db0fbd5fce253b8f6d69bbbad
languageName: node
linkType: hard
"spdx-satisfies@npm:^5.0.1":
version: 5.0.1
resolution: "spdx-satisfies@npm:5.0.1"
dependencies:
spdx-compare: ^1.0.0
spdx-expression-parse: ^3.0.0
spdx-ranges: ^2.0.0
checksum: 7f28a6ac492afbfc4794602b5d43957451b7afdd42506dc52dbeeed875d9b5f5b94f8f3deab1da4e2815111f57f916d135c7bd24f40245be6dab5dda09d41e91
languageName: node
linkType: hard
"spdy-transport@npm:^3.0.0":
version: 3.0.0
resolution: "spdy-transport@npm:3.0.0"
@@ -15776,6 +15961,13 @@ __metadata:
languageName: node
linkType: hard
"tapable@npm:^2.0.0":
version: 2.2.1
resolution: "tapable@npm:2.2.1"
checksum: 3b7a1b4d86fa940aad46d9e73d1e8739335efd4c48322cb37d073eb6f80f5281889bf0320c6d8ffcfa1a0dd5bfdbd0f9d037e252ef972aca595330538aac4d51
languageName: node
linkType: hard
"tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.2":
version: 6.1.11
resolution: "tar@npm:6.1.11"
@@ -16112,6 +16304,13 @@ __metadata:
languageName: node
linkType: hard
"treeify@npm:^1.1.0":
version: 1.1.0
resolution: "treeify@npm:1.1.0"
checksum: aa00dded220c1dd052573bd6fc2c52862f09870851a284f0d3650d72bf913ba9b4f6b824f4f1ab81899bae29375f4266b07fe47cbf82343a1efa13cc09ce87af
languageName: node
linkType: hard
"tryer@npm:^1.0.1":
version: 1.0.1
resolution: "tryer@npm:1.0.1"
@@ -16955,6 +17154,18 @@ __metadata:
languageName: node
linkType: hard
"webpack-manifest-plugin@npm:4.1.1":
version: 4.1.1
resolution: "webpack-manifest-plugin@npm:4.1.1"
dependencies:
tapable: ^2.0.0
webpack-sources: ^2.2.0
peerDependencies:
webpack: ^4.44.2 || ^5.47.0
checksum: 426982030d3b0ef26432d98960ee1fa33889d8f0ed79b3d2c8e37be9b4e4beba7524c60631297ea557c642a340b76d70b0eb6a1e08b86a769409037185795038
languageName: node
linkType: hard
"webpack-sources@npm:^1.1.0, webpack-sources@npm:^1.3.0, webpack-sources@npm:^1.4.0, webpack-sources@npm:^1.4.1, webpack-sources@npm:^1.4.3":
version: 1.4.3
resolution: "webpack-sources@npm:1.4.3"
@@ -16965,6 +17176,16 @@ __metadata:
languageName: node
linkType: hard
"webpack-sources@npm:^2.2.0":
version: 2.3.1
resolution: "webpack-sources@npm:2.3.1"
dependencies:
source-list-map: ^2.0.1
source-map: ^0.6.1
checksum: 6fd67f2274a84c5f51ad89767112ec8b47727134bf0f2ba0cff458c970f18966939a24128bdbddba621cd66eeb2bef0552642a9333cd8e54514f7b2a71776346
languageName: node
linkType: hard
"webpack@npm:4.44.2":
version: 4.44.2
resolution: "webpack@npm:4.44.2"