Skip to content

Fix system collection view fallback & Windows extension build #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Manas-5461X wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix system collection view fallback & Windows extension build #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build/extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const HtmlWebpackPlugin = require('html-webpack-plugin')
const CopyPlugin = require('copy-webpack-plugin')
const ZipPlugin = require('zip-webpack-plugin')

module.exports = (env={}, args={}) => {
const outputPath = path.resolve(__dirname, '..', 'dist', env.vendor, env.production?'prod':'dev')
module.exports = (env = {}, args = {}) => {
const outputPath = path.resolve(__dirname, '..', 'dist', env.vendor, env.production ? 'prod' : 'dev')

env.filename = '[name]'

Expand Down Expand Up @@ -37,7 +37,7 @@ module.exports = (env={}, args={}) => {

output: {
path: outputPath,
filename: ({ chunk: { name } }) => name=='background' ? 'background.js' : `assets/${env.filename}.js`,
filename: ({ chunk: { name } }) => name == 'background' ? 'background.js' : `assets/${env.filename}.js`,
chunkFilename: `assets/${env.filename}.js`,
publicPath: '',
globalObject: 'globalThis',
Expand Down Expand Up @@ -82,15 +82,15 @@ module.exports = (env={}, args={}) => {
...(env.production ? [
new ZipPlugin({
path: '../../',
filename: `${env.vendor}-${env.production?'prod':'dev'}.zip`,
filename: `${env.vendor}-${env.production ? 'prod' : 'dev'}.zip`,
exclude: []
})
] : [])
],

module: {
rules: [{
test: /manifest\/index\.js$/,
test: /manifest[\\/]index\.js$/,
use: [
{
loader: 'file-loader',
Expand Down
4 changes: 2 additions & 2 deletions src/data/sagas/collections/items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function* loadCollections({ ignore=false, onSuccess, onFail }) {
const state = yield select()
const defColls = state.collections.defaults.map((item)=>{
var count = 0
// var view = user?.config?.default_collection_view || 'list'
var view = item.view || user?.config?.default_collection_view || 'list'

//count
if (stat.items){
Expand All @@ -65,7 +65,7 @@ export function* loadCollections({ ignore=false, onSuccess, onFail }) {

return item
.set('count', count)
// .set('view', view)
.set('view', view)
})

yield put({
Expand Down