Skip to content

Commit f3452c3

Browse files
committed
Add support of Neutrino 8
1 parent ee57416 commit f3452c3

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ jspm_packages
3535

3636
# Optional REPL history
3737
.node_repl_history
38+
39+
.vscode

index.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ let path = require('path')
44
let arrify = require('arrify')
55
let deepmerge = require('deepmerge')
66

7-
function merge(options = {}){
7+
function mergeWith(options = {}){
88
return function(opts = {}){
99
return deepmerge(opts, options)
1010
}
1111
}
12-
function premerge(options = {}){
12+
function mergeTo(options = {}){
1313
return function(opts = {}){
1414
return deepmerge(options, opts)
1515
}
@@ -50,24 +50,30 @@ module.exports = function (neutrino, options = {}) {
5050
.end()
5151
.use('svelte')
5252
.loader(require.resolve('svelte-loader'))
53-
.tap(premerge({
53+
.tap(mergeTo({
5454
format: 'es',
55-
generate: 'dom', //ssr
55+
generate: 'dom', //or 'ssr'
5656
name: 'SvelteComponent',
5757
// filename: 'SvelteComponent.html',
5858
// shared: true,
5959
// sourcemap disabling is not implemented in Svelte Compiler
6060
dev: (process.env.NODE_ENV === 'development'),
6161
css: true
62+
// emitCss: false
63+
// preprocess: {
64+
// markup
65+
// style
66+
// script
67+
// }
6268
}))
63-
.tap(merge(options))
69+
.tap(mergeWith(options))
6470
.end()
6571
.use('extract-html')
6672
.loader(require.resolve('extract-loader'))
6773
.end()
6874
.use('html')
6975
.loader(require.resolve('html-loader'))
70-
.tap(premerge({
76+
.tap(mergeTo({
7177
attrs: [':url', 'img:src', 'script:src', 'link:href', 'source:src', 'source:srcset'],
7278
minimize: false
7379
}))

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neutrino-middleware-svelte-loader",
3-
"version": "4.0.0",
3+
"version": "4.1.0",
44
"description": "Neutrino Svelte loader middleware",
55
"main": "index.js",
66
"author": "Constantine Genchevsky <[email protected]>",
@@ -18,18 +18,18 @@
1818
"svelte"
1919
],
2020
"dependencies": {
21-
"deepmerge": "~2.0.0",
21+
"deepmerge": "~2.0.1",
2222
"arrify": "~1.0.1",
23-
"svelte-loader": "~2.1.0",
24-
"extract-loader": "~1.0.1",
25-
"html-loader": "~0.5.1"
23+
"svelte-loader": "~2.3.3",
24+
"extract-loader": "~1.0.2",
25+
"html-loader": "~0.5.5"
2626
},
2727
"devDependencies": {
2828
"svelte": "^1.0.7",
29-
"eslint": "~3.19.0"
29+
"eslint": "~4.16.0"
3030
},
3131
"peerDependencies": {
32-
"neutrino": "^5.0.0 || ^6.0.0 || ^7.0.0"
32+
"neutrino": ">=5.x.x <=8.x.x"
3333
},
3434
"files": [
3535
"*.js",

0 commit comments

Comments
 (0)