@modern-js/runtime 2.15.1-alpha.2 → 2.16.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/CHANGELOG.md +19 -0
- package/dist/cjs/cli/index.js +32 -48
- package/dist/cjs/common.js +13 -27
- package/dist/cjs/config.js +4 -15
- package/dist/cjs/core/appConfig.js +13 -26
- package/dist/cjs/core/compatible.js +170 -158
- package/dist/cjs/core/index.js +38 -45
- package/dist/cjs/core/loader/index.js +12 -35
- package/dist/cjs/core/loader/loaderManager.js +42 -56
- package/dist/cjs/core/loader/useLoader.js +80 -105
- package/dist/cjs/core/plugin.js +28 -40
- package/dist/cjs/core/types.js +4 -15
- package/dist/cjs/document/Body.js +61 -37
- package/dist/cjs/document/Comment.js +22 -32
- package/dist/cjs/document/DocumentContext.js +14 -37
- package/dist/cjs/document/DocumentStructureContext.js +14 -37
- package/dist/cjs/document/Head.js +71 -40
- package/dist/cjs/document/Html.js +46 -58
- package/dist/cjs/document/Links.js +18 -28
- package/dist/cjs/document/Root.js +73 -44
- package/dist/cjs/document/Script.js +22 -32
- package/dist/cjs/document/Scripts.js +18 -28
- package/dist/cjs/document/cli/index.js +161 -207
- package/dist/cjs/document/constants.js +36 -75
- package/dist/cjs/document/index.js +28 -27
- package/dist/cjs/exports/head.js +27 -37
- package/dist/cjs/exports/loadable.js +27 -37
- package/dist/cjs/exports/server.js +7 -25
- package/dist/cjs/exports/styled.js +27 -37
- package/dist/cjs/index.js +22 -42
- package/dist/cjs/router/cli/index.js +91 -114
- package/dist/cjs/router/index.js +32 -39
- package/dist/cjs/router/runtime/DefaultNotFound.js +23 -38
- package/dist/cjs/router/runtime/DeferredDataScripts.js +8 -24
- package/dist/cjs/router/runtime/DeferredDataScripts.node.js +69 -112
- package/dist/cjs/router/runtime/PrefetchLink.js +117 -96
- package/dist/cjs/router/runtime/fetch.js +7 -25
- package/dist/cjs/router/runtime/fetch.node.js +7 -25
- package/dist/cjs/router/runtime/fetch.worker.js +7 -25
- package/dist/cjs/router/runtime/hooks.js +8 -26
- package/dist/cjs/router/runtime/index.js +94 -148
- package/dist/cjs/router/runtime/plugin.js +56 -76
- package/dist/cjs/router/runtime/plugin.node.js +95 -74
- package/dist/cjs/router/runtime/server.js +18 -17
- package/dist/cjs/router/runtime/types.js +4 -15
- package/dist/cjs/router/runtime/utils.js +57 -83
- package/dist/cjs/router/runtime/withRouter.js +24 -39
- package/dist/cjs/runtimeContext.js +14 -27
- package/dist/cjs/ssr/cli/babel-plugin-ssr-loader-id.js +75 -59
- package/dist/cjs/ssr/cli/index.js +120 -150
- package/dist/cjs/ssr/index.js +149 -132
- package/dist/cjs/ssr/index.node.js +73 -74
- package/dist/cjs/ssr/prefetch.js +51 -59
- package/dist/cjs/ssr/react/index.js +15 -28
- package/dist/cjs/ssr/react/nossr/index.js +51 -43
- package/dist/cjs/ssr/react/prerender/index.js +93 -59
- package/dist/cjs/ssr/react/prerender/type.js +4 -15
- package/dist/cjs/ssr/react/prerender/util.js +32 -51
- package/dist/cjs/ssr/react/withCallback/index.js +53 -29
- package/dist/cjs/ssr/serverRender/helmet.js +15 -26
- package/dist/cjs/ssr/serverRender/index.js +14 -32
- package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js +15 -34
- package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.share.js +12 -28
- package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js +28 -55
- package/dist/cjs/ssr/serverRender/renderToStream/index.js +23 -48
- package/dist/cjs/ssr/serverRender/renderToStream/loadable.js +13 -32
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.js +33 -64
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.worker.js +26 -54
- package/dist/cjs/ssr/serverRender/renderToStream/styledComponent.js +9 -27
- package/dist/cjs/ssr/serverRender/renderToStream/template.js +11 -32
- package/dist/cjs/ssr/serverRender/renderToStream/type.js +4 -15
- package/dist/cjs/ssr/serverRender/renderToString/entry.js +133 -99
- package/dist/cjs/ssr/serverRender/renderToString/index.js +21 -48
- package/dist/cjs/ssr/serverRender/renderToString/loadable.js +20 -45
- package/dist/cjs/ssr/serverRender/renderToString/reduce.js +13 -25
- package/dist/cjs/ssr/serverRender/renderToString/styledComponent.js +9 -27
- package/dist/cjs/ssr/serverRender/renderToString/template.js +42 -37
- package/dist/cjs/ssr/serverRender/renderToString/type.js +10 -28
- package/dist/cjs/ssr/serverRender/time.js +7 -25
- package/dist/cjs/ssr/serverRender/time.worker.js +11 -26
- package/dist/cjs/ssr/serverRender/types.js +7 -25
- package/dist/cjs/ssr/serverRender/utils.js +12 -27
- package/dist/cjs/ssr/utils.js +26 -51
- package/dist/cjs/state/cli/index.js +71 -95
- package/dist/cjs/state/index.js +32 -39
- package/dist/cjs/state/plugins.js +26 -46
- package/dist/cjs/state/runtime/index.js +27 -37
- package/dist/cjs/state/runtime/plugin.js +82 -84
- package/dist/cjs/state/types.js +4 -15
- package/dist/esm/cli/index.js +184 -176
- package/dist/esm/common.js +4 -5
- package/dist/esm/config.js +1 -1
- package/dist/esm/core/appConfig.js +8 -7
- package/dist/esm/core/compatible.js +470 -448
- package/dist/esm/core/index.js +3 -4
- package/dist/esm/core/loader/index.js +1 -2
- package/dist/esm/core/loader/loaderManager.js +391 -366
- package/dist/esm/core/loader/useLoader.js +173 -162
- package/dist/esm/core/plugin.js +162 -155
- package/dist/esm/core/types.js +1 -1
- package/dist/esm/document/Body.js +12 -13
- package/dist/esm/document/Comment.js +11 -12
- package/dist/esm/document/DocumentContext.js +4 -5
- package/dist/esm/document/DocumentStructureContext.js +6 -7
- package/dist/esm/document/Head.js +16 -17
- package/dist/esm/document/Html.js +84 -85
- package/dist/esm/document/Links.js +5 -6
- package/dist/esm/document/Root.js +20 -21
- package/dist/esm/document/Script.js +12 -13
- package/dist/esm/document/Scripts.js +5 -6
- package/dist/esm/document/cli/index.js +390 -371
- package/dist/esm/document/constants.js +33 -34
- package/dist/esm/exports/head.js +1 -2
- package/dist/esm/exports/loadable.js +1 -2
- package/dist/esm/exports/server.js +2 -3
- package/dist/esm/exports/styled.js +1 -2
- package/dist/esm/index.js +2 -3
- package/dist/esm/router/cli/index.js +141 -141
- package/dist/esm/router/index.js +2 -3
- package/dist/esm/router/runtime/DefaultNotFound.js +12 -13
- package/dist/esm/router/runtime/DeferredDataScripts.js +4 -4
- package/dist/esm/router/runtime/DeferredDataScripts.node.js +154 -143
- package/dist/esm/router/runtime/PrefetchLink.js +418 -394
- package/dist/esm/router/runtime/fetch.js +2 -1
- package/dist/esm/router/runtime/fetch.worker.js +2 -1
- package/dist/esm/router/runtime/index.js +60 -9
- package/dist/esm/router/runtime/plugin.js +141 -142
- package/dist/esm/router/runtime/plugin.node.js +372 -353
- package/dist/esm/router/runtime/types.js +1 -1
- package/dist/esm/router/runtime/utils.js +295 -279
- package/dist/esm/router/runtime/withRouter.js +57 -58
- package/dist/esm/runtimeContext.js +2 -3
- package/dist/esm/ssr/cli/babel-plugin-ssr-loader-id.js +105 -118
- package/dist/esm/ssr/cli/index.js +146 -146
- package/dist/esm/ssr/index.js +303 -297
- package/dist/esm/ssr/index.node.js +227 -221
- package/dist/esm/ssr/prefetch.js +192 -186
- package/dist/esm/ssr/react/index.js +2 -3
- package/dist/esm/ssr/react/nossr/index.js +58 -47
- package/dist/esm/ssr/react/prerender/index.js +214 -206
- package/dist/esm/ssr/react/prerender/type.js +1 -1
- package/dist/esm/ssr/react/prerender/util.js +91 -92
- package/dist/esm/ssr/react/withCallback/index.js +13 -14
- package/dist/esm/ssr/serverRender/helmet.js +34 -35
- package/dist/esm/ssr/serverRender/index.js +167 -160
- package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.js +58 -59
- package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.share.js +5 -6
- package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js +106 -93
- package/dist/esm/ssr/serverRender/renderToStream/index.js +157 -151
- package/dist/esm/ssr/serverRender/renderToStream/loadable.js +17 -18
- package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.js +117 -117
- package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.worker.js +286 -279
- package/dist/esm/ssr/serverRender/renderToStream/styledComponent.js +8 -9
- package/dist/esm/ssr/serverRender/renderToStream/template.js +62 -51
- package/dist/esm/ssr/serverRender/renderToStream/type.js +1 -1
- package/dist/esm/ssr/serverRender/renderToString/entry.js +393 -383
- package/dist/esm/ssr/serverRender/renderToString/index.js +158 -152
- package/dist/esm/ssr/serverRender/renderToString/loadable.js +46 -47
- package/dist/esm/ssr/serverRender/renderToString/reduce.js +7 -8
- package/dist/esm/ssr/serverRender/renderToString/styledComponent.js +6 -7
- package/dist/esm/ssr/serverRender/renderToString/template.js +142 -128
- package/dist/esm/ssr/serverRender/renderToString/type.js +6 -7
- package/dist/esm/ssr/serverRender/time.js +57 -46
- package/dist/esm/ssr/serverRender/time.worker.js +72 -61
- package/dist/esm/ssr/serverRender/utils.js +14 -15
- package/dist/esm/ssr/utils.js +128 -117
- package/dist/esm/state/cli/index.js +67 -67
- package/dist/esm/state/index.js +2 -3
- package/dist/esm/state/plugins.js +7 -8
- package/dist/esm/state/runtime/index.js +1 -2
- package/dist/esm/state/runtime/plugin.js +177 -166
- package/dist/esm/state/types.js +1 -1
- package/dist/esm-node/cli/index.js +11 -9
- package/dist/esm-node/common.js +3 -8
- package/dist/esm-node/config.js +1 -0
- package/dist/esm-node/core/appConfig.js +2 -6
- package/dist/esm-node/core/compatible.js +104 -120
- package/dist/esm-node/core/index.js +3 -13
- package/dist/esm-node/core/loader/index.js +1 -4
- package/dist/esm-node/core/loader/loaderManager.js +25 -25
- package/dist/esm-node/core/loader/useLoader.js +60 -74
- package/dist/esm-node/core/plugin.js +9 -15
- package/dist/esm-node/core/types.js +1 -0
- package/dist/esm-node/document/Body.js +11 -15
- package/dist/esm-node/document/Comment.js +10 -14
- package/dist/esm-node/document/DocumentContext.js +1 -4
- package/dist/esm-node/document/DocumentStructureContext.js +1 -4
- package/dist/esm-node/document/Head.js +14 -14
- package/dist/esm-node/document/Html.js +31 -34
- package/dist/esm-node/document/Links.js +5 -6
- package/dist/esm-node/document/Root.js +19 -21
- package/dist/esm-node/document/Script.js +10 -14
- package/dist/esm-node/document/Scripts.js +5 -6
- package/dist/esm-node/document/cli/index.js +136 -184
- package/dist/esm-node/document/constants.js +22 -52
- package/dist/esm-node/exports/head.js +1 -4
- package/dist/esm-node/exports/loadable.js +1 -4
- package/dist/esm-node/exports/server.js +1 -4
- package/dist/esm-node/exports/styled.js +1 -4
- package/dist/esm-node/index.js +2 -22
- package/dist/esm-node/router/cli/index.js +83 -98
- package/dist/esm-node/router/index.js +2 -6
- package/dist/esm-node/router/runtime/DefaultNotFound.js +11 -17
- package/dist/esm-node/router/runtime/DeferredDataScripts.js +1 -4
- package/dist/esm-node/router/runtime/DeferredDataScripts.node.js +51 -85
- package/dist/esm-node/router/runtime/PrefetchLink.js +53 -59
- package/dist/esm-node/router/runtime/fetch.js +1 -3
- package/dist/esm-node/router/runtime/fetch.node.js +1 -3
- package/dist/esm-node/router/runtime/fetch.worker.js +1 -3
- package/dist/esm-node/router/runtime/hooks.js +1 -3
- package/dist/esm-node/router/runtime/index.js +6 -67
- package/dist/esm-node/router/runtime/plugin.js +27 -41
- package/dist/esm-node/router/runtime/plugin.node.js +24 -32
- package/dist/esm-node/router/runtime/types.js +1 -0
- package/dist/esm-node/router/runtime/utils.js +34 -50
- package/dist/esm-node/router/runtime/withRouter.js +8 -14
- package/dist/esm-node/runtimeContext.js +2 -6
- package/dist/esm-node/ssr/cli/babel-plugin-ssr-loader-id.js +99 -119
- package/dist/esm-node/ssr/cli/index.js +106 -125
- package/dist/esm-node/ssr/index.js +112 -96
- package/dist/esm-node/ssr/index.node.js +39 -39
- package/dist/esm-node/ssr/prefetch.js +40 -35
- package/dist/esm-node/ssr/react/index.js +2 -6
- package/dist/esm-node/ssr/react/nossr/index.js +2 -9
- package/dist/esm-node/ssr/react/prerender/index.js +32 -23
- package/dist/esm-node/ssr/react/prerender/type.js +1 -0
- package/dist/esm-node/ssr/react/prerender/util.js +23 -33
- package/dist/esm-node/ssr/react/withCallback/index.js +4 -5
- package/dist/esm-node/ssr/serverRender/helmet.js +2 -5
- package/dist/esm-node/ssr/serverRender/index.js +5 -10
- package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js +5 -9
- package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.share.js +3 -10
- package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js +7 -17
- package/dist/esm-node/ssr/serverRender/renderToStream/index.js +2 -7
- package/dist/esm-node/ssr/serverRender/renderToStream/loadable.js +4 -8
- package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.js +21 -39
- package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js +16 -31
- package/dist/esm-node/ssr/serverRender/renderToStream/styledComponent.js +1 -4
- package/dist/esm-node/ssr/serverRender/renderToStream/template.js +2 -8
- package/dist/esm-node/ssr/serverRender/renderToStream/type.js +1 -0
- package/dist/esm-node/ssr/serverRender/renderToString/entry.js +50 -39
- package/dist/esm-node/ssr/serverRender/renderToString/index.js +1 -8
- package/dist/esm-node/ssr/serverRender/renderToString/loadable.js +8 -18
- package/dist/esm-node/ssr/serverRender/renderToString/reduce.js +1 -4
- package/dist/esm-node/ssr/serverRender/renderToString/styledComponent.js +1 -4
- package/dist/esm-node/ssr/serverRender/renderToString/template.js +32 -18
- package/dist/esm-node/ssr/serverRender/renderToString/type.js +3 -6
- package/dist/esm-node/ssr/serverRender/time.js +1 -4
- package/dist/esm-node/ssr/serverRender/time.worker.js +5 -5
- package/dist/esm-node/ssr/serverRender/types.js +1 -3
- package/dist/esm-node/ssr/serverRender/utils.js +4 -10
- package/dist/esm-node/ssr/utils.js +8 -19
- package/dist/esm-node/state/cli/index.js +63 -78
- package/dist/esm-node/state/index.js +2 -6
- package/dist/esm-node/state/plugins.js +4 -10
- package/dist/esm-node/state/runtime/index.js +1 -4
- package/dist/esm-node/state/runtime/plugin.js +47 -44
- package/dist/esm-node/state/types.js +1 -0
- package/package.json +14 -10
- package/types/model.d.ts +1 -0
- package/dist/js/modern/cli/index.js +0 -72
- package/dist/js/modern/common.js +0 -4
- package/dist/js/modern/config.js +0 -0
- package/dist/js/modern/core/app-config.js +0 -10
- package/dist/js/modern/core/compatible.js +0 -285
- package/dist/js/modern/core/index.js +0 -16
- package/dist/js/modern/core/loader/index.js +0 -4
- package/dist/js/modern/core/loader/loaderManager.js +0 -165
- package/dist/js/modern/core/loader/useLoader.js +0 -114
- package/dist/js/modern/core/plugin.js +0 -58
- package/dist/js/modern/document/Body.js +0 -23
- package/dist/js/modern/document/DocumentContext.js +0 -9
- package/dist/js/modern/document/DocumentStructrueContext.js +0 -11
- package/dist/js/modern/document/Head.js +0 -27
- package/dist/js/modern/document/Html.js +0 -78
- package/dist/js/modern/document/Links.js +0 -10
- package/dist/js/modern/document/Root.js +0 -33
- package/dist/js/modern/document/Script.js +0 -20
- package/dist/js/modern/document/Scripts.js +0 -10
- package/dist/js/modern/document/cli/index.js +0 -228
- package/dist/js/modern/document/constants.js +0 -49
- package/dist/js/modern/document/index.js +0 -10
- package/dist/js/modern/exports/head.js +0 -6
- package/dist/js/modern/exports/loadable.js +0 -6
- package/dist/js/modern/exports/server.js +0 -4
- package/dist/js/modern/exports/styled.js +0 -6
- package/dist/js/modern/index.js +0 -22
- package/dist/js/modern/router/cli/index.js +0 -120
- package/dist/js/modern/router/index.js +0 -7
- package/dist/js/modern/router/runtime/DefaultNotFound.js +0 -14
- package/dist/js/modern/router/runtime/index.js +0 -9
- package/dist/js/modern/router/runtime/plugin.js +0 -104
- package/dist/js/modern/router/runtime/plugin.node.js +0 -149
- package/dist/js/modern/router/runtime/server.js +0 -1
- package/dist/js/modern/router/runtime/types.js +0 -0
- package/dist/js/modern/router/runtime/utils.js +0 -196
- package/dist/js/modern/router/runtime/withRouter.js +0 -36
- package/dist/js/modern/runtime-context.js +0 -7
- package/dist/js/modern/ssr/cli/babel-plugin-ssr-loader-id.js +0 -130
- package/dist/js/modern/ssr/cli/index.js +0 -172
- package/dist/js/modern/ssr/index.js +0 -159
- package/dist/js/modern/ssr/index.node.js +0 -79
- package/dist/js/modern/ssr/prefetch.js +0 -69
- package/dist/js/modern/ssr/react/index.js +0 -6
- package/dist/js/modern/ssr/react/nossr/index.js +0 -14
- package/dist/js/modern/ssr/react/prerender/index.js +0 -108
- package/dist/js/modern/ssr/react/prerender/type.js +0 -0
- package/dist/js/modern/ssr/react/prerender/util.js +0 -96
- package/dist/js/modern/ssr/react/withCallback/index.js +0 -15
- package/dist/js/modern/ssr/serverRender/helmet.js +0 -44
- package/dist/js/modern/ssr/serverRender/index.js +0 -35
- package/dist/js/modern/ssr/serverRender/renderToStream/buildTemplate.after.js +0 -36
- package/dist/js/modern/ssr/serverRender/renderToStream/buildTemplate.share.js +0 -11
- package/dist/js/modern/ssr/serverRender/renderToStream/bulidTemplate.before.js +0 -61
- package/dist/js/modern/ssr/serverRender/renderToStream/index.js +0 -58
- package/dist/js/modern/ssr/serverRender/renderToStream/loadable.js +0 -24
- package/dist/js/modern/ssr/serverRender/renderToStream/renderToPipe.js +0 -94
- package/dist/js/modern/ssr/serverRender/renderToStream/styledComponent.js +0 -12
- package/dist/js/modern/ssr/serverRender/renderToStream/template.js +0 -22
- package/dist/js/modern/ssr/serverRender/renderToStream/type.js +0 -0
- package/dist/js/modern/ssr/serverRender/renderToString/entry.js +0 -171
- package/dist/js/modern/ssr/serverRender/renderToString/index.js +0 -52
- package/dist/js/modern/ssr/serverRender/renderToString/loadable.js +0 -48
- package/dist/js/modern/ssr/serverRender/renderToString/reduce.js +0 -8
- package/dist/js/modern/ssr/serverRender/renderToString/styledComponent.js +0 -11
- package/dist/js/modern/ssr/serverRender/renderToString/template.js +0 -58
- package/dist/js/modern/ssr/serverRender/renderToString/type.js +0 -9
- package/dist/js/modern/ssr/serverRender/types.js +0 -4
- package/dist/js/modern/ssr/serverRender/utils.js +0 -22
- package/dist/js/modern/ssr/utils.js +0 -81
- package/dist/js/modern/state/cli/index.js +0 -83
- package/dist/js/modern/state/index.js +0 -7
- package/dist/js/modern/state/plugins.js +0 -13
- package/dist/js/modern/state/runtime/index.js +0 -9
- package/dist/js/modern/state/runtime/plugin.js +0 -97
- package/dist/js/modern/state/types.js +0 -0
- package/dist/js/node/cli/index.js +0 -99
- package/dist/js/node/common.js +0 -27
- package/dist/js/node/config.js +0 -15
- package/dist/js/node/core/app-config.js +0 -34
- package/dist/js/node/core/compatible.js +0 -312
- package/dist/js/node/core/index.js +0 -47
- package/dist/js/node/core/loader/index.js +0 -33
- package/dist/js/node/core/loader/loaderManager.js +0 -195
- package/dist/js/node/core/loader/useLoader.js +0 -132
- package/dist/js/node/core/plugin.js +0 -80
- package/dist/js/node/document/Body.js +0 -43
- package/dist/js/node/document/DocumentContext.js +0 -38
- package/dist/js/node/document/DocumentStructrueContext.js +0 -40
- package/dist/js/node/document/Head.js +0 -51
- package/dist/js/node/document/Html.js +0 -101
- package/dist/js/node/document/Links.js +0 -33
- package/dist/js/node/document/Root.js +0 -57
- package/dist/js/node/document/Script.js +0 -40
- package/dist/js/node/document/Scripts.js +0 -33
- package/dist/js/node/document/cli/index.js +0 -240
- package/dist/js/node/document/constants.js +0 -86
- package/dist/js/node/document/index.js +0 -26
- package/dist/js/node/exports/head.js +0 -34
- package/dist/js/node/exports/loadable.js +0 -34
- package/dist/js/node/exports/server.js +0 -27
- package/dist/js/node/exports/styled.js +0 -34
- package/dist/js/node/index.js +0 -44
- package/dist/js/node/router/cli/index.js +0 -135
- package/dist/js/node/router/index.js +0 -37
- package/dist/js/node/router/runtime/DefaultNotFound.js +0 -37
- package/dist/js/node/router/runtime/index.js +0 -33
- package/dist/js/node/router/runtime/plugin.js +0 -127
- package/dist/js/node/router/runtime/plugin.node.js +0 -175
- package/dist/js/node/router/runtime/server.js +0 -17
- package/dist/js/node/router/runtime/types.js +0 -15
- package/dist/js/node/router/runtime/utils.js +0 -221
- package/dist/js/node/router/runtime/withRouter.js +0 -57
- package/dist/js/node/runtime-context.js +0 -31
- package/dist/js/node/ssr/cli/babel-plugin-ssr-loader-id.js +0 -139
- package/dist/js/node/ssr/cli/index.js +0 -190
- package/dist/js/node/ssr/index.js +0 -185
- package/dist/js/node/ssr/index.node.js +0 -107
- package/dist/js/node/ssr/prefetch.js +0 -90
- package/dist/js/node/ssr/react/index.js +0 -30
- package/dist/js/node/ssr/react/nossr/index.js +0 -43
- package/dist/js/node/ssr/react/prerender/index.js +0 -130
- package/dist/js/node/ssr/react/prerender/type.js +0 -15
- package/dist/js/node/ssr/react/prerender/util.js +0 -123
- package/dist/js/node/ssr/react/withCallback/index.js +0 -38
- package/dist/js/node/ssr/serverRender/helmet.js +0 -65
- package/dist/js/node/ssr/serverRender/index.js +0 -56
- package/dist/js/node/ssr/serverRender/renderToStream/buildTemplate.after.js +0 -65
- package/dist/js/node/ssr/serverRender/renderToStream/buildTemplate.share.js +0 -35
- package/dist/js/node/ssr/serverRender/renderToStream/bulidTemplate.before.js +0 -87
- package/dist/js/node/ssr/serverRender/renderToStream/index.js +0 -87
- package/dist/js/node/ssr/serverRender/renderToStream/loadable.js +0 -47
- package/dist/js/node/ssr/serverRender/renderToStream/renderToPipe.js +0 -111
- package/dist/js/node/ssr/serverRender/renderToStream/styledComponent.js +0 -35
- package/dist/js/node/ssr/serverRender/renderToStream/template.js +0 -45
- package/dist/js/node/ssr/serverRender/renderToStream/type.js +0 -15
- package/dist/js/node/ssr/serverRender/renderToString/entry.js +0 -196
- package/dist/js/node/ssr/serverRender/renderToString/index.js +0 -81
- package/dist/js/node/ssr/serverRender/renderToString/loadable.js +0 -71
- package/dist/js/node/ssr/serverRender/renderToString/reduce.js +0 -31
- package/dist/js/node/ssr/serverRender/renderToString/styledComponent.js +0 -34
- package/dist/js/node/ssr/serverRender/renderToString/template.js +0 -82
- package/dist/js/node/ssr/serverRender/renderToString/type.js +0 -32
- package/dist/js/node/ssr/serverRender/types.js +0 -27
- package/dist/js/node/ssr/serverRender/utils.js +0 -46
- package/dist/js/node/ssr/utils.js +0 -106
- package/dist/js/node/state/cli/index.js +0 -100
- package/dist/js/node/state/index.js +0 -37
- package/dist/js/node/state/plugins.js +0 -45
- package/dist/js/node/state/runtime/index.js +0 -40
- package/dist/js/node/state/runtime/plugin.js +0 -121
- package/dist/js/node/state/types.js +0 -15
- package/dist/js/treeshaking/cli/index.js +0 -186
- package/dist/js/treeshaking/common.js +0 -4
- package/dist/js/treeshaking/config.js +0 -1
- package/dist/js/treeshaking/core/app-config.js +0 -9
- package/dist/js/treeshaking/core/compatible.js +0 -485
- package/dist/js/treeshaking/core/index.js +0 -7
- package/dist/js/treeshaking/core/loader/index.js +0 -2
- package/dist/js/treeshaking/core/loader/loaderManager.js +0 -406
- package/dist/js/treeshaking/core/loader/useLoader.js +0 -188
- package/dist/js/treeshaking/core/plugin.js +0 -176
- package/dist/js/treeshaking/document/Body.js +0 -18
- package/dist/js/treeshaking/document/DocumentContext.js +0 -7
- package/dist/js/treeshaking/document/DocumentStructrueContext.js +0 -9
- package/dist/js/treeshaking/document/Head.js +0 -24
- package/dist/js/treeshaking/document/Html.js +0 -99
- package/dist/js/treeshaking/document/Links.js +0 -8
- package/dist/js/treeshaking/document/Root.js +0 -26
- package/dist/js/treeshaking/document/Script.js +0 -15
- package/dist/js/treeshaking/document/Scripts.js +0 -8
- package/dist/js/treeshaking/document/cli/index.js +0 -393
- package/dist/js/treeshaking/document/constants.js +0 -35
- package/dist/js/treeshaking/document/index.js +0 -10
- package/dist/js/treeshaking/exports/head.js +0 -4
- package/dist/js/treeshaking/exports/loadable.js +0 -4
- package/dist/js/treeshaking/exports/server.js +0 -4
- package/dist/js/treeshaking/exports/styled.js +0 -4
- package/dist/js/treeshaking/index.js +0 -3
- package/dist/js/treeshaking/router/cli/index.js +0 -148
- package/dist/js/treeshaking/router/index.js +0 -4
- package/dist/js/treeshaking/router/runtime/DefaultNotFound.js +0 -14
- package/dist/js/treeshaking/router/runtime/index.js +0 -6
- package/dist/js/treeshaking/router/runtime/plugin.js +0 -132
- package/dist/js/treeshaking/router/runtime/plugin.node.js +0 -390
- package/dist/js/treeshaking/router/runtime/server.js +0 -1
- package/dist/js/treeshaking/router/runtime/types.js +0 -1
- package/dist/js/treeshaking/router/runtime/utils.js +0 -260
- package/dist/js/treeshaking/router/runtime/withRouter.js +0 -67
- package/dist/js/treeshaking/runtime-context.js +0 -4
- package/dist/js/treeshaking/ssr/cli/babel-plugin-ssr-loader-id.js +0 -122
- package/dist/js/treeshaking/ssr/cli/index.js +0 -217
- package/dist/js/treeshaking/ssr/index.js +0 -315
- package/dist/js/treeshaking/ssr/index.node.js +0 -240
- package/dist/js/treeshaking/ssr/prefetch.js +0 -199
- package/dist/js/treeshaking/ssr/react/index.js +0 -3
- package/dist/js/treeshaking/ssr/react/nossr/index.js +0 -58
- package/dist/js/treeshaking/ssr/react/prerender/index.js +0 -237
- package/dist/js/treeshaking/ssr/react/prerender/type.js +0 -1
- package/dist/js/treeshaking/ssr/react/prerender/util.js +0 -108
- package/dist/js/treeshaking/ssr/react/withCallback/index.js +0 -16
- package/dist/js/treeshaking/ssr/serverRender/helmet.js +0 -42
- package/dist/js/treeshaking/ssr/serverRender/index.js +0 -169
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/buildTemplate.after.js +0 -34
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/buildTemplate.share.js +0 -7
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/bulidTemplate.before.js +0 -115
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/index.js +0 -165
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/loadable.js +0 -22
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/renderToPipe.js +0 -119
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/styledComponent.js +0 -11
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/template.js +0 -63
- package/dist/js/treeshaking/ssr/serverRender/renderToStream/type.js +0 -1
- package/dist/js/treeshaking/ssr/serverRender/renderToString/entry.js +0 -393
- package/dist/js/treeshaking/ssr/serverRender/renderToString/index.js +0 -165
- package/dist/js/treeshaking/ssr/serverRender/renderToString/loadable.js +0 -56
- package/dist/js/treeshaking/ssr/serverRender/renderToString/reduce.js +0 -10
- package/dist/js/treeshaking/ssr/serverRender/renderToString/styledComponent.js +0 -9
- package/dist/js/treeshaking/ssr/serverRender/renderToString/template.js +0 -156
- package/dist/js/treeshaking/ssr/serverRender/renderToString/type.js +0 -7
- package/dist/js/treeshaking/ssr/serverRender/types.js +0 -2
- package/dist/js/treeshaking/ssr/serverRender/utils.js +0 -69
- package/dist/js/treeshaking/ssr/utils.js +0 -134
- package/dist/js/treeshaking/state/cli/index.js +0 -71
- package/dist/js/treeshaking/state/index.js +0 -4
- package/dist/js/treeshaking/state/plugins.js +0 -14
- package/dist/js/treeshaking/state/runtime/index.js +0 -5
- package/dist/js/treeshaking/state/runtime/plugin.js +0 -198
- package/dist/js/treeshaking/state/types.js +0 -1
|
@@ -2,156 +2,156 @@ import path from "path";
|
|
|
2
2
|
import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSSGEntry } from "@modern-js/utils";
|
|
3
3
|
var PLUGIN_IDENTIFIER = "ssr";
|
|
4
4
|
var hasStringSSREntry = function(userConfig) {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
}
|
|
5
|
+
var isStreaming = function(ssr) {
|
|
6
|
+
return ssr && typeof ssr === "object" && ssr.mode === "stream";
|
|
7
|
+
};
|
|
8
|
+
var server = userConfig.server;
|
|
9
|
+
if ((server === null || server === void 0 ? void 0 : server.ssr) && !isStreaming(server.ssr)) {
|
|
10
|
+
return true;
|
|
11
|
+
}
|
|
12
|
+
if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
|
|
13
|
+
var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
|
|
14
|
+
try {
|
|
15
|
+
for (var _iterator = Object.keys(server.ssrByEntries)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
|
|
16
|
+
var name = _step.value;
|
|
17
|
+
if (!isStreaming(server.ssrByEntries[name])) {
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
} catch (err) {
|
|
22
|
+
_didIteratorError = true;
|
|
23
|
+
_iteratorError = err;
|
|
24
|
+
} finally {
|
|
25
|
+
try {
|
|
26
|
+
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
27
|
+
_iterator.return();
|
|
28
|
+
}
|
|
29
|
+
} finally {
|
|
30
|
+
if (_didIteratorError) {
|
|
31
|
+
throw _iteratorError;
|
|
34
32
|
}
|
|
33
|
+
}
|
|
35
34
|
}
|
|
36
|
-
|
|
35
|
+
}
|
|
36
|
+
return false;
|
|
37
37
|
};
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
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
|
-
babel: babelConfig
|
|
87
|
-
}
|
|
88
|
-
};
|
|
89
|
-
},
|
|
90
|
-
modifyEntryImports: function modifyEntryImports(param) {
|
|
91
|
-
var entrypoint = param.entrypoint, imports = param.imports;
|
|
92
|
-
var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
|
|
93
|
-
var userConfig = api.useResolvedConfigContext();
|
|
94
|
-
var _api_useAppContext = api.useAppContext(), packageName = _api_useAppContext.packageName, entrypoints = _api_useAppContext.entrypoints;
|
|
95
|
-
pluginsExportsUtils.addExport("export { default as ssr } from '@modern-js/runtime/ssr'");
|
|
96
|
-
var ssrConfig = getEntryOptions(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
|
|
97
|
-
if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
|
|
98
|
-
var _runtimeConfig_router;
|
|
99
|
-
var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
|
|
100
|
-
if ((runtimeConfig === null || runtimeConfig === void 0 ? void 0 : (_runtimeConfig_router = runtimeConfig.router) === null || _runtimeConfig_router === void 0 ? void 0 : _runtimeConfig_router.mode) === "react-router-5") {
|
|
101
|
-
throw new Error("router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'");
|
|
102
|
-
}
|
|
103
|
-
if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
|
|
104
|
-
throw new Error("You should switch to file-system based router to support streaming SSR.");
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
var useSSG = isSSGEntry(userConfig, entryName, entrypoints);
|
|
108
|
-
ssrConfigMap.set(entryName, ssrConfig || useSSG);
|
|
109
|
-
if (ssrConfig || useSSG) {
|
|
110
|
-
imports.push({
|
|
111
|
-
value: "@modern-js/runtime/plugins",
|
|
112
|
-
specifiers: [
|
|
113
|
-
{
|
|
114
|
-
imported: PLUGIN_IDENTIFIER
|
|
115
|
-
}
|
|
116
|
-
]
|
|
117
|
-
});
|
|
118
|
-
}
|
|
119
|
-
return {
|
|
120
|
-
entrypoint: entrypoint,
|
|
121
|
-
imports: imports
|
|
122
|
-
};
|
|
123
|
-
},
|
|
124
|
-
modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
|
|
125
|
-
var entrypoint = param.entrypoint, plugins = param.plugins;
|
|
126
|
-
if (ssrConfigMap.get(entrypoint.entryName)) {
|
|
127
|
-
plugins.push({
|
|
128
|
-
name: PLUGIN_IDENTIFIER,
|
|
129
|
-
options: JSON.stringify(ssrConfigMap.get(entrypoint.entryName))
|
|
130
|
-
});
|
|
131
|
-
}
|
|
132
|
-
return {
|
|
133
|
-
entrypoint: entrypoint,
|
|
134
|
-
plugins: plugins
|
|
135
|
-
};
|
|
136
|
-
},
|
|
137
|
-
modifyEntryExport: function modifyEntryExport(param) {
|
|
138
|
-
var entrypoint = param.entrypoint, exportStatement = param.exportStatement;
|
|
139
|
-
if (ssrConfigMap.get(entrypoint.entryName)) {
|
|
140
|
-
return {
|
|
141
|
-
entrypoint: entrypoint,
|
|
142
|
-
exportStatement: [
|
|
143
|
-
"export function ".concat(SERVER_RENDER_FUNCTION_NAME, "(context) {\n return bootstrap(AppWrapper, context)\n }"),
|
|
144
|
-
exportStatement
|
|
145
|
-
].join("\n")
|
|
146
|
-
};
|
|
38
|
+
export default function() {
|
|
39
|
+
return {
|
|
40
|
+
name: "@modern-js/plugin-ssr",
|
|
41
|
+
required: [
|
|
42
|
+
"@modern-js/runtime"
|
|
43
|
+
],
|
|
44
|
+
setup: function(api) {
|
|
45
|
+
var ssrConfigMap = /* @__PURE__ */ new Map();
|
|
46
|
+
var pluginsExportsUtils;
|
|
47
|
+
return {
|
|
48
|
+
config: function config() {
|
|
49
|
+
var appContext = api.useAppContext();
|
|
50
|
+
pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
|
|
51
|
+
var _api_useAppContext = api.useAppContext(), _api_useAppContext_bundlerType = _api_useAppContext.bundlerType, bundlerType = _api_useAppContext_bundlerType === void 0 ? "webpack" : _api_useAppContext_bundlerType;
|
|
52
|
+
var babelConfig = bundlerType === "webpack" ? function(config2) {
|
|
53
|
+
var _config_plugins;
|
|
54
|
+
(_config_plugins = config2.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
|
|
55
|
+
var userConfig = api.useResolvedConfigContext();
|
|
56
|
+
if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
|
|
57
|
+
var _config_plugins1;
|
|
58
|
+
(_config_plugins1 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
|
|
59
|
+
}
|
|
60
|
+
} : void 0;
|
|
61
|
+
return {
|
|
62
|
+
source: {
|
|
63
|
+
alias: {
|
|
64
|
+
// ensure that all packages use the same storage in @modern-js/utils/ssr
|
|
65
|
+
"@modern-js/utils/ssr": require.resolve("@modern-js/utils/ssr"),
|
|
66
|
+
"@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
|
|
67
|
+
},
|
|
68
|
+
globalVars: function(values, param) {
|
|
69
|
+
var target = param.target;
|
|
70
|
+
values["process.env.MODERN_TARGET"] = target === "node" || target === "service-worker" ? "node" : "browser";
|
|
71
|
+
}
|
|
72
|
+
},
|
|
73
|
+
tools: {
|
|
74
|
+
webpackChain: function(chain, param) {
|
|
75
|
+
var isServer = param.isServer, isServiceWorker = param.isServiceWorker, CHAIN_ID = param.CHAIN_ID;
|
|
76
|
+
var userConfig = api.useResolvedConfigContext();
|
|
77
|
+
if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
|
|
78
|
+
var LoadableWebpackPlugin = require("@loadable/webpack-plugin");
|
|
79
|
+
chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
|
|
80
|
+
{
|
|
81
|
+
filename: LOADABLE_STATS_FILE
|
|
147
82
|
}
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
83
|
+
]);
|
|
84
|
+
}
|
|
85
|
+
},
|
|
86
|
+
babel: babelConfig
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
},
|
|
90
|
+
modifyEntryImports: function modifyEntryImports(param) {
|
|
91
|
+
var entrypoint = param.entrypoint, imports = param.imports;
|
|
92
|
+
var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
|
|
93
|
+
var userConfig = api.useResolvedConfigContext();
|
|
94
|
+
var _api_useAppContext = api.useAppContext(), packageName = _api_useAppContext.packageName, entrypoints = _api_useAppContext.entrypoints;
|
|
95
|
+
pluginsExportsUtils.addExport("export { default as ssr } from '@modern-js/runtime/ssr'");
|
|
96
|
+
var ssrConfig = getEntryOptions(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
|
|
97
|
+
if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
|
|
98
|
+
var _ref;
|
|
99
|
+
var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
|
|
100
|
+
if (((_ref = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) === null || _ref === void 0 ? void 0 : _ref.mode) === "react-router-5") {
|
|
101
|
+
throw new Error("router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'");
|
|
102
|
+
}
|
|
103
|
+
if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
|
|
104
|
+
throw new Error("You should switch to file-system based router to support streaming SSR.");
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
var useSSG = isSSGEntry(userConfig, entryName, entrypoints);
|
|
108
|
+
ssrConfigMap.set(entryName, ssrConfig || useSSG);
|
|
109
|
+
if (ssrConfig || useSSG) {
|
|
110
|
+
imports.push({
|
|
111
|
+
value: "@modern-js/runtime/plugins",
|
|
112
|
+
specifiers: [
|
|
113
|
+
{
|
|
114
|
+
imported: PLUGIN_IDENTIFIER
|
|
152
115
|
}
|
|
116
|
+
]
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
return {
|
|
120
|
+
entrypoint,
|
|
121
|
+
imports
|
|
122
|
+
};
|
|
123
|
+
},
|
|
124
|
+
modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
|
|
125
|
+
var entrypoint = param.entrypoint, plugins = param.plugins;
|
|
126
|
+
if (ssrConfigMap.get(entrypoint.entryName)) {
|
|
127
|
+
plugins.push({
|
|
128
|
+
name: PLUGIN_IDENTIFIER,
|
|
129
|
+
options: JSON.stringify(ssrConfigMap.get(entrypoint.entryName))
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
return {
|
|
133
|
+
entrypoint,
|
|
134
|
+
plugins
|
|
135
|
+
};
|
|
136
|
+
},
|
|
137
|
+
modifyEntryExport: function modifyEntryExport(param) {
|
|
138
|
+
var entrypoint = param.entrypoint, exportStatement = param.exportStatement;
|
|
139
|
+
if (ssrConfigMap.get(entrypoint.entryName)) {
|
|
140
|
+
return {
|
|
141
|
+
entrypoint,
|
|
142
|
+
exportStatement: [
|
|
143
|
+
"export function ".concat(SERVER_RENDER_FUNCTION_NAME, "(context) {\n return bootstrap(AppWrapper, context)\n }"),
|
|
144
|
+
exportStatement
|
|
145
|
+
].join("\n")
|
|
153
146
|
};
|
|
147
|
+
}
|
|
148
|
+
return {
|
|
149
|
+
entrypoint,
|
|
150
|
+
exportStatement
|
|
151
|
+
};
|
|
154
152
|
}
|
|
155
|
-
|
|
156
|
-
}
|
|
157
|
-
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
;
|