@xarc/app-dev 11.0.9 → 11.0.10
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 +5 -3
- 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 +5 -3
- 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/app-dev-middleware.js +1 -1
- package/lib/app-dev-middleware.js.map +1 -1
- package/lib/dev-admin/admin-http.d.ts +1 -4
- 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 +12 -7
- 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 +12 -12
- package/scripts/l10n/flatten-messages.js +14 -4
- package/src/config/babel/babelrc-client.ts +12 -5
- package/src/config/babel/babelrc-server.ts +10 -10
- package/src/config/babel/babelrc.ts +17 -7
- package/src/config/opt2/babel-options.ts +1 -1
- package/src/lib/app-dev-middleware.ts +1 -1
- package/src/lib/dev-admin/redbird-spawn.ts +25 -19
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-var-requires */
|
|
3
3
|
/* eslint-disable no-console, no-magic-numbers */
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.fastifyPlugin =
|
|
5
|
+
exports.fastifyPlugin = fastifyPlugin;
|
|
6
6
|
const app_dev_middleware_1 = require("./app-dev-middleware");
|
|
7
7
|
/**
|
|
8
8
|
* webpack dev server fastify plugin
|
|
@@ -27,5 +27,4 @@ async function fastifyPlugin(server) {
|
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
exports.fastifyPlugin = fastifyPlugin;
|
|
31
30
|
//# sourceMappingURL=webpack-dev-fastify.js.map
|
|
@@ -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.
|
|
3
|
+
"version": "11.0.10",
|
|
4
4
|
"description": "Electrode X application development support",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"homepage": "http://www.electrode.io",
|
|
@@ -28,14 +28,14 @@
|
|
|
28
28
|
"Joel Chen <xchen@walmartlabs.com>"
|
|
29
29
|
],
|
|
30
30
|
"peerDependencies": {
|
|
31
|
-
"@xarc/app": "^11.0.
|
|
31
|
+
"@xarc/app": "^11.0.10"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@babel/cli": "^7.17.10",
|
|
35
35
|
"@babel/core": "^7.17.12",
|
|
36
|
-
"@babel/plugin-
|
|
36
|
+
"@babel/plugin-transform-class-properties": "^7.24.1",
|
|
37
37
|
"@babel/plugin-proposal-decorators": "^7.17.12",
|
|
38
|
-
"@babel/plugin-
|
|
38
|
+
"@babel/plugin-transform-object-rest-spread": "^7.24.7",
|
|
39
39
|
"@babel/plugin-transform-react-constant-elements": "^7.17.12",
|
|
40
40
|
"@babel/plugin-transform-react-inline-elements": "^7.16.7",
|
|
41
41
|
"@babel/plugin-transform-runtime": "^7.17.12",
|
|
@@ -44,10 +44,10 @@
|
|
|
44
44
|
"@babel/preset-typescript": "^7.17.12",
|
|
45
45
|
"@babel/register": "^7.17.7",
|
|
46
46
|
"@jchip/redbird": "^1.3.0",
|
|
47
|
-
"@xarc/dev-base": "^0.1.
|
|
47
|
+
"@xarc/dev-base": "^0.1.3",
|
|
48
48
|
"@xarc/run": "^1.0.5",
|
|
49
|
-
"@xarc/subapp": "^0.4.
|
|
50
|
-
"@xarc/webpack": "^11.2.
|
|
49
|
+
"@xarc/subapp": "^0.4.2",
|
|
50
|
+
"@xarc/webpack": "^11.2.7",
|
|
51
51
|
"ansi-to-html": "^0.7.2",
|
|
52
52
|
"babel-plugin-lodash": "^3.3.4",
|
|
53
53
|
"babel-plugin-minify-dead-code-elimination": "^0.5.2",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"fast-async": "^7.0.5",
|
|
63
63
|
"filter-scan-dir": "1.5.5",
|
|
64
64
|
"fs-extra": "^10.1.0",
|
|
65
|
-
"glob": "^
|
|
65
|
+
"glob": "^9.0.0",
|
|
66
66
|
"identity-obj-proxy": "^3.0.0",
|
|
67
67
|
"is-ci": "^2.0.0",
|
|
68
68
|
"lodash": "^4.17.21",
|
|
@@ -78,7 +78,6 @@
|
|
|
78
78
|
"ps-get": "^1.1.0",
|
|
79
79
|
"read-pkg-up": "^7.0.1",
|
|
80
80
|
"regenerator-runtime": "^0.13.9",
|
|
81
|
-
"request": "^2.88.2",
|
|
82
81
|
"require-at": "^1.0.6",
|
|
83
82
|
"semver": "^7.3.7",
|
|
84
83
|
"serve-index-fs": "^1.10.1",
|
|
@@ -97,16 +96,17 @@
|
|
|
97
96
|
"@istanbuljs/nyc-config-typescript": "^1.0.2",
|
|
98
97
|
"@types/chai": "^4.3.1",
|
|
99
98
|
"@types/mocha": "^10.0.1",
|
|
100
|
-
"@types/node": "^
|
|
99
|
+
"@types/node": "^20.14.10",
|
|
101
100
|
"@types/sinon": "^9.0.10",
|
|
102
101
|
"@types/sinon-chai": "^3.2.8",
|
|
103
102
|
"@types/webpack": "5.28.0",
|
|
104
103
|
"@typescript-eslint/eslint-plugin": "^5.0.0",
|
|
105
104
|
"@typescript-eslint/parser": "^5.0.0",
|
|
106
|
-
"@xarc/app": "^11.0.
|
|
105
|
+
"@xarc/app": "^11.0.10",
|
|
107
106
|
"@xarc/module-dev": "^4.1.0",
|
|
108
107
|
"@xarc/run": "^1.1.1",
|
|
109
|
-
"babel-
|
|
108
|
+
"@babel/eslint-parser": "^7.25.1",
|
|
109
|
+
"@babel/core": "^7.11.0",
|
|
110
110
|
"chai": "^4.3.6",
|
|
111
111
|
"electrode-server": "^3.3.0",
|
|
112
112
|
"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 getFilePaths = Util.promisify(require("glob"));
|
|
9
|
+
const { glob: 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,7 +39,10 @@ function readFileAsJSON(filePath) {
|
|
|
39
39
|
* from all files
|
|
40
40
|
*/
|
|
41
41
|
async function getAllDefaultMessages(messageFilesPathPattern) {
|
|
42
|
-
const fileJsons = await xaa.map(
|
|
42
|
+
const fileJsons = await xaa.map(
|
|
43
|
+
await getFilePaths(messageFilesPathPattern),
|
|
44
|
+
readFileAsJSON
|
|
45
|
+
);
|
|
43
46
|
return fileJsons.reduce((previousValue, defaultMessageDescriptors) => {
|
|
44
47
|
defaultMessageDescriptors.forEach((descriptor) => {
|
|
45
48
|
previousValue[descriptor.id] = descriptor;
|
|
@@ -48,12 +51,19 @@ async function getAllDefaultMessages(messageFilesPathPattern) {
|
|
|
48
51
|
}, {});
|
|
49
52
|
}
|
|
50
53
|
|
|
51
|
-
const writeRawMessages = _.partial(
|
|
54
|
+
const writeRawMessages = _.partial(
|
|
55
|
+
writeFileAsJSON,
|
|
56
|
+
RAW_MESSAGES_DIR,
|
|
57
|
+
RAW_MESSAGES_NAME
|
|
58
|
+
);
|
|
52
59
|
|
|
53
60
|
const isMain = require.main === module;
|
|
54
61
|
|
|
55
62
|
function flattenMessagesL10n() {
|
|
56
|
-
return Promise.all([
|
|
63
|
+
return Promise.all([
|
|
64
|
+
getAllDefaultMessages(MESSAGES_PATTERN),
|
|
65
|
+
Fs.ensureDir(RAW_MESSAGES_DIR),
|
|
66
|
+
])
|
|
57
67
|
.then(_.first)
|
|
58
68
|
.then(writeRawMessages)
|
|
59
69
|
.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-transform-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-transform-properties",
|
|
52
52
|
{ loose: looseClassProps, ...transformClassProps },
|
|
53
53
|
],
|
|
54
54
|
//
|
|
@@ -102,7 +102,9 @@ const plugins = basePlugins.concat(
|
|
|
102
102
|
"babel-plugin-react-css-modules",
|
|
103
103
|
{
|
|
104
104
|
context: "./src",
|
|
105
|
-
generateScopedName: `${
|
|
105
|
+
generateScopedName: `${
|
|
106
|
+
isProduction ? "" : "[name]__[local]___"
|
|
107
|
+
}[hash:base64:5]`,
|
|
106
108
|
filetypes: {
|
|
107
109
|
".scss": {
|
|
108
110
|
syntax: "postcss-scss",
|
|
@@ -119,13 +121,18 @@ const plugins = basePlugins.concat(
|
|
|
119
121
|
],
|
|
120
122
|
],
|
|
121
123
|
enableKarmaCov && [
|
|
122
|
-
getPluginFrom(
|
|
124
|
+
getPluginFrom(
|
|
125
|
+
["@xarc/opt-karma", "electrode-archetype-opt-karma"],
|
|
126
|
+
"babel-plugin-istanbul"
|
|
127
|
+
),
|
|
123
128
|
]
|
|
124
129
|
);
|
|
125
130
|
|
|
126
131
|
const targets = envTargets[babelTarget];
|
|
127
132
|
const coreJsVersion = require("core-js/package.json").version.split(".")[0];
|
|
128
|
-
const useBuiltIns = hasMultiTargets
|
|
133
|
+
const useBuiltIns = hasMultiTargets
|
|
134
|
+
? { useBuiltIns: "entry", corejs: coreJsVersion }
|
|
135
|
+
: {};
|
|
129
136
|
|
|
130
137
|
const presets = [
|
|
131
138
|
//
|
|
@@ -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(x => x),
|
|
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-transform-class-properties",
|
|
39
|
+
{ loose: looseClassProps },
|
|
40
40
|
],
|
|
41
|
-
enableTypeScript && "@babel/proposal-object-rest-spread"
|
|
42
|
-
].filter(x => x)
|
|
41
|
+
enableTypeScript && "@babel/proposal-object-rest-spread",
|
|
42
|
+
].filter((x) => x),
|
|
43
43
|
};
|
|
@@ -33,7 +33,8 @@ const {
|
|
|
33
33
|
|
|
34
34
|
const addFlowPlugin = Boolean(enableFlow && optFlow);
|
|
35
35
|
|
|
36
|
-
const { BABEL_ENV, NODE_ENV, XARC_BABEL_TARGET, ENABLE_KARMA_COV } =
|
|
36
|
+
const { BABEL_ENV, NODE_ENV, XARC_BABEL_TARGET, ENABLE_KARMA_COV } =
|
|
37
|
+
process.env;
|
|
37
38
|
|
|
38
39
|
const enableCssModule = detectCSSModule(xOptions);
|
|
39
40
|
const enableKarmaCov = ENABLE_KARMA_COV === "true";
|
|
@@ -68,7 +69,9 @@ const getReactCssModulePlugin = (): any => {
|
|
|
68
69
|
"babel-plugin-react-css-modules",
|
|
69
70
|
{
|
|
70
71
|
context: "./src",
|
|
71
|
-
generateScopedName: `${
|
|
72
|
+
generateScopedName: `${
|
|
73
|
+
enableShortHash ? "" : "[name]__[local]___"
|
|
74
|
+
}[hash:base64:5]`,
|
|
72
75
|
filetypes: {
|
|
73
76
|
".scss": {
|
|
74
77
|
syntax: "postcss-scss",
|
|
@@ -101,7 +104,7 @@ const basePlugins = [
|
|
|
101
104
|
},
|
|
102
105
|
],
|
|
103
106
|
// allow decorators on class and method
|
|
104
|
-
// Note: This must go before @babel/plugin-
|
|
107
|
+
// Note: This must go before @babel/plugin-transform-class-properties
|
|
105
108
|
(enableTypeScript || proposalDecorators) && [
|
|
106
109
|
"@babel/plugin-proposal-decorators",
|
|
107
110
|
{ legacy: legacyDecorators, ...proposalDecorators },
|
|
@@ -112,7 +115,7 @@ const basePlugins = [
|
|
|
112
115
|
// Note: This must go before @babel/plugin-transform-classes
|
|
113
116
|
//
|
|
114
117
|
(enableTypeScript || transformClassProps) && [
|
|
115
|
-
"@babel/plugin-
|
|
118
|
+
"@babel/plugin-transform-class-properties",
|
|
116
119
|
{ loose: looseClassProps, ...transformClassProps },
|
|
117
120
|
],
|
|
118
121
|
//
|
|
@@ -159,7 +162,10 @@ const plugins = basePlugins.concat(
|
|
|
159
162
|
getReactCssModulePlugin(),
|
|
160
163
|
!isNodeTarget &&
|
|
161
164
|
enableKarmaCov && [
|
|
162
|
-
getPluginFrom(
|
|
165
|
+
getPluginFrom(
|
|
166
|
+
["@xarc/opt-karma", "electrode-archetype-opt-karma"],
|
|
167
|
+
"babel-plugin-istanbul"
|
|
168
|
+
),
|
|
163
169
|
]
|
|
164
170
|
);
|
|
165
171
|
|
|
@@ -167,9 +173,13 @@ const target = isNodeTarget ? "node" : babelTarget;
|
|
|
167
173
|
|
|
168
174
|
const targets = envTargets[target];
|
|
169
175
|
if (!isJest) {
|
|
170
|
-
const srcMsg = _.isEmpty(targets)
|
|
176
|
+
const srcMsg = _.isEmpty(targets)
|
|
177
|
+
? " (will read from '.browserslistrc')"
|
|
178
|
+
: "";
|
|
171
179
|
console.log(
|
|
172
|
-
ck`<orange>Babel preset-env compile targets: </><cyan>${JSON.stringify(
|
|
180
|
+
ck`<orange>Babel preset-env compile targets: </><cyan>${JSON.stringify(
|
|
181
|
+
targets
|
|
182
|
+
)}</>${srcMsg}`
|
|
173
183
|
);
|
|
174
184
|
}
|
|
175
185
|
|
|
@@ -48,7 +48,7 @@ export type BabelOptions = {
|
|
|
48
48
|
// DEPRECATE: legacyDecorators?: boolean;
|
|
49
49
|
|
|
50
50
|
/**
|
|
51
|
-
* Add `@babel/plugin-
|
|
51
|
+
* Add `@babel/plugin-transform-class-properties` for class properties support
|
|
52
52
|
* - **Default: `false`**
|
|
53
53
|
* - if not set, then we check env `BABEL_CLASS_PROPS`
|
|
54
54
|
*
|
|
@@ -99,7 +99,7 @@ export class AppDevMiddleware {
|
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
setup({ serverPort = undefined } = {}) {
|
|
102
|
-
process.on("message", data => {
|
|
102
|
+
process.on("message", (data: any) => {
|
|
103
103
|
switch (data.name) {
|
|
104
104
|
case WEBPACK_EVENT_REPORT:
|
|
105
105
|
this.handleWebpackReport(data);
|
|
@@ -2,7 +2,6 @@
|
|
|
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";
|
|
6
5
|
import http from "http";
|
|
7
6
|
import Util from "util";
|
|
8
7
|
import { formUrl } from "../utils";
|
|
@@ -37,9 +36,11 @@ const isProxyRunning = async () => {
|
|
|
37
36
|
port: httpPort,
|
|
38
37
|
path: controlPaths.status,
|
|
39
38
|
});
|
|
40
|
-
|
|
41
39
|
try {
|
|
42
|
-
await
|
|
40
|
+
const response = await fetch(statusUrl);
|
|
41
|
+
if (!response.ok) {
|
|
42
|
+
throw new Error("Failed to fetch status");
|
|
43
|
+
}
|
|
43
44
|
return true;
|
|
44
45
|
} catch {
|
|
45
46
|
return false;
|
|
@@ -58,22 +59,19 @@ const handleRestart = (type) => {
|
|
|
58
59
|
.map((k) => `${k}=${options[k]}`)
|
|
59
60
|
.join("&"),
|
|
60
61
|
});
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
restartUrl
|
|
70
|
-
);
|
|
71
|
-
}
|
|
62
|
+
|
|
63
|
+
fetch(restartUrl).catch((err) => {
|
|
64
|
+
console.error(
|
|
65
|
+
"Restarting failed. Error:",
|
|
66
|
+
err,
|
|
67
|
+
"\nrestart URL",
|
|
68
|
+
restartUrl
|
|
69
|
+
);
|
|
72
70
|
});
|
|
73
71
|
};
|
|
74
72
|
|
|
75
73
|
process.on("SIGHUP", restart);
|
|
76
|
-
process.on("message", (data) => {
|
|
74
|
+
process.on("message", (data: any) => {
|
|
77
75
|
if (data.name === "restart") {
|
|
78
76
|
restart(_.omit(data, "name"));
|
|
79
77
|
} else if (data.name === "update-ports") {
|
|
@@ -123,10 +121,18 @@ async function mainSpawn() {
|
|
|
123
121
|
|
|
124
122
|
const handleElevatedProxy = () => {
|
|
125
123
|
process.on("SIGINT", () => {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
124
|
+
fetch(exitUrl)
|
|
125
|
+
.then(() => {
|
|
126
|
+
console.log("Elevated Electrode dev proxy terminating");
|
|
127
|
+
process.nextTick(() => process.exit(0));
|
|
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
|
+
});
|
|
130
136
|
});
|
|
131
137
|
};
|
|
132
138
|
|