Skip to content

Commit f4dac4c

Browse files
PatrickMenotijotanarciso
PatrickMenoti
authored and
jotanarciso
committed
fix: presets (manifest) (#304)
2 parents 42354ed + 2ea3e6c commit f4dac4c

File tree

13 files changed

+124
-28
lines changed

13 files changed

+124
-28
lines changed

‎.vscode/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"editor.codeActionsOnSave": {
3-
"source.fixAll.eslint": true
3+
"source.fixAll.eslint": "explicit"
44
},
55
"editor.defaultFormatter": "esbenp.prettier-vscode",
66
"editor.formatOnSave": true,

‎lib/presets/custom/angular/deliver/prebuild.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const packageManager = await getPackageManager();
77
const manifest = {
88
origin: [
99
{
10-
name: 'origin_storage_default',
10+
name: 'origin-storage-default',
1111
type: 'object_storage',
1212
},
1313
],
@@ -17,10 +17,26 @@ const manifest = {
1717
name: 'Main_Rule',
1818
match: '^\\/',
1919
setOrigin: {
20-
name: 'origin_storage_default',
20+
name: 'origin-storage-default',
2121
type: 'object_storage',
2222
},
2323
},
24+
{
25+
name: 'Index_Rewrite_1',
26+
match: '.*/$',
27+
// eslint-disable-next-line no-template-curly-in-string
28+
rewrite: {
29+
set: (uri) => `${uri}index.html`,
30+
},
31+
},
32+
{
33+
name: 'Index_Rewrite_2',
34+
match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
35+
// eslint-disable-next-line no-template-curly-in-string
36+
rewrite: {
37+
set: (uri) => `${uri}index.html`,
38+
},
39+
},
2440
],
2541
},
2642
};

‎lib/presets/custom/astro/deliver/prebuild.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const packageManager = await getPackageManager();
1111
const manifest = {
1212
origin: [
1313
{
14-
name: 'origin_storage_default',
14+
name: 'origin-storage-default',
1515
type: 'object_storage',
1616
},
1717
],
@@ -21,10 +21,26 @@ const manifest = {
2121
name: 'Main_Rule',
2222
match: '^\\/',
2323
setOrigin: {
24-
name: 'origin_storage_default',
24+
name: 'origin-storage-default',
2525
type: 'object_storage',
2626
},
2727
},
28+
{
29+
name: 'Index_Rewrite_1',
30+
match: '.*/$',
31+
// eslint-disable-next-line no-template-curly-in-string
32+
rewrite: {
33+
set: (uri) => `${uri}index.html`,
34+
},
35+
},
36+
{
37+
name: 'Index_Rewrite_2',
38+
match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
39+
// eslint-disable-next-line no-template-curly-in-string
40+
rewrite: {
41+
set: (uri) => `${uri}index.html`,
42+
},
43+
},
2844
],
2945
},
3046
};

‎lib/presets/custom/eleventy/deliver/prebuild.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { exec, copyDirectory, generateManifest } from '#utils';
44
const manifest = {
55
origin: [
66
{
7-
name: 'origin_storage_default',
7+
name: 'origin-storage-default',
88
type: 'object_storage',
99
},
1010
],
@@ -14,7 +14,7 @@ const manifest = {
1414
name: 'Main_Rule',
1515
match: '^\\/',
1616
setOrigin: {
17-
name: 'origin_storage_default',
17+
name: 'origin-storage-default',
1818
type: 'object_storage',
1919
},
2020
},
@@ -28,7 +28,7 @@ const manifest = {
2828
},
2929
{
3030
name: 'Index_Rewrite_2',
31-
match: '^(?!.*/$)(?![sS]*.[a-zA-Z0-9]+$).*',
31+
match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
3232
// eslint-disable-next-line no-template-curly-in-string
3333
rewrite: {
3434
set: (uri) => `${uri}index.html`,

‎lib/presets/custom/gatsby/deliver/prebuild.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const packageManager = await getPackageManager();
1111
const manifest = {
1212
origin: [
1313
{
14-
name: 'origin_storage_default',
14+
name: 'origin-storage-default',
1515
type: 'object_storage',
1616
},
1717
],
@@ -21,10 +21,26 @@ const manifest = {
2121
name: 'Main_Rule',
2222
match: '^\\/',
2323
setOrigin: {
24-
name: 'origin_storage_default',
24+
name: 'origin-storage-default',
2525
type: 'object_storage',
2626
},
2727
},
28+
{
29+
name: 'Index_Rewrite_1',
30+
match: '.*/$',
31+
// eslint-disable-next-line no-template-curly-in-string
32+
rewrite: {
33+
set: (uri) => `${uri}index.html`,
34+
},
35+
},
36+
{
37+
name: 'Index_Rewrite_2',
38+
match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
39+
// eslint-disable-next-line no-template-curly-in-string
40+
rewrite: {
41+
set: (uri) => `${uri}index.html`,
42+
},
43+
},
2844
],
2945
},
3046
};

‎lib/presets/custom/hexo/deliver/prebuild.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const packageManager = await getPackageManager();
1111
const manifest = {
1212
origin: [
1313
{
14-
name: 'origin_storage_default',
14+
name: 'origin-storage-default',
1515
type: 'object_storage',
1616
},
1717
],
@@ -21,7 +21,7 @@ const manifest = {
2121
name: 'Main_Rule',
2222
match: '^\\/',
2323
setOrigin: {
24-
name: 'origin_storage_default',
24+
name: 'origin-storage-default',
2525
type: 'object_storage',
2626
},
2727
},
@@ -35,7 +35,7 @@ const manifest = {
3535
},
3636
{
3737
name: 'Index_Rewrite_2',
38-
match: '^(?!.*/$)(?![sS]*.[a-zA-Z0-9]+$).*',
38+
match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
3939
// eslint-disable-next-line no-template-curly-in-string
4040
rewrite: {
4141
set: (uri) => `${uri}index.html`,

‎lib/presets/custom/hugo/deliver/prebuild.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const packageManager = await getPackageManager();
1111
const manifest = {
1212
origin: [
1313
{
14-
name: 'origin_storage_default',
14+
name: 'origin-storage-default',
1515
type: 'object_storage',
1616
},
1717
],
@@ -21,7 +21,7 @@ const manifest = {
2121
name: 'Main_Rule',
2222
match: '^\\/',
2323
setOrigin: {
24-
name: 'origin_storage_default',
24+
name: 'origin-storage-default',
2525
type: 'object_storage',
2626
},
2727
},
@@ -35,7 +35,7 @@ const manifest = {
3535
},
3636
{
3737
name: 'Index_Rewrite_2',
38-
match: '^(?!.*/$)(?![sS]*.[a-zA-Z0-9]+$).*',
38+
match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
3939
// eslint-disable-next-line no-template-curly-in-string
4040
rewrite: {
4141
set: (uri) => `${uri}index.html`,

‎lib/presets/custom/next/compute/prebuild.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const { deleteTelemetryFiles, createVercelProjectConfig, runVercelBuild } =
1414
const edgeManifest = {
1515
origin: [
1616
{
17-
name: 'origin_storage_default',
17+
name: 'origin-storage-default',
1818
type: 'object_storage',
1919
},
2020
],
@@ -24,7 +24,7 @@ const edgeManifest = {
2424
name: 'Assets_Rule_1',
2525
match: '/^/_next/static/;', // starts with '/_next/static/'
2626
setOrigin: {
27-
name: 'origin_storage_default',
27+
name: 'origin-storage-default',
2828
type: 'object_storage',
2929
},
3030
deliver: true,

‎lib/presets/custom/next/deliver/prebuild.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const packageManager = await getPackageManager();
1717
const cdnManifest = {
1818
origin: [
1919
{
20-
name: 'origin_storage_default',
20+
name: 'origin-storage-default',
2121
type: 'object_storage',
2222
},
2323
],
@@ -27,7 +27,7 @@ const cdnManifest = {
2727
name: 'Main_Rule',
2828
match: '^\\/',
2929
setOrigin: {
30-
name: 'origin_storage_default',
30+
name: 'origin-storage-default',
3131
type: 'object_storage',
3232
},
3333
},
@@ -41,7 +41,7 @@ const cdnManifest = {
4141
},
4242
{
4343
name: 'Index_Rewrite_2',
44-
match: '^(?!.*/$)(?![sS]*.[a-zA-Z0-9]+$).*',
44+
match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
4545
// eslint-disable-next-line no-template-curly-in-string
4646
rewrite: {
4747
set: (uri) => `${uri}index.html`,

‎lib/presets/custom/react/deliver/prebuild.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const packageManager = await getPackageManager();
55
const manifest = {
66
origin: [
77
{
8-
name: 'origin_storage_default',
8+
name: 'origin-storage-default',
99
type: 'object_storage',
1010
},
1111
],
@@ -15,10 +15,26 @@ const manifest = {
1515
name: 'Main_Rule',
1616
match: '^\\/',
1717
setOrigin: {
18-
name: 'origin_storage_default',
18+
name: 'origin-storage-default',
1919
type: 'object_storage',
2020
},
2121
},
22+
{
23+
name: 'Index_Rewrite_1',
24+
match: '.*/$',
25+
// eslint-disable-next-line no-template-curly-in-string
26+
rewrite: {
27+
set: (uri) => `${uri}index.html`,
28+
},
29+
},
30+
{
31+
name: 'Index_Rewrite_2',
32+
match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
33+
// eslint-disable-next-line no-template-curly-in-string
34+
rewrite: {
35+
set: (uri) => `${uri}index.html`,
36+
},
37+
},
2238
],
2339
},
2440
};

‎lib/presets/custom/svelte/deliver/prebuild.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const packageManager = await getPackageManager();
1111
const manifest = {
1212
origin: [
1313
{
14-
name: 'origin_storage_default',
14+
name: 'origin-storage-default',
1515
type: 'object_storage',
1616
},
1717
],
@@ -21,10 +21,26 @@ const manifest = {
2121
name: 'Main_Rule',
2222
match: '^\\/',
2323
setOrigin: {
24-
name: 'origin_storage_default',
24+
name: 'origin-storage-default',
2525
type: 'object_storage',
2626
},
2727
},
28+
{
29+
name: 'Index_Rewrite_1',
30+
match: '.*/$',
31+
// eslint-disable-next-line no-template-curly-in-string
32+
rewrite: {
33+
set: (uri) => `${uri}index.html`,
34+
},
35+
},
36+
{
37+
name: 'Index_Rewrite_2',
38+
match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
39+
// eslint-disable-next-line no-template-curly-in-string
40+
rewrite: {
41+
set: (uri) => `${uri}index.html`,
42+
},
43+
},
2844
],
2945
},
3046
};

‎lib/presets/custom/vue/deliver/prebuild.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const defaultViteOutDir = 'dist';
1313
const manifest = {
1414
origin: [
1515
{
16-
name: 'origin_storage_default',
16+
name: 'origin-storage-default',
1717
type: 'object_storage',
1818
},
1919
],
@@ -23,10 +23,26 @@ const manifest = {
2323
name: 'Main_Rule',
2424
match: '^\\/',
2525
setOrigin: {
26-
name: 'origin_storage_default',
26+
name: 'origin-storage-default',
2727
type: 'object_storage',
2828
},
2929
},
30+
{
31+
name: 'Index_Rewrite_1',
32+
match: '.*/$',
33+
// eslint-disable-next-line no-template-curly-in-string
34+
rewrite: {
35+
set: (uri) => `${uri}index.html`,
36+
},
37+
},
38+
{
39+
name: 'Index_Rewrite_2',
40+
match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
41+
// eslint-disable-next-line no-template-curly-in-string
42+
rewrite: {
43+
set: (uri) => `${uri}index.html`,
44+
},
45+
},
3046
],
3147
},
3248
};

‎lib/utils/generateManifest/generateManifest.utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ function processManifestConfig(config) {
149149
const pathTransformation = functionString
150150
.replace(/.*=>\s*`/, '') // Remove the function part up to the template string
151151
.replace(/`\s*;?\s*}?\s*$/, '') // Removes the end of the template string and possible function closures
152-
.replace(/\$\{([^}]+)\}/g, (match, p1) => `%{${p1}}`); // Replace ${other[index]} with %{other[index]}
152+
.replace(/\$\{([^}]+)\}/g, (match, p1) => `\${${p1}}`); // Replace ${other[index]} with %{other[index]}
153153

154154
cdnRule.behaviors.push({
155155
name: 'rewrite_request',

0 commit comments

Comments
 (0)