@modern-js/app-tools 2.70.2 → 2.70.3

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.
Files changed (7) hide show
  1. package/dist/cjs/plugins/deploy/platforms/netlify.js +3 -2
  2. package/dist/cjs/plugins/deploy/platforms/vercel.js +3 -2
  3. package/dist/esm/plugins/deploy/platforms/netlify.js +4 -3
  4. package/dist/esm/plugins/deploy/platforms/vercel.js +4 -3
  5. package/dist/esm-node/plugins/deploy/platforms/netlify.js +3 -2
  6. package/dist/esm-node/plugins/deploy/platforms/vercel.js +3 -2
  7. package/package.json +19 -19
package/dist/cjs/plugins/deploy/platforms/netlify.js CHANGED
@@ -66,13 +66,14 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
66
66
  },
67
67
  async writeOutput() {
68
68
  const routes = [];
69
- const { source: { mainEntryName } } = modernConfig;
69
+ const { source: { mainEntryName }, html: { disableHtmlFolder, outputStructure } } = modernConfig;
70
70
  if (!needModernServer) {
71
71
  entrypoints.forEach((entry) => {
72
72
  const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
73
+ const htmlPath = disableHtmlFolder || outputStructure === "flat" ? `/html/${entry.entryName}.html` : `/html/${entry.entryName}/index.html`;
73
74
  routes.push({
74
75
  src: `/${isMain ? "" : `${entry.entryName}/`}*`,
75
- dest: `/html/${entry.entryName}/index.html`,
76
+ dest: htmlPath,
76
77
  status: 200
77
78
  });
78
79
  });
package/dist/cjs/plugins/deploy/platforms/vercel.js CHANGED
@@ -69,15 +69,16 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
69
69
  ]
70
70
  };
71
71
  if (!needModernServer) {
72
- const { source: { mainEntryName } } = modernConfig;
72
+ const { source: { mainEntryName }, html: { disableHtmlFolder, outputStructure } } = modernConfig;
73
73
  entrypoints.forEach((entry) => {
74
74
  const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
75
+ const htmlPath = disableHtmlFolder || outputStructure === "flat" ? `/html/${entry.entryName}.html` : `/html/${entry.entryName}/index.html`;
75
76
  config.routes.push({
76
77
  src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
77
78
  headers: {
78
79
  "cache-control": "s-maxage=0"
79
80
  },
80
- dest: `/html/${entry.entryName}/index.html`
81
+ dest: htmlPath
81
82
  });
82
83
  });
83
84
  } else {
package/dist/esm/plugins/deploy/platforms/netlify.js CHANGED
@@ -147,18 +147,19 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
147
147
  },
