Skip to content

Commit

Permalink
Merge pull request #96 from ucfopen/dev/2.2.0
Browse files Browse the repository at this point in the history
dev/2.2.0
  • Loading branch information
clpetersonucf authored Jul 9, 2020
2 parents fa5c5e4 + e4fdf53 commit 7b7abfb
Show file tree
Hide file tree
Showing 123 changed files with 6,338 additions and 5,791 deletions.
15 changes: 7 additions & 8 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
[
"@babel/preset-env",
{
debug: true,
targets: {
browsers: [
">0.25%",
"not ie 10",
"not op_mini all"
]
}
useBuiltIns: "usage",
corejs: 3,
// debug: true, // outputs polyfills and browserlist
// targets: 'defaults' // allows .browserslistrc to work
}
],
"jest"
],
"plugins": [
'babel-plugin-angularjs-annotate'
]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ node_modules
coverage
**.DS_Store
*.*-e
yarn-error.log
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
coverage
*.*-e
.yarn-error.log
69 changes: 41 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"name": "materia-server-client-assets",
"version": "2.1.1",
"version": "2.2.0",
"license": "AGPL-3.0",
"description": "Materia Server Client Assets contains all the javascript and css for Materia Server and the Materia Widget Development Kit.",
"author": "University of Central Florida, Center for Distributed Learning",
"homepage": "https://ucfopen.github.io/Materia-Docs",
"repository": "https://github.com/ucfopen/Materia-Server-Client-Assets.git",
"scripts": {
"test": "TZ=Etc/UTC jest --verbose",
"test:dev": "TZ=Etc/UTC jest --verbose --watch --coverage",
"test:ci": "TZ=Etc/UTC CI=true jest --ci --useStderr --coverage --coverageReporters text-summary cobertura",
"build": "webpack -p",
"build-watch": "webpack --watch",
"build-dev": "webpack",
"prepare": "yarn build",
"prettier:run": "prettier --write 'src/**/*.{js,scss}'",
"prettier:debug": "prettier -l 'src/**/*.{js,scss}'",
"prettier:detectchanges": "git diff --exit-code ./src || (echo '!! Prettier created files that need to be manually added.'; exit 1;)",
"precommit": "yarn test && lint-staged"
"prettier:detectchanges": "git diff --exit-code ./src || (echo '!! Prettier created files that need to be manually added.'; exit 1;)"
},
"prettier": {
"printWidth": 100,
Expand All @@ -25,10 +26,19 @@
},
"lint-staged": {
"src/**/*.{js,scss}": [
"yarn prettier --write",
"git add"
"yarn prettier --write"
]
},
"husky": {
"hooks": {
"pre-commit": "yarn test:ci && yarn lint-staged"
}
},
"browserslist": [
"> 0.5%",
"not ie >= 0",
"not op_mini all"
],
"jest": {
"transform": {
"ctrl-widget-catalog.js": "babel-jest"
Expand All @@ -46,41 +56,44 @@
],
"coverageThreshold": {
"global": {
"statements": 44,
"branches": 31,
"statements": 43,
"branches": 32,
"functions": 48,
"lines": 43
}
}
},
"dependencies": {
"angular": "1.6.9",
"angular": "1.8.0",
"js-snakecase": "^1.2.0",
"ngmodal": "ucfcdl/ngModal#v1.2.2"
},
"devDependencies": {
"@babel/core": "^7.4.5",
"@babel/preset-env": "^7.4.5",
"angular-animate": "1.6.9",
"angular-mocks": "1.6.9",
"babel-jest": "^24.6.0",
"babel-loader": "^8.0.6",
"@babel/core": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"angular-animate": "1.8.0",
"angular-mocks": "1.8.0",
"autoprefixer": "^9.7.6",
"babel-jest": "^26.1.0",
"babel-loader": "^8.1.0",
"babel-plugin-angularjs-annotate": "^0.10.0",
"babel-polyfill": "^6.26.0",
"clean-webpack-plugin": "^2.0.2",
"css-loader": "^0.28.4",
"extract-text-webpack-plugin": "^3.0.0",
"clean-webpack-plugin": "^3.0.0",
"core-js": "3",
"css-loader": "^3.6.0",
"hammerjs": "2.0.8",
"husky": "^2.3.0",
"jest": "^24.6.0",
"lint-staged": "^8.1.7",
"node-sass": "^4.12.0",
"prettier": "^1.11.1",
"sass-loader": "^6.0.6",
"style-loader": "^0.20.2",
"webpack": "3.12.0",
"webpack-strip-block": "^0.2.0",
"whatwg-fetch": "^3.0.0"
"husky": "^4.2.5",
"ignore-emit-webpack-plugin": "^2.0.2",
"jest": "^26.1.0",
"lint-staged": "^10.2.11",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.14.1",
"postcss-loader": "^3.0.0",
"prettier": "^2.0.5",
"sass-loader": "^9.0.1",
"style-loader": "^1.2.1",
"webpack": "4.43.0",
"webpack-cli": "^3.3.12",
"webpack-strip-block": "^0.2.0"
},
"engines": {
"node": "^12.3.1",
Expand Down
Loading

0 comments on commit 7b7abfb

Please sign in to comment.