github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3645 from overleaf/ae-import-config

Browse source 
Add config for optional modules

GitOrigin-RevId: 082261eff5d505ce98dfaafe179547b312c0511b
This commit is contained in:
Alf Eaton 2021-03-03 12:52:29 +00:00 committed by Copybot
parent b04b8daf85
commit a481ffef17
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/.gitignore vendored
View file

@ -58,6 +58,8 @@ Gemfile.lock
docker-shared.yml docker-shared.yml
config/*.coffee config/*.coffee
!config/settings.defaults.coffee
!config/settings.webpack.coffee
modules/**/Makefile modules/**/Makefile

13
services/web/.storybook/main.js
View file

@ -1,7 +1,18 @@
const path = require('path')
// NOTE: must be set before webpack config is imported
process.env.SHARELATEX_CONFIG = path.resolve(
__dirname,
'../config/settings.webpack.coffee'
)
const customConfig = require('../webpack.config.dev') const customConfig = require('../webpack.config.dev')
module.exports = { module.exports = {
stories: ['../frontend/stories/**/*.stories.js'], stories: [
'../frontend/stories/**/*.stories.js',
'../modules/**/stories/**/*.stories.js'
],
addons: ['@storybook/addon-essentials', '@storybook/addon-a11y'], addons: ['@storybook/addon-essentials', '@storybook/addon-a11y'],
webpackFinal: storybookConfig => { webpackFinal: storybookConfig => {
// Combine Storybook's webpack loaders with our webpack loaders // Combine Storybook's webpack loaders with our webpack loaders

5
services/web/config/settings.defaults.coffee
View file

@ -680,3 +680,8 @@ module.exports = settings =
'th': [ 'abbr', 'headers', 'colspan', 'rowspan', 'scope', 'sorted', 'style' ] 'th': [ 'abbr', 'headers', 'colspan', 'rowspan', 'scope', 'sorted', 'style' ]
'tr': [ 'class' ] 'tr': [ 'class' ]
'video': [ 'alt', 'class', 'controls', 'height', 'width' ] 'video': [ 'alt', 'class', 'controls', 'height', 'width' ]
overleafModuleImports: {
# modules to import (an empty array for each set of modules)
}