@redhat-cloud-services/frontend-components-config 6.4.10 → 6.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/common.js +4 -0
- package/bin/common.js.map +1 -1
- package/lib/createConfig.d.ts +3 -2
- package/lib/createConfig.js +4 -11
- package/lib/createConfig.js.map +1 -1
- package/lib/index.d.ts +2 -1
- package/lib/index.js +22 -3
- package/lib/index.js.map +1 -1
- package/package.json +2 -2
package/bin/common.js
CHANGED
|
@@ -19,6 +19,10 @@ function validateFECConfig(cwd) {
|
|
|
19
19
|
(0, frontend_components_config_utilities_1.fecLogger)(frontend_components_config_utilities_1.LogType.error, 'Missing config "appUrl" in fec.config.js');
|
|
20
20
|
throw 'fec.config.js validation failed, missing "appUrl" config';
|
|
21
21
|
}
|
|
22
|
+
if (config.publicPath && config.publicPath !== 'auto') {
|
|
23
|
+
(0, frontend_components_config_utilities_1.fecLogger)(frontend_components_config_utilities_1.LogType.error, 'Invalid config "publicPath" in fec.config.js, must be empty or set to "auto"');
|
|
24
|
+
throw 'fec.config.js validation failed, "publicPath" must be empty or set to "auto"';
|
|
25
|
+
}
|
|
22
26
|
process.env.FEC_CONFIG_PATH = configPath;
|
|
23
27
|
}
|
|
24
28
|
function getWebpackConfigPath(path, cwd) {
|
package/bin/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/config/src/bin/common.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/config/src/bin/common.ts"],"names":[],"mappings":";;AAKA,8CAoBC;AAED,oDAkBC;AA7CD,oHAAiG;AAEzF,IAAA,OAAO,GAAK,OAAO,CAAC,MAAM,CAAC,QAApB,CAAqB;AAC5B,IAAA,QAAQ,GAAK,OAAO,CAAC,IAAI,CAAC,SAAlB,CAAmB;AAEnC,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,IAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IACnD,IAAI,CAAC;QACH,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,gDAAS,EAAC,8CAAO,CAAC,KAAK,EAAE,gDAAuC,UAAU,CAAE,CAAC,CAAC;QAC9E,MAAM,sDAAsD,CAAC;IAC/D,CAAC;IAED,IAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,IAAA,gDAAS,EAAC,8CAAO,CAAC,KAAK,EAAE,0CAA0C,CAAC,CAAC;QACrE,MAAM,0DAA0D,CAAC;IACnE,CAAC;IAED,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;QACtD,IAAA,gDAAS,EAAC,8CAAO,CAAC,KAAK,EAAE,8EAA8E,CAAC,CAAC;QACzG,MAAM,8EAA8E,CAAC;IACvF,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,UAAU,CAAC;AAC3C,CAAC;AAED,SAAgB,oBAAoB,CAAC,IAAY,EAAE,GAAW;IAC5D,IAAI,UAAU,CAAC;IACf,IAAI,CAAC;QACH,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAChC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACrB,IAAI,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QACjC,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAI,UAAU,EAAE,CAAC;YACf,IAAA,gDAAS,EAAC,8CAAO,CAAC,KAAK,EAAE,8CAAsC,UAAU,OAAG,CAAC,CAAC;QAChF,CAAC;aAAM,CAAC;YACN,IAAA,gDAAS,EAAC,8CAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAChC,MAAM,mBAAmB,CAAC;QAC5B,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,OAAO,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;AACrD,MAAM,CAAC,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAC"}
|
package/lib/createConfig.d.ts
CHANGED
|
@@ -14,7 +14,8 @@ export interface CommonConfigOptions {
|
|
|
14
14
|
export type FrontendEnv = 'stage-stable' | 'prod-stable';
|
|
15
15
|
export interface CreateConfigOptions extends CommonConfigOptions {
|
|
16
16
|
port?: number;
|
|
17
|
-
publicPath
|
|
17
|
+
publicPath?: 'auto';
|
|
18
|
+
cdnPath: string;
|
|
18
19
|
appEntry: string;
|
|
19
20
|
https?: boolean;
|
|
20
21
|
mode?: Configuration['mode'];
|
|
@@ -52,5 +53,5 @@ export interface CreateConfigOptions extends CommonConfigOptions {
|
|
|
52
53
|
frontendCRDPath?: string;
|
|
53
54
|
deploymentBuild?: boolean;
|
|
54
55
|
}
|
|
55
|
-
export declare const createConfig: ({ port, publicPath, appEntry, rootFolder, https, mode, appName, useFileHash, env, sassPrefix, useProxy, proxyURL, localChrome, keycloakUri, customProxy, routes, routesPath, isProd, standalone, reposDir, appUrl, proxyVerbose, target, registry, client, bundlePfModules, bounceProd, useAgent, useDevBuild, useCache, cacheConfig, _unstableHotReload, hotReload, resolve, nodeModulesDirectories, stripAllPfStyles, blockLegacyChrome, devtool, _unstableSpdy, frontendCRDPath, deploymentBuild, }: CreateConfigOptions) => Configuration;
|
|
56
|
+
export declare const createConfig: ({ port, cdnPath, publicPath, appEntry, rootFolder, https, mode, appName, useFileHash, env, sassPrefix, useProxy, proxyURL, localChrome, keycloakUri, customProxy, routes, routesPath, isProd, standalone, reposDir, appUrl, proxyVerbose, target, registry, client, bundlePfModules, bounceProd, useAgent, useDevBuild, useCache, cacheConfig, _unstableHotReload, hotReload, resolve, nodeModulesDirectories, stripAllPfStyles, blockLegacyChrome, devtool, _unstableSpdy, frontendCRDPath, deploymentBuild, }: CreateConfigOptions) => Configuration;
|
|
56
57
|
export default createConfig;
|
package/lib/createConfig.js
CHANGED
|
@@ -25,13 +25,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.createConfig = void 0;
|
|
27
27
|
var path = require('path');
|
|
28
|
-
var fs = require('fs');
|
|
29
28
|
var MiniCssExtractPlugin = require('mini-css-extract-plugin');
|
|
30
29
|
var search_ignored_styles_1 = __importDefault(require("@redhat-cloud-services/frontend-components-config-utilities/search-ignored-styles"));
|
|
31
30
|
var frontend_components_config_utilities_1 = require("@redhat-cloud-services/frontend-components-config-utilities");
|
|
32
31
|
var addPrefixToContent_1 = __importDefault(require("./addPrefixToContent"));
|
|
33
32
|
var createConfig = function (_a) {
|
|
34
|
-
var port = _a.port, publicPath = _a.publicPath, appEntry = _a.appEntry, rootFolder = _a.rootFolder, https = _a.https, mode = _a.mode, appName = _a.appName, _b = _a.useFileHash, useFileHash = _b === void 0 ? true : _b, env = _a.env, sassPrefix = _a.sassPrefix, useProxy = _a.useProxy, proxyURL = _a.proxyURL, localChrome = _a.localChrome, keycloakUri = _a.keycloakUri, customProxy = _a.customProxy, routes = _a.routes, routesPath = _a.routesPath, isProd = _a.isProd, _c = _a.standalone, standalone = _c === void 0 ? false : _c, reposDir = _a.reposDir, _d = _a.appUrl, appUrl = _d === void 0 ? [] : _d, proxyVerbose = _a.proxyVerbose, target = _a.target, registry = _a.registry, _e = _a.client, client = _e === void 0 ? {
|
|
33
|
+
var port = _a.port, cdnPath = _a.cdnPath, publicPath = _a.publicPath, appEntry = _a.appEntry, rootFolder = _a.rootFolder, https = _a.https, mode = _a.mode, appName = _a.appName, _b = _a.useFileHash, useFileHash = _b === void 0 ? true : _b, env = _a.env, sassPrefix = _a.sassPrefix, useProxy = _a.useProxy, proxyURL = _a.proxyURL, localChrome = _a.localChrome, keycloakUri = _a.keycloakUri, customProxy = _a.customProxy, routes = _a.routes, routesPath = _a.routesPath, isProd = _a.isProd, _c = _a.standalone, standalone = _c === void 0 ? false : _c, reposDir = _a.reposDir, _d = _a.appUrl, appUrl = _d === void 0 ? [] : _d, proxyVerbose = _a.proxyVerbose, target = _a.target, registry = _a.registry, _e = _a.client, client = _e === void 0 ? {
|
|
35
34
|
overlay: false,
|
|
36
35
|
} : _e, _f = _a.bundlePfModules, bundlePfModules = _f === void 0 ? false : _f, bounceProd = _a.bounceProd, useAgent = _a.useAgent, _g = _a.useDevBuild, useDevBuild = _g === void 0 ? true : _g, _h = _a.useCache, useCache = _h === void 0 ? false : _h, _j = _a.cacheConfig, cacheConfig = _j === void 0 ? {} : _j, _unstableHotReload = _a._unstableHotReload, hotReload = _a.hotReload, _k = _a.resolve, resolve = _k === void 0 ? {} : _k, _l = _a.nodeModulesDirectories, nodeModulesDirectories = _l === void 0 ? [] : _l, _m = _a.stripAllPfStyles, stripAllPfStyles = _m === void 0 ? false : _m, blockLegacyChrome = _a.blockLegacyChrome, _o = _a.devtool, devtool = _o === void 0 ? false : _o, _p = _a._unstableSpdy, _unstableSpdy = _p === void 0 ? false : _p, _q = _a.frontendCRDPath, frontendCRDPath = _q === void 0 ? path.resolve(rootFolder, 'deploy/frontend.yaml') : _q, _r = _a.deploymentBuild, deploymentBuild = _r === void 0 ? false : _r;
|
|
37
36
|
if (typeof _unstableHotReload !== 'undefined') {
|
|
@@ -40,13 +39,6 @@ var createConfig = function (_a) {
|
|
|
40
39
|
var internalHotReload = !!(typeof hotReload !== 'undefined' ? hotReload : _unstableHotReload);
|
|
41
40
|
var filenameMask = "js/[name].".concat(!internalHotReload && useFileHash ? "[contenthash]." : '', "js");
|
|
42
41
|
var outputPath = "".concat(rootFolder || '', "/dist");
|
|
43
|
-
var copyTemplate = function (chromePath) {
|
|
44
|
-
var template = fs.readFileSync("".concat(chromePath, "/index.html"), { encoding: 'utf-8' });
|
|
45
|
-
if (!fs.existsSync(outputPath)) {
|
|
46
|
-
fs.mkdirSync(outputPath);
|
|
47
|
-
}
|
|
48
|
-
fs.writeFileSync("".concat(outputPath, "/index.html"), template);
|
|
49
|
-
};
|
|
50
42
|
var devServerPort = typeof port === 'number' ? port : useProxy || standalone ? 1337 : 8002;
|
|
51
43
|
return __assign(__assign(__assign(__assign(__assign({ mode: mode || (isProd ? 'production' : 'development'), devtool: devtool }, (useCache
|
|
52
44
|
? {
|
|
@@ -64,7 +56,7 @@ var createConfig = function (_a) {
|
|
|
64
56
|
}, output: {
|
|
65
57
|
filename: filenameMask,
|
|
66
58
|
path: outputPath,
|
|
67
|
-
publicPath: publicPath,
|
|
59
|
+
publicPath: publicPath === 'auto' ? publicPath : cdnPath,
|
|
68
60
|
chunkFilename: filenameMask,
|
|
69
61
|
} }), (internalHotReload
|
|
70
62
|
? {
|
|
@@ -155,6 +147,7 @@ var createConfig = function (_a) {
|
|
|
155
147
|
disableDotRule: true,
|
|
156
148
|
}, devMiddleware: {
|
|
157
149
|
writeToDisk: true,
|
|
150
|
+
publicPath: cdnPath,
|
|
158
151
|
}, client: client }, (0, frontend_components_config_utilities_1.proxy)({
|
|
159
152
|
env: env,
|
|
160
153
|
localChrome: localChrome,
|
|
@@ -168,7 +161,7 @@ var createConfig = function (_a) {
|
|
|
168
161
|
port: devServerPort,
|
|
169
162
|
reposDir: reposDir,
|
|
170
163
|
appUrl: appUrl,
|
|
171
|
-
publicPath:
|
|
164
|
+
publicPath: cdnPath,
|
|
172
165
|
proxyVerbose: proxyVerbose,
|
|
173
166
|
target: target,
|
|
174
167
|
registry: registry,
|
package/lib/createConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createConfig.js","sourceRoot":"","sources":["../../../../packages/config/src/lib/createConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,IAAM,
|
|
1
|
+
{"version":3,"file":"createConfig.js","sourceRoot":"","sources":["../../../../packages/config/src/lib/createConfig.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -4,11 +4,12 @@ export * from './createConfig';
|
|
|
4
4
|
export * from './createPlugins';
|
|
5
5
|
type WebpackConfiguration = import('webpack').Configuration;
|
|
6
6
|
export type FecWebpackConfiguration = WebpackConfiguration;
|
|
7
|
-
type FecConfigurationOptions = Omit<CreateConfigOptions, 'publicPath' | 'appEntry' | 'appName'> & CreatePluginsOptions & {
|
|
7
|
+
type FecConfigurationOptions = Omit<CreateConfigOptions, 'publicPath' | 'appEntry' | 'appName' | 'cdnPath'> & Omit<CreatePluginsOptions, 'cdnPath'> & {
|
|
8
8
|
deployment?: string;
|
|
9
9
|
debug?: boolean;
|
|
10
10
|
appEntry?: string;
|
|
11
11
|
blockLegacyChrome?: boolean;
|
|
12
|
+
publicPath?: 'auto';
|
|
12
13
|
};
|
|
13
14
|
declare const createFecConfig: (configurations: FecConfigurationOptions) => {
|
|
14
15
|
config: ReturnType<typeof createConfig>;
|
package/lib/index.js
CHANGED
|
@@ -29,8 +29,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
29
29
|
};
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
31
|
var frontend_components_config_utilities_1 = require("@redhat-cloud-services/frontend-components-config-utilities");
|
|
32
|
+
var path_1 = __importDefault(require("path"));
|
|
32
33
|
var createConfig_1 = __importDefault(require("./createConfig"));
|
|
33
34
|
var createPlugins_1 = __importDefault(require("./createPlugins"));
|
|
35
|
+
var crd_check_1 = require("@redhat-cloud-services/frontend-components-config-utilities/feo/crd-check");
|
|
34
36
|
var sync = require('glob').sync;
|
|
35
37
|
__exportStar(require("./createConfig"), exports);
|
|
36
38
|
__exportStar(require("./createPlugins"), exports);
|
|
@@ -51,6 +53,7 @@ var getAppEntry = function (rootFolder, isProd) {
|
|
|
51
53
|
return "".concat(rootFolder, "/").concat(entries[0]);
|
|
52
54
|
};
|
|
53
55
|
var createFecConfig = function (configurations) {
|
|
56
|
+
var _a, _b;
|
|
54
57
|
configurations.isProd = configurations.isProd || process.env.NODE_ENV === 'production';
|
|
55
58
|
var isProd = configurations.isProd;
|
|
56
59
|
var insights = require("".concat(configurations.rootFolder, "/package.json")).insights;
|
|
@@ -63,7 +66,23 @@ var createFecConfig = function (configurations) {
|
|
|
63
66
|
gitBranch = 'main';
|
|
64
67
|
}
|
|
65
68
|
var appDeployment = typeof configurations.deployment === 'string' ? configurations.deployment : configurations.deployment || 'apps';
|
|
66
|
-
var
|
|
69
|
+
var _c = configurations.frontendCRDPath, frontendCRDPath = _c === void 0 ? path_1.default.resolve(configurations.rootFolder, 'deploy/frontend.yaml') : _c;
|
|
70
|
+
var frontendCrdRef = { current: undefined };
|
|
71
|
+
var FEOFeaturesEnabled = false;
|
|
72
|
+
try {
|
|
73
|
+
frontendCrdRef.current = (0, crd_check_1.readFrontendCRD)(frontendCRDPath);
|
|
74
|
+
FEOFeaturesEnabled = (0, crd_check_1.hasFEOFeaturesEnabled)(frontendCrdRef.current);
|
|
75
|
+
}
|
|
76
|
+
catch (e) {
|
|
77
|
+
(0, frontend_components_config_utilities_1.fecLogger)(frontend_components_config_utilities_1.LogType.warn, "FEO features are not enabled. Unable to find frontend CRD file at ".concat(frontendCRDPath, ". If you want FEO features for local development, make sure to have a \"deploy/frontend.yaml\" file in your project or specify its location via \"frontendCRDPath\" attribute."));
|
|
78
|
+
}
|
|
79
|
+
var cdnPath;
|
|
80
|
+
if (FEOFeaturesEnabled && configurations.publicPath === 'auto' && frontendCrdRef.current) {
|
|
81
|
+
cdnPath = "".concat((_b = (_a = frontendCrdRef.current) === null || _a === void 0 ? void 0 : _a.objects[0]) === null || _b === void 0 ? void 0 : _b.spec.frontend.paths[0], "/").replace(/\/\//, '/');
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
cdnPath = "/".concat(appDeployment, "/").concat(insights.appname, "/");
|
|
85
|
+
}
|
|
67
86
|
var appEntry = configurations.appEntry || getAppEntry(configurations.rootFolder, isProd);
|
|
68
87
|
var generateSourceMaps = !isProd;
|
|
69
88
|
if (configurations.debug) {
|
|
@@ -73,7 +92,7 @@ var createFecConfig = function (configurations) {
|
|
|
73
92
|
(0, frontend_components_config_utilities_1.fecLogger)(frontend_components_config_utilities_1.LogType.debug, "Current branch: ".concat(gitBranch));
|
|
74
93
|
!generateSourceMaps && (0, frontend_components_config_utilities_1.fecLogger)(frontend_components_config_utilities_1.LogType.debug, "Source map generation for \"".concat(gitBranch, "\" deployment has been disabled."));
|
|
75
94
|
(0, frontend_components_config_utilities_1.fecLogger)(frontend_components_config_utilities_1.LogType.debug, "Using deployments: ".concat(appDeployment));
|
|
76
|
-
(0, frontend_components_config_utilities_1.fecLogger)(frontend_components_config_utilities_1.LogType.debug, "
|
|
95
|
+
(0, frontend_components_config_utilities_1.fecLogger)(frontend_components_config_utilities_1.LogType.debug, "CDN path: ".concat(cdnPath));
|
|
77
96
|
(0, frontend_components_config_utilities_1.fecLogger)(frontend_components_config_utilities_1.LogType.debug, "App entry: ".concat(appEntry));
|
|
78
97
|
(0, frontend_components_config_utilities_1.fecLogger)(frontend_components_config_utilities_1.LogType.debug, "Use proxy: ".concat(configurations.useProxy ? 'true' : 'false'));
|
|
79
98
|
if (!(configurations.useProxy || configurations.standalone)) {
|
|
@@ -83,7 +102,7 @@ var createFecConfig = function (configurations) {
|
|
|
83
102
|
console.groupEnd();
|
|
84
103
|
}
|
|
85
104
|
return {
|
|
86
|
-
config: (0, createConfig_1.default)(__assign(__assign({}, configurations), { publicPath: publicPath, appEntry: appEntry, appName: insights.appname })),
|
|
105
|
+
config: (0, createConfig_1.default)(__assign(__assign({}, configurations), { cdnPath: cdnPath, publicPath: configurations.publicPath, appEntry: appEntry, appName: insights.appname })),
|
|
87
106
|
plugins: (0, createPlugins_1.default)(__assign(__assign({}, configurations), { generateSourceMaps: generateSourceMaps, appName: insights.appname })),
|
|
88
107
|
};
|
|
89
108
|
};
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/config/src/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oHAAiG;AACjG,gEAAmE;AACnE,kEAAsE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/config/src/lib/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redhat-cloud-services/frontend-components-config",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.5.1",
|
|
4
4
|
"description": "Config plugins and settings for RedHat Cloud Services project.",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"scripts": {},
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
|
|
30
|
-
"@redhat-cloud-services/frontend-components-config-utilities": "^4.
|
|
30
|
+
"@redhat-cloud-services/frontend-components-config-utilities": "^4.2.0",
|
|
31
31
|
"@redhat-cloud-services/tsc-transform-imports": "^1.0.21",
|
|
32
32
|
"@swc/core": "^1.3.76",
|
|
33
33
|
"assert": "^2.0.0",
|