Skip to content
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

Enhancement build, structure and fix jest tests #1221

Merged
merged 5 commits into from
Mar 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 8 additions & 32 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,35 +1,11 @@
{
"env": {
"test": {
"presets": [
["@babel/preset-env", {
"targets": {
"node": "current"
}
"presets": [
["@babel/env", {
"forceAllTransforms": true,
"targets": {
"node": "current"
}
}]
]
},
"development": {
"presets": [
["@babel/preset-env", {
"modules": false,
"targets": {
"browsers": "> 2%",
"uglify": true
}
}]
]
},
"production": {
"presets": [
["@babel/preset-env", {
"modules": false,
"targets": {
"browsers": "> 2%",
"uglify": true
}
}]
]
}
}
],
"sourceMaps": true
}
19 changes: 16 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
* text=auto
*.css linguist-vendored
*.scss linguist-vendored
*.js linguist-vendored

# Enforce Unix newlines
*.css text eol=lf linguist-vendored
*.html text eol=lf
*.js text eol=lf linguist-vendored
*.json text eol=lf
*.md text eol=lf
*.scss text eol=lf linguist-vendored
*.svg text eol=lf
*.txt text eol=lf
*.xml text eol=lf
*.yml text eol=lf

# Don't diff or textually merge source maps
*.map binary

CHANGELOG.md export-ignore
119 changes: 63 additions & 56 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,60 +1,67 @@
{
"private": true,
"scripts": {
"dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "npm run development -- --watch",
"watch-poll": "npm run watch -- --watch-poll",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"test": "cross-env NODE_ENV=test jest",
"tdd": "npm run test -- --watch --notify"
},
"devDependencies": {
"@babel/core": "^7.4.0",
"@coreui/coreui": "^2.1.9",
"@fortawesome/fontawesome-svg-core": "^1.2.17",
"@fortawesome/free-brands-svg-icons": "^5.8.1",
"@fortawesome/free-regular-svg-icons": "^5.8.1",
"@fortawesome/free-solid-svg-icons": "^5.8.1",
"@vue/test-utils": "^1.0.0-beta.29",
"axios": "^0.18",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^24.5.0",
"babel-template": "^6.26.0",
"bootstrap": "^4.3.1",
"cross-env": "^5.2",
"jest-vue-preprocessor": "^1.5.0",
"jquery": "^3.2",
"laravel-mix": "^4.0.15",
"lodash": "^4.17.5",
"pace": "github:HubSpot/pace#v1.0.2",
"perfect-scrollbar": "^1.4.0",
"popper.js": "^1.14.7",
"resolve-url-loader": "^2.3.2",
"sass": "^1.17.3",
"sass-loader": "^7.1.0",
"simple-line-icons": "^2.4.1",
"sweetalert2": "^8.0.5",
"vue": "^2.6.10",
"vue-template-compiler": "^2.6.10"
},
"jest": {
"testURL": "http://localhost",
"roots": [
"<rootDir>/tests/Javascript/"
],
"moduleNameMapper": {
"^vue$": "vue/dist/vue.common.js"
"name": "@rappasoft/laravel-5-boilerplate",
"author": "rappasoft rappa819@gmail.com",
"private": true,
"license": "MIT",
"scripts": {
"dev": "cross-var $npm_execpath run development",
"development": "cross-env NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "cross-var $npm_execpath run development -- --watch",
"watch-poll": "cross-var $npm_execpath run watch -- --watch-poll",
"hot": "cross-env NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "cross-var $npm_execpath run production",
"production": "cross-env NODE_ENV=production webpack --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"test": "cross-env NODE_ENV=test jest",
"tdd": "cross-var $npm_execpath run test -- --watch --notify"
},
"moduleFileExtensions": [
"js",
"vue"
],
"transform": {
"^.+\\.js$": "<rootDir>/node_modules/babel-jest",
".*\\.(vue)$": "<rootDir>/node_modules/jest-vue-preprocessor"
"devDependencies": {
"@coreui/coreui": "^2.1.9",
"@fortawesome/fontawesome-free": "^5.8.1",
"@vue/test-utils": "^1.0.0-beta.29",
"axios": "^0.18.0",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^24.5.0",
"bootstrap": "^4.3.1",
"cross-env": "^5.2.0",
"cross-var": "^1.1.0",
"jest": "^24.5.0",
"jquery": "^3.3.1",
"laravel-mix": "^4.0.15",
"lodash": "^4.17.11",
"pace": "github:HubSpot/pace#v1.0.2",
"perfect-scrollbar": "^1.4.0",
"popper.js": "^1.14.7",
"resolve-url-loader": "^2.3.2",
"sass": "^1.17.3",
"sass-loader": "^7.1.0",
"simple-line-icons": "^2.4.1",
"sweetalert2": "^8.7.0",
"vue": "^2.6.10",
"vue-jest": "^3.0.4",
"vue-template-compiler": "^2.6.10"
},
"browserslist": {
"development": "last 1 version",
"production": ">2%, Firefox ESR"
},
"jest": {
"testURL": "http://localhost",
"roots": [
"<rootDir>/tests/Javascript/"
],
"moduleNameMapper": {
"^@/(.*)$": "<rootDir>/resources/js/$1"
},
"moduleFileExtensions": [
"js",
"vue"
],
"transform": {
"^.+\\.js$": "babel-jest",
".*\\.(vue)$": "vue-jest"
}
},
"engines": {
"node": ">=6.0.0"
}
}
}
2 changes: 1 addition & 1 deletion public/css/backend.css

Large diffs are not rendered by default.

22 changes: 21 additions & 1 deletion public/css/frontend.css

Large diffs are not rendered by default.

Binary file not shown.
Loading