@xarc/app-dev 11.0.10-beta.0 → 11.0.10-beta.11
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/config/archetype.js +1 -2
- package/config/archetype.js.map +1 -1
- package/config/babel/babelrc-client.js +3 -5
- package/config/babel/babelrc-client.js.map +1 -1
- package/config/babel/babelrc-server.js +10 -10
- package/config/babel/babelrc-server.js.map +1 -1
- package/config/babel/babelrc.js +3 -5
- package/config/babel/babelrc.js.map +1 -1
- package/config/babel/common.js +2 -2
- package/config/babel/common.js.map +1 -1
- package/config/dev-proxy.js +2 -2
- package/config/dev-proxy.js.map +1 -1
- package/config/env-app.js +1 -2
- package/config/env-app.js.map +1 -1
- package/config/env-babel.js +1 -2
- package/config/env-babel.js.map +1 -1
- package/config/env-karma.js +1 -2
- package/config/env-karma.js.map +1 -1
- package/config/env-proxy.js +1 -2
- package/config/env-proxy.js.map +1 -1
- package/config/env-webpack.js +1 -2
- package/config/env-webpack.js.map +1 -1
- package/config/karma/util/load-user-config.js +1 -2
- package/config/karma/util/load-user-config.js.map +1 -1
- package/config/opt2/babel-options.d.ts +1 -1
- package/config/options.js +4 -4
- package/config/options.js.map +1 -1
- package/config/user-config.js +1 -2
- package/config/user-config.js.map +1 -1
- package/lib/dev-admin/admin-http.d.ts +0 -3
- package/lib/dev-admin/admin-server.d.ts +0 -1
- package/lib/dev-admin/cleanup.js +2 -2
- package/lib/dev-admin/cleanup.js.map +1 -1
- package/lib/dev-admin/dev-http.d.ts +0 -1
- package/lib/dev-admin/dev-server-start.js +1 -2
- package/lib/dev-admin/dev-server-start.js.map +1 -1
- package/lib/dev-admin/log-parser.js +2 -3
- package/lib/dev-admin/log-parser.js.map +1 -1
- package/lib/dev-admin/redbird-spawn.js +7 -12
- package/lib/dev-admin/redbird-spawn.js.map +1 -1
- package/lib/dev-tasks.js +2 -2
- package/lib/dev-tasks.js.map +1 -1
- package/lib/fake-res.d.ts +0 -1
- package/lib/index.d.ts +0 -1
- package/lib/stats-mapper.js +1 -2
- package/lib/stats-mapper.js.map +1 -1
- package/lib/stats-utils.js +8 -9
- package/lib/stats-utils.js.map +1 -1
- package/lib/tasks/eslint.js +3 -4
- package/lib/tasks/eslint.js.map +1 -1
- package/lib/utils.js +8 -8
- package/lib/utils.js.map +1 -1
- package/lib/webpack-dev-express.js +1 -2
- package/lib/webpack-dev-express.js.map +1 -1
- package/lib/webpack-dev-fastify.js +1 -2
- package/lib/webpack-dev-fastify.js.map +1 -1
- package/lib/webpack-dev-hapi.js +2 -2
- package/lib/webpack-dev-hapi.js.map +1 -1
- package/lib/webpack-dev-koa.js +1 -2
- package/lib/webpack-dev-koa.js.map +1 -1
- package/package.json +11 -11
- package/scripts/l10n/flatten-messages.js +4 -14
- package/src/config/babel/babelrc-client.ts +5 -12
- package/src/config/babel/babelrc-server.ts +10 -10
- package/src/config/babel/babelrc.ts +7 -17
- package/src/config/opt2/babel-options.ts +1 -1
- package/src/lib/dev-admin/redbird-spawn.ts +18 -24
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-dev-fastify.js","sourceRoot":"","sources":["../src/lib/webpack-dev-fastify.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,iDAAiD
|
|
1
|
+
{"version":3,"file":"webpack-dev-fastify.js","sourceRoot":"","sources":["../src/lib/webpack-dev-fastify.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,iDAAiD;;AAUjD,sCAmBC;AA3BD,6DAAwD;AAExD;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CAAC,MAAW;IAC7C,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,IAAI,qCAAgB,EAAE,CAAC;QAE1C,UAAU,CAAC,KAAK,EAAE,CAAC;QAEnB,oDAAoD;QACpD,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;YAClC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACxC,IAAI,OAAO,EAAE,CAAC;gBACZ,aAAa,CAAC,UAAU,CAAC,CAAC;gBAC1B,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YAClD,CAAC;QACH,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;YAC1C,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
package/lib/webpack-dev-hapi.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable no-console, no-magic-numbers */
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.hapiPlugin =
|
|
4
|
+
exports.hapiPlugin = void 0;
|
|
5
|
+
exports.register = register;
|
|
5
6
|
const app_dev_middleware_1 = require("./app-dev-middleware");
|
|
6
7
|
/**
|
|
7
8
|
* Hapi 16 and lower plugin for webpack dev
|
|
@@ -34,7 +35,6 @@ function register(server, _options, next) {
|
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
|
-
exports.register = register;
|
|
38
38
|
const pkg = {
|
|
39
39
|
name: "electrode-x-dev-hapi16",
|
|
40
40
|
version: "1.0.0"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-dev-hapi.js","sourceRoot":"","sources":["../src/lib/webpack-dev-hapi.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;
|
|
1
|
+
{"version":3,"file":"webpack-dev-hapi.js","sourceRoot":"","sources":["../src/lib/webpack-dev-hapi.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;AAajD,4BAqBC;AAhCD,6DAAwD;AAExD;;;;;;;;GAQG;AACH,SAAgB,QAAQ,CAAC,MAAW,EAAE,QAAa,EAAE,IAA2B;IAC9E,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,qCAAgB,EAAE,CAAC;QAE1C,UAAU,CAAC,KAAK,EAAE,CAAC;QAEnB,MAAM,CAAC,GAAG,CAAC;YACT,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;gBACzB,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;gBAC/C,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,CAAC;SACF,CAAC,CAAC;QACH,OAAO,IAAI,IAAI,IAAI,EAAE,CAAC;IACxB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,GAAG,GAAG;IACV,IAAI,EAAE,wBAAwB;IAC9B,OAAO,EAAE,OAAO;CACjB,CAAC;AAEF,QAAQ,CAAC,UAAU,GAAG,EAAE,GAAG,EAAE,CAAC;AAEjB,QAAA,UAAU,GAAG;IACxB,QAAQ;CACT,CAAC"}
|
package/lib/webpack-dev-koa.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.koaMiddleware =
|
|
3
|
+
exports.koaMiddleware = koaMiddleware;
|
|
4
4
|
const app_dev_middleware_1 = require("./app-dev-middleware");
|
|
5
5
|
/**
|
|
6
6
|
* webpack dev middleware for app using Koa
|
|
@@ -18,5 +18,4 @@ function koaMiddleware(app) {
|
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
exports.koaMiddleware = koaMiddleware;
|
|
22
21
|
//# sourceMappingURL=webpack-dev-koa.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-dev-koa.js","sourceRoot":"","sources":["../src/lib/webpack-dev-koa.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webpack-dev-koa.js","sourceRoot":"","sources":["../src/lib/webpack-dev-koa.ts"],"names":[],"mappings":";;AAOA,sCAUC;AAjBD,6DAAwD;AAExD;;;;GAIG;AACH,SAAgB,aAAa,CAAC,GAAG;IAC/B,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;IAC3D,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,UAAU,GAAG,IAAI,qCAAgB,EAAE,CAAC;QAC1C,UAAU,CAAC,KAAK,EAAE,CAAC;QACnB,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAC1B,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;YACvC,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xarc/app-dev",
|
|
3
|
-
"version": "11.0.10-beta.
|
|
3
|
+
"version": "11.0.10-beta.11",
|
|
4
4
|
"description": "Electrode X application development support",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"homepage": "http://www.electrode.io",
|
|
@@ -39,14 +39,14 @@
|
|
|
39
39
|
"Joel Chen <xchen@walmartlabs.com>"
|
|
40
40
|
],
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@xarc/app": "^11.0.
|
|
42
|
+
"@xarc/app": "^11.0.9"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
45
|
"@babel/cli": "^7.17.10",
|
|
46
46
|
"@babel/core": "^7.17.12",
|
|
47
|
+
"@babel/plugin-proposal-class-properties": "^7.17.12",
|
|
47
48
|
"@babel/plugin-proposal-decorators": "^7.17.12",
|
|
48
|
-
"@babel/plugin-
|
|
49
|
-
"@babel/plugin-transform-object-rest-spread": "^7.24.7",
|
|
49
|
+
"@babel/plugin-proposal-object-rest-spread": "^7.17.12",
|
|
50
50
|
"@babel/plugin-transform-react-constant-elements": "^7.17.12",
|
|
51
51
|
"@babel/plugin-transform-react-inline-elements": "^7.16.7",
|
|
52
52
|
"@babel/plugin-transform-runtime": "^7.17.12",
|
|
@@ -55,10 +55,10 @@
|
|
|
55
55
|
"@babel/preset-typescript": "^7.17.12",
|
|
56
56
|
"@babel/register": "^7.17.7",
|
|
57
57
|
"@jchip/redbird": "^1.3.0",
|
|
58
|
-
"@xarc/dev-base": "^0.1.
|
|
58
|
+
"@xarc/dev-base": "^0.1.2",
|
|
59
59
|
"@xarc/run": "^1.0.5",
|
|
60
|
-
"@xarc/subapp": "^0.4.
|
|
61
|
-
"@xarc/webpack": "11.2.0-beta.
|
|
60
|
+
"@xarc/subapp": "^0.4.1",
|
|
61
|
+
"@xarc/webpack": "11.2.0-beta.12",
|
|
62
62
|
"ansi-to-html": "^0.7.2",
|
|
63
63
|
"babel-plugin-lodash": "^3.3.4",
|
|
64
64
|
"babel-plugin-minify-dead-code-elimination": "^0.5.2",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"fast-async": "^7.0.5",
|
|
74
74
|
"filter-scan-dir": "1.5.5",
|
|
75
75
|
"fs-extra": "^10.1.0",
|
|
76
|
-
"glob": "^
|
|
76
|
+
"glob": "^8.0.3",
|
|
77
77
|
"identity-obj-proxy": "^3.0.0",
|
|
78
78
|
"is-ci": "^2.0.0",
|
|
79
79
|
"lodash": "^4.17.21",
|
|
@@ -89,6 +89,7 @@
|
|
|
89
89
|
"ps-get": "^1.1.0",
|
|
90
90
|
"read-pkg-up": "^7.0.1",
|
|
91
91
|
"regenerator-runtime": "^0.13.9",
|
|
92
|
+
"request": "^2.88.2",
|
|
92
93
|
"require-at": "^1.0.6",
|
|
93
94
|
"semver": "^7.3.7",
|
|
94
95
|
"serve-index-fs": "^1.10.1",
|
|
@@ -104,8 +105,6 @@
|
|
|
104
105
|
"xsh": "^0.4.5"
|
|
105
106
|
},
|
|
106
107
|
"devDependencies": {
|
|
107
|
-
"@babel/core": "^7.11.0",
|
|
108
|
-
"@babel/eslint-parser": "^7.25.1",
|
|
109
108
|
"@istanbuljs/nyc-config-typescript": "^1.0.2",
|
|
110
109
|
"@types/chai": "^4.3.1",
|
|
111
110
|
"@types/mocha": "^10.0.1",
|
|
@@ -115,9 +114,10 @@
|
|
|
115
114
|
"@types/webpack": "5.28.0",
|
|
116
115
|
"@typescript-eslint/eslint-plugin": "^5.0.0",
|
|
117
116
|
"@typescript-eslint/parser": "^5.0.0",
|
|
118
|
-
"@xarc/app": "^11.0.
|
|
117
|
+
"@xarc/app": "^11.0.9",
|
|
119
118
|
"@xarc/module-dev": "^4.1.0",
|
|
120
119
|
"@xarc/run": "^1.1.1",
|
|
120
|
+
"babel-eslint": "^10.1.0",
|
|
121
121
|
"chai": "^4.3.6",
|
|
122
122
|
"electrode-server": "^3.3.0",
|
|
123
123
|
"electrode-server1": "npm:electrode-server@^1.0.0",
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
const _ = require("lodash");
|
|
7
7
|
const Util = require("util");
|
|
8
8
|
const Fs = require("fs-extra");
|
|
9
|
-
const
|
|
9
|
+
const getFilePaths = Util.promisify(require("glob"));
|
|
10
10
|
const MESSAGES_PATTERN = "./tmp/messages/**/*.json";
|
|
11
11
|
const RAW_MESSAGES_DIR = "./dist/";
|
|
12
12
|
const RAW_MESSAGES_NAME = "raw-messages.json";
|
|
@@ -39,10 +39,7 @@ function readFileAsJSON(filePath) {
|
|
|
39
39
|
* from all files
|
|
40
40
|
*/
|
|
41
41
|
async function getAllDefaultMessages(messageFilesPathPattern) {
|
|
42
|
-
const fileJsons = await xaa.map(
|
|
43
|
-
await getFilePaths(messageFilesPathPattern),
|
|
44
|
-
readFileAsJSON
|
|
45
|
-
);
|
|
42
|
+
const fileJsons = await xaa.map(await getFilePaths(messageFilesPathPattern), readFileAsJSON);
|
|
46
43
|
return fileJsons.reduce((previousValue, defaultMessageDescriptors) => {
|
|
47
44
|
defaultMessageDescriptors.forEach((descriptor) => {
|
|
48
45
|
previousValue[descriptor.id] = descriptor;
|
|
@@ -51,19 +48,12 @@ async function getAllDefaultMessages(messageFilesPathPattern) {
|
|
|
51
48
|
}, {});
|
|
52
49
|
}
|
|
53
50
|
|
|
54
|
-
const writeRawMessages = _.partial(
|
|
55
|
-
writeFileAsJSON,
|
|
56
|
-
RAW_MESSAGES_DIR,
|
|
57
|
-
RAW_MESSAGES_NAME
|
|
58
|
-
);
|
|
51
|
+
const writeRawMessages = _.partial(writeFileAsJSON, RAW_MESSAGES_DIR, RAW_MESSAGES_NAME);
|
|
59
52
|
|
|
60
53
|
const isMain = require.main === module;
|
|
61
54
|
|
|
62
55
|
function flattenMessagesL10n() {
|
|
63
|
-
return Promise.all([
|
|
64
|
-
getAllDefaultMessages(MESSAGES_PATTERN),
|
|
65
|
-
Fs.ensureDir(RAW_MESSAGES_DIR),
|
|
66
|
-
])
|
|
56
|
+
return Promise.all([getAllDefaultMessages(MESSAGES_PATTERN), Fs.ensureDir(RAW_MESSAGES_DIR)])
|
|
67
57
|
.then(_.first)
|
|
68
58
|
.then(writeRawMessages)
|
|
69
59
|
.then(() => {
|
|
@@ -37,7 +37,7 @@ const basePlugins = [
|
|
|
37
37
|
},
|
|
38
38
|
],
|
|
39
39
|
// allow decorators on class and method
|
|
40
|
-
// Note: This must go before @babel/plugin-proposal-
|
|
40
|
+
// Note: This must go before @babel/plugin-proposal-class-properties
|
|
41
41
|
(enableTypeScript || proposalDecorators) && [
|
|
42
42
|
"@babel/plugin-proposal-decorators",
|
|
43
43
|
{ legacy: legacyDecorators, ...proposalDecorators },
|
|
@@ -48,7 +48,7 @@ const basePlugins = [
|
|
|
48
48
|
// Note: This must go before @babel/plugin-transform-classes
|
|
49
49
|
//
|
|
50
50
|
(enableTypeScript || transformClassProps) && [
|
|
51
|
-
"@babel/plugin-proposal-
|
|
51
|
+
"@babel/plugin-proposal-class-properties",
|
|
52
52
|
{ loose: looseClassProps, ...transformClassProps },
|
|
53
53
|
],
|
|
54
54
|
//
|
|
@@ -102,9 +102,7 @@ const plugins = basePlugins.concat(
|
|
|
102
102
|
"babel-plugin-react-css-modules",
|
|
103
103
|
{
|
|
104
104
|
context: "./src",
|
|
105
|
-
generateScopedName: `${
|
|
106
|
-
isProduction ? "" : "[name]__[local]___"
|
|
107
|
-
}[hash:base64:5]`,
|
|
105
|
+
generateScopedName: `${isProduction ? "" : "[name]__[local]___"}[hash:base64:5]`,
|
|
108
106
|
filetypes: {
|
|
109
107
|
".scss": {
|
|
110
108
|
syntax: "postcss-scss",
|
|
@@ -121,18 +119,13 @@ const plugins = basePlugins.concat(
|
|
|
121
119
|
],
|
|
122
120
|
],
|
|
123
121
|
enableKarmaCov && [
|
|
124
|
-
getPluginFrom(
|
|
125
|
-
["@xarc/opt-karma", "electrode-archetype-opt-karma"],
|
|
126
|
-
"babel-plugin-istanbul"
|
|
127
|
-
),
|
|
122
|
+
getPluginFrom(["@xarc/opt-karma", "electrode-archetype-opt-karma"], "babel-plugin-istanbul"),
|
|
128
123
|
]
|
|
129
124
|
);
|
|
130
125
|
|
|
131
126
|
const targets = envTargets[babelTarget];
|
|
132
127
|
const coreJsVersion = require("core-js/package.json").version.split(".")[0];
|
|
133
|
-
const useBuiltIns = hasMultiTargets
|
|
134
|
-
? { useBuiltIns: "entry", corejs: coreJsVersion }
|
|
135
|
-
: {};
|
|
128
|
+
const useBuiltIns = hasMultiTargets ? { useBuiltIns: "entry", corejs: coreJsVersion } : {};
|
|
136
129
|
|
|
137
130
|
const presets = [
|
|
138
131
|
//
|
|
@@ -11,7 +11,7 @@ const {
|
|
|
11
11
|
enableFlow,
|
|
12
12
|
transformClassProps,
|
|
13
13
|
looseClassProps,
|
|
14
|
-
envTargets = {}
|
|
14
|
+
envTargets = {}
|
|
15
15
|
} = _.get(xOptions, "babel", {});
|
|
16
16
|
|
|
17
17
|
const addFlowPlugin = Boolean(enableFlow && optFlow);
|
|
@@ -23,21 +23,21 @@ export = {
|
|
|
23
23
|
[
|
|
24
24
|
"@babel/preset-env",
|
|
25
25
|
{
|
|
26
|
-
targets: node
|
|
27
|
-
}
|
|
26
|
+
targets: node
|
|
27
|
+
}
|
|
28
28
|
],
|
|
29
29
|
enableTypeScript && "@babel/preset-typescript",
|
|
30
|
-
"@babel/preset-react"
|
|
31
|
-
].filter(
|
|
30
|
+
"@babel/preset-react"
|
|
31
|
+
].filter(x => x),
|
|
32
32
|
plugins: [
|
|
33
33
|
addFlowPlugin && [
|
|
34
34
|
"@babel/plugin-transform-flow-strip-types",
|
|
35
|
-
{ requireDirective: flowRequireDirective }
|
|
35
|
+
{ requireDirective: flowRequireDirective }
|
|
36
36
|
],
|
|
37
37
|
(enableTypeScript || transformClassProps) && [
|
|
38
|
-
"@babel/plugin-
|
|
39
|
-
{ loose: looseClassProps }
|
|
38
|
+
"@babel/plugin-proposal-class-properties",
|
|
39
|
+
{ loose: looseClassProps }
|
|
40
40
|
],
|
|
41
|
-
enableTypeScript && "@babel/proposal-object-rest-spread"
|
|
42
|
-
].filter(
|
|
41
|
+
enableTypeScript && "@babel/proposal-object-rest-spread"
|
|
42
|
+
].filter(x => x)
|
|
43
43
|
};
|
|
@@ -33,8 +33,7 @@ const {
|
|
|
33
33
|
|
|
34
34
|
const addFlowPlugin = Boolean(enableFlow && optFlow);
|
|
35
35
|
|
|
36
|
-
const { BABEL_ENV, NODE_ENV, XARC_BABEL_TARGET, ENABLE_KARMA_COV } =
|
|
37
|
-
process.env;
|
|
36
|
+
const { BABEL_ENV, NODE_ENV, XARC_BABEL_TARGET, ENABLE_KARMA_COV } = process.env;
|
|
38
37
|
|
|
39
38
|
const enableCssModule = detectCSSModule(xOptions);
|
|
40
39
|
const enableKarmaCov = ENABLE_KARMA_COV === "true";
|
|
@@ -69,9 +68,7 @@ const getReactCssModulePlugin = (): any => {
|
|
|
69
68
|
"babel-plugin-react-css-modules",
|
|
70
69
|
{
|
|
71
70
|
context: "./src",
|
|
72
|
-
generateScopedName: `${
|
|
73
|
-
enableShortHash ? "" : "[name]__[local]___"
|
|
74
|
-
}[hash:base64:5]`,
|
|
71
|
+
generateScopedName: `${enableShortHash ? "" : "[name]__[local]___"}[hash:base64:5]`,
|
|
75
72
|
filetypes: {
|
|
76
73
|
".scss": {
|
|
77
74
|
syntax: "postcss-scss",
|
|
@@ -104,7 +101,7 @@ const basePlugins = [
|
|
|
104
101
|
},
|
|
105
102
|
],
|
|
106
103
|
// allow decorators on class and method
|
|
107
|
-
// Note: This must go before @babel/plugin-
|
|
104
|
+
// Note: This must go before @babel/plugin-proposal-class-properties
|
|
108
105
|
(enableTypeScript || proposalDecorators) && [
|
|
109
106
|
"@babel/plugin-proposal-decorators",
|
|
110
107
|
{ legacy: legacyDecorators, ...proposalDecorators },
|
|
@@ -115,7 +112,7 @@ const basePlugins = [
|
|
|
115
112
|
// Note: This must go before @babel/plugin-transform-classes
|
|
116
113
|
//
|
|
117
114
|
(enableTypeScript || transformClassProps) && [
|
|
118
|
-
"@babel/plugin-
|
|
115
|
+
"@babel/plugin-proposal-class-properties",
|
|
119
116
|
{ loose: looseClassProps, ...transformClassProps },
|
|
120
117
|
],
|
|
121
118
|
//
|
|
@@ -162,10 +159,7 @@ const plugins = basePlugins.concat(
|
|
|
162
159
|
getReactCssModulePlugin(),
|
|
163
160
|
!isNodeTarget &&
|
|
164
161
|
enableKarmaCov && [
|
|
165
|
-
getPluginFrom(
|
|
166
|
-
["@xarc/opt-karma", "electrode-archetype-opt-karma"],
|
|
167
|
-
"babel-plugin-istanbul"
|
|
168
|
-
),
|
|
162
|
+
getPluginFrom(["@xarc/opt-karma", "electrode-archetype-opt-karma"], "babel-plugin-istanbul"),
|
|
169
163
|
]
|
|
170
164
|
);
|
|
171
165
|
|
|
@@ -173,13 +167,9 @@ const target = isNodeTarget ? "node" : babelTarget;
|
|
|
173
167
|
|
|
174
168
|
const targets = envTargets[target];
|
|
175
169
|
if (!isJest) {
|
|
176
|
-
const srcMsg = _.isEmpty(targets)
|
|
177
|
-
? " (will read from '.browserslistrc')"
|
|
178
|
-
: "";
|
|
170
|
+
const srcMsg = _.isEmpty(targets) ? " (will read from '.browserslistrc')" : "";
|
|
179
171
|
console.log(
|
|
180
|
-
ck`<orange>Babel preset-env compile targets: </><cyan>${JSON.stringify(
|
|
181
|
-
targets
|
|
182
|
-
)}</>${srcMsg}`
|
|
172
|
+
ck`<orange>Babel preset-env compile targets: </><cyan>${JSON.stringify(targets)}</>${srcMsg}`
|
|
183
173
|
);
|
|
184
174
|
}
|
|
185
175
|
|
|
@@ -48,7 +48,7 @@ export type BabelOptions = {
|
|
|
48
48
|
// DEPRECATE: legacyDecorators?: boolean;
|
|
49
49
|
|
|
50
50
|
/**
|
|
51
|
-
* Add `@babel/plugin-
|
|
51
|
+
* Add `@babel/plugin-proposal-class-properties` for class properties support
|
|
52
52
|
* - **Default: `false`**
|
|
53
53
|
* - if not set, then we check env `BABEL_CLASS_PROPS`
|
|
54
54
|
*
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
/* eslint-disable no-magic-numbers, no-process-exit, global-require, no-console, max-statements */
|
|
3
3
|
|
|
4
4
|
import sudoPrompt from "sudo-prompt";
|
|
5
|
+
import request from "request";
|
|
5
6
|
import http from "http";
|
|
6
7
|
import Util from "util";
|
|
7
8
|
import { formUrl } from "../utils";
|
|
@@ -36,11 +37,9 @@ const isProxyRunning = async () => {
|
|
|
36
37
|
port: httpPort,
|
|
37
38
|
path: controlPaths.status,
|
|
38
39
|
});
|
|
40
|
+
|
|
39
41
|
try {
|
|
40
|
-
|
|
41
|
-
if (!response.ok) {
|
|
42
|
-
throw new Error("Failed to fetch status");
|
|
43
|
-
}
|
|
42
|
+
await Util.promisify(request)(statusUrl);
|
|
44
43
|
return true;
|
|
45
44
|
} catch {
|
|
46
45
|
return false;
|
|
@@ -59,14 +58,17 @@ const handleRestart = (type) => {
|
|
|
59
58
|
.map((k) => `${k}=${options[k]}`)
|
|
60
59
|
.join("&"),
|
|
61
60
|
});
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
61
|
+
request(restartUrl, (err, _res, body) => {
|
|
62
|
+
if (err) {
|
|
63
|
+
console.error(
|
|
64
|
+
"Restarting failed, body:",
|
|
65
|
+
body,
|
|
66
|
+
"Error",
|
|
67
|
+
err,
|
|
68
|
+
"\nrestart URL",
|
|
69
|
+
restartUrl
|
|
70
|
+
);
|
|
71
|
+
}
|
|
70
72
|
});
|
|
71
73
|
};
|
|
72
74
|
|
|
@@ -121,18 +123,10 @@ async function mainSpawn() {
|
|
|
121
123
|
|
|
122
124
|
const handleElevatedProxy = () => {
|
|
123
125
|
process.on("SIGINT", () => {
|
|
124
|
-
|
|
125
|
-
.
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
})
|
|
129
|
-
.catch((err) => {
|
|
130
|
-
console.error(
|
|
131
|
-
"Failed to terminate Elevated Electrode dev proxy. Error:",
|
|
132
|
-
err
|
|
133
|
-
);
|
|
134
|
-
process.nextTick(() => process.exit(1));
|
|
135
|
-
});
|
|
126
|
+
request(exitUrl, () => {
|
|
127
|
+
console.log("Elevated Electrode dev proxy terminating");
|
|
128
|
+
process.nextTick(() => process.exit(0));
|
|
129
|
+
});
|
|
136
130
|
});
|
|
137
131
|
};
|
|
138
132
|
|