Commit a4b58c9a authored by echel0n's avatar echel0n
Browse files

Migrating away from Bower to NPM/WebPack

parent 86021ad4
{
"registry": "https://registry.bower.io",
"directory": "bower_components",
"strict-ssl": false
}
......@@ -18,21 +18,10 @@ module.exports = function (grunt) {
}
},
clean: {
bower_components: 'bower_components',
//sass: [
// '.sass-cache',
// 'sickrage/core/webserver/static/scss/'
//],
options: {
force: true
}
},
bower: {
install: {
options: {
copy: false
}
}
},
node_modules: 'node_modules'
},
bower_concat: {
all: {
......@@ -400,7 +389,7 @@ module.exports = function (grunt) {
grunt.registerTask(
'default', [
'clean',
'bower',
'npm-install',
'bower_concat',
'googlefonts',
'copy',
......
......@@ -9,31 +9,14 @@
"tests"
],
"dependencies": {
"jquery": "~3.2.1",
"jquery-ui": "~1.12.1",
"jquery-form": "~3.46.0",
"jquery-timeago": "~1.4.3",
"jqueryui-touch-punch": "*",
"jquery-confirm": "https://github.com/craftpip/jquery-confirm.git#v3.3.1",
"jquery.steps": "~1.1.0",
"jquery-validation": "~1.15.0",
"jquery-backstretch": "~2.1.16",
"jquery-migrate": "~3.0.0",
"jquery.tablesorter": "~2.30.6",
"bootstrap": "^4.0.0",
"bootstrap-hover-dropdown": "~2.1.3",
"bootstrap-formhelpers": "~2.3.0",
"bootstrap-tokenfield": "~0.12.1",
"typeahead.js": "~0.11.1",
"bootbox.js": "~4.4.0",
"underscore": "~1.8.3",
"pnotify": "~3.2.1",
"isotope": "~2.2.2",
"selectboxes": "https://raw.githubusercontent.com/SamWM/jQuery-Plugins/master/selectboxes/jquery.selectboxes.js",
"bookmarkscroll": "https://raw.githubusercontent.com/socialpanic/.github.io/master/bookmarkscroll.js",
"scrollup": "~2.4.1",
"qtip2": "git://github.com/qTip2/qTip2.git#v3.0.3",
"components-font-awesome": "^4.7.0",
"jsgettext": "~0.8.1"
},
"resolutions": {
......
# Changelog
- * 8e6b694 - 2018-07-09: Compiled all CSS/SCSS into 1 core file
- * 3374cb5 - 2018-07-09: Migrating away from Bower to NPM/WebPack
- * 86021ad - 2018-07-09: Compiled all CSS/SCSS into 1 core file
- * b912b2e - 2018-07-08: Refactored config views to Bootstrap 4.x
- * ae015ef - 2018-07-08: Release v9.3.54
- * afa499a - 2018-07-08: Set secure cookie to expire after 30 days
......
This diff is collapsed.
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 300;
src: url(../fonts/open-sans-300-normal.eot);
src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/open-sans-300-normal.woff2) format('woff'), url(../fonts/open-sans-300-normal.woff) format('woff'), url(../fonts/open-sans-300-normal.ttf) format('truetype'), url(../fonts/open-sans-300-normal.svg#OpenSans) format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 300;
src: url(../fonts/open-sans-300-italic.eot);
src: local('Open Sans Light Italic'), local('OpenSans-LightItalic'), url(../fonts/open-sans-300-italic.woff2) format('woff'), url(../fonts/open-sans-300-italic.woff) format('woff'), url(../fonts/open-sans-300-italic.ttf) format('truetype'), url(../fonts/open-sans-300-italic.svg#OpenSans) format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url(../fonts/open-sans-400-normal.eot);
src: local('Open Sans Regular'), local('OpenSans-Regular'), url(../fonts/open-sans-400-normal.woff2) format('woff'), url(../fonts/open-sans-400-normal.woff) format('woff'), url(../fonts/open-sans-400-normal.ttf) format('truetype'), url(../fonts/open-sans-400-normal.svg#OpenSans) format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 400;
src: url(../fonts/open-sans-400-italic.eot);
src: local('Open Sans Italic'), local('OpenSans-Italic'), url(../fonts/open-sans-400-italic.woff2) format('woff'), url(../fonts/open-sans-400-italic.woff) format('woff'), url(../fonts/open-sans-400-italic.ttf) format('truetype'), url(../fonts/open-sans-400-italic.svg#OpenSans) format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 600;
src: url(../fonts/open-sans-600-normal.eot);
src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(../fonts/open-sans-600-normal.woff2) format('woff'), url(../fonts/open-sans-600-normal.woff) format('woff'), url(../fonts/open-sans-600-normal.ttf) format('truetype'), url(../fonts/open-sans-600-normal.svg#OpenSans) format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 600;
src: url(../fonts/open-sans-600-italic.eot);
src: local('Open Sans SemiBold Italic'), local('OpenSans-SemiBoldItalic'), url(../fonts/open-sans-600-italic.woff2) format('woff'), url(../fonts/open-sans-600-italic.woff) format('woff'), url(../fonts/open-sans-600-italic.ttf) format('truetype'), url(../fonts/open-sans-600-italic.svg#OpenSans) format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
src: url(../fonts/open-sans-700-normal.eot);
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/open-sans-700-normal.woff2) format('woff'), url(../fonts/open-sans-700-normal.woff) format('woff'), url(../fonts/open-sans-700-normal.ttf) format('truetype'), url(../fonts/open-sans-700-normal.svg#OpenSans) format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 700;
src: url(../fonts/open-sans-700-italic.eot);
src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url(../fonts/open-sans-700-italic.woff2) format('woff'), url(../fonts/open-sans-700-italic.woff) format('woff'), url(../fonts/open-sans-700-italic.ttf) format('truetype'), url(../fonts/open-sans-700-italic.svg#OpenSans) format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 800;
src: url(../fonts/open-sans-800-normal.eot);
src: local('Open Sans ExtraBold'), local('OpenSans-ExtraBold'), url(../fonts/open-sans-800-normal.woff2) format('woff'), url(../fonts/open-sans-800-normal.woff) format('woff'), url(../fonts/open-sans-800-normal.ttf) format('truetype'), url(../fonts/open-sans-800-normal.svg#OpenSans) format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 800;
src: url(../fonts/open-sans-800-italic.eot);
src: local('Open Sans ExtraBold Italic'), local('OpenSans-ExtraBoldItalic'), url(../fonts/open-sans-800-italic.woff2) format('woff'), url(../fonts/open-sans-800-italic.woff) format('woff'), url(../fonts/open-sans-800-italic.ttf) format('truetype'), url(../fonts/open-sans-800-italic.svg#OpenSans) format('svg');
}
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: 400;
src: url(../fonts/droid-sans-400-normal.eot);
src: local('Droid Sans Regular'), local('DroidSans-Regular'), url(../fonts/droid-sans-400-normal.woff2) format('woff'), url(../fonts/droid-sans-400-normal.woff) format('woff'), url(../fonts/droid-sans-400-normal.ttf) format('truetype'), url(../fonts/droid-sans-400-normal.svg#DroidSans) format('svg');
}
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: 700;
src: url(../fonts/droid-sans-700-normal.eot);
src: local('Droid Sans Bold'), local('DroidSans-Bold'), url(../fonts/droid-sans-700-normal.woff2) format('woff'), url(../fonts/droid-sans-700-normal.woff) format('woff'), url(../fonts/droid-sans-700-normal.ttf) format('truetype'), url(../fonts/droid-sans-700-normal.svg#DroidSans) format('svg');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url(../fonts/roboto-400-normal.eot);
src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto-400-normal.woff2) format('woff'), url(../fonts/roboto-400-normal.woff) format('woff'), url(../fonts/roboto-400-normal.ttf) format('truetype'), url(../fonts/roboto-400-normal.svg#Roboto) format('svg');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: url(../fonts/roboto-700-normal.eot);
src: local('Roboto Bold'), local('Roboto-Bold'), url(../fonts/roboto-700-normal.woff2) format('woff'), url(../fonts/roboto-700-normal.woff) format('woff'), url(../fonts/roboto-700-normal.ttf) format('truetype'), url(../fonts/roboto-700-normal.svg#Roboto) format('svg');
}
This diff is collapsed.
This diff is collapsed.
......@@ -9,16 +9,29 @@
"url": "https://www.sickrage.ca/forums/"
},
"homepage": "https://www.sickrage.ca",
"scripts": {
"dev": "webpack --mode development",
"build": "webpack --mode production"
},
"devDependencies": {
"@fortawesome/fontawesome-free": "^5.1.0",
"animate.css": "^3.6.1",
"autoprefixer": "^8.6.5",
"babel-core": "^6.26.3",
"babel-loader": "^7.1.5",
"babel-preset-env": "^1.7.0",
"bootbox": "^4.4.0",
"bootstrap": "^4.1.1",
"compass": "^0.1.1",
"bootstrap-tokenfield": "^0.12.0",
"css-loader": "^1.0.0",
"file-loader": "^1.1.11",
"grunt": "^1.0.1",
"grunt-bower-concat": "^1.0.0",
"grunt-bower-task": "^0.4.0",
"grunt-changelog": "^0.3.2",
"grunt-cli": "^1.2.0",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-compass": "^1.1.1",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^1.0.2",
"grunt-contrib-imagemin": "^1.0.0",
......@@ -26,13 +39,35 @@
"grunt-contrib-uglify": "^2.0.0",
"grunt-exec": "^2.0.0",
"grunt-google-fonts": "^0.3.0",
"grunt-npm-install": "^0.3.1",
"grunt-po2json": "^0.3.0",
"grunt-sass": "^1.1.0",
"grunt-spritesmith": "^6.4.0",
"grunt-string-replace": "^1.3.1",
"load-grunt-tasks": "^3.4.1"
},
"dependencies": {
"popper.js": "^1.14.3"
"jquery": "^3.3.1",
"jquery-backstretch": "^2.1.16",
"jquery-confirm": "^3.3.2",
"jquery-form": "^4.2.2",
"jquery-steps": "^1.1.0",
"jquery-ui": "^1.12.1",
"jquery-validation": "^1.17.0",
"load-grunt-tasks": "^3.4.1",
"material-design-icons": "^3.0.1",
"node-sass": "^4.9.2",
"nonblockjs": "^1.0.8",
"pnotify": "^4.0.0-alpha.4",
"popper.js": "^1.14.3",
"postcss-loader": "^2.1.5",
"precss": "^3.1.2",
"qtip2": "^3.0.3",
"sass-loader": "^7.0.3",
"style-loader": "^0.21.0",
"tablesorter": "^2.30.6",
"timeago": "^1.6.3",
"typeahead.js": "^0.11.1",
"underscore": "^1.9.1",
"url-loader": "^1.0.1",
"webpack": "^4.15.1",
"webpack-cli": "^3.0.8"
}
}
This source diff could not be displayed because it is too large. You can view the blob instead.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment