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

Move Bower dependencies to npm #510

Open
wants to merge 81 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
6443ea4
bower removes
Apr 18, 2022
8f4c954
version up
Apr 18, 2022
c7c7f9c
remove commented line
Apr 19, 2022
7693003
review fixes part 1
Apr 19, 2022
166c57d
move packages to res
Apr 19, 2022
da12151
fix eslint
Apr 19, 2022
7151d77
fix error alert
Apr 20, 2022
b7fe079
workaround for bug in lib
Apr 20, 2022
8ef6fb0
Merge branch 'master' into master
DaniilSmirnov Apr 20, 2022
6a4cca6
update master
May 10, 2022
2ad317a
Merge branch 'DeviceFarmer-master'
May 10, 2022
2d01f00
fix yarn.lock
May 10, 2022
72321c9
upgrade node to latest version v17.9.0 (#500)
denis99999 Apr 12, 2022
2cbae3e
update semaphore files for consistency with upgrading nodejs to lates…
denis99999 Apr 14, 2022
275107f
bower removes
Apr 18, 2022
3bffed9
version up
Apr 18, 2022
8ccd6f5
remove commented line
Apr 19, 2022
cd713d8
review fixes part 1
Apr 19, 2022
3d5f41f
move packages to res
Apr 19, 2022
8466cef
fix eslint
Apr 19, 2022
6915a25
fix error alert
Apr 20, 2022
83f8b2d
workaround for bug in lib
Apr 20, 2022
87b2e96
Merge branch 'master' into master
DaniilSmirnov May 10, 2022
fcc2cdf
fix yarn.lock
May 10, 2022
ddf4beb
update master
May 10, 2022
f848a8d
Merge remote-tracking branch 'origin/master'
May 10, 2022
2b9a530
fix yarn.lock
May 10, 2022
f3538a0
bower removes
Apr 18, 2022
2a91e6f
move packages to res
Apr 19, 2022
0e38d8a
Fix adbkit API invocations (#524)
koral-- May 5, 2022
0831124
Merge remote-tracking branch 'origin/master'
May 10, 2022
ffa58ad
Fix adbkit API invocations (#524)
koral-- May 5, 2022
2fa5b8c
bower removes
Apr 18, 2022
df32c19
move packages to res
Apr 19, 2022
837d42a
update master
May 10, 2022
8989114
Merge remote-tracking branch 'origin/master'
May 10, 2022
335a1ba
update master
May 10, 2022
7f73f73
bower removes
Apr 18, 2022
f770ba0
move packages to res
Apr 19, 2022
c49e728
update master
May 10, 2022
42c691a
Merge remote-tracking branch 'origin/master'
May 10, 2022
68365de
fix dco
DaniilSmirnov May 10, 2022
e60bcee
Revert "Fix adbkit API invocations (#524)" (#528)
koral-- May 12, 2022
ce5a000
fix bug on screen grabber management (#554)
denis99999 Jul 29, 2022
da9284b
add contributors (#555)
denis99999 Aug 2, 2022
d9e5944
add frame rate management (#558)
denis99999 Aug 3, 2022
da6c786
Update DEPLOYMENT.md (#569)
denis99999 Aug 24, 2022
878171e
fix deprecated warnings on Buffer class (#580)
denis99999 Sep 16, 2022
40757e7
Upload the ipa files for the iOS platform (#583)
mankoffs Sep 20, 2022
0c74b53
fix #592 Fix marketName issue (#593)
jsjs4013 Sep 30, 2022
2a5b1b9
Bump passport from 0.4.1 to 0.6.0 (#581)
dependabot[bot] Oct 9, 2022
e7e0d3b
Fixing the link to get the package swagger-node-runner from ssh to ht…
Energoblock Oct 31, 2022
dd8c186
Update rethinkdb to 2.4.2 in docker compose sample (#611)
koral-- Nov 1, 2022
24c944d
Enable device market name (#601)
MykytaIvshkn Nov 3, 2022
f168b45
move off screen password autofill (#610)
Ristakis Nov 3, 2022
831ee73
Bump moment from 2.29.3 to 2.29.4 (#596)
dependabot[bot] Nov 24, 2022
a146768
Update device-db to 1.3.0 (#619)
koral-- Nov 25, 2022
1d3df08
Bump decode-uri-component from 0.2.0 to 0.2.2 (#622)
dependabot[bot] Dec 6, 2022
856d5f0
bower removes
Apr 18, 2022
b75ebfc
version up
Apr 18, 2022
ffbe511
review fixes part 1
Apr 19, 2022
ec994aa
move packages to res
Apr 19, 2022
587aa26
fix eslint
Apr 19, 2022
0080e90
fix error alert
Apr 20, 2022
f3d61d6
workaround for bug in lib
Apr 20, 2022
d012aab
update master
May 10, 2022
ec6e024
bower removes
Apr 18, 2022
8574a17
move packages to res
Apr 19, 2022
514c051
Fix adbkit API invocations (#524)
koral-- May 5, 2022
bfe9686
bower removes
Apr 18, 2022
62bb46a
move packages to res
Apr 19, 2022
664bc2f
update master
May 10, 2022
6a38c94
bower removes
Apr 18, 2022
35c22fe
move packages to res
Apr 19, 2022
20007b5
update master
May 10, 2022
899df36
bower removes
Apr 18, 2022
41255df
move packages to res
Apr 19, 2022
2c17f46
update master
May 10, 2022
61dbe1e
review fix
Dec 23, 2022
9e88ff0
Merge remote-tracking branch 'origin/master'
Dec 23, 2022
51c0447
resolve confilcts
Dec 23, 2022
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
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devicefarmer/stf",
"version": "3.6.2",
"version": "3.6.1",
"description": "Smartphone Test Farm",
"keywords": [
"adb",
Expand Down Expand Up @@ -33,7 +33,7 @@
"prepare": "not-in-install && gulp build || in-install",
"test:unit": "gulp karma",
"test:e2e": "gulp protractor",
"lint": "gulp test"
"lint": "gulp lint"
},
"dependencies": {
"@devicefarmer/adbkit": "^2.11.3",
Expand Down Expand Up @@ -128,12 +128,11 @@
"ws": "^3.0.0",
"yargs": "^6.6.0",
"yauzl": "^2.10.0",
"zeromq": "^5.0.0"
"zeromq": "^5.2.8"
},
"devDependencies": {
"angular-mocks": "1.5.11",
"async": "^2.0.1",
"bower": "^1.8.8",
"chai": "^3.4.1",
"css-loader": "^0.28.11",
"del": "^2.0.1",
Expand All @@ -150,6 +149,7 @@
"gulp-pug": "^4.0.1",
"gulp-run": "^1.6.12",
"gulp-util": "^3.0.7",
"grunt": "^0.4.0",
"html-loader": "^0.5.5",
"http-https": "^1.0.0",
"imports-loader": "^0.8.0",
Expand Down Expand Up @@ -185,8 +185,7 @@
"then-jade": "^2.4.1",
"url-loader": "^0.6.2",
"webpack": "^3.1.0",
"webpack-dev-server": "^2.11.5",
"zeromq": "5.2.8"
"webpack-dev-server": "^2.11.5"
},
"engines": {
"node": ">= 12",
DaniilSmirnov marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
9 changes: 3 additions & 6 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,9 @@ module.exports = {
, extensions: ['.js', '.json']
, enforceModuleExtension: false
, alias: {
'@devicefarmer/adbkit': './adbkit'
, 'angular-bootstrap': 'angular-bootstrap/ui-bootstrap-tpls'
, localforage: 'localforage/dist/localforage.js'
, 'socket.io': 'socket.io-client'
, stats: 'stats.js/src/Stats.js'
, 'underscore.string': 'underscore.string/index'
localforage: 'localforage/dist/localforage.js'
, 'socket.io': 'socket.io-client'
, stats: 'stats.js/src/Stats.js'
}
}
, module: {
Expand Down
Loading