@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,6 +1,6 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-var-requires, no-console, @typescript-eslint/ban-ts-comment */
|
|
2
2
|
|
|
3
|
-
import makeOptionalRequire from "optional-require";
|
|
3
|
+
import { makeOptionalRequire } from "optional-require";
|
|
4
4
|
import { getPluginFrom, loadXarcOptions } from "./common";
|
|
5
5
|
import _ from "lodash";
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@ const {
|
|
|
18
18
|
looseClassProps,
|
|
19
19
|
hasMultiTargets,
|
|
20
20
|
target: babelTarget,
|
|
21
|
-
envTargets = {}
|
|
21
|
+
envTargets = {},
|
|
22
22
|
} = _.get(xOptions, "babel", {});
|
|
23
23
|
|
|
24
24
|
const addFlowPlugin = Boolean(enableFlow && optFlow);
|
|
@@ -30,17 +30,17 @@ const basePlugins = [
|
|
|
30
30
|
{
|
|
31
31
|
compiler: {
|
|
32
32
|
promises: true,
|
|
33
|
-
generators: false
|
|
33
|
+
generators: false,
|
|
34
34
|
},
|
|
35
35
|
runtimePattern: null,
|
|
36
|
-
useRuntimeModule: true
|
|
37
|
-
}
|
|
36
|
+
useRuntimeModule: true,
|
|
37
|
+
},
|
|
38
38
|
],
|
|
39
39
|
// allow decorators on class and method
|
|
40
40
|
// Note: This must go before @babel/plugin-proposal-class-properties
|
|
41
41
|
(enableTypeScript || proposalDecorators) && [
|
|
42
42
|
"@babel/plugin-proposal-decorators",
|
|
43
|
-
{ legacy: legacyDecorators, ...proposalDecorators }
|
|
43
|
+
{ legacy: legacyDecorators, ...proposalDecorators },
|
|
44
44
|
],
|
|
45
45
|
//
|
|
46
46
|
// allow class properties. loose option compile to assignment expression instead
|
|
@@ -49,7 +49,7 @@ const basePlugins = [
|
|
|
49
49
|
//
|
|
50
50
|
(enableTypeScript || transformClassProps) && [
|
|
51
51
|
"@babel/plugin-proposal-class-properties",
|
|
52
|
-
{ loose: looseClassProps, ...transformClassProps }
|
|
52
|
+
{ loose: looseClassProps, ...transformClassProps },
|
|
53
53
|
],
|
|
54
54
|
//
|
|
55
55
|
// i18n has not been used at all and these are very outdated
|
|
@@ -73,8 +73,8 @@ const basePlugins = [
|
|
|
73
73
|
"@babel/plugin-transform-runtime",
|
|
74
74
|
addFlowPlugin && [
|
|
75
75
|
"@babel/plugin-transform-flow-strip-types",
|
|
76
|
-
{ requireDirective: flowRequireDirective, ...enableFlow }
|
|
77
|
-
]
|
|
76
|
+
{ requireDirective: flowRequireDirective, ...enableFlow },
|
|
77
|
+
],
|
|
78
78
|
];
|
|
79
79
|
|
|
80
80
|
const { BABEL_ENV, NODE_ENV, ENABLE_KARMA_COV } = process.env;
|
|
@@ -92,9 +92,9 @@ const plugins = basePlugins.concat(
|
|
|
92
92
|
[
|
|
93
93
|
"babel-plugin-transform-react-remove-prop-types",
|
|
94
94
|
{
|
|
95
|
-
removeImport: true
|
|
96
|
-
}
|
|
97
|
-
]
|
|
95
|
+
removeImport: true,
|
|
96
|
+
},
|
|
97
|
+
],
|
|
98
98
|
],
|
|
99
99
|
// css module support
|
|
100
100
|
enableCssModule && [
|
|
@@ -106,20 +106,20 @@ const plugins = basePlugins.concat(
|
|
|
106
106
|
filetypes: {
|
|
107
107
|
".scss": {
|
|
108
108
|
syntax: "postcss-scss",
|
|
109
|
-
plugins: ["postcss-nested"]
|
|
109
|
+
plugins: ["postcss-nested"],
|
|
110
110
|
},
|
|
111
111
|
".styl": {
|
|
112
|
-
syntax: "sugarss"
|
|
112
|
+
syntax: "sugarss",
|
|
113
113
|
},
|
|
114
114
|
".less": {
|
|
115
|
-
syntax: "postcss-less"
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
}
|
|
119
|
-
]
|
|
115
|
+
syntax: "postcss-less",
|
|
116
|
+
},
|
|
117
|
+
},
|
|
118
|
+
},
|
|
119
|
+
],
|
|
120
120
|
],
|
|
121
121
|
enableKarmaCov && [
|
|
122
|
-
getPluginFrom(["@xarc/opt-karma", "electrode-archetype-opt-karma"], "babel-plugin-istanbul")
|
|
122
|
+
getPluginFrom(["@xarc/opt-karma", "electrode-archetype-opt-karma"], "babel-plugin-istanbul"),
|
|
123
123
|
]
|
|
124
124
|
);
|
|
125
125
|
|
|
@@ -149,14 +149,14 @@ const presets = [
|
|
|
149
149
|
modules: "auto",
|
|
150
150
|
loose: true,
|
|
151
151
|
targets,
|
|
152
|
-
...useBuiltIns
|
|
153
|
-
}
|
|
152
|
+
...useBuiltIns,
|
|
153
|
+
},
|
|
154
154
|
],
|
|
155
155
|
enableTypeScript && "@babel/preset-typescript",
|
|
156
|
-
"@babel/preset-react"
|
|
156
|
+
"@babel/preset-react",
|
|
157
157
|
];
|
|
158
158
|
|
|
159
159
|
export = {
|
|
160
|
-
presets: presets.filter(x => x),
|
|
161
|
-
plugins: plugins.filter(x => x)
|
|
160
|
+
presets: presets.filter((x) => x),
|
|
161
|
+
plugins: plugins.filter((x) => x),
|
|
162
162
|
};
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* and this file will set preset-env targets accordingly.
|
|
7
7
|
*/
|
|
8
8
|
import ck from "chalker";
|
|
9
|
-
import makeOptionalRequire from "optional-require";
|
|
9
|
+
import { makeOptionalRequire } from "optional-require";
|
|
10
10
|
import _ from "lodash";
|
|
11
11
|
import { getPluginFrom, loadXarcOptions, detectCSSModule } from "./common";
|
|
12
12
|
|
|
@@ -28,7 +28,7 @@ const {
|
|
|
28
28
|
looseClassProps,
|
|
29
29
|
hasMultiTargets,
|
|
30
30
|
target: babelTarget,
|
|
31
|
-
envTargets = {}
|
|
31
|
+
envTargets = {},
|
|
32
32
|
} = _.get(xOptions, "babel", {});
|
|
33
33
|
|
|
34
34
|
const addFlowPlugin = Boolean(enableFlow && optFlow);
|
|
@@ -72,17 +72,17 @@ const getReactCssModulePlugin = (): any => {
|
|
|
72
72
|
filetypes: {
|
|
73
73
|
".scss": {
|
|
74
74
|
syntax: "postcss-scss",
|
|
75
|
-
plugins: ["postcss-nested"]
|
|
75
|
+
plugins: ["postcss-nested"],
|
|
76
76
|
},
|
|
77
77
|
".styl": {
|
|
78
|
-
syntax: "sugarss"
|
|
78
|
+
syntax: "sugarss",
|
|
79
79
|
},
|
|
80
80
|
".less": {
|
|
81
|
-
syntax: "postcss-less"
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
]
|
|
81
|
+
syntax: "postcss-less",
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
},
|
|
85
|
+
],
|
|
86
86
|
];
|
|
87
87
|
};
|
|
88
88
|
|
|
@@ -94,17 +94,17 @@ const basePlugins = [
|
|
|
94
94
|
{
|
|
95
95
|
compiler: {
|
|
96
96
|
promises: true,
|
|
97
|
-
generators: false
|
|
97
|
+
generators: false,
|
|
98
98
|
},
|
|
99
99
|
runtimePattern: null,
|
|
100
|
-
useRuntimeModule: true
|
|
101
|
-
}
|
|
100
|
+
useRuntimeModule: true,
|
|
101
|
+
},
|
|
102
102
|
],
|
|
103
103
|
// allow decorators on class and method
|
|
104
104
|
// Note: This must go before @babel/plugin-proposal-class-properties
|
|
105
105
|
(enableTypeScript || proposalDecorators) && [
|
|
106
106
|
"@babel/plugin-proposal-decorators",
|
|
107
|
-
{ legacy: legacyDecorators, ...proposalDecorators }
|
|
107
|
+
{ legacy: legacyDecorators, ...proposalDecorators },
|
|
108
108
|
],
|
|
109
109
|
//
|
|
110
110
|
// allow class properties. loose option compile to assignment expression instead
|
|
@@ -113,7 +113,7 @@ const basePlugins = [
|
|
|
113
113
|
//
|
|
114
114
|
(enableTypeScript || transformClassProps) && [
|
|
115
115
|
"@babel/plugin-proposal-class-properties",
|
|
116
|
-
{ loose: looseClassProps, ...transformClassProps }
|
|
116
|
+
{ loose: looseClassProps, ...transformClassProps },
|
|
117
117
|
],
|
|
118
118
|
//
|
|
119
119
|
// i18n has not been used at all and these are very outdated
|
|
@@ -137,8 +137,8 @@ const basePlugins = [
|
|
|
137
137
|
"@babel/plugin-transform-runtime",
|
|
138
138
|
addFlowPlugin && [
|
|
139
139
|
"@babel/plugin-transform-flow-strip-types",
|
|
140
|
-
{ requireDirective: flowRequireDirective, ...enableFlow }
|
|
141
|
-
]
|
|
140
|
+
{ requireDirective: flowRequireDirective, ...enableFlow },
|
|
141
|
+
],
|
|
142
142
|
];
|
|
143
143
|
|
|
144
144
|
// @ts-ignore
|
|
@@ -150,16 +150,16 @@ const plugins = basePlugins.concat(
|
|
|
150
150
|
[
|
|
151
151
|
"babel-plugin-transform-react-remove-prop-types",
|
|
152
152
|
{
|
|
153
|
-
removeImport: true
|
|
154
|
-
}
|
|
155
|
-
]
|
|
153
|
+
removeImport: true,
|
|
154
|
+
},
|
|
155
|
+
],
|
|
156
156
|
],
|
|
157
157
|
// css module support
|
|
158
158
|
// Note: this is needed for server side (node.js) also.
|
|
159
159
|
getReactCssModulePlugin(),
|
|
160
160
|
!isNodeTarget &&
|
|
161
161
|
enableKarmaCov && [
|
|
162
|
-
getPluginFrom(["@xarc/opt-karma", "electrode-archetype-opt-karma"], "babel-plugin-istanbul")
|
|
162
|
+
getPluginFrom(["@xarc/opt-karma", "electrode-archetype-opt-karma"], "babel-plugin-istanbul"),
|
|
163
163
|
]
|
|
164
164
|
);
|
|
165
165
|
|
|
@@ -177,7 +177,7 @@ const useBuiltIns =
|
|
|
177
177
|
!isNodeTarget && hasMultiTargets
|
|
178
178
|
? {
|
|
179
179
|
useBuiltIns: "entry",
|
|
180
|
-
corejs: require("core-js/package.json").version.split(".")[0] // eslint-disable-line
|
|
180
|
+
corejs: require("core-js/package.json").version.split(".")[0], // eslint-disable-line
|
|
181
181
|
}
|
|
182
182
|
: {};
|
|
183
183
|
|
|
@@ -204,14 +204,14 @@ const presets = [
|
|
|
204
204
|
modules: "auto",
|
|
205
205
|
loose: true,
|
|
206
206
|
targets,
|
|
207
|
-
...useBuiltIns
|
|
208
|
-
}
|
|
207
|
+
...useBuiltIns,
|
|
208
|
+
},
|
|
209
209
|
],
|
|
210
210
|
enableTypeScript && "@babel/preset-typescript",
|
|
211
|
-
"@babel/preset-react"
|
|
211
|
+
"@babel/preset-react",
|
|
212
212
|
];
|
|
213
213
|
|
|
214
214
|
export = {
|
|
215
|
-
presets: presets.filter(x => x),
|
|
216
|
-
plugins: plugins.filter(x => x)
|
|
215
|
+
presets: presets.filter((x) => x),
|
|
216
|
+
plugins: plugins.filter((x) => x),
|
|
217
217
|
};
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-var-requires */
|
|
2
2
|
|
|
3
|
-
import makeOptionalRequire from "optional-require";
|
|
3
|
+
import { makeOptionalRequire } from "optional-require";
|
|
4
4
|
|
|
5
5
|
const optionalRequire = makeOptionalRequire(require);
|
|
6
6
|
|
|
7
|
-
const Enzyme = optionalRequire("enzyme");
|
|
8
|
-
const EnzymeAdapter = optionalRequire("enzyme-adapter-react-16");
|
|
7
|
+
const Enzyme: any = optionalRequire("enzyme");
|
|
8
|
+
const EnzymeAdapter: any = optionalRequire("enzyme-adapter-react-16");
|
|
9
9
|
|
|
10
10
|
if (Enzyme && EnzymeAdapter) {
|
|
11
11
|
// Setup enzyme's react adapter
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import makeOptionalRequire from "optional-require";
|
|
1
|
+
import { makeOptionalRequire } from "optional-require";
|
|
2
2
|
|
|
3
3
|
import Path from "path";
|
|
4
4
|
import _ from "lodash";
|
|
@@ -13,7 +13,7 @@ const optionalRequire = makeOptionalRequire(require);
|
|
|
13
13
|
*/
|
|
14
14
|
export function loadUserConfig(filename, config, settings) {
|
|
15
15
|
const filePath = Path.resolve("archetype/config/karma", filename);
|
|
16
|
-
const userConfig = optionalRequire(filePath);
|
|
16
|
+
const userConfig: any = optionalRequire(filePath);
|
|
17
17
|
|
|
18
18
|
if (userConfig) {
|
|
19
19
|
assert(_.isFunction(userConfig), `${filePath} must export a function`);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import makeOptionalRequire from "optional-require";
|
|
1
|
+
import { makeOptionalRequire } from "optional-require";
|
|
2
2
|
const optionalRequire = makeOptionalRequire(require);
|
|
3
3
|
|
|
4
4
|
const Enzyme = optionalRequire("enzyme");
|
|
@@ -14,7 +14,7 @@ const chai = optionalRequire("chai");
|
|
|
14
14
|
* @param addons
|
|
15
15
|
*/
|
|
16
16
|
function chaiUse(addons) {
|
|
17
|
-
[].concat(addons).forEach(x => {
|
|
17
|
+
[].concat(addons).forEach((x) => {
|
|
18
18
|
const AddonMod = x && optionalRequire(x);
|
|
19
19
|
if (AddonMod) {
|
|
20
20
|
chai.use(AddonMod);
|
package/src/config/options.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-var-requires, max-statements */
|
|
2
2
|
|
|
3
3
|
import Path from "path";
|
|
4
|
-
import makeOptionalRequire from "optional-require";
|
|
4
|
+
import { makeOptionalRequire } from "optional-require";
|
|
5
5
|
import * as utils from "../lib/utils"; // really import ESM into single var utils
|
|
6
6
|
import _ from "lodash";
|
|
7
7
|
import xenvConfig from "xenv-config";
|
|
@@ -20,7 +20,7 @@ const optionalRequire = makeOptionalRequire(require);
|
|
|
20
20
|
*/
|
|
21
21
|
export 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 @@ export 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
|
|
|
47
47
|
if (optPkg) {
|
|
@@ -64,7 +64,7 @@ export const getUserConfigOptions = (packageNames, devPackageNames) => {
|
|
|
64
64
|
// Check for any optional archetype in application's devDependencies or dependencies
|
|
65
65
|
//
|
|
66
66
|
...checkOptArchetypeInAppDep(devPackageNames, true).options,
|
|
67
|
-
...checkOptArchetypeInAppDep(packageNames).options
|
|
67
|
+
...checkOptArchetypeInAppDep(packageNames).options,
|
|
68
68
|
};
|
|
69
69
|
};
|
|
70
70
|
|
|
@@ -81,7 +81,7 @@ export function getDefaultArchetypeOptions() {
|
|
|
81
81
|
//
|
|
82
82
|
const appPkg = optionalRequire(Path.resolve("package.json")) || {
|
|
83
83
|
dependencies: {},
|
|
84
|
-
devDependencies: {}
|
|
84
|
+
devDependencies: {},
|
|
85
85
|
};
|
|
86
86
|
const packageNames = Object.keys(appPkg.dependencies);
|
|
87
87
|
const devPackageNames = Object.keys(appPkg.devDependencies);
|
|
@@ -96,7 +96,7 @@ export function getDefaultArchetypeOptions() {
|
|
|
96
96
|
eTmpDir: ETMP_DIR,
|
|
97
97
|
prodModulesDir: Path.join(PROD_DIR, "modules"),
|
|
98
98
|
checkUserBabelRc: utils.checkUserBabelRc,
|
|
99
|
-
devArchetypeName: "@xarc/app-dev"
|
|
99
|
+
devArchetypeName: "@xarc/app-dev",
|
|
100
100
|
};
|
|
101
101
|
}
|
|
102
102
|
|
|
@@ -135,21 +135,21 @@ export function getDevArchetypeLegacy() {
|
|
|
135
135
|
mocha: `${configDir}/mocha`,
|
|
136
136
|
webpack: `${configDir}/webpack`,
|
|
137
137
|
jest: `${configDir}/jest`,
|
|
138
|
-
...userConfig.configPaths
|
|
138
|
+
...userConfig.configPaths,
|
|
139
139
|
},
|
|
140
140
|
prodDir: PROD_DIR,
|
|
141
141
|
eTmpDir: ETMP_DIR,
|
|
142
|
-
AppMode: makeAppMode(PROD_DIR, userConfig.reactLib)
|
|
142
|
+
AppMode: makeAppMode(PROD_DIR, userConfig.reactLib),
|
|
143
143
|
};
|
|
144
144
|
|
|
145
145
|
const topConfigSpec = {
|
|
146
|
-
devOpenBrowser: { env: "ELECTRODE_DEV_OPEN_BROWSER", default: false }
|
|
146
|
+
devOpenBrowser: { env: "ELECTRODE_DEV_OPEN_BROWSER", default: false },
|
|
147
147
|
};
|
|
148
148
|
|
|
149
149
|
const typeScriptOption =
|
|
150
150
|
userConfig.typescript === false
|
|
151
151
|
? {
|
|
152
|
-
babel: { enableTypeScript: userConfig.typescript }
|
|
152
|
+
babel: { enableTypeScript: userConfig.typescript },
|
|
153
153
|
}
|
|
154
154
|
: {};
|
|
155
155
|
|
|
@@ -159,9 +159,7 @@ export function getDevArchetypeLegacy() {
|
|
|
159
159
|
);
|
|
160
160
|
|
|
161
161
|
archetypeConfig.babel.hasMultiTargets =
|
|
162
|
-
Object.keys(archetypeConfig.babel.envTargets)
|
|
163
|
-
.sort()
|
|
164
|
-
.join(",") !== "default,node";
|
|
162
|
+
Object.keys(archetypeConfig.babel.envTargets).sort().join(",") !== "default,node";
|
|
165
163
|
|
|
166
164
|
let AppMode;
|
|
167
165
|
|
|
@@ -176,7 +174,7 @@ export function getDevArchetypeLegacy() {
|
|
|
176
174
|
}
|
|
177
175
|
|
|
178
176
|
return AppMode;
|
|
179
|
-
}
|
|
177
|
+
},
|
|
180
178
|
});
|
|
181
179
|
|
|
182
180
|
return archetypeConfig;
|