Skip to content

Commit 4271788

Browse files
committed
chore: get ready for Svelte 4
1 parent 0d55b01 commit 4271788

File tree

5 files changed

+24
-16
lines changed

5 files changed

+24
-16
lines changed

.prettierrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"useTabs": true,
3+
"singleQuote": true,
4+
"printWidth": 100,
5+
"endOfLine": "lf"
6+
}

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# rollup-plugin-svelte changelog
22

3+
## 7.1.5
4+
5+
- Get ready for Svelte 4
6+
37
## 7.1.4
48

59
- Forward options to `this.resolve` ([#208](https://github.com/sveltejs/rollup-plugin-svelte/pull/208))

index.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const path = require('path');
22
const fs = require('fs');
33
const { resolve } = require('resolve.exports');
44
const { createFilter } = require('@rollup/pluginutils');
5-
const { compile, preprocess } = require('svelte/compiler');
5+
const { compile, preprocess, VERSION } = require('svelte/compiler');
66

77
const PREFIX = '[rollup-plugin-svelte]';
88

@@ -12,7 +12,7 @@ const plugin_options = new Set([
1212
'extensions',
1313
'include',
1414
'onwarn',
15-
'preprocess'
15+
'preprocess',
1616
]);
1717

1818
let warned = false;
@@ -26,7 +26,9 @@ module.exports = function (options = {}) {
2626
const extensions = rest.extensions || ['.svelte'];
2727
const filter = createFilter(rest.include, rest.exclude);
2828

29-
compilerOptions.format = 'esm';
29+
if (VERSION[0] === '3') {
30+
compilerOptions.format = 'esm';
31+
}
3032

3133
for (const key in rest) {
3234
if (plugin_options.has(key)) continue;
@@ -56,12 +58,7 @@ module.exports = function (options = {}) {
5658
*/
5759
async resolveId(importee, importer, options) {
5860
if (cache_emit.has(importee)) return importee;
59-
if (
60-
!importer ||
61-
importee[0] === '.' ||
62-
importee[0] === '\0' ||
63-
path.isAbsolute(importee)
64-
)
61+
if (!importer || importee[0] === '.' || importee[0] === '\0' || path.isAbsolute(importee))
6562
return null;
6663

6764
// if this is a bare import, see if there's a valid pkg.svelte
@@ -103,7 +100,9 @@ module.exports = function (options = {}) {
103100
resolve(pkg, entry, { conditions: ['svelte'] });
104101

105102
if (!warned) {
106-
console.error('\n\u001B[1m\u001B[31mWARNING: Your @rollup/plugin-node-resolve configuration\'s \'exportConditions\' array should include \'svelte\'. See https://github.com/sveltejs/rollup-plugin-svelte#svelte-exports-condition for more information\u001B[39m\u001B[22m\n');
103+
console.error(
104+
'\n\u001B[1m\u001B[31mWARNING: Your @rollup/plugin-node-resolve configuration\'s \'exportConditions\' array should include \'svelte\'. See https://github.com/sveltejs/rollup-plugin-svelte#svelte-exports-condition for more information\u001B[39m\u001B[22m\n'
105+
);
107106
warned = true;
108107
}
109108
} catch (e) {
@@ -135,8 +134,7 @@ module.exports = function (options = {}) {
135134

136135
if (rest.preprocess) {
137136
const processed = await preprocess(code, rest.preprocess, { filename });
138-
if (processed.dependencies)
139-
dependencies.push(...processed.dependencies);
137+
if (processed.dependencies) dependencies.push(...processed.dependencies);
140138
if (processed.map) svelte_options.sourcemap = processed.map;
141139
code = processed.code;
142140
}
@@ -162,6 +160,6 @@ module.exports = function (options = {}) {
162160
}
163161

164162
return compiled.js;
165-
}
163+
},
166164
};
167165
};

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "7.1.4",
2+
"version": "7.1.5",
33
"name": "rollup-plugin-svelte",
44
"description": "Compile Svelte components with Rollup",
55
"repository": "sveltejs/rollup-plugin-svelte",

0 commit comments

Comments
 (0)