148
148
  writeOutput: function writeOutput() {
149
149
  return _async_to_generator(function() {
150
- var routes, mainEntryName, redirectContent, redirectFilePath;
150
+ var routes, mainEntryName, _modernConfig_html, disableHtmlFolder, outputStructure, redirectContent, redirectFilePath;
151
151
  return _ts_generator(this, function(_state) {
152
152
  switch (_state.label) {
153
153
  case 0:
154
154
  routes = [];
155
- mainEntryName = modernConfig.source.mainEntryName;
155
+ mainEntryName = modernConfig.source.mainEntryName, _modernConfig_html = modernConfig.html, disableHtmlFolder = _modernConfig_html.disableHtmlFolder, outputStructure = _modernConfig_html.outputStructure;
156
156
  if (!needModernServer) {
157
157
  entrypoints.forEach(function(entry) {
158
158
  var isMain = isMainEntry(entry.entryName, mainEntryName);
159
+ var htmlPath = disableHtmlFolder || outputStructure === "flat" ? "/html/".concat(entry.entryName, ".html") : "/html/".concat(entry.entryName, "/index.html");
159
160
  routes.push({
160
161
  src: "/".concat(isMain ? "" : "".concat(entry.entryName, "/"), "*"),
161
- dest: "/html/".concat(entry.entryName, "/index.html"),
162
+ dest: htmlPath,
162
163
  status: 200
163
164
  });
164
165
  });
package/dist/esm/plugins/deploy/platforms/vercel.js CHANGED
@@ -43,7 +43,7 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
43
43
  },
44
44
  writeOutput: function writeOutput() {
45
45
  return _async_to_generator(function() {
46
- var config, mainEntryName, staticDirectory, destHtmlDirectory, outputHtmlDirectory, nodeVersion;
46
+ var config, mainEntryName, _modernConfig_html, disableHtmlFolder, outputStructure, staticDirectory, destHtmlDirectory, outputHtmlDirectory, nodeVersion;
47
47
  return _ts_generator(this, function(_state) {
48
48
  switch (_state.label) {
49
49
  case 0:
@@ -63,15 +63,16 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
63
63
  ]
64
64
  };
65
65
  if (!needModernServer) {
66
- mainEntryName = modernConfig.source.mainEntryName;
66
+ mainEntryName = modernConfig.source.mainEntryName, _modernConfig_html = modernConfig.html, disableHtmlFolder = _modernConfig_html.disableHtmlFolder, outputStructure = _modernConfig_html.outputStructure;
67
67
  entrypoints.forEach(function(entry) {
68
68
  var isMain = isMainEntry(entry.entryName, mainEntryName);
69
+ var htmlPath = disableHtmlFolder || outputStructure === "flat" ? "/html/".concat(entry.entryName, ".html") : "/html/".concat(entry.entryName, "/index.html");
69
70
  config.routes.push({
70
71
  src: "/".concat(isMain ? "" : entry.entryName, "(?:/.*)?"),
71
72
  headers: {
72
73
  "cache-control": "s-maxage=0"
73
74
  },
74
- dest: "/html/".concat(entry.entryName, "/index.html")
75
+ dest: htmlPath
75
76
  });
76
77
  });
77
78
  } else {
package/dist/esm-node/plugins/deploy/platforms/netlify.js CHANGED
@@ -33,13 +33,14 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
33
33
  },
34
34
  async writeOutput() {
35
35
  const routes = [];
36
- const { source: { mainEntryName } } = modernConfig;
36
+ const { source: { mainEntryName }, html: { disableHtmlFolder, outputStructure } } = modernConfig;
37
37
  if (!needModernServer) {
38
38
  entrypoints.forEach((entry) => {
39
39
  const isMain = isMainEntry(entry.entryName, mainEntryName);
40
+ const htmlPath = disableHtmlFolder || outputStructure === "flat" ? `/html/${entry.entryName}.html` : `/html/${entry.entryName}/index.html`;
40
41
  routes.push({
41
42
  src: `/${isMain ? "" : `${entry.entryName}/`}*`,
42
- dest: `/html/${entry.entryName}/index.html`,
43
+ dest: htmlPath,
43
44
  status: 200
44
45
  });
45
46
  });
package/dist/esm-node/plugins/deploy/platforms/vercel.js CHANGED
@@ -36,15 +36,16 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
36
36
  ]
37
37
  };
38
38
  if (!needModernServer) {
39
- const { source: { mainEntryName } } = modernConfig;
39
+ const { source: { mainEntryName }, html: { disableHtmlFolder, outputStructure } } = modernConfig;
40
40
  entrypoints.forEach((entry) => {
41
41
  const isMain = isMainEntry(entry.entryName, mainEntryName);
42
+ const htmlPath = disableHtmlFolder || outputStructure === "flat" ? `/html/${entry.entryName}.html` : `/html/${entry.entryName}/index.html`;
42
43
  config.routes.push({
43
44
  src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
44
45
  headers: {
45
46
  "cache-control": "s-maxage=0"
46
47
  },
47
- dest: `/html/${entry.entryName}/index.html`
48
+ dest: htmlPath
48
49
  });
49
50
  });
50
51
  } else {
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.70.2",
18
+ "version": "2.70.3",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -86,30 +86,30 @@
86
86
  "@babel/traverse": "^7.23.2",
87
87
  "@babel/types": "^7.26.0",
88
88
  "@rsbuild/core": "1.7.2",
89
- "@rsbuild/plugin-node-polyfill": "1.4.2",
89
+ "@rsbuild/plugin-node-polyfill": "1.4.3",
90
90
  "@swc/helpers": "^0.5.17",
91
91
  "es-module-lexer": "^1.1.0",
92
92
  "esbuild": "0.25.5",
93
93
  "esbuild-register": "^3.6.0",
94
94
  "flatted": "^3.3.3",
95
95
  "mlly": "^1.7.4",
96
- "ndepe": "^0.1.12",
96
+ "ndepe": "^0.1.13",
97
97
  "pkg-types": "^1.3.1",
98
98
  "std-env": "^3.7.0",
99
- "@modern-js/core": "2.70.2",
100
- "@modern-js/plugin": "2.70.2",
101
- "@modern-js/node-bundle-require": "2.70.2",
102
- "@modern-js/plugin-data-loader": "2.70.2",
103
- "@modern-js/plugin-i18n": "2.70.2",
104
- "@modern-js/plugin-v2": "2.70.2",
105
- "@modern-js/prod-server": "2.70.2",
106
- "@modern-js/rsbuild-plugin-esbuild": "2.70.2",
107
- "@modern-js/server": "2.70.2",
108
- "@modern-js/server-core": "2.70.2",
109
- "@modern-js/server-utils": "2.70.2",
110
- "@modern-js/types": "2.70.2",
111
- "@modern-js/uni-builder": "2.70.2",
112
- "@modern-js/utils": "2.70.2"
99
+ "@modern-js/core": "2.70.3",
100
+ "@modern-js/node-bundle-require": "2.70.3",
101
+ "@modern-js/plugin": "2.70.3",
102
+ "@modern-js/plugin-data-loader": "2.70.3",
103
+ "@modern-js/plugin-i18n": "2.70.3",
104
+ "@modern-js/plugin-v2": "2.70.3",
105
+ "@modern-js/prod-server": "2.70.3",
106
+ "@modern-js/rsbuild-plugin-esbuild": "2.70.3",
107
+ "@modern-js/server": "2.70.3",
108
+ "@modern-js/server-core": "2.70.3",
109
+ "@modern-js/server-utils": "2.70.3",
110
+ "@modern-js/types": "2.70.3",
111
+ "@modern-js/utils": "2.70.3",
112
+ "@modern-js/uni-builder": "2.70.3"
113
113
  },
114
114
  "devDependencies": {
115
115
  "@rsbuild/plugin-webpack-swc": "1.1.2",
@@ -121,8 +121,8 @@
121
121
  "tsconfig-paths": "^4.2.0",
122
122
  "typescript": "^5",
123
123
  "webpack": "^5.103.0",
124
- "@scripts/jest-config": "2.66.0",
125
- "@scripts/build": "2.66.0"
124
+ "@scripts/build": "2.66.0",
125
+ "@scripts/jest-config": "2.66.0"
126
126
  },
127
127
  "peerDependencies": {
128
128
  "ts-node": "^10.7.0",