Minor upgrades

This commit is contained in:
Tony Air 2018-02-21 20:18:55 +07:00
parent 7531889184
commit f6ab76e334
4 changed files with 19526 additions and 15 deletions

19503
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -5,6 +5,10 @@
"author": "Tony Air <tony@twma.pro>", "author": "Tony Air <tony@twma.pro>",
"license": "MIT", "license": "MIT",
"private": false, "private": false,
"repository": {
"type": "git",
"url": "git+https://github.com/a2nt/silverstripe-webpack"
},
"engines": { "engines": {
"yarn": ">= 1.0.0" "yarn": ">= 1.0.0"
}, },
@ -15,36 +19,36 @@
"build": "cross-env NODE_ENV=production webpack -p --config webpack.config.prod.js --progress" "build": "cross-env NODE_ENV=production webpack -p --config webpack.config.prod.js --progress"
}, },
"dependencies": { "dependencies": {
"bootstrap": "twbs/bootstrap#>= 3.1.0", "bootstrap": "^4.0.0",
"favicons-webpack-plugin": "^0.0.7", "font-awesome": "^4.7.0",
"jquery": "^3.3.1", "jquery": "^3.3.1",
"js-yaml": "^3.10.0",
"popper": "^1.0.1",
"popper.js": "^1.12.9" "popper.js": "^1.12.9"
}, },
"devDependencies": { "devDependencies": {
"exports-loader": "^0.7.0",
"favicons-webpack-plugin": "^0.0.7",
"@silverstripe/eslint-config": "0.0.2",
"autoprefixer": "^7.2.5",
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
"babel-loader": "^7.1.2", "babel-loader": "^7.1.2",
"babel-plugin-transform-react-jsx": "^6.24.1", "babel-plugin-transform-react-jsx": "^6.24.1",
"babel-preset-es2015": "^6.24.1", "babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1", "babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1", "babel-preset-stage-2": "^6.24.1",
"animate.css": "^3.5.2",
"autoprefixer": "^7.2.5",
"browser-sync": "^2.23.6", "browser-sync": "^2.23.6",
"browser-sync-webpack-plugin": "^1.2.0", "browser-sync-webpack-plugin": "^1.2.0",
"copy-webpack-plugin": "^4.3.1", "copy-webpack-plugin": "^4.3.1",
"copyfiles": "^1.2.0", "copyfiles": "^1.2.0",
"cross-env": "^5.1.3", "cross-env": "^5.1.3",
"css-loader": "^0.28.9", "css-loader": "^0.28.9",
"eslint": "^4.18.1",
"exports-loader": "^0.7.0",
"extract-text-webpack-plugin": "^3.0.2", "extract-text-webpack-plugin": "^3.0.2",
"favicons-webpack-plugin": "0.0.7",
"file-loader": "^1.1.5", "file-loader": "^1.1.5",
"html-webpack-plugin": "^2.30.1", "html-webpack-plugin": "^2.30.1",
"laravel-mix": "^1.0", "laravel-mix": "^1.0",
"lost": "^8.2.0", "lost": "^8.2.0",
"node-sass": "^4.6.1", "node-sass": "^4.7.2",
"object-assign": "^4.1.1",
"optimize-css-assets-webpack-plugin": "^3.2.0", "optimize-css-assets-webpack-plugin": "^3.2.0",
"postcss-loader": "^2.0.10", "postcss-loader": "^2.0.10",
"react": "^16.2.0", "react": "^16.2.0",
@ -64,15 +68,15 @@
"webpack-dashboard": "^1.1.1", "webpack-dashboard": "^1.1.1",
"webpack-dev-server": "^2.11.1", "webpack-dev-server": "^2.11.1",
"webpack-manifest-plugin": "^1.3.2", "webpack-manifest-plugin": "^1.3.2",
"webpack-merge": "^4.1.1", "webpack-merge": "^4.1.1"
"worker-loader": "^1.1.0"
}, },
"stylelint": { "stylelint": {
"rules": { "rules": {
"block-no-empty": null, "block-no-empty": null,
"color-no-invalid-hex": true, "color-no-invalid-hex": true,
"comment-empty-line-before": [ "comment-empty-line-before": [
"always", { "always",
{
"ignore": [ "ignore": [
"stylelint-commands", "stylelint-commands",
"after-comment" "after-comment"
@ -81,7 +85,8 @@
], ],
"declaration-colon-space-after": "always", "declaration-colon-space-after": "always",
"indentation": [ "indentation": [
4, { 4,
{
"except": [ "except": [
"value" "value"
] ]
@ -89,7 +94,8 @@
], ],
"max-empty-lines": 2, "max-empty-lines": 2,
"rule-empty-line-before": [ "rule-empty-line-before": [
"always", { "always",
{
"except": [ "except": [
"first-nested" "first-nested"
], ],
@ -107,4 +113,4 @@
] ]
} }
} }
} }

View File

@ -7,4 +7,5 @@ WebpackTemplateProvider:
hostname: localhost hostname: localhost
port: "3000" port: "3000"
pages: site/src/js/types pages: site/src/js/types
pagesscss: site/src/scss/types
src: site/src src: site/src

View File

@ -7,6 +7,7 @@ module.exports = {
SRC: path.join(__dirname, conf.WebpackTemplateProvider.src), SRC: path.join(__dirname, conf.WebpackTemplateProvider.src),
BUILD: path.join(__dirname, conf.WebpackTemplateProvider.dist), BUILD: path.join(__dirname, conf.WebpackTemplateProvider.dist),
PAGES: path.join(__dirname, conf.WebpackTemplateProvider.pages), PAGES: path.join(__dirname, conf.WebpackTemplateProvider.pages),
PAGESSCSS: path.join(__dirname, conf.WebpackTemplateProvider.pagesscss),
HOSTNAME: conf.WebpackTemplateProvider.hostname, HOSTNAME: conf.WebpackTemplateProvider.hostname,
PORT: conf.WebpackTemplateProvider.port PORT: conf.WebpackTemplateProvider.port
}; };