Skip to content

Commit ac9f872

Browse files
committed
use a regex
1 parent 47b0158 commit ac9f872

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

jsconfig.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
"checkJs": true,
66
"esModuleInterop": true,
77
"forceConsistentCasingInFileNames": true,
8-
"lib": ["es2020", "DOM"],
8+
"lib": ["es2021", "DOM"],
99
"moduleResolution": "node",
1010
"module": "es2022",
1111
"resolveJsonModule": true,
1212
"skipLibCheck": true,
1313
"sourceMap": true,
1414
"strict": true,
1515
"target": "es2022"
16-
}
16+
},
17+
"include": ["src", "scripts", ".svelte-kit/ambient.d.ts"]
1718
}

scripts/create-common-bundle/index.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ const ignored_basenames = ['.DS_Store', 'LICENSE'];
1919
const ignored_extensions = ['.d.ts', '.map'];
2020
const ignored_directories = ['.svelte-kit', 'node_modules/.bin', 'node_modules/rollup/dist/shared'];
2121

22-
const ignored_files = new Set([
23-
'node_modules/svelte/compiler.js',
24-
'node_modules/@esbuild/darwin-arm64/bin/esbuild'
25-
]);
22+
const ignored_files = [
23+
/^node_modules\/svelte\/compiler\.js$/,
24+
/^node_modules\/@esbuild\/.+\/bin\/esbuild$/
25+
];
2626

2727
for (const file of glob('**', { cwd, filesOnly: true, dot: true }).map((file) =>
2828
file.replaceAll('\\', '/')
@@ -31,8 +31,9 @@ for (const file of glob('**', { cwd, filesOnly: true, dot: true }).map((file) =>
3131
if (ignored_basenames.find((basename) => file.endsWith('/' + basename))) continue;
3232
if (ignored_directories.find((dir) => file.startsWith(dir + '/'))) continue;
3333

34-
if (ignored_files.has(file)) {
35-
ignored_files.delete(file);
34+
const ignored_index = ignored_files.findIndex((pattern) => pattern.test(file));
35+
if (ignored_index !== -1) {
36+
ignored_files.splice(ignored_index, 1);
3637
continue;
3738
}
3839

@@ -50,7 +51,7 @@ for (const file of glob('**', { cwd, filesOnly: true, dot: true }).map((file) =>
5051
zip.addFile(file, fs.readFileSync(`${cwd}/${file}`));
5152
}
5253

53-
if (ignored_files.size > 0) {
54+
if (ignored_files.length > 0) {
5455
throw new Error(`expected to find ${Array.from(ignored_files).join(', ')}`);
5556
}
5657

0 commit comments

Comments
 (0)