Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

chore(*): refactor, improve, upgrade #444

Closed
wants to merge 10 commits into from
Closed

chore(*): refactor, improve, upgrade #444

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
be0b98a
refactor(*): rename files and directories to bring in-line with moder…
gkalpak Aug 25, 2016
10a4f37
chore(*): switch from `bower` to `npm` for frontend dependencies
gkalpak Dec 7, 2016
4e999e7
fixup! chore(*): switch from `bower` to `npm` for frontend dependencies
gkalpak Oct 30, 2018
9d30bed
docs(*): use the name AngularJS rather than Angular
petebacondarwin Oct 13, 2017
66e59e5
chore(*): upgrade all dependencies to latest versions
gkalpak Oct 26, 2018
e48966d
chore(*): check in `package-lock.json`
gkalpak Oct 26, 2018
204cb76
chore(travis): simplify and improve config
gkalpak Oct 26, 2018
cda81f3
fixup! chore(travis): simplify and improve config
gkalpak Oct 30, 2018
58a3c46
chore(*): do not install WebDriver for Firefox to avoid error on CI
gkalpak Oct 26, 2018
a02c9f2
chore(travis): use headless Chrome in tests
gkalpak Oct 30, 2018
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
Prev Previous commit
Next Next commit
chore(*): upgrade all dependencies to latest versions
  • Loading branch information
@gkalpak
gkalpak committed Oct 30, 2018
commit 66e59e556e1324008a3ef20ed86827c66fce9e28
10 changes: 2 additions & 8 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,8 @@ module.exports = function(config) {
plugins: [
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-jasmine',
'karma-junit-reporter'
],

junitReporter: {
outputFile: 'test_out/unit.xml',
suite: 'unit'
}
'karma-jasmine'
]

});
};
29 changes: 14 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,36 @@
"repository": "https://github.com/angular/angular-seed",
"license": "MIT",
"dependencies": {
"angular": "^1.5.9",
"angular-loader": "^1.5.9",
"angular-route": "^1.5.9",
"angular": "^1.7.5",
"angular-loader": "^1.7.5",
"angular-route": "^1.7.5",
"html5-boilerplate": "0.0.1"
},
"devDependencies": {
"angular-mocks": "^1.5.9",
"angular-mocks": "^1.7.5",
"cpx": "^1.5.0",
"http-server": "^0.9.0",
"jasmine-core": "^2.4.1",
"karma": "^0.13.22",
"karma-chrome-launcher": "^0.2.3",
"karma-firefox-launcher": "^0.1.7",
"karma-jasmine": "^0.3.8",
"karma-junit-reporter": "^0.4.1",
"protractor": "^4.0.9"
"http-server": "^0.11.1",
"jasmine-core": "^3.3.0",
"karma": "^3.1.1",
"karma-chrome-launcher": "^2.2.0",
"karma-firefox-launcher": "^1.1.0",
"karma-jasmine": "^1.1.2",
"protractor": "^5.4.1"
},
"scripts": {
"postinstall": "npm run copy-libs",
"update-deps": "npm update",
"postupdate-deps": "npm run copy-libs",
"copy-libs": "cpx \"node_modules/{angular,angular-*,html5-boilerplate}/**/*\" app/lib -C",
"copy-libs": "cpx \"node_modules/{angular,angular-*,html5-boilerplate}/**/*\" app/lib -C",
"prestart": "npm install",
"start": "http-server -a localhost -p 8000 -c-1 ./app",
"pretest": "npm install",
"test": "karma start karma.conf.js",
"test-single-run": "karma start karma.conf.js --single-run",
"test-single-run": "npm test -- --single-run",
"preupdate-webdriver": "npm install",
"update-webdriver": "webdriver-manager update",
"preprotractor": "npm run update-webdriver",
"protractor": "protractor e2e-tests/protractor.conf.js",
"update-index-async": "node -e \"var fs=require('fs'),indexFile='app/index-async.html',loaderFile='app/lib/angular-loader/angular-loader.min.js',loaderText=fs.readFileSync(loaderFile,'utf-8').split(/sourceMappingURL=angular-loader.min.js.map/).join('sourceMappingURL=lib/angular-loader/angular-loader.min.js.map'),indexText=fs.readFileSync(indexFile,'utf-8').split(/\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/).join('//@@NG_LOADER_START@@\\n'+loaderText+' //@@NG_LOADER_END@@');fs.writeFileSync(indexFile,indexText);\""
"update-index-async": "node --eval \"var fs=require('fs'),indexFile='app/index-async.html',loaderFile='app/lib/angular-loader/angular-loader.min.js',loaderText=fs.readFileSync(loaderFile,'utf-8').split(/sourceMappingURL=angular-loader.min.js.map/).join('sourceMappingURL=lib/angular-loader/angular-loader.min.js.map'),indexText=fs.readFileSync(indexFile,'utf-8').split(/\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/).join('//@@NG_LOADER_START@@\\n'+loaderText+' //@@NG_LOADER_END@@');fs.writeFileSync(indexFile,indexText);\""
}
}