Move assets to assets/ root folder "as is"
1
.gitignore
vendored
|
@ -48,7 +48,6 @@ data/db/wallabag*.sqlite
|
||||||
# assets stuff
|
# assets stuff
|
||||||
node_modules/
|
node_modules/
|
||||||
bin
|
bin
|
||||||
app/Resources/build/
|
|
||||||
package-lock.json
|
package-lock.json
|
||||||
|
|
||||||
# Test-generated files
|
# Test-generated files
|
||||||
|
|
|
@ -6,8 +6,8 @@ const projectDir = path.resolve(__dirname, '../../../');
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
entry: {
|
entry: {
|
||||||
material: path.join(projectDir, './app/Resources/static/themes/material/index.js'),
|
material: path.join(projectDir, './assets/material/index.js'),
|
||||||
public: path.join(projectDir, './app/Resources/static/themes/_global/share.js'),
|
public: path.join(projectDir, './assets/_global/share.js'),
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
filename: '[name].js',
|
filename: '[name].js',
|
||||||
|
@ -25,7 +25,7 @@ module.exports = {
|
||||||
configFile: 'stylelint.config.js',
|
configFile: 'stylelint.config.js',
|
||||||
failOnError: false,
|
failOnError: false,
|
||||||
quiet: false,
|
quiet: false,
|
||||||
context: 'app/Resources/static/themes',
|
context: 'assets',
|
||||||
files: '**/*.scss',
|
files: '**/*.scss',
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
|
|
|
@ -85,9 +85,6 @@ module.exports = merge(commonConfig, {
|
||||||
test: /\.(jpg|png|gif|svg|ico)$/,
|
test: /\.(jpg|png|gif|svg|ico)$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
type: 'asset/resource',
|
type: 'asset/resource',
|
||||||
generator: {
|
|
||||||
filename: (content) => content.filename.replace('app/Resources/static/', ''),
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
test: /\.(eot|ttf|woff|woff2)$/,
|
test: /\.(eot|ttf|woff|woff2)$/,
|
||||||
|
|
Before Width: | Height: | Size: 164 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 891 B After Width: | Height: | Size: 891 B |
Before Width: | Height: | Size: 451 B After Width: | Height: | Size: 451 B |
Before Width: | Height: | Size: 995 B After Width: | Height: | Size: 995 B |
Before Width: | Height: | Size: 1,012 B After Width: | Height: | Size: 1,012 B |
Before Width: | Height: | Size: 718 B After Width: | Height: | Size: 718 B |
Before Width: | Height: | Size: 110 B After Width: | Height: | Size: 110 B |
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 138 B |