-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
Dump update #15
base: master
Are you sure you want to change the base?
Dump update #15
Changes from 1 commit
184f78d
44426f5
f7af19d
8a153f0
6284a0a
a633520
a275ed1
8f81be1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,3 +5,4 @@ theme.js | |
theme.min.js | ||
config.json | ||
assets/css/pre-build | ||
assets/js/libs |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
app.js | ||
theme.min.css | ||
theme.min.js | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please add a prettier runner in grunt. it's not all IDE that will parse and correct the files and our stack should be IDE independent. |
||
"useTabs": true, | ||
"tabWidth": 4, | ||
"trailingComma": "all", | ||
"singleQuote": true, | ||
"printWidth": 100, | ||
"semi": true, | ||
"arrowParens": "always", | ||
"endOfLine": "lf" | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
const findUsedJsFiles = (grunt) => { | ||
const file = grunt.file.read('snippets/js.liquid', 'utf8'); | ||
const file = grunt.file.read('snippets/js-modules.liquid', 'utf8'); | ||
const regex = /'([0-9a-zA-Z\-_\.]*.js)' \| asset_url/gm; | ||
|
||
let jsFiles = []; | ||
|
@@ -31,7 +31,6 @@ const findUsedJsLibs = (grunt) => { | |
}; | ||
|
||
module.exports = function (grunt) { | ||
|
||
let shopifyConfig = grunt.file.readJSON('config.json', 'utf8'); | ||
|
||
grunt.initConfig({ | ||
|
@@ -41,8 +40,8 @@ module.exports = function (grunt) { | |
pkg: grunt.file.readJSON('package.json'), | ||
install: { | ||
options: { | ||
env: ['default', 'staging', 'production'] | ||
} | ||
env: ['default', 'staging', 'production'], | ||
}, | ||
}, | ||
shopify: { | ||
options: { | ||
|
@@ -58,15 +57,15 @@ module.exports = function (grunt) { | |
'locales/*', | ||
'sections/*', | ||
'snippets/*', | ||
'templates/*' | ||
] | ||
} | ||
} | ||
'templates/*', | ||
], | ||
}, | ||
}, | ||
}); | ||
|
||
const tasks = grunt.file.expand({ filter: 'isFile', cwd: 'tasks' }, ['*']); | ||
|
||
tasks.forEach(task => { | ||
tasks.forEach((task) => { | ||
require(`./tasks/${task}`)(grunt); | ||
}); | ||
|
||
|
@@ -79,22 +78,22 @@ module.exports = function (grunt) { | |
grunt.loadNpmTasks('grunt-contrib-jshint'); | ||
grunt.loadNpmTasks('grunt-contrib-watch'); | ||
grunt.loadNpmTasks('grunt-contrib-clean'); | ||
grunt.loadNpmTasks('grunt-csso'); | ||
grunt.loadNpmTasks('grunt-babel'); | ||
grunt.loadNpmTasks('grunt-purgecss'); | ||
grunt.loadNpmTasks('grunt-csso'); | ||
grunt.loadNpmTasks('grunt-complexity'); | ||
grunt.loadNpmTasks('grunt-env'); | ||
|
||
grunt.registerTask('dev-js', ['complexity', 'jshint']); | ||
grunt.registerTask('dev-js', ['jshint']); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please re-add complexity. |
||
grunt.registerTask('dev', ['dev-js']); | ||
|
||
grunt.registerTask('js', ['dev-js', 'clean:js', 'libs', 'concat:js', 'babel', 'headers:js']); | ||
grunt.registerTask('css', ['clean:css','postcss', 'concat:css', 'purgecss', 'csso', 'headers:css']); | ||
grunt.registerTask('build', ['css', 'js']); | ||
grunt.registerTask('css', ['clean:css', 'postcss', 'csso', 'headers:css']); | ||
grunt.registerTask('build', ['env:build', 'css', 'js']); | ||
|
||
grunt.registerTask('deploy', ['build', 'shopify:deploy']); | ||
grunt.registerTask('deploy:staging', ['build', 'shopify:deploy:staging']); | ||
grunt.registerTask('deploy:prod', ['build', 'shopify:deploy:production']); | ||
grunt.registerTask('init', ['install', 'deploy']); | ||
|
||
grunt.registerTask('default', ['watch']); | ||
grunt.registerTask('default', ['env:dev', 'watch']); | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,3 @@ | |
|
||
/* Utils */ | ||
@import 'tailwind/utilities.css'; | ||
|
||
/* Admin */ | ||
@import 'lib/admin.css'; |
Large diffs are not rendered by default.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing empty line