@servicetitan/startup 27.4.0 → 28.1.0
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/dist/cli/commands/get-command.d.ts.map +1 -1
- package/dist/cli/commands/get-command.js +4 -2
- package/dist/cli/commands/get-command.js.map +1 -1
- package/dist/cli/commands/init.d.ts +0 -1
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +39 -9
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/mfe-package-clean.d.ts +14 -0
- package/dist/cli/commands/mfe-package-clean.d.ts.map +1 -0
- package/dist/cli/commands/mfe-package-clean.js +124 -0
- package/dist/cli/commands/mfe-package-clean.js.map +1 -0
- package/dist/cli/commands/mfe-package-publish.d.ts +20 -0
- package/dist/cli/commands/mfe-package-publish.d.ts.map +1 -0
- package/dist/cli/commands/mfe-package-publish.js +153 -0
- package/dist/cli/commands/mfe-package-publish.js.map +1 -0
- package/dist/cli/commands/mfe-publish.d.ts +6 -30
- package/dist/cli/commands/mfe-publish.d.ts.map +1 -1
- package/dist/cli/commands/mfe-publish.js +14 -226
- package/dist/cli/commands/mfe-publish.js.map +1 -1
- package/dist/cli/utils/assets-copy.d.ts.map +1 -1
- package/dist/cli/utils/assets-copy.js +3 -3
- package/dist/cli/utils/assets-copy.js.map +1 -1
- package/dist/cli/utils/cli-os.d.ts +9 -2
- package/dist/cli/utils/cli-os.d.ts.map +1 -1
- package/dist/cli/utils/cli-os.js +16 -8
- package/dist/cli/utils/cli-os.js.map +1 -1
- package/dist/cli/utils/styles-copy.d.ts.map +1 -1
- package/dist/cli/utils/styles-copy.js +3 -3
- package/dist/cli/utils/styles-copy.js.map +1 -1
- package/dist/utils/get-branch-configs.d.ts +3 -0
- package/dist/utils/get-branch-configs.d.ts.map +1 -0
- package/dist/utils/get-branch-configs.js +18 -0
- package/dist/utils/get-branch-configs.js.map +1 -0
- package/dist/utils/get-configuration.d.ts +13 -3
- package/dist/utils/get-configuration.d.ts.map +1 -1
- package/dist/utils/get-configuration.js +28 -5
- package/dist/utils/get-configuration.js.map +1 -1
- package/dist/utils/get-folders.js +2 -2
- package/dist/utils/get-folders.js.map +1 -1
- package/dist/utils/get-jest-config.d.ts.map +1 -1
- package/dist/utils/get-jest-config.js +2 -10
- package/dist/utils/get-jest-config.js.map +1 -1
- package/dist/webpack/configs/dev-server-config.d.ts.map +1 -1
- package/dist/webpack/configs/dev-server-config.js +1 -1
- package/dist/webpack/configs/dev-server-config.js.map +1 -1
- package/dist/webpack/configs/plugins/ignore-plugin/is-optional-anvil-peer-dependency.js +1 -1
- package/dist/webpack/configs/plugins/ignore-plugin/is-optional-anvil-peer-dependency.js.map +1 -1
- package/dist/webpack/configs/plugins/index.d.ts +1 -0
- package/dist/webpack/configs/plugins/index.d.ts.map +1 -1
- package/dist/webpack/configs/plugins/index.js +1 -0
- package/dist/webpack/configs/plugins/index.js.map +1 -1
- package/dist/webpack/configs/plugins/virtual-modules-plugin.d.ts.map +1 -1
- package/dist/webpack/configs/plugins/virtual-modules-plugin.js +15 -5
- package/dist/webpack/configs/plugins/virtual-modules-plugin.js.map +1 -1
- package/dist/webpack/configs/plugins/watch-run-plugin.d.ts +8 -0
- package/dist/webpack/configs/plugins/watch-run-plugin.d.ts.map +1 -0
- package/dist/webpack/configs/plugins/watch-run-plugin.js +26 -0
- package/dist/webpack/configs/plugins/watch-run-plugin.js.map +1 -0
- package/dist/webpack/configs/plugins-config.d.ts.map +1 -1
- package/dist/webpack/configs/plugins-config.js +1 -0
- package/dist/webpack/configs/plugins-config.js.map +1 -1
- package/dist/webpack/configs/types.d.ts +16 -0
- package/dist/webpack/configs/types.d.ts.map +1 -1
- package/dist/webpack/configs/utils/generate-metadata.d.ts.map +1 -1
- package/dist/webpack/configs/utils/generate-metadata.js +3 -3
- package/dist/webpack/configs/utils/generate-metadata.js.map +1 -1
- package/jest/jest-preset.js +9 -0
- package/package.json +18 -23
- package/src/cli/commands/__tests__/init.test.ts +108 -28
- package/src/cli/commands/__tests__/mfe-package-clean.test.ts +45 -6
- package/src/cli/commands/__tests__/mfe-package-publish.test.ts +77 -7
- package/src/cli/commands/__tests__/mfe-publish.test.ts +19 -1
- package/src/cli/commands/__tests__/tests.test.ts +4 -0
- package/src/cli/commands/get-command.ts +3 -1
- package/src/cli/commands/init.ts +40 -10
- package/src/cli/commands/mfe-package-clean.ts +143 -0
- package/src/cli/commands/mfe-package-publish.ts +189 -0
- package/src/cli/commands/mfe-publish.ts +18 -298
- package/src/cli/utils/__tests__/assets-copy.test.ts +3 -7
- package/src/cli/utils/__tests__/cli-os.test.ts +41 -6
- package/src/cli/utils/__tests__/eslint.test.ts +4 -0
- package/src/cli/utils/__tests__/styles-copy.test.ts +3 -7
- package/src/cli/utils/assets-copy.ts +3 -3
- package/src/cli/utils/cli-os.ts +20 -8
- package/src/cli/utils/styles-copy.ts +3 -3
- package/src/utils/__tests__/get-branch-configs.test.ts +36 -0
- package/src/utils/__tests__/get-configuration.test.ts +65 -0
- package/src/utils/__tests__/get-jest-config.test.ts +1 -7
- package/src/utils/__tests__/load-shared-dependencies.test.ts +82 -88
- package/src/utils/get-branch-configs.ts +17 -0
- package/src/utils/get-configuration.ts +45 -7
- package/src/utils/get-folders.ts +1 -1
- package/src/utils/get-jest-config.ts +2 -10
- package/src/webpack/__tests__/create-webpack-config-shared-dependencies.test.ts +0 -1
- package/src/webpack/__tests__/create-webpack-config-web-component.test.ts +47 -13
- package/src/webpack/__tests__/create-webpack-config.test.ts +3 -2
- package/src/webpack/configs/dev-server-config.ts +2 -1
- package/src/webpack/configs/plugins/ignore-plugin/is-optional-anvil-peer-dependency.ts +1 -1
- package/src/webpack/configs/plugins/index.ts +1 -0
- package/src/webpack/configs/plugins/virtual-modules-plugin.ts +17 -5
- package/src/webpack/configs/plugins/watch-run-plugin.ts +23 -0
- package/src/webpack/configs/plugins-config.ts +2 -0
- package/src/webpack/configs/types.ts +19 -0
- package/src/webpack/configs/utils/generate-metadata.ts +5 -5
- package/tsconfig/base.json +1 -1
- package/template/.eslintrc.json +0 -3
- package/template/.gitignore +0 -21
- package/template/.npmrc +0 -3
- package/template/.prettierrc +0 -9
- package/template/.stylelintignore +0 -1
- package/template/.stylelintrc.json +0 -3
- package/template/.vscode/extensions.json +0 -18
- package/template/.vscode/settings.json +0 -4
- package/template/lerna.json +0 -4
- package/template/package.json +0 -32
- package/template/packages/application/package.json +0 -35
- package/template/packages/application/src/__tests__/app.test.tsx +0 -33
- package/template/packages/application/src/app.css +0 -3
- package/template/packages/application/src/app.tsx +0 -45
- package/template/packages/application/src/design-system.css +0 -3
- package/template/packages/application/src/index.tsx +0 -8
- package/template/packages/application/src/main-page.tsx +0 -5
- package/template/packages/application/src/second-page.tsx +0 -5
- package/template/packages/application/tsconfig.json +0 -13
- package/template/packages/feature-a/package.json +0 -19
- package/template/packages/feature-a/src/index.ts +0 -0
- package/template/packages/feature-a/tsconfig.json +0 -9
- package/template/packages/feature-b/package.json +0 -19
- package/template/packages/feature-b/src/index.ts +0 -0
- package/template/packages/feature-b/tsconfig.json +0 -9
- package/template/packages/feature-c/package.json +0 -19
- package/template/packages/feature-c/src/index.ts +0 -0
- package/template/packages/feature-c/tsconfig.json +0 -9
- package/template/setupTests.ts +0 -27
- package/template/tsconfig.test.json +0 -5
- package/template-react18/packages/application/package.json +0 -35
- package/template-react18/packages/application/src/index.tsx +0 -9
- package/template-react18/packages/feature-a/package.json +0 -19
- package/template-react18/packages/feature-b/package.json +0 -19
- package/template-react18/packages/feature-c/package.json +0 -19
- package/tsconfig.json +0 -13
|
@@ -8,17 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
16
|
-
const path_1 = __importDefault(require("path"));
|
|
12
|
+
exports.MFEPublish = void 0;
|
|
17
13
|
const utils_1 = require("../../utils");
|
|
18
14
|
const utils_2 = require("../utils");
|
|
19
|
-
const cli_git_1 = require("../utils/cli-git");
|
|
20
|
-
const cli_npm_1 = require("../utils/cli-npm");
|
|
21
|
-
const publish_1 = require("../utils/publish");
|
|
22
15
|
class MFEPublish {
|
|
23
16
|
constructor(args) {
|
|
24
17
|
Object.defineProperty(this, "args", {
|
|
@@ -34,11 +27,7 @@ class MFEPublish {
|
|
|
34
27
|
async execute() {
|
|
35
28
|
var _a, _b;
|
|
36
29
|
let packages = (_a = (0, utils_1.splitPackagesByType)((0, utils_1.getPackages)())[utils_1.PackageType.Webpack]) !== null && _a !== void 0 ? _a : [];
|
|
37
|
-
packages = packages.filter(p =>
|
|
38
|
-
var _a;
|
|
39
|
-
const packageJson = (0, utils_1.readJson)(path_1.default.join(p.location, 'package.json'));
|
|
40
|
-
return ((_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson.cli) === null || _a === void 0 ? void 0 : _a['web-component']) === true;
|
|
41
|
-
});
|
|
30
|
+
packages = packages.filter(p => (0, utils_1.isWebComponent)(p.location));
|
|
42
31
|
if (this.args.scope) {
|
|
43
32
|
packages = packages.filter(p => Array.isArray(this.args.scope)
|
|
44
33
|
? this.args.scope.includes(p.name)
|
|
@@ -47,20 +36,20 @@ class MFEPublish {
|
|
|
47
36
|
if (!packages.length) {
|
|
48
37
|
throw new Error('no packages found for publication');
|
|
49
38
|
}
|
|
39
|
+
const isClean = !!this.args.clean;
|
|
50
40
|
await (0, utils_2.lernaExec)({
|
|
51
|
-
'cmd': `startup mfe-package-${
|
|
41
|
+
'cmd': `startup mfe-package-${isClean ? 'clean' : 'publish'}`,
|
|
52
42
|
'concurrency': (_b = this.args.concurrency) !== null && _b !== void 0 ? _b : 1,
|
|
53
43
|
'scope': packages.map(({ name }) => name),
|
|
54
44
|
'stream': true,
|
|
55
|
-
'--': this.getPublishOptions(),
|
|
45
|
+
'--': isClean ? this.getCleanOptions() : this.getPublishOptions(),
|
|
56
46
|
});
|
|
57
47
|
}
|
|
58
48
|
getPublishOptions() {
|
|
59
|
-
const { build, branch,
|
|
49
|
+
const { build, branch, dry, force, registry, tag } = this.args;
|
|
60
50
|
return [
|
|
61
51
|
...[branch && `--branch ${branch}`],
|
|
62
52
|
...[build && `--build ${build}`],
|
|
63
|
-
...[count && `--count ${count}`],
|
|
64
53
|
...[dry && '--dry'],
|
|
65
54
|
...[force && '--force'],
|
|
66
55
|
...[registry && `--registry ${registry}`],
|
|
@@ -68,6 +57,14 @@ class MFEPublish {
|
|
|
68
57
|
...[tag === false && `--no-tag`],
|
|
69
58
|
].filter(item => !!item);
|
|
70
59
|
}
|
|
60
|
+
getCleanOptions() {
|
|
61
|
+
const { branch, count } = this.args;
|
|
62
|
+
return [
|
|
63
|
+
...[branch && typeof branch === 'string' && `--branch ${branch}`],
|
|
64
|
+
...[branch && branch === true && '--branch'],
|
|
65
|
+
...[count && `--count ${count}`],
|
|
66
|
+
].filter(item => !!item);
|
|
67
|
+
}
|
|
71
68
|
}
|
|
72
69
|
exports.MFEPublish = MFEPublish;
|
|
73
70
|
__decorate([
|
|
@@ -76,213 +73,4 @@ __decorate([
|
|
|
76
73
|
__metadata("design:paramtypes", []),
|
|
77
74
|
__metadata("design:returntype", Promise)
|
|
78
75
|
], MFEPublish.prototype, "execute", null);
|
|
79
|
-
class MFEPackagePublish {
|
|
80
|
-
constructor(args) {
|
|
81
|
-
Object.defineProperty(this, "args", {
|
|
82
|
-
enumerable: true,
|
|
83
|
-
configurable: true,
|
|
84
|
-
writable: true,
|
|
85
|
-
value: args
|
|
86
|
-
});
|
|
87
|
-
}
|
|
88
|
-
description() {
|
|
89
|
-
return undefined;
|
|
90
|
-
}
|
|
91
|
-
async execute() {
|
|
92
|
-
if (!(0, utils_1.isWebComponent)()) {
|
|
93
|
-
throw new Error('only web-components can be published');
|
|
94
|
-
}
|
|
95
|
-
const packageJson = (0, utils_1.readJson)('package.json');
|
|
96
|
-
if (packageJson.private) {
|
|
97
|
-
utils_1.log.info('package is private, skipping publish');
|
|
98
|
-
return;
|
|
99
|
-
}
|
|
100
|
-
const data = this.getPublishData();
|
|
101
|
-
const packageName = packageJson.name;
|
|
102
|
-
if (!data.version) {
|
|
103
|
-
utils_1.log.info('no build version found, skipping publish');
|
|
104
|
-
return;
|
|
105
|
-
}
|
|
106
|
-
if (!data.isBranchConfigured && !data.force) {
|
|
107
|
-
utils_1.log.info('branch is not configured for publishing, use --force flag to publish if needed');
|
|
108
|
-
return;
|
|
109
|
-
}
|
|
110
|
-
const versions = (0, cli_npm_1.npmGetPackageVersions)(data.registry, packageName);
|
|
111
|
-
const dryRunPrefix = data.dry ? '(dry-run) ' : '';
|
|
112
|
-
if (versions.includes(data.version)) {
|
|
113
|
-
utils_1.log.info(`${dryRunPrefix}${packageName} version ${data.version} is already published, skipping publish`);
|
|
114
|
-
if (data.tag) {
|
|
115
|
-
utils_1.log.info(`${dryRunPrefix}adding tag "${data.tag}" to ${packageName} version ${data.version}`);
|
|
116
|
-
if (!data.dry) {
|
|
117
|
-
await (0, cli_npm_1.npmTagVersion)({
|
|
118
|
-
packageName,
|
|
119
|
-
packageVersion: data.version,
|
|
120
|
-
registry: data.registry,
|
|
121
|
-
tag: data.tag,
|
|
122
|
-
});
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
return;
|
|
126
|
-
}
|
|
127
|
-
await (0, cli_npm_1.npmPackageSet)('version', data.version);
|
|
128
|
-
await (0, cli_npm_1.npmPackageSet)('publishConfig.registry', data.registry);
|
|
129
|
-
if (!packageJson.files) {
|
|
130
|
-
await (0, cli_npm_1.npmPackageSet)('files[0]', 'dist');
|
|
131
|
-
await (0, cli_npm_1.npmPackageSet)('files[1]', 'package.json');
|
|
132
|
-
}
|
|
133
|
-
if (data.dry) {
|
|
134
|
-
await (0, cli_npm_1.npmPublishDry)();
|
|
135
|
-
}
|
|
136
|
-
else {
|
|
137
|
-
await (0, cli_npm_1.npmPublish)(data.tag);
|
|
138
|
-
}
|
|
139
|
-
utils_1.log.info(`${dryRunPrefix}published ${packageName} version ${data.version}`);
|
|
140
|
-
}
|
|
141
|
-
getPublishData() {
|
|
142
|
-
var _a, _b, _c;
|
|
143
|
-
const cli = this.args;
|
|
144
|
-
const branch = (_a = cli.branch) !== null && _a !== void 0 ? _a : (0, cli_git_1.gitGetBranch)();
|
|
145
|
-
const branchConfig = getBranchConfigs()[branch];
|
|
146
|
-
let buildVersion = cli.build;
|
|
147
|
-
if (!buildVersion) {
|
|
148
|
-
buildVersion = (0, publish_1.getDefaultBuildVersion)(branch, (0, cli_git_1.gitGetCommitHash)());
|
|
149
|
-
}
|
|
150
|
-
if (!buildVersion) {
|
|
151
|
-
throw new Error('build version is not set');
|
|
152
|
-
}
|
|
153
|
-
let tag;
|
|
154
|
-
if (cli.tag === false) {
|
|
155
|
-
tag = '';
|
|
156
|
-
}
|
|
157
|
-
else if (cli.tag) {
|
|
158
|
-
tag = cli.tag;
|
|
159
|
-
}
|
|
160
|
-
else {
|
|
161
|
-
tag = (_b = branchConfig === null || branchConfig === void 0 ? void 0 : branchConfig.tag) !== null && _b !== void 0 ? _b : '';
|
|
162
|
-
}
|
|
163
|
-
const registry = (_c = cli.registry) !== null && _c !== void 0 ? _c : 'https://verdaccio.servicetitan.com';
|
|
164
|
-
return {
|
|
165
|
-
tag,
|
|
166
|
-
version: '0.0.0-' + buildVersion,
|
|
167
|
-
buildVersion,
|
|
168
|
-
registry,
|
|
169
|
-
dry: !!cli.dry,
|
|
170
|
-
force: !!cli.force,
|
|
171
|
-
isBranchConfigured: !!branchConfig,
|
|
172
|
-
};
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
exports.MFEPackagePublish = MFEPackagePublish;
|
|
176
|
-
__decorate([
|
|
177
|
-
utils_1.logErrors,
|
|
178
|
-
__metadata("design:type", Function),
|
|
179
|
-
__metadata("design:paramtypes", []),
|
|
180
|
-
__metadata("design:returntype", Promise)
|
|
181
|
-
], MFEPackagePublish.prototype, "execute", null);
|
|
182
|
-
class MFEPackageClean {
|
|
183
|
-
constructor(args) {
|
|
184
|
-
Object.defineProperty(this, "args", {
|
|
185
|
-
enumerable: true,
|
|
186
|
-
configurable: true,
|
|
187
|
-
writable: true,
|
|
188
|
-
value: args
|
|
189
|
-
});
|
|
190
|
-
}
|
|
191
|
-
description() {
|
|
192
|
-
return undefined;
|
|
193
|
-
}
|
|
194
|
-
async execute() {
|
|
195
|
-
if (!(0, utils_1.isWebComponent)()) {
|
|
196
|
-
throw new Error('only web-components can be cleaned');
|
|
197
|
-
}
|
|
198
|
-
const data = this.getCleanData();
|
|
199
|
-
const packageJson = (0, utils_1.readJson)('package.json');
|
|
200
|
-
const packageName = packageJson.name;
|
|
201
|
-
const branchedVersions = this.getBranchedVersions(packageName, data.registry);
|
|
202
|
-
utils_1.log.info(`branched versions (${data.count}):`, JSON.stringify(branchedVersions, undefined, 4));
|
|
203
|
-
const branchedVersionsToClean = {};
|
|
204
|
-
for (const branch of Object.keys(branchedVersions)) {
|
|
205
|
-
// limit branches for now
|
|
206
|
-
if (!branchedVersions[branch] || !data.branches.includes(branch)) {
|
|
207
|
-
continue;
|
|
208
|
-
}
|
|
209
|
-
branchedVersions[branch].sort(([, adt], [, bdt]) => (adt > bdt ? -1 : 1));
|
|
210
|
-
branchedVersionsToClean[branch] = branchedVersions[branch].slice(data.count);
|
|
211
|
-
}
|
|
212
|
-
utils_1.log.info('found versions for unpublish:', JSON.stringify(branchedVersionsToClean, undefined, 4));
|
|
213
|
-
const unVersions = Object.keys(branchedVersionsToClean).reduce((out, br) => [...out, ...branchedVersionsToClean[br].map(([v]) => v)], []);
|
|
214
|
-
for (const version of unVersions) {
|
|
215
|
-
try {
|
|
216
|
-
// eslint-disable-next-line no-await-in-loop
|
|
217
|
-
await (0, cli_npm_1.npmUnpublish)(data.registry, packageName, version);
|
|
218
|
-
}
|
|
219
|
-
catch (_a) {
|
|
220
|
-
utils_1.log.error(`error while removing ${packageName} version ${version}`);
|
|
221
|
-
}
|
|
222
|
-
}
|
|
223
|
-
}
|
|
224
|
-
getCleanData() {
|
|
225
|
-
let count = this.args.count;
|
|
226
|
-
if (!count) {
|
|
227
|
-
count = 5;
|
|
228
|
-
}
|
|
229
|
-
const registry = 'https://verdaccio.servicetitan.com';
|
|
230
|
-
return { count, registry, branches: Object.keys(getBranchConfigs()) };
|
|
231
|
-
}
|
|
232
|
-
getBranchedVersions(packageName, registry) {
|
|
233
|
-
const versions = (0, cli_npm_1.npmGetPackageVersionDates)(registry, packageName);
|
|
234
|
-
const branchedVersions = {};
|
|
235
|
-
const unknownVersions = [];
|
|
236
|
-
const addVersion = (branch, version, dt) => {
|
|
237
|
-
if (!branchedVersions[branch]) {
|
|
238
|
-
branchedVersions[branch] = [];
|
|
239
|
-
}
|
|
240
|
-
branchedVersions[branch].push([version, dt]);
|
|
241
|
-
};
|
|
242
|
-
for (const [version, dt] of versions) {
|
|
243
|
-
if (!version.startsWith('0.0.0-')) {
|
|
244
|
-
continue;
|
|
245
|
-
}
|
|
246
|
-
const buildVersion = version.replace('0.0.0-', '');
|
|
247
|
-
if (/^(\d+)\.(\d+)\.(\d+)$/.test(buildVersion)) {
|
|
248
|
-
// master version generated by nerdbank versioning
|
|
249
|
-
addVersion('master', version, dt);
|
|
250
|
-
continue;
|
|
251
|
-
}
|
|
252
|
-
const match1 = buildVersion.match(/^(\d+)\.(\d+)\.(\d+)-([\dA-Za-z\-]+).([\dA-Za-z]+)$/);
|
|
253
|
-
if (match1 === null || match1 === void 0 ? void 0 : match1.length) {
|
|
254
|
-
// branch version generated by nerdbank versioning
|
|
255
|
-
addVersion(match1[4], version, dt);
|
|
256
|
-
continue;
|
|
257
|
-
}
|
|
258
|
-
const match2 = buildVersion.match(/^([\dA-Za-z\-]+).([\dA-Za-z]+)$/);
|
|
259
|
-
if (match2 === null || match2 === void 0 ? void 0 : match2.length) {
|
|
260
|
-
// branch version generated by mfe-publisher versioning
|
|
261
|
-
addVersion(match2[1], version, dt);
|
|
262
|
-
continue;
|
|
263
|
-
}
|
|
264
|
-
unknownVersions.push(version);
|
|
265
|
-
}
|
|
266
|
-
if (unknownVersions.length) {
|
|
267
|
-
utils_1.log.info('unknown versions:', unknownVersions.join());
|
|
268
|
-
}
|
|
269
|
-
return branchedVersions;
|
|
270
|
-
}
|
|
271
|
-
}
|
|
272
|
-
exports.MFEPackageClean = MFEPackageClean;
|
|
273
|
-
__decorate([
|
|
274
|
-
utils_1.logErrors,
|
|
275
|
-
__metadata("design:type", Function),
|
|
276
|
-
__metadata("design:paramtypes", []),
|
|
277
|
-
__metadata("design:returntype", Promise)
|
|
278
|
-
], MFEPackageClean.prototype, "execute", null);
|
|
279
|
-
const getBranchConfigs = () => {
|
|
280
|
-
// ToDo: add ability to configure it in a package.json
|
|
281
|
-
return {
|
|
282
|
-
develop: { tag: 'dev' },
|
|
283
|
-
dev: { tag: 'dev' },
|
|
284
|
-
next: { tag: 'next' },
|
|
285
|
-
master: { tag: 'prod' },
|
|
286
|
-
};
|
|
287
|
-
};
|
|
288
76
|
//# sourceMappingURL=mfe-publish.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mfe-publish.js","sourceRoot":"","sources":["../../../src/cli/commands/mfe-publish.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mfe-publish.js","sourceRoot":"","sources":["../../../src/cli/commands/mfe-publish.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets-copy.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/assets-copy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assets-copy.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/assets-copy.ts"],"names":[],"mappings":"AAKA,wBAAgB,UAAU,kBAOzB;AAED,wBAAsB,eAAe,kBAQpC"}
|
|
@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.assetsCopy = assetsCopy;
|
|
7
7
|
exports.assetsCopyWatch = assetsCopyWatch;
|
|
8
8
|
const cpx2_1 = __importDefault(require("cpx2"));
|
|
9
|
-
const util_1 = __importDefault(require("util"));
|
|
10
9
|
const utils_1 = require("../../utils");
|
|
11
10
|
const _1 = require(".");
|
|
12
|
-
|
|
11
|
+
function assetsCopy() {
|
|
13
12
|
const { source, destination } = (0, utils_1.getFolders)();
|
|
14
13
|
utils_1.log.info('Copying asset files...');
|
|
15
|
-
|
|
14
|
+
cpx2_1.default.copySync(`${source}/**/*.{${_1.assetExtensions.join()}}`, destination);
|
|
15
|
+
return Promise.resolve();
|
|
16
16
|
}
|
|
17
17
|
async function assetsCopyWatch() {
|
|
18
18
|
const { source, destination } = (0, utils_1.getFolders)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets-copy.js","sourceRoot":"","sources":["../../../src/cli/utils/assets-copy.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"assets-copy.js","sourceRoot":"","sources":["../../../src/cli/utils/assets-copy.ts"],"names":[],"mappings":";;;;;AAKA,gCAOC;AAED,0CAQC;AAtBD,gDAAuB;AAEvB,uCAA8C;AAC9C,wBAAoC;AAEpC,SAAgB,UAAU;IACtB,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,kBAAU,GAAE,CAAC;IAE7C,WAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAEnC,cAAG,CAAC,QAAQ,CAAC,GAAG,MAAM,UAAU,kBAAe,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;IACxE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC7B,CAAC;AAEM,KAAK,UAAU,eAAe;IACjC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,kBAAU,GAAE,CAAC;IAE7C,MAAM,IAAI,OAAO,CAAO,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE;QACnC,cAAG,CAAC,KAAK,CAAC,GAAG,MAAM,UAAU,kBAAe,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE;YACjE,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
import { ExecSyncOptionsWithBufferEncoding, SpawnOptionsWithoutStdio } from 'child_process';
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
type RunCommandOptions = SpawnOptionsWithoutStdio & {
|
|
3
|
+
quiet?: boolean;
|
|
4
|
+
};
|
|
5
|
+
export declare const runCommand: (command: string | (string | false)[], { quiet, ...spawnOptions }?: RunCommandOptions) => Promise<void>;
|
|
6
|
+
type RunCommandOutputOptions = ExecSyncOptionsWithBufferEncoding & {
|
|
7
|
+
quiet?: boolean;
|
|
8
|
+
};
|
|
9
|
+
export declare const runCommandOutput: (command: string | (string | false)[], { quiet, ...execSyncOptions }?: RunCommandOutputOptions) => string;
|
|
10
|
+
export {};
|
|
4
11
|
//# sourceMappingURL=cli-os.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-os.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/cli-os.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,iCAAiC,EAEjC,wBAAwB,EAC3B,MAAM,eAAe,CAAC;AAGvB,eAAO,MAAM,UAAU,YACV,MAAM,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"cli-os.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/cli-os.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,iCAAiC,EAEjC,wBAAwB,EAC3B,MAAM,eAAe,CAAC;AAGvB,KAAK,iBAAiB,GAAG,wBAAwB,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAExE,eAAO,MAAM,UAAU,YACV,MAAM,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,+BACR,iBAAiB,KAC9C,OAAO,CAAC,IAAI,CAwCd,CAAC;AAEF,KAAK,uBAAuB,GAAG,iCAAiC,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEvF,eAAO,MAAM,gBAAgB,YAChB,MAAM,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,kCACL,uBAAuB,KACvD,MA2BF,CAAC"}
|
package/dist/cli/utils/cli-os.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runCommandOutput = exports.runCommand = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const utils_1 = require("../../utils");
|
|
6
|
-
const runCommand = (command,
|
|
6
|
+
const runCommand = (command, { quiet, ...spawnOptions } = {}) => {
|
|
7
7
|
return new Promise((resolve, reject) => {
|
|
8
8
|
const commandArray = Array.isArray(command)
|
|
9
9
|
? command
|
|
@@ -18,12 +18,16 @@ const runCommand = (command, opts) => {
|
|
|
18
18
|
reject();
|
|
19
19
|
return;
|
|
20
20
|
}
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
if (!quiet) {
|
|
22
|
+
utils_1.log.info(`run command ${fullCommand}`);
|
|
23
|
+
}
|
|
24
|
+
const proc = (0, child_process_1.spawn)(commandName, commandArray, spawnOptions);
|
|
23
25
|
proc.stdout.pipe(process.stdout);
|
|
24
26
|
proc.stderr.pipe(process.stderr);
|
|
25
27
|
proc.on('exit', function (code) {
|
|
26
|
-
|
|
28
|
+
if (!quiet) {
|
|
29
|
+
utils_1.log.info(`command finished with code ${code}`, fullCommand);
|
|
30
|
+
}
|
|
27
31
|
if (code) {
|
|
28
32
|
reject();
|
|
29
33
|
}
|
|
@@ -34,7 +38,7 @@ const runCommand = (command, opts) => {
|
|
|
34
38
|
});
|
|
35
39
|
};
|
|
36
40
|
exports.runCommand = runCommand;
|
|
37
|
-
const runCommandOutput = (command,
|
|
41
|
+
const runCommandOutput = (command, { quiet, ...execSyncOptions } = {}) => {
|
|
38
42
|
const commandArray = Array.isArray(command)
|
|
39
43
|
? command
|
|
40
44
|
.filter(c => !!c)
|
|
@@ -47,9 +51,13 @@ const runCommandOutput = (command, options) => {
|
|
|
47
51
|
if (!commandName) {
|
|
48
52
|
throw new Error();
|
|
49
53
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
54
|
+
if (!quiet) {
|
|
55
|
+
utils_1.log.info(`run command ${fullCommand}`);
|
|
56
|
+
}
|
|
57
|
+
const result = (0, child_process_1.execSync)(fullCommand, execSyncOptions).toString();
|
|
58
|
+
if (!quiet) {
|
|
59
|
+
utils_1.log.info('command finished', result);
|
|
60
|
+
}
|
|
53
61
|
return result;
|
|
54
62
|
};
|
|
55
63
|
exports.runCommandOutput = runCommandOutput;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-os.js","sourceRoot":"","sources":["../../../src/cli/utils/cli-os.ts"],"names":[],"mappings":";;;AAAA,iDAKuB;AACvB,uCAAkC;
|
|
1
|
+
{"version":3,"file":"cli-os.js","sourceRoot":"","sources":["../../../src/cli/utils/cli-os.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles-copy.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/styles-copy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"styles-copy.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/styles-copy.ts"],"names":[],"mappings":"AAKA,wBAAgB,UAAU,kBAOzB;AAED,wBAAsB,eAAe,kBAQpC"}
|
|
@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.stylesCopy = stylesCopy;
|
|
7
7
|
exports.stylesCopyWatch = stylesCopyWatch;
|
|
8
8
|
const cpx2_1 = __importDefault(require("cpx2"));
|
|
9
|
-
const util_1 = __importDefault(require("util"));
|
|
10
9
|
const utils_1 = require("../../utils");
|
|
11
10
|
const _1 = require(".");
|
|
12
|
-
|
|
11
|
+
function stylesCopy() {
|
|
13
12
|
const { source, destination } = (0, utils_1.getFolders)();
|
|
14
13
|
utils_1.log.info('Copying style files...');
|
|
15
|
-
|
|
14
|
+
cpx2_1.default.copySync(`${source}/**/*.{${_1.styleExtensions.join()}}`, destination);
|
|
15
|
+
return Promise.resolve();
|
|
16
16
|
}
|
|
17
17
|
async function stylesCopyWatch() {
|
|
18
18
|
const { source, destination } = (0, utils_1.getFolders)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles-copy.js","sourceRoot":"","sources":["../../../src/cli/utils/styles-copy.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"styles-copy.js","sourceRoot":"","sources":["../../../src/cli/utils/styles-copy.ts"],"names":[],"mappings":";;;;;AAKA,gCAOC;AAED,0CAQC;AAtBD,gDAAuB;AAEvB,uCAA8C;AAC9C,wBAAoC;AAEpC,SAAgB,UAAU;IACtB,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,kBAAU,GAAE,CAAC;IAE7C,WAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAEnC,cAAG,CAAC,QAAQ,CAAC,GAAG,MAAM,UAAU,kBAAe,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;IACxE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC7B,CAAC;AAEM,KAAK,UAAU,eAAe;IACjC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,kBAAU,GAAE,CAAC;IAE7C,MAAM,IAAI,OAAO,CAAO,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE;QACnC,cAAG,CAAC,KAAK,CAAC,GAAG,MAAM,UAAU,kBAAe,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE;YACjE,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-branch-configs.d.ts","sourceRoot":"","sources":["../../src/utils/get-branch-configs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAWlF,wBAAgB,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAK9E"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getBranchesConfigs = getBranchesConfigs;
|
|
4
|
+
const index_1 = require("./index");
|
|
5
|
+
function getDefaultConfigs() {
|
|
6
|
+
return {
|
|
7
|
+
develop: { publishTag: 'dev' },
|
|
8
|
+
dev: { publishTag: 'dev' },
|
|
9
|
+
next: { publishTag: 'next' },
|
|
10
|
+
master: { publishTag: 'prod' },
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
function getBranchesConfigs() {
|
|
14
|
+
const packageConfigs = (0, index_1.getWebComponentBranchConfigs)();
|
|
15
|
+
const defaultConfigs = getDefaultConfigs();
|
|
16
|
+
return packageConfigs !== null && packageConfigs !== void 0 ? packageConfigs : defaultConfigs;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=get-branch-configs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-branch-configs.js","sourceRoot":"","sources":["../../src/utils/get-branch-configs.ts"],"names":[],"mappings":";;AAWA,gDAKC;AAhBD,mCAAkF;AAElF,SAAS,iBAAiB;IACtB,OAAO;QACH,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;QAC9B,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;QAC1B,IAAI,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;QAC5B,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;KACjC,CAAC;AACN,CAAC;AAED,SAAgB,kBAAkB;IAC9B,MAAM,cAAc,GAAG,IAAA,oCAA4B,GAAE,CAAC;IACtD,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;IAE3C,OAAO,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,cAAc,CAAC;AAC5C,CAAC"}
|
|
@@ -50,8 +50,16 @@ export declare enum CommandName {
|
|
|
50
50
|
'styles-check' = "styles-check",
|
|
51
51
|
'test' = "test"
|
|
52
52
|
}
|
|
53
|
+
export interface WebComponentBranchConfigs {
|
|
54
|
+
publishTag?: string;
|
|
55
|
+
}
|
|
53
56
|
interface WebComponentOptions {
|
|
54
|
-
legacyRoot
|
|
57
|
+
legacyRoot?: boolean;
|
|
58
|
+
/**
|
|
59
|
+
* mapping of git branches to configs.
|
|
60
|
+
* Used to separate configs (ex publish tag) depending on current branch
|
|
61
|
+
*/
|
|
62
|
+
branches?: Record<string, WebComponentBranchConfigs>;
|
|
55
63
|
}
|
|
56
64
|
type Configuration = {
|
|
57
65
|
'legacy'?: boolean;
|
|
@@ -60,7 +68,7 @@ type Configuration = {
|
|
|
60
68
|
stylelint: StylelintConfiguration;
|
|
61
69
|
};
|
|
62
70
|
'test'?: JestConfiguration;
|
|
63
|
-
'web-component'?: boolean | WebComponentOptions;
|
|
71
|
+
'web-component'?: boolean | string | WebComponentOptions;
|
|
64
72
|
'webpack'?: false | WebpackConfiguration;
|
|
65
73
|
} & {
|
|
66
74
|
[key in CommandName]: NodeConfiguration;
|
|
@@ -72,6 +80,8 @@ export declare function getESLintConfiguration(): ESLintConfiguration;
|
|
|
72
80
|
export declare function getJestConfiguration(): JestConfiguration & NodeConfiguration;
|
|
73
81
|
export declare function getStylelintConfiguration(): StylelintConfiguration;
|
|
74
82
|
export declare function getWebpackConfiguration(locationOrJson?: LocationOrJson): WebpackConfiguration;
|
|
83
|
+
export declare function getWebComponentConfiguration(locationOrJson?: LocationOrJson): WebComponentOptions | undefined;
|
|
84
|
+
export declare function getWebComponentBranchConfigs(locationOrJson?: LocationOrJson): Record<string, WebComponentBranchConfigs> | undefined;
|
|
75
85
|
export declare function isBundle(locationOrJson?: LocationOrJson): boolean;
|
|
76
86
|
export declare function isCustomStyleRules(): boolean;
|
|
77
87
|
export declare function isDevServerDisabled(): boolean;
|
|
@@ -79,6 +89,6 @@ export declare function isExposeSharedDependencies(): boolean;
|
|
|
79
89
|
export declare function isLegacy(locationOrJson?: LocationOrJson): boolean;
|
|
80
90
|
export declare function isLegacyRoot(): boolean;
|
|
81
91
|
export declare function isStyleCheckDisabled(): boolean;
|
|
82
|
-
export declare function isWebComponent(): boolean;
|
|
92
|
+
export declare function isWebComponent(locationOrJson?: LocationOrJson): boolean;
|
|
83
93
|
export {};
|
|
84
94
|
//# sourceMappingURL=get-configuration.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-configuration.d.ts","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-configuration.d.ts","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,8 @@ exports.getESLintConfiguration = getESLintConfiguration;
|
|
|
10
10
|
exports.getJestConfiguration = getJestConfiguration;
|
|
11
11
|
exports.getStylelintConfiguration = getStylelintConfiguration;
|
|
12
12
|
exports.getWebpackConfiguration = getWebpackConfiguration;
|
|
13
|
+
exports.getWebComponentConfiguration = getWebComponentConfiguration;
|
|
14
|
+
exports.getWebComponentBranchConfigs = getWebComponentBranchConfigs;
|
|
13
15
|
exports.isBundle = isBundle;
|
|
14
16
|
exports.isCustomStyleRules = isCustomStyleRules;
|
|
15
17
|
exports.isDevServerDisabled = isDevServerDisabled;
|
|
@@ -18,8 +20,10 @@ exports.isLegacy = isLegacy;
|
|
|
18
20
|
exports.isLegacyRoot = isLegacyRoot;
|
|
19
21
|
exports.isStyleCheckDisabled = isStyleCheckDisabled;
|
|
20
22
|
exports.isWebComponent = isWebComponent;
|
|
23
|
+
const fs_1 = __importDefault(require("fs"));
|
|
21
24
|
const path_1 = __importDefault(require("path"));
|
|
22
25
|
const read_json_1 = require("./read-json");
|
|
26
|
+
const log_1 = require("./log");
|
|
23
27
|
exports.allowedWebpackDevServerOptions = ['headers', 'port', 'proxy', 'static'];
|
|
24
28
|
/* eslint-disable @typescript-eslint/naming-convention */
|
|
25
29
|
var CommandName;
|
|
@@ -69,6 +73,26 @@ function getWebpackConfiguration(locationOrJson) {
|
|
|
69
73
|
const { webpack } = getConfiguration(locationOrJson);
|
|
70
74
|
return typeof webpack === 'object' ? webpack : {};
|
|
71
75
|
}
|
|
76
|
+
function getWebComponentConfiguration(locationOrJson = './') {
|
|
77
|
+
const config = getConfigurationSafe(locationOrJson)['web-component'];
|
|
78
|
+
if (config === true) {
|
|
79
|
+
return {};
|
|
80
|
+
}
|
|
81
|
+
if (typeof config === 'object') {
|
|
82
|
+
return config;
|
|
83
|
+
}
|
|
84
|
+
if (typeof config === 'string') {
|
|
85
|
+
if (fs_1.default.existsSync(config)) {
|
|
86
|
+
return require(path_1.default.resolve(config));
|
|
87
|
+
}
|
|
88
|
+
log_1.log.warning(`could not find web-component configuration: "${config}"`);
|
|
89
|
+
return undefined;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
function getWebComponentBranchConfigs(locationOrJson = './') {
|
|
93
|
+
const config = getWebComponentConfiguration(locationOrJson);
|
|
94
|
+
return config === null || config === void 0 ? void 0 : config.branches;
|
|
95
|
+
}
|
|
72
96
|
function isBundle(locationOrJson) {
|
|
73
97
|
return getConfiguration(locationOrJson).webpack !== false;
|
|
74
98
|
}
|
|
@@ -86,14 +110,13 @@ function isLegacy(locationOrJson) {
|
|
|
86
110
|
return getConfiguration(locationOrJson).legacy === true;
|
|
87
111
|
}
|
|
88
112
|
function isLegacyRoot() {
|
|
89
|
-
|
|
90
|
-
return
|
|
113
|
+
var _a;
|
|
114
|
+
return ((_a = getWebComponentConfiguration()) === null || _a === void 0 ? void 0 : _a.legacyRoot) === true;
|
|
91
115
|
}
|
|
92
116
|
function isStyleCheckDisabled() {
|
|
93
117
|
return getWebpackConfiguration()['disable-style-check'] === true;
|
|
94
118
|
}
|
|
95
|
-
function isWebComponent() {
|
|
96
|
-
|
|
97
|
-
return config === true || typeof config === 'object';
|
|
119
|
+
function isWebComponent(locationOrJson = './') {
|
|
120
|
+
return !!getWebComponentConfiguration(locationOrJson);
|
|
98
121
|
}
|
|
99
122
|
//# sourceMappingURL=get-configuration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-configuration.js","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"get-configuration.js","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":"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"}
|