Skip to content

Using Platform specific path separator. #4

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
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Using Platform specific path separator. #4

Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d7083ce
Create utils.py
jackton1 Oct 9, 2017
cea74e3
Update utils.py
jackton1 Oct 9, 2017
8411f78
Updated app.py using os.path module
jackton1 Oct 9, 2017
beee6ef
Delete utils.py
jackton1 Oct 9, 2017
2c8f85b
Modified app.py
jackton1 Oct 9, 2017
8835350
Update apps.py
jackton1 Oct 9, 2017
07dc619
Fix babelify reference
jackton1 Oct 9, 2017
9658343
Removed from unavailable module
jackton1 Oct 10, 2017
513a8e5
Modified module specification
jackton1 Oct 10, 2017
a47e4f6
Update apps.py
jackton1 May 21, 2018
12591f1
Fixed path
jackton1 May 22, 2018
6e61b79
Update apps.py
jackton1 May 22, 2018
9cada41
Update apps.py
jackton1 May 22, 2018
2df6e83
Update apps.py
jackton1 May 22, 2018
ed79ad7
Removed extra space
jackton1 May 22, 2018
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
13 changes: 7 additions & 6 deletions compressor_toolkit/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ class CompressorToolkitConfig(AppConfig):
NODE_SASS_BIN = getattr(
settings,
'COMPRESS_NODE_SASS_BIN',
'node_modules/.bin/node-sass' if LOCAL_NPM_INSTALL else 'node-sass'
os.path.join('node_modules', '.bin', 'node-sass') if LOCAL_NPM_INSTALL else 'node-sass'
)

# postcss executable
POSTCSS_BIN = getattr(
settings,
'COMPRESS_POSTCSS_BIN',
'node_modules/.bin/postcss' if LOCAL_NPM_INSTALL else 'postcss'
os.path.join('node_modules', '.bin', 'postcss') if LOCAL_NPM_INSTALL else 'postcss'
)

# Browser versions config for Autoprefixer
Expand All @@ -36,17 +36,18 @@ class CompressorToolkitConfig(AppConfig):
# Custom SCSS transpiler command
SCSS_COMPILER_CMD = getattr(settings, 'COMPRESS_SCSS_COMPILER_CMD', (
'{node_sass_bin} --output-style expanded {paths} "{infile}" > "{outfile}" && '
'{postcss_bin} --use "{node_modules}/autoprefixer" '
'--autoprefixer.browsers "{autoprefixer_browsers}" -r "{outfile}"'
'{postcss_bin} --use "%(autoprefixer)s" '
'--autoprefixer.browsers "{autoprefixer_browsers}" -r "{outfile}"' %
{'autoprefixer': os.path.join(NODE_MODULES, 'autoprefixer')}
))

# browserify executable
BROWSERIFY_BIN = getattr(
settings,
'COMPRESS_BROWSERIFY_BIN',
'node_modules/.bin/browserify' if LOCAL_NPM_INSTALL else 'browserify'
os.path.join('node_modules', '.bin', 'browserify') if LOCAL_NPM_INSTALL else 'browserify'
)

# Custom ES6 transpiler command
ES6_COMPILER_CMD = getattr(settings, 'COMPRESS_ES6_COMPILER_CMD', (
'export NODE_PATH="{paths}" && '
Expand Down