@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-canary.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/js/modern/analyze/constants.js +38 -18
- package/dist/js/modern/analyze/generateCode.js +261 -221
- package/dist/js/modern/analyze/getBundleEntry.js +31 -32
- package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +93 -49
- package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js +89 -47
- package/dist/js/modern/analyze/getClientRoutes/index.js +6 -2
- package/dist/js/modern/analyze/getClientRoutes/utils.js +23 -10
- package/dist/js/modern/analyze/getFileSystemEntry.js +43 -22
- package/dist/js/modern/analyze/getHtmlTemplate.js +89 -49
- package/dist/js/modern/analyze/getServerRoutes.js +122 -126
- package/dist/js/modern/analyze/index.js +193 -159
- package/dist/js/modern/analyze/isDefaultExportFunction.js +30 -16
- package/dist/js/modern/analyze/makeLegalIdentifier.js +10 -11
- package/dist/js/modern/analyze/nestedRoutes.js +106 -60
- package/dist/js/modern/analyze/templates.js +161 -80
- package/dist/js/modern/analyze/utils.js +87 -66
- package/dist/js/modern/builder/builderPlugins/compatModern.js +121 -109
- package/dist/js/modern/builder/index.js +122 -83
- package/dist/js/modern/builder/loaders/routerLoader.js +9 -12
- package/dist/js/modern/builder/loaders/serverModuleLoader.js +4 -1
- package/dist/js/modern/builder/share.js +22 -20
- package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +23 -22
- package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +31 -27
- package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +98 -84
- package/dist/js/modern/commands/build.js +67 -42
- package/dist/js/modern/commands/deploy.js +27 -4
- package/dist/js/modern/commands/dev.js +77 -27
- package/dist/js/modern/commands/index.js +1 -1
- package/dist/js/modern/commands/inspect.js +30 -5
- package/dist/js/modern/commands/start.js +37 -15
- package/dist/js/modern/config/default.js +103 -113
- package/dist/js/modern/config/index.js +8 -2
- package/dist/js/modern/config/initial/createHtmlConfig.js +5 -2
- package/dist/js/modern/config/initial/createOutputConfig.js +9 -10
- package/dist/js/modern/config/initial/createSourceConfig.js +5 -2
- package/dist/js/modern/config/initial/createToolsConfig.js +7 -6
- package/dist/js/modern/config/initial/index.js +9 -4
- package/dist/js/modern/config/initial/inits.js +109 -73
- package/dist/js/modern/config/initial/transformNormalizedConfig.js +6 -3
- package/dist/js/modern/defineConfig.js +26 -11
- package/dist/js/modern/exports/server.js +4 -1
- package/dist/js/modern/hooks.js +10 -3
- package/dist/js/modern/index.js +140 -89
- package/dist/js/modern/initialize/index.js +98 -51
- package/dist/js/modern/locale/en.js +20 -21
- package/dist/js/modern/locale/index.js +6 -6
- package/dist/js/modern/locale/zh.js +21 -22
- package/dist/js/modern/schema/Schema.js +6 -5
- package/dist/js/modern/schema/index.js +51 -100
- package/dist/js/modern/schema/legacy.js +96 -231
- package/dist/js/modern/types/config/index.js +0 -1
- package/dist/js/modern/types/index.js +0 -1
- package/dist/js/modern/types/legacyConfig/output.js +0 -1
- package/dist/js/modern/utils/commands.js +5 -2
- package/dist/js/modern/utils/config.js +102 -41
- package/dist/js/modern/utils/createFileWatcher.js +84 -51
- package/dist/js/modern/utils/createServer.js +63 -17
- package/dist/js/modern/utils/getSpecifiedEntries.js +46 -19
- package/dist/js/modern/utils/language.js +6 -3
- package/dist/js/modern/utils/printInstructions.js +27 -8
- package/dist/js/modern/utils/restart.js +43 -16
- package/dist/js/modern/utils/routes.js +29 -12
- package/dist/js/node/analyze/constants.js +54 -39
- package/dist/js/node/analyze/generateCode.js +281 -239
- package/dist/js/node/analyze/getBundleEntry.js +55 -44
- package/dist/js/node/analyze/getClientRoutes/getRoutes.js +132 -76
- package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +128 -74
- package/dist/js/node/analyze/getClientRoutes/index.js +23 -17
- package/dist/js/node/analyze/getClientRoutes/utils.js +44 -21
- package/dist/js/node/analyze/getFileSystemEntry.js +70 -39
- package/dist/js/node/analyze/getHtmlTemplate.js +116 -61
- package/dist/js/node/analyze/getServerRoutes.js +143 -137
- package/dist/js/node/analyze/index.js +240 -174
- package/dist/js/node/analyze/isDefaultExportFunction.js +55 -26
- package/dist/js/node/analyze/makeLegalIdentifier.js +27 -15
- package/dist/js/node/analyze/nestedRoutes.js +137 -75
- package/dist/js/node/analyze/templates.js +183 -89
- package/dist/js/node/analyze/utils.js +114 -81
- package/dist/js/node/builder/builderPlugins/compatModern.js +149 -122
- package/dist/js/node/builder/index.js +150 -92
- package/dist/js/node/builder/loaders/routerLoader.js +27 -18
- package/dist/js/node/builder/loaders/serverModuleLoader.js +22 -7
- package/dist/js/node/builder/share.js +45 -25
- package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +39 -26
- package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +47 -31
- package/dist/js/node/builder/webpackPlugins/routerPlugin.js +116 -90
- package/dist/js/node/commands/build.js +89 -52
- package/dist/js/node/commands/deploy.js +45 -10
- package/dist/js/node/commands/dev.js +99 -41
- package/dist/js/node/commands/index.js +19 -38
- package/dist/js/node/commands/inspect.js +48 -11
- package/dist/js/node/commands/start.js +65 -26
- package/dist/js/node/config/default.js +119 -117
- package/dist/js/node/config/index.js +25 -29
- package/dist/js/node/config/initial/createHtmlConfig.js +22 -6
- package/dist/js/node/config/initial/createOutputConfig.js +26 -14
- package/dist/js/node/config/initial/createSourceConfig.js +22 -6
- package/dist/js/node/config/initial/createToolsConfig.js +24 -10
- package/dist/js/node/config/initial/index.js +28 -17
- package/dist/js/node/config/initial/inits.js +126 -81
- package/dist/js/node/config/initial/transformNormalizedConfig.js +31 -15
- package/dist/js/node/defineConfig.js +43 -17
- package/dist/js/node/exports/server.js +21 -10
- package/dist/js/node/hooks.js +44 -29
- package/dist/js/node/index.js +190 -130
- package/dist/js/node/initialize/index.js +116 -61
- package/dist/js/node/locale/en.js +36 -25
- package/dist/js/node/locale/index.js +27 -15
- package/dist/js/node/locale/zh.js +37 -26
- package/dist/js/node/schema/Schema.js +23 -10
- package/dist/js/node/schema/index.js +77 -114
- package/dist/js/node/schema/legacy.js +117 -240
- package/dist/js/node/types/config/index.js +17 -16
- package/dist/js/node/types/index.js +19 -38
- package/dist/js/node/types/legacyConfig/output.js +0 -5
- package/dist/js/node/utils/commands.js +21 -6
- package/dist/js/node/utils/config.js +120 -51
- package/dist/js/node/utils/createFileWatcher.js +104 -61
- package/dist/js/node/utils/createServer.js +86 -25
- package/dist/js/node/utils/getSpecifiedEntries.js +64 -25
- package/dist/js/node/utils/language.js +24 -8
- package/dist/js/node/utils/printInstructions.js +47 -16
- package/dist/js/node/utils/restart.js +61 -21
- package/dist/js/node/utils/routes.js +53 -18
- package/dist/js/treeshaking/analyze/constants.js +28 -18
- package/dist/js/treeshaking/analyze/generateCode.js +599 -406
- package/dist/js/treeshaking/analyze/getBundleEntry.js +52 -63
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +214 -168
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +215 -169
- package/dist/js/treeshaking/analyze/getClientRoutes/index.js +3 -2
- package/dist/js/treeshaking/analyze/getClientRoutes/utils.js +19 -20
- package/dist/js/treeshaking/analyze/getFileSystemEntry.js +89 -86
- package/dist/js/treeshaking/analyze/getHtmlTemplate.js +298 -125
- package/dist/js/treeshaking/analyze/getServerRoutes.js +210 -147
- package/dist/js/treeshaking/analyze/index.js +558 -303
- package/dist/js/treeshaking/analyze/isDefaultExportFunction.js +45 -26
- package/dist/js/treeshaking/analyze/makeLegalIdentifier.js +13 -16
- package/dist/js/treeshaking/analyze/nestedRoutes.js +411 -200
- package/dist/js/treeshaking/analyze/templates.js +433 -236
- package/dist/js/treeshaking/analyze/utils.js +358 -153
- package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +281 -200
- package/dist/js/treeshaking/builder/index.js +371 -163
- package/dist/js/treeshaking/builder/loaders/routerLoader.js +11 -12
- package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +3 -2
- package/dist/js/treeshaking/builder/share.js +41 -44
- package/dist/js/treeshaking/builder/webpackPlugins/htmlAsyncChunkPlugin.js +108 -44
- package/dist/js/treeshaking/builder/webpackPlugins/htmlBottomTemplate.js +70 -39
- package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +332 -112
- package/dist/js/treeshaking/commands/build.js +286 -88
- package/dist/js/treeshaking/commands/deploy.js +153 -25
- package/dist/js/treeshaking/commands/dev.js +318 -131
- package/dist/js/treeshaking/commands/index.js +1 -1
- package/dist/js/treeshaking/commands/inspect.js +147 -32
- package/dist/js/treeshaking/commands/start.js +190 -67
- package/dist/js/treeshaking/config/default.js +210 -198
- package/dist/js/treeshaking/config/index.js +3 -2
- package/dist/js/treeshaking/config/initial/createHtmlConfig.js +19 -31
- package/dist/js/treeshaking/config/initial/createOutputConfig.js +43 -70
- package/dist/js/treeshaking/config/initial/createSourceConfig.js +37 -40
- package/dist/js/treeshaking/config/initial/createToolsConfig.js +23 -38
- package/dist/js/treeshaking/config/initial/index.js +10 -9
- package/dist/js/treeshaking/config/initial/inits.js +205 -106
- package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +27 -34
- package/dist/js/treeshaking/defineConfig.js +60 -13
- package/dist/js/treeshaking/exports/server.js +2 -1
- package/dist/js/treeshaking/hooks.js +26 -25
- package/dist/js/treeshaking/index.js +465 -257
- package/dist/js/treeshaking/initialize/index.js +290 -112
- package/dist/js/treeshaking/locale/en.js +34 -33
- package/dist/js/treeshaking/locale/index.js +5 -5
- package/dist/js/treeshaking/locale/zh.js +34 -33
- package/dist/js/treeshaking/schema/Schema.js +267 -69
- package/dist/js/treeshaking/schema/index.js +165 -121
- package/dist/js/treeshaking/schema/legacy.js +323 -256
- package/dist/js/treeshaking/types/config/deploy.js +1 -0
- package/dist/js/treeshaking/types/config/dev.js +1 -0
- package/dist/js/treeshaking/types/config/experiments.js +1 -0
- package/dist/js/treeshaking/types/config/html.js +1 -0
- package/dist/js/treeshaking/types/config/index.js +0 -1
- package/dist/js/treeshaking/types/config/output.js +1 -0
- package/dist/js/treeshaking/types/config/performance.js +1 -0
- package/dist/js/treeshaking/types/config/security.js +1 -0
- package/dist/js/treeshaking/types/config/source.js +1 -0
- package/dist/js/treeshaking/types/config/tools.js +1 -0
- package/dist/js/treeshaking/types/hooks.js +1 -0
- package/dist/js/treeshaking/types/index.js +0 -1
- package/dist/js/treeshaking/types/legacyConfig/deploy.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/dev.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/index.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/output.js +1 -1
- package/dist/js/treeshaking/types/legacyConfig/source.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/tools.js +1 -0
- package/dist/js/treeshaking/utils/commands.js +6 -5
- package/dist/js/treeshaking/utils/config.js +295 -117
- package/dist/js/treeshaking/utils/createFileWatcher.js +278 -118
- package/dist/js/treeshaking/utils/createServer.js +252 -67
- package/dist/js/treeshaking/utils/getSpecifiedEntries.js +182 -55
- package/dist/js/treeshaking/utils/language.js +6 -5
- package/dist/js/treeshaking/utils/printInstructions.js +151 -29
- package/dist/js/treeshaking/utils/restart.js +184 -42
- package/dist/js/treeshaking/utils/routes.js +151 -27
- package/dist/js/treeshaking/utils/types.js +1 -0
- package/dist/types/analyze/index.d.ts +2 -0
- package/dist/types/builder/builderPlugins/compatModern.d.ts +2 -1
- package/dist/types/builder/index.d.ts +2 -2
- package/dist/types/builder/webpackPlugins/routerPlugin.d.ts +1 -7
- package/dist/types/defineConfig.d.ts +1 -0
- package/dist/types/index.d.ts +2 -0
- package/dist/types/initialize/index.d.ts +2 -0
- package/dist/types/types/config/index.d.ts +1 -0
- package/dist/types/types/config/output.d.ts +0 -1
- package/dist/types/types/config/source.d.ts +1 -0
- package/dist/types/types/config/tools.d.ts +2 -0
- package/dist/types/types/legacyConfig/dev.d.ts +1 -0
- package/dist/types/types/legacyConfig/output.d.ts +1 -1
- package/dist/types/types/legacyConfig/source.d.ts +1 -0
- package/dist/types/types/legacyConfig/tools.d.ts +1 -0
- package/dist/types/utils/config.d.ts +1 -0
- package/dist/types/utils/createServer.d.ts +1 -0
- package/dist/types/utils/restart.d.ts +1 -1
- package/package.json +9 -8
|
@@ -1,208 +1,419 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
2
|
+
try {
|
|
3
|
+
var info = gen[key](arg);
|
|
4
|
+
var value = info.value;
|
|
5
|
+
} catch (error) {
|
|
6
|
+
reject(error);
|
|
7
|
+
return;
|
|
8
|
+
}
|
|
9
|
+
if (info.done) {
|
|
10
|
+
resolve(value);
|
|
11
|
+
} else {
|
|
12
|
+
Promise.resolve(value).then(_next, _throw);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
function _asyncToGenerator(fn) {
|
|
16
|
+
return function() {
|
|
17
|
+
var self = this, args = arguments;
|
|
18
|
+
return new Promise(function(resolve, reject) {
|
|
19
|
+
var gen = fn.apply(self, args);
|
|
20
|
+
function _next(value) {
|
|
21
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
22
|
+
}
|
|
23
|
+
function _throw(err) {
|
|
24
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
25
|
+
}
|
|
26
|
+
_next(undefined);
|
|
27
|
+
});
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
function _defineProperty(obj, key, value) {
|
|
31
|
+
if (key in obj) {
|
|
32
|
+
Object.defineProperty(obj, key, {
|
|
33
|
+
value: value,
|
|
34
|
+
enumerable: true,
|
|
35
|
+
configurable: true,
|
|
36
|
+
writable: true
|
|
37
|
+
});
|
|
38
|
+
} else {
|
|
39
|
+
obj[key] = value;
|
|
40
|
+
}
|
|
41
|
+
return obj;
|
|
42
|
+
}
|
|
43
|
+
function _objectSpread(target) {
|
|
44
|
+
for(var i = 1; i < arguments.length; i++){
|
|
45
|
+
var source = arguments[i] != null ? arguments[i] : {};
|
|
46
|
+
var ownKeys = Object.keys(source);
|
|
47
|
+
if (typeof Object.getOwnPropertySymbols === "function") {
|
|
48
|
+
ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
|
|
49
|
+
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
|
|
50
|
+
}));
|
|
51
|
+
}
|
|
52
|
+
ownKeys.forEach(function(key) {
|
|
53
|
+
_defineProperty(target, key, source[key]);
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
return target;
|
|
57
|
+
}
|
|
58
|
+
function ownKeys(object, enumerableOnly) {
|
|
59
|
+
var keys = Object.keys(object);
|
|
60
|
+
if (Object.getOwnPropertySymbols) {
|
|
61
|
+
var symbols = Object.getOwnPropertySymbols(object);
|
|
62
|
+
if (enumerableOnly) {
|
|
63
|
+
symbols = symbols.filter(function(sym) {
|
|
64
|
+
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
keys.push.apply(keys, symbols);
|
|
68
|
+
}
|
|
69
|
+
return keys;
|
|
70
|
+
}
|
|
71
|
+
function _objectSpreadProps(target, source) {
|
|
72
|
+
source = source != null ? source : {};
|
|
73
|
+
if (Object.getOwnPropertyDescriptors) {
|
|
74
|
+
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
|
75
|
+
} else {
|
|
76
|
+
ownKeys(Object(source)).forEach(function(key) {
|
|
77
|
+
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
return target;
|
|
81
|
+
}
|
|
82
|
+
var __generator = this && this.__generator || function(thisArg, body) {
|
|
83
|
+
var f, y, t, g, _ = {
|
|
84
|
+
label: 0,
|
|
85
|
+
sent: function() {
|
|
86
|
+
if (t[0] & 1) throw t[1];
|
|
87
|
+
return t[1];
|
|
88
|
+
},
|
|
89
|
+
trys: [],
|
|
90
|
+
ops: []
|
|
91
|
+
};
|
|
92
|
+
return(g = {
|
|
93
|
+
next: verb(0),
|
|
94
|
+
"throw": verb(1),
|
|
95
|
+
"return": verb(2)
|
|
96
|
+
}, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
|
|
97
|
+
return this;
|
|
98
|
+
}), g);
|
|
99
|
+
function verb(n) {
|
|
100
|
+
return function(v) {
|
|
101
|
+
return step([
|
|
102
|
+
n,
|
|
103
|
+
v
|
|
104
|
+
]);
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
function step(op) {
|
|
108
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
109
|
+
while(_)try {
|
|
110
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
111
|
+
if (y = 0, t) op = [
|
|
112
|
+
op[0] & 2,
|
|
113
|
+
t.value
|
|
114
|
+
];
|
|
115
|
+
switch(op[0]){
|
|
116
|
+
case 0:
|
|
117
|
+
case 1:
|
|
118
|
+
t = op;
|
|
119
|
+
break;
|
|
120
|
+
case 4:
|
|
121
|
+
_.label++;
|
|
122
|
+
return {
|
|
123
|
+
value: op[1],
|
|
124
|
+
done: false
|
|
125
|
+
};
|
|
126
|
+
case 5:
|
|
127
|
+
_.label++;
|
|
128
|
+
y = op[1];
|
|
129
|
+
op = [
|
|
130
|
+
0
|
|
131
|
+
];
|
|
132
|
+
continue;
|
|
133
|
+
case 7:
|
|
134
|
+
op = _.ops.pop();
|
|
135
|
+
_.trys.pop();
|
|
136
|
+
continue;
|
|
137
|
+
default:
|
|
138
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
139
|
+
_ = 0;
|
|
140
|
+
continue;
|
|
141
|
+
}
|
|
142
|
+
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
143
|
+
_.label = op[1];
|
|
144
|
+
break;
|
|
145
|
+
}
|
|
146
|
+
if (op[0] === 6 && _.label < t[1]) {
|
|
147
|
+
_.label = t[1];
|
|
148
|
+
t = op;
|
|
149
|
+
break;
|
|
150
|
+
}
|
|
151
|
+
if (t && _.label < t[2]) {
|
|
152
|
+
_.label = t[2];
|
|
153
|
+
_.ops.push(op);
|
|
154
|
+
break;
|
|
155
|
+
}
|
|
156
|
+
if (t[2]) _.ops.pop();
|
|
157
|
+
_.trys.pop();
|
|
158
|
+
continue;
|
|
159
|
+
}
|
|
160
|
+
op = body.call(thisArg, _);
|
|
161
|
+
} catch (e) {
|
|
162
|
+
op = [
|
|
163
|
+
6,
|
|
164
|
+
e
|
|
165
|
+
];
|
|
166
|
+
y = 0;
|
|
167
|
+
} finally{
|
|
168
|
+
f = t = 0;
|
|
169
|
+
}
|
|
170
|
+
if (op[0] & 5) throw op[1];
|
|
171
|
+
return {
|
|
172
|
+
value: op[0] ? op[1] : void 0,
|
|
173
|
+
done: true
|
|
174
|
+
};
|
|
175
|
+
}
|
|
176
|
+
};
|
|
177
|
+
import * as path from "path";
|
|
178
|
+
import { fs, getRouteId } from "@modern-js/utils";
|
|
7
179
|
import { JS_EXTENSIONS } from "./constants";
|
|
8
180
|
import { hasLoader, replaceWithAlias } from "./utils";
|
|
9
|
-
var LAYOUT_FILE =
|
|
10
|
-
var PAGE_FILE =
|
|
11
|
-
var LOADING_FILE =
|
|
12
|
-
var ERROR_FILE =
|
|
13
|
-
var LOADER_FILE =
|
|
14
|
-
var conventionNames = [
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
181
|
+
var LAYOUT_FILE = "layout";
|
|
182
|
+
var PAGE_FILE = "page";
|
|
183
|
+
var LOADING_FILE = "loading";
|
|
184
|
+
var ERROR_FILE = "error";
|
|
185
|
+
var LOADER_FILE = "loader";
|
|
186
|
+
var conventionNames = [
|
|
187
|
+
LAYOUT_FILE,
|
|
188
|
+
PAGE_FILE,
|
|
189
|
+
LOADING_FILE,
|
|
190
|
+
ERROR_FILE,
|
|
191
|
+
LOADER_FILE
|
|
192
|
+
];
|
|
193
|
+
var getLoaderPath = function() {
|
|
194
|
+
var _ref = _asyncToGenerator(function(filename) {
|
|
195
|
+
return __generator(this, function(_state) {
|
|
196
|
+
switch(_state.label){
|
|
197
|
+
case 0:
|
|
198
|
+
return [
|
|
199
|
+
4,
|
|
200
|
+
hasLoader(filename)
|
|
201
|
+
];
|
|
202
|
+
case 1:
|
|
203
|
+
if (_state.sent()) {
|
|
204
|
+
return [
|
|
205
|
+
2,
|
|
206
|
+
filename
|
|
207
|
+
];
|
|
208
|
+
}
|
|
209
|
+
return [
|
|
210
|
+
2,
|
|
211
|
+
void 0
|
|
212
|
+
];
|
|
27
213
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
return _context.stop();
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
}, _callee);
|
|
37
|
-
}));
|
|
38
|
-
return function getLoaderPath(_x) {
|
|
39
|
-
return _ref.apply(this, arguments);
|
|
40
|
-
};
|
|
214
|
+
});
|
|
215
|
+
});
|
|
216
|
+
return function getLoaderPath(filename) {
|
|
217
|
+
return _ref.apply(this, arguments);
|
|
218
|
+
};
|
|
41
219
|
}();
|
|
42
|
-
var replaceDynamicPath = function
|
|
43
|
-
|
|
220
|
+
var replaceDynamicPath = function(routePath) {
|
|
221
|
+
return routePath.replace(/\[(.*?)\]/g, ":$1");
|
|
44
222
|
};
|
|
45
|
-
var createIndexRoute = function
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
223
|
+
var createIndexRoute = function(routeInfo, rootDir, filename, entryName) {
|
|
224
|
+
return createRoute(_objectSpreadProps(_objectSpread({}, routeInfo), {
|
|
225
|
+
index: true,
|
|
226
|
+
children: void 0
|
|
227
|
+
}), rootDir, filename, entryName);
|
|
50
228
|
};
|
|
51
|
-
var createRoute = function
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
229
|
+
var createRoute = function(routeInfo, rootDir, filename, entryName) {
|
|
230
|
+
var id = getRouteId(filename, rootDir, entryName);
|
|
231
|
+
return _objectSpreadProps(_objectSpread({}, routeInfo), {
|
|
232
|
+
id: id,
|
|
233
|
+
type: "nested"
|
|
234
|
+
});
|
|
57
235
|
};
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
236
|
+
var walk = function() {
|
|
237
|
+
var _ref = _asyncToGenerator(function(dirname, rootDir, alias, entryName) {
|
|
238
|
+
var isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref, ref1, childRoute1, err, finalRoute;
|
|
239
|
+
return __generator(this, function(_state) {
|
|
240
|
+
switch(_state.label){
|
|
241
|
+
case 0:
|
|
242
|
+
return [
|
|
243
|
+
4,
|
|
244
|
+
fs.pathExists(dirname)
|
|
245
|
+
];
|
|
246
|
+
case 1:
|
|
247
|
+
if (!_state.sent()) {
|
|
248
|
+
return [
|
|
249
|
+
2,
|
|
250
|
+
null
|
|
251
|
+
];
|
|
252
|
+
}
|
|
253
|
+
return [
|
|
254
|
+
4,
|
|
255
|
+
fs.stat(dirname)
|
|
256
|
+
];
|
|
257
|
+
case 2:
|
|
258
|
+
isDirectory = _state.sent().isDirectory();
|
|
259
|
+
if (!isDirectory) {
|
|
260
|
+
return [
|
|
261
|
+
2,
|
|
262
|
+
null
|
|
263
|
+
];
|
|
264
|
+
}
|
|
265
|
+
relativeDir = path.relative(rootDir, dirname);
|
|
266
|
+
pathSegments = relativeDir.split(path.sep);
|
|
267
|
+
lastSegment = pathSegments[pathSegments.length - 1];
|
|
268
|
+
isRoot = lastSegment === "";
|
|
269
|
+
isPathlessLayout = lastSegment.startsWith("__");
|
|
270
|
+
isWithoutLayoutPath = lastSegment.includes(".");
|
|
271
|
+
routePath = isRoot || isPathlessLayout ? "/" : "".concat(lastSegment);
|
|
272
|
+
if (isWithoutLayoutPath) {
|
|
273
|
+
routePath = lastSegment.split(".").join("/");
|
|
274
|
+
}
|
|
275
|
+
routePath = replaceDynamicPath(routePath);
|
|
276
|
+
route = {
|
|
277
|
+
path: routePath,
|
|
278
|
+
children: [],
|
|
279
|
+
isRoot: isRoot
|
|
280
|
+
};
|
|
281
|
+
return [
|
|
282
|
+
4,
|
|
283
|
+
fs.readdir(dirname)
|
|
284
|
+
];
|
|
285
|
+
case 3:
|
|
286
|
+
items = _state.sent();
|
|
287
|
+
_iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
|
|
288
|
+
_state.label = 4;
|
|
289
|
+
case 4:
|
|
290
|
+
_state.trys.push([
|
|
291
|
+
4,
|
|
292
|
+
15,
|
|
293
|
+
16,
|
|
294
|
+
17
|
|
295
|
+
]);
|
|
296
|
+
_iterator = items[Symbol.iterator]();
|
|
297
|
+
_state.label = 5;
|
|
298
|
+
case 5:
|
|
299
|
+
if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
|
|
300
|
+
3,
|
|
301
|
+
14
|
|
302
|
+
];
|
|
303
|
+
item = _step.value;
|
|
304
|
+
itemPath = path.join(dirname, item);
|
|
305
|
+
extname = path.extname(item);
|
|
306
|
+
itemWithoutExt = item.slice(0, -extname.length);
|
|
307
|
+
return [
|
|
308
|
+
4,
|
|
309
|
+
fs.stat(itemPath)
|
|
310
|
+
];
|
|
311
|
+
case 6:
|
|
312
|
+
isDirectory2 = _state.sent().isDirectory();
|
|
313
|
+
if (!isDirectory2) return [
|
|
314
|
+
3,
|
|
315
|
+
8
|
|
316
|
+
];
|
|
317
|
+
return [
|
|
318
|
+
4,
|
|
319
|
+
walk(itemPath, rootDir, alias, entryName)
|
|
320
|
+
];
|
|
321
|
+
case 7:
|
|
322
|
+
childRoute = _state.sent();
|
|
323
|
+
if (childRoute) {
|
|
324
|
+
;
|
|
325
|
+
(ref = route.children) === null || ref === void 0 ? void 0 : ref.push(childRoute);
|
|
326
|
+
}
|
|
327
|
+
_state.label = 8;
|
|
328
|
+
case 8:
|
|
329
|
+
if (extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
|
|
330
|
+
return [
|
|
331
|
+
3,
|
|
332
|
+
13
|
|
333
|
+
];
|
|
334
|
+
}
|
|
335
|
+
if (!(itemWithoutExt === LAYOUT_FILE)) return [
|
|
336
|
+
3,
|
|
337
|
+
10
|
|
338
|
+
];
|
|
339
|
+
route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
|
|
340
|
+
return [
|
|
341
|
+
4,
|
|
342
|
+
getLoaderPath(itemPath)
|
|
343
|
+
];
|
|
344
|
+
case 9:
|
|
345
|
+
route.loader = _state.sent();
|
|
346
|
+
_state.label = 10;
|
|
347
|
+
case 10:
|
|
348
|
+
if (!(itemWithoutExt === PAGE_FILE)) return [
|
|
349
|
+
3,
|
|
350
|
+
12
|
|
351
|
+
];
|
|
352
|
+
childRoute1 = createIndexRoute({
|
|
353
|
+
_component: replaceWithAlias(alias.basename, itemPath, alias.name)
|
|
354
|
+
}, rootDir, itemPath, entryName);
|
|
355
|
+
return [
|
|
356
|
+
4,
|
|
357
|
+
getLoaderPath(itemPath)
|
|
358
|
+
];
|
|
359
|
+
case 11:
|
|
360
|
+
childRoute1.loader = _state.sent();
|
|
361
|
+
(ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(childRoute1);
|
|
362
|
+
_state.label = 12;
|
|
363
|
+
case 12:
|
|
364
|
+
if (itemWithoutExt === LOADING_FILE) {
|
|
365
|
+
route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
|
|
366
|
+
}
|
|
367
|
+
if (itemWithoutExt === ERROR_FILE) {
|
|
368
|
+
route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
|
|
369
|
+
}
|
|
370
|
+
_state.label = 13;
|
|
371
|
+
case 13:
|
|
372
|
+
_iteratorNormalCompletion = true;
|
|
373
|
+
return [
|
|
374
|
+
3,
|
|
375
|
+
5
|
|
376
|
+
];
|
|
377
|
+
case 14:
|
|
378
|
+
return [
|
|
379
|
+
3,
|
|
380
|
+
17
|
|
381
|
+
];
|
|
382
|
+
case 15:
|
|
383
|
+
err = _state.sent();
|
|
384
|
+
_didIteratorError = true;
|
|
385
|
+
_iteratorError = err;
|
|
386
|
+
return [
|
|
387
|
+
3,
|
|
388
|
+
17
|
|
389
|
+
];
|
|
390
|
+
case 16:
|
|
391
|
+
try {
|
|
392
|
+
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
393
|
+
_iterator.return();
|
|
394
|
+
}
|
|
395
|
+
} finally{
|
|
396
|
+
if (_didIteratorError) {
|
|
397
|
+
throw _iteratorError;
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
return [
|
|
401
|
+
7
|
|
402
|
+
];
|
|
403
|
+
case 17:
|
|
404
|
+
finalRoute = createRoute(route, rootDir, path.join(dirname, "".concat(LAYOUT_FILE, ".ts")), entryName);
|
|
405
|
+
if (isPathlessLayout) {
|
|
406
|
+
delete finalRoute.path;
|
|
407
|
+
}
|
|
408
|
+
return [
|
|
409
|
+
2,
|
|
410
|
+
finalRoute
|
|
411
|
+
];
|
|
111
412
|
}
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
_isDirectory = _context2.sent.isDirectory();
|
|
120
|
-
if (!_isDirectory) {
|
|
121
|
-
_context2.next = 38;
|
|
122
|
-
break;
|
|
123
|
-
}
|
|
124
|
-
_context2.next = 36;
|
|
125
|
-
return walk(itemPath, rootDir, alias, entryName);
|
|
126
|
-
case 36:
|
|
127
|
-
childRoute = _context2.sent;
|
|
128
|
-
if (childRoute) {
|
|
129
|
-
(_route$children = route.children) === null || _route$children === void 0 ? void 0 : _route$children.push(childRoute);
|
|
130
|
-
}
|
|
131
|
-
case 38:
|
|
132
|
-
if (!(extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt)))) {
|
|
133
|
-
_context2.next = 40;
|
|
134
|
-
break;
|
|
135
|
-
}
|
|
136
|
-
return _context2.abrupt("continue", 53);
|
|
137
|
-
case 40:
|
|
138
|
-
if (!(itemWithoutExt === LAYOUT_FILE)) {
|
|
139
|
-
_context2.next = 45;
|
|
140
|
-
break;
|
|
141
|
-
}
|
|
142
|
-
route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
|
|
143
|
-
_context2.next = 44;
|
|
144
|
-
return getLoaderPath(itemPath);
|
|
145
|
-
case 44:
|
|
146
|
-
route.loader = _context2.sent;
|
|
147
|
-
case 45:
|
|
148
|
-
if (!(itemWithoutExt === PAGE_FILE)) {
|
|
149
|
-
_context2.next = 51;
|
|
150
|
-
break;
|
|
151
|
-
}
|
|
152
|
-
_childRoute = createIndexRoute({
|
|
153
|
-
_component: replaceWithAlias(alias.basename, itemPath, alias.name)
|
|
154
|
-
}, rootDir, itemPath, entryName);
|
|
155
|
-
_context2.next = 49;
|
|
156
|
-
return getLoaderPath(itemPath);
|
|
157
|
-
case 49:
|
|
158
|
-
_childRoute.loader = _context2.sent;
|
|
159
|
-
(_route$children2 = route.children) === null || _route$children2 === void 0 ? void 0 : _route$children2.push(_childRoute);
|
|
160
|
-
case 51:
|
|
161
|
-
// if (itemWithoutExt === LOADER_FILE) {
|
|
162
|
-
// route.loader = replaceWithAlias(alias.basename, itemPath, alias.name);
|
|
163
|
-
// }
|
|
164
|
-
|
|
165
|
-
if (itemWithoutExt === LOADING_FILE) {
|
|
166
|
-
route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
|
|
167
|
-
}
|
|
168
|
-
if (itemWithoutExt === ERROR_FILE) {
|
|
169
|
-
route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
|
|
170
|
-
}
|
|
171
|
-
case 53:
|
|
172
|
-
_context2.next = 25;
|
|
173
|
-
break;
|
|
174
|
-
case 55:
|
|
175
|
-
_context2.next = 60;
|
|
176
|
-
break;
|
|
177
|
-
case 57:
|
|
178
|
-
_context2.prev = 57;
|
|
179
|
-
_context2.t0 = _context2["catch"](23);
|
|
180
|
-
_iterator.e(_context2.t0);
|
|
181
|
-
case 60:
|
|
182
|
-
_context2.prev = 60;
|
|
183
|
-
_iterator.f();
|
|
184
|
-
return _context2.finish(60);
|
|
185
|
-
case 63:
|
|
186
|
-
finalRoute = createRoute(route, rootDir, path.join(dirname, "".concat(LAYOUT_FILE, ".ts")), entryName);
|
|
187
|
-
/**
|
|
188
|
-
* when the url is /, the __auth/layout.tsx component should not be rendered
|
|
189
|
-
* - routes
|
|
190
|
-
* - __auth
|
|
191
|
-
* - layout.tsx
|
|
192
|
-
* - layout.tsx
|
|
193
|
-
*/
|
|
194
|
-
if (isPathlessLayout) {
|
|
195
|
-
delete finalRoute.path;
|
|
196
|
-
}
|
|
197
|
-
return _context2.abrupt("return", finalRoute);
|
|
198
|
-
case 66:
|
|
199
|
-
case "end":
|
|
200
|
-
return _context2.stop();
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
}, _callee2, null, [[23, 57, 60, 63]]);
|
|
204
|
-
}));
|
|
205
|
-
return function walk(_x2, _x3, _x4, _x5) {
|
|
206
|
-
return _ref2.apply(this, arguments);
|
|
207
|
-
};
|
|
208
|
-
}();
|
|
413
|
+
});
|
|
414
|
+
});
|
|
415
|
+
return function walk(dirname, rootDir, alias, entryName) {
|
|
416
|
+
return _ref.apply(this, arguments);
|
|
417
|
+
};
|
|
418
|
+
}();
|
|
419
|
+
export { walk };
|