@xarc/app-dev 10.0.11 → 10.1.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/xrun.js +0 -1
- package/config/archetype.js +4 -4
- package/config/archetype.js.map +1 -1
- package/config/babel/babelrc-client.js +27 -27
- package/config/babel/babelrc-client.js.map +1 -1
- package/config/babel/babelrc-server.js +1 -1
- package/config/babel/babelrc-server.js.map +1 -1
- package/config/babel/babelrc.js +30 -30
- package/config/babel/babelrc.js.map +1 -1
- package/config/babel/common.js +1 -1
- package/config/babel/common.js.map +1 -1
- package/config/dev-proxy.js +6 -6
- package/config/dev-proxy.js.map +1 -1
- package/config/env-app.js +1 -1
- package/config/env-app.js.map +1 -1
- package/config/env-babel.js +2 -2
- package/config/env-babel.js.map +1 -1
- package/config/env-karma.js +1 -1
- package/config/env-karma.js.map +1 -1
- package/config/env-proxy.js +2 -2
- package/config/env-proxy.js.map +1 -1
- package/config/env-webpack.js +2 -2
- package/config/env-webpack.js.map +1 -1
- package/config/eslint/js/base.js +0 -1
- package/config/eslint/js/es5-node.js +0 -1
- package/config/eslint/js/es6-node.js +0 -1
- package/config/eslint/js/es6-react.js +0 -1
- package/config/eslint/js/es6-test.js +0 -1
- package/config/eslint/js/opt-eslint-require.js +0 -1
- package/config/jest/__mocks__/framework-mock.js +2 -3
- package/config/jest/__mocks__/framework-mock.js.map +1 -1
- package/config/jest/jest.config.js +1 -1
- package/config/jest/jest.config.js.map +1 -1
- package/config/karma/browser-settings.js +1 -1
- package/config/karma/browser-settings.js.map +1 -1
- package/config/karma/entry-xarc.js +0 -1
- package/config/karma/entry.js +0 -1
- package/config/karma/karma.conf.coverage.js +3 -3
- package/config/karma/karma.conf.coverage.js.map +1 -1
- package/config/karma/karma.conf.dev.js +2 -2
- package/config/karma/karma.conf.dev.js.map +1 -1
- package/config/karma/karma.conf.js +2 -2
- package/config/karma/karma.conf.js.map +1 -1
- package/config/karma/karma.conf.watch.js +2 -2
- package/config/karma/karma.conf.watch.js.map +1 -1
- package/config/karma/util/load-user-config.js +3 -3
- package/config/karma/util/load-user-config.js.map +1 -1
- package/config/mocha/setup.js +3 -4
- package/config/mocha/setup.js.map +1 -1
- package/config/options.js +19 -21
- package/config/options.js.map +1 -1
- package/config/user-config.js +3 -3
- package/config/user-config.js.map +1 -1
- package/lib/app-dev-middleware.js +2 -2
- package/lib/app-dev-middleware.js.map +1 -1
- package/lib/babel-run.js +1 -1
- package/lib/babel-run.js.map +1 -1
- package/lib/dev-admin/admin-http.d.ts +1 -1
- package/lib/dev-admin/admin-http.js +3 -3
- package/lib/dev-admin/admin-http.js.map +1 -1
- package/lib/dev-admin/admin-server.js +57 -57
- package/lib/dev-admin/admin-server.js.map +1 -1
- package/lib/dev-admin/cleanup.js +3 -3
- package/lib/dev-admin/cleanup.js.map +1 -1
- package/lib/dev-admin/dev-http.js +5 -5
- package/lib/dev-admin/dev-http.js.map +1 -1
- package/lib/dev-admin/dev-server-start.js +4 -4
- package/lib/dev-admin/dev-server-start.js.map +1 -1
- package/lib/dev-admin/dev-server.js +1 -1
- package/lib/dev-admin/dev-server.js.map +1 -1
- package/lib/dev-admin/index.js +1 -1
- package/lib/dev-admin/index.js.map +1 -1
- package/lib/dev-admin/json-formatter-js.js +0 -1
- package/lib/dev-admin/log-view.js +0 -1
- package/lib/dev-admin/middleware.js +13 -13
- package/lib/dev-admin/middleware.js.map +1 -1
- package/lib/dev-admin/redbird-proxy.js +44 -44
- package/lib/dev-admin/redbird-proxy.js.map +1 -1
- package/lib/dev-admin/redbird-spawn.js +5 -5
- package/lib/dev-admin/redbird-spawn.js.map +1 -1
- package/lib/dev-tasks.d.ts +1 -1
- package/lib/dev-tasks.js +124 -123
- package/lib/dev-tasks.js.map +1 -1
- package/lib/fake-res.js +2 -2
- package/lib/fake-res.js.map +1 -1
- package/lib/module-processor.js +1 -1
- package/lib/module-processor.js.map +1 -1
- package/lib/stats-mapper.js +1 -1
- package/lib/stats-mapper.js.map +1 -1
- package/lib/tasks/eslint.js +27 -27
- package/lib/tasks/eslint.js.map +1 -1
- package/lib/tasks/package-json.js +3 -3
- package/lib/tasks/package-json.js.map +1 -1
- package/lib/utils.d.ts +1 -1
- package/lib/utils.js +12 -11
- package/lib/utils.js.map +1 -1
- package/package.json +9 -9
- package/require.js +0 -1
- package/scripts/l10n/flatten-messages.js +0 -1
- package/scripts/map-isomorphic-cdn.js +0 -1
- package/scripts/merge-isomorphic-assets.js +0 -1
- package/scripts/webpack5-jsonp-cdn.js +0 -1
- package/src/config/babel/babelrc-client.ts +25 -25
- package/src/config/babel/babelrc.ts +26 -26
- package/src/config/eslint/js/base.js +0 -1
- package/src/config/eslint/js/es5-node.js +0 -1
- package/src/config/eslint/js/es6-node.js +0 -1
- package/src/config/eslint/js/es6-react.js +0 -1
- package/src/config/eslint/js/es6-test.js +0 -1
- package/src/config/eslint/js/opt-eslint-require.js +0 -1
- package/src/config/jest/__mocks__/framework-mock.ts +3 -3
- package/src/config/karma/entry-xarc.js +0 -1
- package/src/config/karma/entry.js +0 -1
- package/src/config/karma/util/load-user-config.ts +2 -2
- package/src/config/mocha/setup.ts +2 -2
- package/src/config/options.ts +12 -14
- package/src/config/user-config.ts +1 -1
- package/src/lib/dev-admin/admin-server.ts +32 -32
- package/src/lib/dev-admin/json-formatter-js.js +0 -1
- package/src/lib/dev-admin/log-view.js +0 -1
- package/src/lib/dev-admin/redbird-proxy.ts +25 -23
- package/src/lib/dev-tasks.ts +110 -105
- package/src/lib/tasks/eslint.ts +26 -26
- package/src/lib/utils.ts +11 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"framework-mock.js","sourceRoot":"","sources":["../../../src/config/jest/__mocks__/framework-mock.ts"],"names":[],"mappings":";AAAA,uDAAuD
|
|
1
|
+
{"version":3,"file":"framework-mock.js","sourceRoot":"","sources":["../../../src/config/jest/__mocks__/framework-mock.ts"],"names":[],"mappings":";AAAA,uDAAuD;;AAEvD,uDAAuD;AAEvD,MAAM,eAAe,GAAG,IAAA,sCAAmB,EAAC,OAAO,CAAC,CAAC;AAErD,MAAM,MAAM,GAAQ,eAAe,CAAC,QAAQ,CAAC,CAAC;AAC9C,MAAM,aAAa,GAAQ,eAAe,CAAC,yBAAyB,CAAC,CAAC;AAEtE,IAAI,MAAM,IAAI,aAAa,EAAE;IAC3B,+BAA+B;IAC/B,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,aAAa,EAAE,EAAE,CAAC,CAAC;CACpD"}
|
|
@@ -11,7 +11,7 @@ const jestMajVersion = parseInt(jestPkg.version.split(".")[0], 10);
|
|
|
11
11
|
// Jest changed its config setting for setup files on version 24
|
|
12
12
|
const SETUP_FILES_VERSION_SPLIT = 24;
|
|
13
13
|
const utils_1 = require("../../lib/utils");
|
|
14
|
-
const xarcOptions = utils_1.loadXarcOptions();
|
|
14
|
+
const xarcOptions = (0, utils_1.loadXarcOptions)();
|
|
15
15
|
const xarcCwd = xarcOptions.cwd;
|
|
16
16
|
const { enableTypeScript } = xarcOptions.babel;
|
|
17
17
|
// https://jestjs.io/docs/en/configuration.html#testregex-string
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jest.config.js","sourceRoot":"","sources":["../../src/config/jest/jest.config.ts"],"names":[],"mappings":";AAAA,uDAAuD;AAEvD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;AACnE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC;AAC7E,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC9D,MAAM,UAAU,GAAG,sBAAsB,CAAC,CAAC,gBAAgB,EAAE,8BAA8B,CAAC,CAAC,CAAC;AAE9F,MAAM,OAAO,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC;AAChD,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACnE,gEAAgE;AAChE,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAErC,2CAAkD;AAElD,MAAM,WAAW,GAAG,uBAAe,
|
|
1
|
+
{"version":3,"file":"jest.config.js","sourceRoot":"","sources":["../../src/config/jest/jest.config.ts"],"names":[],"mappings":";AAAA,uDAAuD;AAEvD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;AACnE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC;AAC7E,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC9D,MAAM,UAAU,GAAG,sBAAsB,CAAC,CAAC,gBAAgB,EAAE,8BAA8B,CAAC,CAAC,CAAC;AAE9F,MAAM,OAAO,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC;AAChD,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACnE,gEAAgE;AAChE,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAErC,2CAAkD;AAElD,MAAM,WAAW,GAAG,IAAA,uBAAe,GAAE,CAAC;AACtC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC;AAEhC,MAAM,EAAE,gBAAgB,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC;AAE/C,gEAAgE;AAChE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;AAC/C,MAAM,SAAS,GAAG,6CAA6C,QAAQ,OAAO,CAAC;AAE/E,MAAM,OAAO,GAAG,OAAO,CAAC;AAExB,MAAM,iBAAiB,GAAG;IACxB,OAAO;IACP,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,kCAAkC,CAAC;IAC7D,oBAAoB,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,gBAAgB,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5F,SAAS,EAAE,gBAAgB;QACzB,CAAC,CAAC;YACE,aAAa,EAAE,YAAY;YAC3B,aAAa,EAAE,YAAY;SAC5B;QACH,CAAC,CAAC,SAAS;IACb,SAAS;IACT,sBAAsB,EAAE,CAAC,gBAAgB,EAAE,cAAc,CAAC;IAC1D,iBAAiB,EAAE,CAAC,cAAc,EAAE,KAAK,CAAC;IAC1C,gBAAgB,EAAE;QAChB,qFAAqF,EAAE,QAAQ;QAC/F,+BAA+B,EAAE,oBAAoB;KACtD;IACD,wBAAwB,EAAE,CAAC,gBAAgB,CAAC;IAC5C,OAAO,EAAE,mBAAmB;CAC7B,CAAC;AAEF,MAAM,wBAAwB,GAAG,EAAE,4BAA4B,EAAE,aAAa,EAAE,CAAC;AACjF,MAAM,iBAAiB,GAAG,EAAE,kBAAkB,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;AAElE,MAAM,oBAAoB,GACxB,cAAc,IAAI,yBAAyB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,wBAAwB,CAAC;AAE7F,iBAAS,CAAC,CAAC,KAAK,CACd,EAAE,EACF,CAAC,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,EACjD,oBAAoB,EACpB,WAAW,CAAC,IAAI,CACjB,CAAC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
const utils_1 = require("../../lib/utils");
|
|
4
4
|
const logger_1 = require("../../lib/logger");
|
|
5
5
|
module.exports = function updateKarmaBrowserSettings(settings) {
|
|
6
|
-
const xarcOptions = utils_1.loadXarcOptions();
|
|
6
|
+
const xarcOptions = (0, utils_1.loadXarcOptions)();
|
|
7
7
|
const browser = xarcOptions.karma.browser.toLowerCase();
|
|
8
8
|
if (browser === "chrome") {
|
|
9
9
|
settings.browsers = ["ChromeHeadless"];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-settings.js","sourceRoot":"","sources":["../../src/config/karma/browser-settings.ts"],"names":[],"mappings":";AAAA,oCAAoC;AAEpC,2CAAkD;AAElD,6CAA0C;AAQ1C,iBAAS,SAAS,0BAA0B,CAAC,QAAa;IACxD,MAAM,WAAW,GAAG,uBAAe,
|
|
1
|
+
{"version":3,"file":"browser-settings.js","sourceRoot":"","sources":["../../src/config/karma/browser-settings.ts"],"names":[],"mappings":";AAAA,oCAAoC;AAEpC,2CAAkD;AAElD,6CAA0C;AAQ1C,iBAAS,SAAS,0BAA0B,CAAC,QAAa;IACxD,MAAM,WAAW,GAAG,IAAA,uBAAe,GAAE,CAAC;IAEtC,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IAExD,IAAI,OAAO,KAAK,QAAQ,EAAE;QACxB,QAAQ,CAAC,QAAQ,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACvC,eAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;KACxD;SAAM,IAAI,OAAO,KAAK,WAAW,EAAE;QAClC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC3C,QAAQ,CAAC,QAAQ,GAAG,CAAC,WAAW,CAAC,CAAC;QAElC,eAAM,CAAC,IAAI,CACT,2FAA2F,CAC5F,CAAC;KACH;SAAM;QACL,eAAM,CAAC,KAAK,CAAC,mBAAmB,OAAO,8BAA8B,CAAC,CAAC;QACvE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACxB;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC"}
|
package/config/karma/entry.js
CHANGED
|
@@ -12,12 +12,12 @@ const load_user_config_1 = require("./util/load-user-config");
|
|
|
12
12
|
const utils_1 = require("../../lib/utils");
|
|
13
13
|
const customCheck = require("@xarc/webpack/lib/util/custom-check"); // eslint-disable-line
|
|
14
14
|
module.exports = function (config) {
|
|
15
|
-
const xarcOptions = utils_1.loadXarcOptions();
|
|
15
|
+
const xarcOptions = (0, utils_1.loadXarcOptions)();
|
|
16
16
|
const xarcCwd = process.env.XARC_CWD || xarcOptions.cwd;
|
|
17
17
|
const webpackConfigFile = customCheck.getWebpackStartConfig("../webpack/webpack.config.coverage", false);
|
|
18
18
|
// eslint-disable-next-line
|
|
19
19
|
const webpackCovCfg = require(webpackConfigFile);
|
|
20
|
-
karma_conf_1.default(config);
|
|
20
|
+
(0, karma_conf_1.default)(config);
|
|
21
21
|
const settings = {
|
|
22
22
|
reporters: ["spec", "sonarqubeUnit", "coverage"],
|
|
23
23
|
webpack: webpackCovCfg,
|
|
@@ -36,6 +36,6 @@ module.exports = function (config) {
|
|
|
36
36
|
useBrowserName: false
|
|
37
37
|
}
|
|
38
38
|
};
|
|
39
|
-
load_user_config_1.loadUserConfig(path_1.default.basename(__filename), config, settings);
|
|
39
|
+
(0, load_user_config_1.loadUserConfig)(path_1.default.basename(__filename), config, settings);
|
|
40
40
|
};
|
|
41
41
|
//# sourceMappingURL=karma.conf.coverage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma.conf.coverage.js","sourceRoot":"","sources":["../../src/config/karma/karma.conf.coverage.ts"],"names":[],"mappings":";;AAAA,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,UAAU,CAAC;AAExC,wDAAwB;AAExB;;;;GAIG;AACH,sEAAqC;AACrC,8DAAyD;AACzD,2CAAkD;AAClD,MAAM,WAAW,GAAG,OAAO,CAAC,qCAAqC,CAAC,CAAC,CAAC,sBAAsB;AAQ1F,iBAAS,UAAS,MAAM;IACtB,MAAM,WAAW,GAAG,uBAAe,
|
|
1
|
+
{"version":3,"file":"karma.conf.coverage.js","sourceRoot":"","sources":["../../src/config/karma/karma.conf.coverage.ts"],"names":[],"mappings":";;AAAA,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,UAAU,CAAC;AAExC,wDAAwB;AAExB;;;;GAIG;AACH,sEAAqC;AACrC,8DAAyD;AACzD,2CAAkD;AAClD,MAAM,WAAW,GAAG,OAAO,CAAC,qCAAqC,CAAC,CAAC,CAAC,sBAAsB;AAQ1F,iBAAS,UAAS,MAAM;IACtB,MAAM,WAAW,GAAG,IAAA,uBAAe,GAAE,CAAC;IACtC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,WAAW,CAAC,GAAG,CAAC;IACxD,MAAM,iBAAiB,GAAG,WAAW,CAAC,qBAAqB,CACzD,oCAAoC,EACpC,KAAK,CACN,CAAC;IAEF,2BAA2B;IAC3B,MAAM,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEjD,IAAA,oBAAS,EAAC,MAAM,CAAC,CAAC;IAElB,MAAM,QAAQ,GAAG;QACf,SAAS,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,UAAU,CAAC;QAChD,OAAO,EAAE,aAAa;QACtB,gBAAgB,EAAE;YAChB,SAAS,EAAE;gBACT,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,eAAe,EAAE;gBACpD,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;gBAC7B,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;aAC9B;YACD,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC;SACjD;QACD,qBAAqB,EAAE;YACrB,gBAAgB,EAAE,KAAK;YACvB,UAAU,EAAE,WAAW;YACvB,SAAS,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC;YACtD,cAAc,EAAE,KAAK;SACtB;KACF,CAAC;IAEF,IAAA,iCAAc,EAAC,cAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC,CAAC"}
|
|
@@ -13,7 +13,7 @@ const Path = require("path");
|
|
|
13
13
|
const browserSettings = require("./browser-settings");
|
|
14
14
|
const utils_1 = require("../../lib/utils");
|
|
15
15
|
module.exports = function (config) {
|
|
16
|
-
const xarcOptions = utils_1.loadXarcOptions();
|
|
16
|
+
const xarcOptions = (0, utils_1.loadXarcOptions)();
|
|
17
17
|
const xarcCwd = xarcOptions.cwd;
|
|
18
18
|
const settings = {
|
|
19
19
|
frameworks: ["mocha"],
|
|
@@ -33,6 +33,6 @@ module.exports = function (config) {
|
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
35
|
browserSettings(settings);
|
|
36
|
-
load_user_config_1.loadUserConfig(Path.basename(__filename), config, settings);
|
|
36
|
+
(0, load_user_config_1.loadUserConfig)(Path.basename(__filename), config, settings);
|
|
37
37
|
};
|
|
38
38
|
//# sourceMappingURL=karma.conf.dev.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma.conf.dev.js","sourceRoot":"","sources":["../../src/config/karma/karma.conf.dev.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD;;;;;;;GAOG;AAEH,8DAAyD;AACzD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACtD,2CAAkD;AAElD,iBAAS,UAAS,MAAM;IACtB,MAAM,WAAW,GAAG,uBAAe,
|
|
1
|
+
{"version":3,"file":"karma.conf.dev.js","sourceRoot":"","sources":["../../src/config/karma/karma.conf.dev.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD;;;;;;;GAOG;AAEH,8DAAyD;AACzD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACtD,2CAAkD;AAElD,iBAAS,UAAS,MAAM;IACtB,MAAM,WAAW,GAAG,IAAA,uBAAe,GAAE,CAAC;IACtC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC;IAChC,MAAM,QAAQ,GAAG;QACf,UAAU,EAAE,CAAC,OAAO,CAAC;QACrB,SAAS,EAAE,CAAC,MAAM,CAAC;QACnB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE;YACL,8DAA8D;YAC9D,wCAAwC;SACzC;QACD,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;QACf,mBAAmB,EAAE,GAAG;QACxB,MAAM,EAAE;YACN,KAAK,EAAE;gBACL,EAAE,EAAE,KAAK;aACV;SACF;KACF,CAAC;IAEF,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC1B,IAAA,iCAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC,CAAC"}
|
|
@@ -91,7 +91,7 @@ module.exports = function getKarmaConfig(config) {
|
|
|
91
91
|
console.error("ERROR: @xarc/opt-karma not found - running karma tests is not possible");
|
|
92
92
|
plugins = [];
|
|
93
93
|
}
|
|
94
|
-
const xarcOptions = utils_1.loadXarcOptions();
|
|
94
|
+
const xarcOptions = (0, utils_1.loadXarcOptions)();
|
|
95
95
|
const xarcCwd = process.env.XARC_CWD || xarcOptions.cwd;
|
|
96
96
|
const { MAIN_PATH, PREPROCESSORS, DLL_PATHS } = getPaths(xarcCwd);
|
|
97
97
|
const webpack = loadWebpackConfig();
|
|
@@ -141,6 +141,6 @@ module.exports = function getKarmaConfig(config) {
|
|
|
141
141
|
singleRun: true
|
|
142
142
|
};
|
|
143
143
|
browserSettings(settings);
|
|
144
|
-
load_user_config_1.loadUserConfig(Path.basename(__filename), config, settings);
|
|
144
|
+
(0, load_user_config_1.loadUserConfig)(Path.basename(__filename), config, settings);
|
|
145
145
|
};
|
|
146
146
|
//# sourceMappingURL=karma.conf.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma.conf.js","sourceRoot":"","sources":["../../src/config/karma/karma.conf.ts"],"names":[],"mappings":";AAAA,mEAAmE;AACnE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,qCAAqC,CAAC,CAAC;AACnE,8DAAyD;AACzD,MAAM,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACtD,MAAM,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AAC9D,2CAAkD;AAElD;;GAEG;AACH,SAAS,iBAAiB;IACxB,IAAI;QACF,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnC,OAAO;YACL,yCAAyC;YACzC,kCAAkC;YAClC,0CAA0C;YAC1C,qCAAqC;YACrC,mCAAmC;YACnC,+BAA+B;YAC/B,wCAAwC;YACxC,yCAAyC;YACzC,iDAAiD;YACjD,0CAA0C;YAC1C,uCAAuC;YACvC,iCAAiC;SAClC,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED;;GAEG;AACH,SAAS,sBAAsB;IAC7B,IAAI;QACF,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;QACjD,OAAO;YACL,uBAAuB;YACvB,gBAAgB;YAChB,wBAAwB;YACxB,mBAAmB;YACnB,iBAAiB;YACjB,aAAa;YACb,sBAAsB;YACtB,uBAAuB;YACvB,+BAA+B;YAC/B,wBAAwB;YACxB,qBAAqB;YACrB,eAAe;SAChB,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,OAAO;IACvB,IAAI,SAAS,CAAC;IAEd,IAAI;QACF,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC;KACxE;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,iBAAiB,EAAE,EAAE;YACvB,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;SAChD;aAAM;YACL,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;SAC3C;KACF;IAED,OAAO,CAAC,GAAG,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC;IAEtD,MAAM,aAAa,GAAG,EAAE,CAAC;IAEzB,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAEpD,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAElE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;AACjD,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB;IACxB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;QAC/B,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC;QACpC,OAAO,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAC9C,uCAAuC,EACvC,KAAK,CACN,CAAC,CAAC;KACJ;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAQD,iBAAS,SAAS,cAAc,CAAC,MAAM;IACrC,IAAI,OAAO,GAAG,iBAAiB,EAAE,IAAI,sBAAsB,EAAE,CAAC;IAC9D,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;QACxF,OAAO,GAAG,EAAE,CAAC;KACd;IACD,MAAM,WAAW,GAAG,uBAAe,
|
|
1
|
+
{"version":3,"file":"karma.conf.js","sourceRoot":"","sources":["../../src/config/karma/karma.conf.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
|
|
|
9
9
|
const karma_conf_dev_1 = tslib_1.__importDefault(require("./karma.conf.dev"));
|
|
10
10
|
const load_user_config_1 = require("./util/load-user-config");
|
|
11
11
|
module.exports = function (config) {
|
|
12
|
-
karma_conf_dev_1.default(config);
|
|
12
|
+
(0, karma_conf_dev_1.default)(config);
|
|
13
13
|
const settings = {
|
|
14
14
|
crossOriginAttribute: false,
|
|
15
15
|
files: [
|
|
@@ -25,6 +25,6 @@ module.exports = function (config) {
|
|
|
25
25
|
};
|
|
26
26
|
}))
|
|
27
27
|
};
|
|
28
|
-
load_user_config_1.loadUserConfig(path_1.default.basename(__filename), config, settings);
|
|
28
|
+
(0, load_user_config_1.loadUserConfig)(path_1.default.basename(__filename), config, settings);
|
|
29
29
|
};
|
|
30
30
|
//# sourceMappingURL=karma.conf.watch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma.conf.watch.js","sourceRoot":"","sources":["../../src/config/karma/karma.conf.watch.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAEH,wDAAwB;AACxB,8EAAmC;AACnC,8DAAyD;AAQzD,iBAAS,UAAS,MAAM;IACtB,wBAAG,
|
|
1
|
+
{"version":3,"file":"karma.conf.watch.js","sourceRoot":"","sources":["../../src/config/karma/karma.conf.watch.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAEH,wDAAwB;AACxB,8EAAmC;AACnC,8DAAyD;AAQzD,iBAAS,UAAS,MAAM;IACtB,IAAA,wBAAG,EAAC,MAAM,CAAC,CAAC;IACZ,MAAM,QAAQ,GAAG;QACf,oBAAoB,EAAE,KAAK;QAC3B,KAAK,EAAE;YACL,8DAA8D;YAC9D,wCAA+C;YAC/C,uDAAuD;SACxD,CAAC,MAAM,CACN,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACzC,OAAO;gBACL,OAAO;gBACP,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,IAAI;aACP,CAAC;QACX,CAAC,CAAC,CACH;KACF,CAAC;IAEF,IAAA,iCAAc,EAAC,cAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC,CAAC"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.loadUserConfig = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const optional_require_1 =
|
|
5
|
+
const optional_require_1 = require("optional-require");
|
|
6
6
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
7
|
const lodash_1 = tslib_1.__importDefault(require("lodash"));
|
|
8
8
|
const assert_1 = tslib_1.__importDefault(require("assert"));
|
|
9
|
-
const optionalRequire = optional_require_1.
|
|
9
|
+
const optionalRequire = (0, optional_require_1.makeOptionalRequire)(require);
|
|
10
10
|
/**
|
|
11
11
|
* @param filename
|
|
12
12
|
* @param config
|
|
@@ -16,7 +16,7 @@ function loadUserConfig(filename, config, settings) {
|
|
|
16
16
|
const filePath = path_1.default.resolve("archetype/config/karma", filename);
|
|
17
17
|
const userConfig = optionalRequire(filePath);
|
|
18
18
|
if (userConfig) {
|
|
19
|
-
assert_1.default(lodash_1.default.isFunction(userConfig), `${filePath} must export a function`);
|
|
19
|
+
(0, assert_1.default)(lodash_1.default.isFunction(userConfig), `${filePath} must export a function`);
|
|
20
20
|
userConfig(config, settings);
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-user-config.js","sourceRoot":"","sources":["../../../src/config/karma/util/load-user-config.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"load-user-config.js","sourceRoot":"","sources":["../../../src/config/karma/util/load-user-config.ts"],"names":[],"mappings":";;;;AAAA,uDAAuD;AAEvD,wDAAwB;AACxB,4DAAuB;AACvB,4DAA4B;AAE5B,MAAM,eAAe,GAAG,IAAA,sCAAmB,EAAC,OAAO,CAAC,CAAC;AAErD;;;;GAIG;AACH,SAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ;IACvD,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,QAAQ,CAAC,CAAC;IAClE,MAAM,UAAU,GAAQ,eAAe,CAAC,QAAQ,CAAC,CAAC;IAElD,IAAI,UAAU,EAAE;QACd,IAAA,gBAAM,EAAC,gBAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,GAAG,QAAQ,yBAAyB,CAAC,CAAC;QACvE,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;KAC9B;SAAM;QACL,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;KACtB;AACH,CAAC;AAVD,wCAUC"}
|
package/config/mocha/setup.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
4
|
-
const
|
|
5
|
-
const optionalRequire = optional_require_1.default(require);
|
|
3
|
+
const optional_require_1 = require("optional-require");
|
|
4
|
+
const optionalRequire = (0, optional_require_1.makeOptionalRequire)(require);
|
|
6
5
|
const Enzyme = optionalRequire("enzyme");
|
|
7
6
|
const Adapter = optionalRequire("enzyme-adapter-react-16");
|
|
8
7
|
if (Enzyme && Adapter) {
|
|
@@ -13,7 +12,7 @@ const chai = optionalRequire("chai");
|
|
|
13
12
|
* @param addons
|
|
14
13
|
*/
|
|
15
14
|
function chaiUse(addons) {
|
|
16
|
-
[].concat(addons).forEach(x => {
|
|
15
|
+
[].concat(addons).forEach((x) => {
|
|
17
16
|
const AddonMod = x && optionalRequire(x);
|
|
18
17
|
if (AddonMod) {
|
|
19
18
|
chai.use(AddonMod);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/config/mocha/setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/config/mocha/setup.ts"],"names":[],"mappings":";;AAAA,uDAAuD;AACvD,MAAM,eAAe,GAAG,IAAA,sCAAmB,EAAC,OAAO,CAAC,CAAC;AAErD,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AACzC,MAAM,OAAO,GAAG,eAAe,CAAC,yBAAyB,CAAC,CAAC;AAE3D,IAAI,MAAM,IAAI,OAAO,EAAE;IACrB,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,OAAO,EAAE,EAAE,CAAC,CAAC;CAC9C;AAED,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;AAErC;;GAEG;AACH,SAAS,OAAO,CAAC,MAAM;IACrB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9B,MAAM,QAAQ,GAAG,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SACpB;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,IAAI,IAAI,EAAE;IACR,OAAO,CAAC,CAAC,kBAAkB,EAAE,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAE9D,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC;IAE/B,MAAc,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;CACtC"}
|
package/config/options.js
CHANGED
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
exports.getDevArchetypeLegacy = exports.getDefaultArchetypeOptions = exports.getUserConfigOptions = exports.checkOptArchetypeInAppDep = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
|
-
const optional_require_1 =
|
|
7
|
+
const optional_require_1 = require("optional-require");
|
|
8
8
|
const utils = tslib_1.__importStar(require("../lib/utils")); // really import ESM into single var utils
|
|
9
9
|
const lodash_1 = tslib_1.__importDefault(require("lodash"));
|
|
10
10
|
const xenv_config_1 = tslib_1.__importDefault(require("xenv-config"));
|
|
@@ -13,14 +13,14 @@ const env_webpack_1 = require("./env-webpack");
|
|
|
13
13
|
const env_babel_1 = require("./env-babel");
|
|
14
14
|
const env_karma_1 = require("./env-karma");
|
|
15
15
|
const app_2 = require("@xarc/app");
|
|
16
|
-
const optionalRequire = optional_require_1.
|
|
16
|
+
const optionalRequire = (0, optional_require_1.makeOptionalRequire)(require);
|
|
17
17
|
/**
|
|
18
18
|
* @param dependencies
|
|
19
19
|
* @param isDev
|
|
20
20
|
*/
|
|
21
21
|
function checkOptArchetypeInAppDep(dependencies, isDev = undefined) {
|
|
22
22
|
const options = dependencies
|
|
23
|
-
.filter(x => x.startsWith("electrode-archetype-opt-") || x.startsWith("@xarc/opt-"))
|
|
23
|
+
.filter((x) => x.startsWith("electrode-archetype-opt-") || x.startsWith("@xarc/opt-"))
|
|
24
24
|
.reduce((acc, name) => {
|
|
25
25
|
//
|
|
26
26
|
// In dev mode, when all dev deps are installed, we can safely load
|
|
@@ -41,7 +41,7 @@ function checkOptArchetypeInAppDep(dependencies, isDev = undefined) {
|
|
|
41
41
|
if (process.env._ELECTRODE_DEV_ || (process.env.NODE_ENV === "production" && !isDev)) {
|
|
42
42
|
throw err;
|
|
43
43
|
}
|
|
44
|
-
}
|
|
44
|
+
},
|
|
45
45
|
});
|
|
46
46
|
if (optPkg) {
|
|
47
47
|
const optPkgFlag = optPkg();
|
|
@@ -62,7 +62,7 @@ const getUserConfigOptions = (packageNames, devPackageNames) => {
|
|
|
62
62
|
// Check for any optional archetype in application's devDependencies or dependencies
|
|
63
63
|
//
|
|
64
64
|
...checkOptArchetypeInAppDep(devPackageNames, true).options,
|
|
65
|
-
...checkOptArchetypeInAppDep(packageNames).options
|
|
65
|
+
...checkOptArchetypeInAppDep(packageNames).options,
|
|
66
66
|
};
|
|
67
67
|
};
|
|
68
68
|
exports.getUserConfigOptions = getUserConfigOptions;
|
|
@@ -79,7 +79,7 @@ function getDefaultArchetypeOptions() {
|
|
|
79
79
|
//
|
|
80
80
|
const appPkg = optionalRequire(path_1.default.resolve("package.json")) || {
|
|
81
81
|
dependencies: {},
|
|
82
|
-
devDependencies: {}
|
|
82
|
+
devDependencies: {},
|
|
83
83
|
};
|
|
84
84
|
const packageNames = Object.keys(appPkg.dependencies);
|
|
85
85
|
const devPackageNames = Object.keys(appPkg.devDependencies);
|
|
@@ -87,12 +87,12 @@ function getDefaultArchetypeOptions() {
|
|
|
87
87
|
return {
|
|
88
88
|
dir: path_1.default.resolve(__dirname, ".."),
|
|
89
89
|
pkg,
|
|
90
|
-
options: exports.getUserConfigOptions(packageNames, devPackageNames),
|
|
90
|
+
options: (0, exports.getUserConfigOptions)(packageNames, devPackageNames),
|
|
91
91
|
prodDir: app_2.PROD_DIR,
|
|
92
92
|
eTmpDir: app_2.ETMP_DIR,
|
|
93
93
|
prodModulesDir: path_1.default.join(app_2.PROD_DIR, "modules"),
|
|
94
94
|
checkUserBabelRc: utils.checkUserBabelRc,
|
|
95
|
-
devArchetypeName: "@xarc/app-dev"
|
|
95
|
+
devArchetypeName: "@xarc/app-dev",
|
|
96
96
|
};
|
|
97
97
|
}
|
|
98
98
|
exports.getDefaultArchetypeOptions = getDefaultArchetypeOptions;
|
|
@@ -106,9 +106,9 @@ exports.getDefaultArchetypeOptions = getDefaultArchetypeOptions;
|
|
|
106
106
|
function getDevArchetypeLegacy() {
|
|
107
107
|
const defaultArchetypeConfig = getDefaultArchetypeOptions();
|
|
108
108
|
const userConfig = defaultArchetypeConfig.options;
|
|
109
|
-
const webpack = env_webpack_1.getEnvWebpack();
|
|
110
|
-
const babel = env_babel_1.getEnvBabel();
|
|
111
|
-
const karma = env_karma_1.getEnvKarma();
|
|
109
|
+
const webpack = (0, env_webpack_1.getEnvWebpack)();
|
|
110
|
+
const babel = (0, env_babel_1.getEnvBabel)();
|
|
111
|
+
const karma = (0, env_karma_1.getEnvKarma)();
|
|
112
112
|
const { myPkg: devPkg, myDir: devDir } = utils.getMyPkg();
|
|
113
113
|
const configDir = path_1.default.join(devDir, "config");
|
|
114
114
|
const devRequire = require(path_1.default.join(devDir, "require"));
|
|
@@ -128,25 +128,23 @@ function getDevArchetypeLegacy() {
|
|
|
128
128
|
mocha: `${configDir}/mocha`,
|
|
129
129
|
webpack: `${configDir}/webpack`,
|
|
130
130
|
jest: `${configDir}/jest`,
|
|
131
|
-
...userConfig.configPaths
|
|
131
|
+
...userConfig.configPaths,
|
|
132
132
|
},
|
|
133
133
|
prodDir: app_2.PROD_DIR,
|
|
134
134
|
eTmpDir: app_2.ETMP_DIR,
|
|
135
|
-
AppMode: app_1.makeAppMode(app_2.PROD_DIR, userConfig.reactLib)
|
|
135
|
+
AppMode: (0, app_1.makeAppMode)(app_2.PROD_DIR, userConfig.reactLib),
|
|
136
136
|
};
|
|
137
137
|
const topConfigSpec = {
|
|
138
|
-
devOpenBrowser: { env: "ELECTRODE_DEV_OPEN_BROWSER", default: false }
|
|
138
|
+
devOpenBrowser: { env: "ELECTRODE_DEV_OPEN_BROWSER", default: false },
|
|
139
139
|
};
|
|
140
140
|
const typeScriptOption = userConfig.typescript === false
|
|
141
141
|
? {
|
|
142
|
-
babel: { enableTypeScript: userConfig.typescript }
|
|
142
|
+
babel: { enableTypeScript: userConfig.typescript },
|
|
143
143
|
}
|
|
144
144
|
: {};
|
|
145
|
-
const archetypeConfig = Object.assign(lodash_1.default.merge(config, typeScriptOption), xenv_config_1.default(topConfigSpec, lodash_1.default.pick(userConfig, Object.keys(topConfigSpec)), { merge: lodash_1.default.merge }));
|
|
145
|
+
const archetypeConfig = Object.assign(lodash_1.default.merge(config, typeScriptOption), (0, xenv_config_1.default)(topConfigSpec, lodash_1.default.pick(userConfig, Object.keys(topConfigSpec)), { merge: lodash_1.default.merge }));
|
|
146
146
|
archetypeConfig.babel.hasMultiTargets =
|
|
147
|
-
Object.keys(archetypeConfig.babel.envTargets)
|
|
148
|
-
.sort()
|
|
149
|
-
.join(",") !== "default,node";
|
|
147
|
+
Object.keys(archetypeConfig.babel.envTargets).sort().join(",") !== "default,node";
|
|
150
148
|
let AppMode;
|
|
151
149
|
//
|
|
152
150
|
// AppMode could cause circular dependency loading
|
|
@@ -155,10 +153,10 @@ function getDevArchetypeLegacy() {
|
|
|
155
153
|
Object.defineProperty(archetypeConfig, "AppMode", {
|
|
156
154
|
get() {
|
|
157
155
|
if (!AppMode) {
|
|
158
|
-
AppMode = app_1.makeAppMode(archetypeConfig.prodDir, archetypeConfig.reactLib);
|
|
156
|
+
AppMode = (0, app_1.makeAppMode)(archetypeConfig.prodDir, archetypeConfig.reactLib);
|
|
159
157
|
}
|
|
160
158
|
return AppMode;
|
|
161
|
-
}
|
|
159
|
+
},
|
|
162
160
|
});
|
|
163
161
|
return archetypeConfig;
|
|
164
162
|
}
|
package/config/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/config/options.ts"],"names":[],"mappings":";AAAA,uEAAuE;;;;AAEvE,wDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/config/options.ts"],"names":[],"mappings":"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"}
|
package/config/user-config.js
CHANGED
|
@@ -5,15 +5,15 @@ exports.getUserConfig = void 0;
|
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
7
|
const lodash_1 = require("lodash");
|
|
8
|
-
const optional_require_1 =
|
|
9
|
-
const optionalRequire = optional_require_1.
|
|
8
|
+
const optional_require_1 = require("optional-require");
|
|
9
|
+
const optionalRequire = (0, optional_require_1.makeOptionalRequire)(require);
|
|
10
10
|
let cachedUserConfig = null;
|
|
11
11
|
/**
|
|
12
12
|
* Load user's config under the directory archetype/config
|
|
13
13
|
*/
|
|
14
14
|
function getUserConfig() {
|
|
15
15
|
cachedUserConfig =
|
|
16
|
-
cachedUserConfig || lodash_1.merge({ options: {} }, optionalRequire(path_1.default.resolve("archetype/config")));
|
|
16
|
+
cachedUserConfig || (0, lodash_1.merge)({ options: {} }, optionalRequire(path_1.default.resolve("archetype/config")));
|
|
17
17
|
return cachedUserConfig;
|
|
18
18
|
}
|
|
19
19
|
exports.getUserConfig = getUserConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-config.js","sourceRoot":"","sources":["../src/config/user-config.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;;AAEvD,wDAAwB;AACxB,mCAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"user-config.js","sourceRoot":"","sources":["../src/config/user-config.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;;AAEvD,wDAAwB;AACxB,mCAA+B;AAC/B,uDAAuD;AAEvD,MAAM,eAAe,GAAG,IAAA,sCAAmB,EAAC,OAAO,CAAC,CAAC;AAErD,IAAI,gBAAgB,GAAG,IAAI,CAAC;AAC5B;;GAEG;AACH,SAAgB,aAAa;IAC3B,gBAAgB;QACd,gBAAgB,IAAI,IAAA,cAAK,EAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,cAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAChG,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAJD,sCAIC"}
|
|
@@ -6,7 +6,7 @@ exports.AppDevMiddleware = void 0;
|
|
|
6
6
|
const Path = require("path");
|
|
7
7
|
const _ = require("lodash");
|
|
8
8
|
const app_1 = require("@xarc/app");
|
|
9
|
-
const { getXRequire } = app_1.xAppRequire("isomorphic-loader");
|
|
9
|
+
const { getXRequire } = (0, app_1.xAppRequire)("isomorphic-loader");
|
|
10
10
|
const { refreshAllSubApps } = require("subapp-util");
|
|
11
11
|
const { refreshAllSubApps2 } = require("@xarc/subapp");
|
|
12
12
|
const webpack_dev_relay_1 = require("./dev-admin/webpack-dev-relay");
|
|
@@ -45,7 +45,7 @@ class AppDevMiddleware {
|
|
|
45
45
|
moduleName = moduleName.split("|")[0];
|
|
46
46
|
if (!moduleName.startsWith("webpack/runtime")) {
|
|
47
47
|
try {
|
|
48
|
-
const xarcOptions = utils_1.loadXarcOptions();
|
|
48
|
+
const xarcOptions = (0, utils_1.loadXarcOptions)();
|
|
49
49
|
const xarcCwd = xarcOptions.cwd;
|
|
50
50
|
const moduleFullPath = require.resolve(Path.resolve(xarcCwd, moduleName));
|
|
51
51
|
delete require.cache[moduleFullPath];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-dev-middleware.js","sourceRoot":"","sources":["../src/lib/app-dev-middleware.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,iEAAiE;;;AAEjE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,mCAAwC;AACxC,MAAM,EAAE,WAAW,EAAE,GAAG,iBAAW,
|
|
1
|
+
{"version":3,"file":"app-dev-middleware.js","sourceRoot":"","sources":["../src/lib/app-dev-middleware.ts"],"names":[],"mappings":"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"}
|
package/lib/babel-run.js
CHANGED
|
@@ -19,7 +19,7 @@ const utils_1 = require("../lib/utils");
|
|
|
19
19
|
const webpack_1 = require("@xarc/webpack");
|
|
20
20
|
const serverDir = process.argv[2] || "src/server";
|
|
21
21
|
let start;
|
|
22
|
-
const xarcOptions = utils_1.loadXarcOptions();
|
|
22
|
+
const xarcOptions = (0, utils_1.loadXarcOptions)();
|
|
23
23
|
const xarcCwd = xarcOptions.cwd;
|
|
24
24
|
try {
|
|
25
25
|
// Try to load user's dev.js under src/server
|
package/lib/babel-run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"babel-run.js","sourceRoot":"","sources":["../src/lib/babel-run.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD;;;;;;;;;;;GAWG;AACH,wDAAwB;AACxB,wCAA+C;AAC/C,2CAAqC;AAErC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC;AAElD,IAAI,KAAK,CAAC;AACV,MAAM,WAAW,GAAG,uBAAe,
|
|
1
|
+
{"version":3,"file":"babel-run.js","sourceRoot":"","sources":["../src/lib/babel-run.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD;;;;;;;;;;;GAWG;AACH,wDAAwB;AACxB,wCAA+C;AAC/C,2CAAqC;AAErC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC;AAElD,IAAI,KAAK,CAAC;AACV,MAAM,WAAW,GAAG,IAAA,uBAAe,GAAE,CAAC;AACtC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC;AAEhC,IAAI;IACF,6CAA6C;IAC7C,KAAK,GAAG,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;CAC7D;AAAC,OAAO,GAAG,EAAE;IACZ,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB,EAAE;QACnC,MAAM,GAAG,CAAC;KACX;IAED,yEAAyE;IACzE,4DAA4D;IAC5D,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACzB,MAAM,EAAE,CAAC,cAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAC3C,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;aACxB,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;aAC7D,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACnB,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAEvD,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAChC;AAED,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;IAC/B,KAAK,EAAE,CAAC;CACT"}
|
|
@@ -42,7 +42,7 @@ export declare class AdminHttp {
|
|
|
42
42
|
_streamLogsHandler(url: Url.UrlWithStringQuery, res: http.ServerResponse): void;
|
|
43
43
|
sendLogsToStreamClients(): void;
|
|
44
44
|
_sendLogsToStreamClients(): void;
|
|
45
|
-
requestListener(req: http.IncomingMessage, res: http.ServerResponse): void;
|
|
45
|
+
requestListener(req: http.IncomingMessage, res: http.ServerResponse): void | http.ServerResponse;
|
|
46
46
|
/**
|
|
47
47
|
* Shutdown the http server
|
|
48
48
|
*/
|
|
@@ -40,10 +40,10 @@ function compareEntryId(a, b) {
|
|
|
40
40
|
// }
|
|
41
41
|
class AdminHttp {
|
|
42
42
|
constructor(options) {
|
|
43
|
-
this._ready = xaa_1.makeDefer();
|
|
43
|
+
this._ready = (0, xaa_1.makeDefer)();
|
|
44
44
|
this._server = http_1.default.createServer(this.requestListener.bind(this));
|
|
45
45
|
this._getLogs = options.getLogs;
|
|
46
|
-
const port = utils_1.isValidPort(options.port) ? 0 : options.port;
|
|
46
|
+
const port = (0, utils_1.isValidPort)(options.port) ? 0 : options.port;
|
|
47
47
|
this._server.listen(port, () => {
|
|
48
48
|
this._port = this._server.address().port;
|
|
49
49
|
this._ready.resolve(this._port);
|
|
@@ -75,7 +75,7 @@ class AdminHttp {
|
|
|
75
75
|
return compareEntryId(event, lastEntryId) > 0;
|
|
76
76
|
})
|
|
77
77
|
.map(event => {
|
|
78
|
-
const message = log_parser_1.getLogEventAsHtml(event);
|
|
78
|
+
const message = (0, log_parser_1.getLogEventAsHtml)(event);
|
|
79
79
|
const record = {
|
|
80
80
|
level: event.level,
|
|
81
81
|
ts: event.ts,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-http.js","sourceRoot":"","sources":["../../src/lib/dev-admin/admin-http.ts"],"names":[],"mappings":";AAAA,qDAAqD;;;;AAErD,wDAAwB;AACxB,wDAAwB;AACxB,oDAAoB;AACpB,sDAAsB;AACtB,6CAAiD;AACjD,sEAA6B;AAC7B,4DAAuB;AACvB,oCAAuC;AACvC,6BAAuC;AA0BvC;;GAEG;AACH,SAAS,YAAY,CAAC,GAAW;IAC/B,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACxB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,OAAO;YACL,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACvB,CAAC;KACH;IAED,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;AAC/B,CAAC;AAED;;;GAGG;AACH,SAAS,cAAc,CAAC,CAAa,EAAE,CAAa;IAClD,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE;QACjB,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;KAClC;IACD,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;AACrB,CAAC;AAED,uCAAuC;AACvC,yEAAyE;AACzE,IAAI;AAEJ,MAAa,SAAS;IAYpB,YAAY,OAAyB;QACnC,IAAI,CAAC,MAAM,GAAG,eAAS,
|
|
1
|
+
{"version":3,"file":"admin-http.js","sourceRoot":"","sources":["../../src/lib/dev-admin/admin-http.ts"],"names":[],"mappings":"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"}
|