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.

Sign up for GitHub

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

Jump to bottom

Keep build folder ... kills circular-json #34841

Merged
merged 4 commits into from
Mar 20, 2019
Merged

Keep build folder ... kills circular-json #34841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cc700c
Keep build folder ... kills circular-json
DeepDiver1975 Nov 30, 2018
10d03d5
Adding modclean to have smaller release tar balls
DeepDiver1975 Oct 19, 2018
b5a7ff1
Fixing node components
DeepDiver1975 Nov 26, 2018
a7f2864
Adjust Graffino/Browser-Update from 2.0.2 to v2.0.2 to match stable10
phil-davis Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion build/modclean-patterns-owncloud/patterns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
".spmignore",
"AUTHORS*",
"benchmarks",
"build",
"data",
"data-scripts",
"docs",
Expand Down
7 changes: 2 additions & 5 deletions build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@
"homepage": "https://github.com/owncloud/",
"contributors": [],
"dependencies": {
"@bower_components/Jcrop": "tapmodo/Jcrop#2.0.4",
"@bower_components/Snap.js": "jakiestfu/Snap.js#1.9.3",
"@bower_components/backbone": "jashkenas/backbone#1.3.3",
"@bower_components/base64": "davidchambers/Base64.js#1.0.2",
"@bower_components/blueimp-md5": "blueimp/JavaScript-MD5#2.10.0",
"@bower_components/bootstrap": "twbs/bootstrap#3.3.7",
"@bower_components/bowser": "ded/bowser#1.9.4",
"@bower_components/browser-update": "Graffino/Browser-Update#2.0.2",
"@bower_components/browser-update": "Graffino/Browser-Update#v2.0.2",
"@bower_components/clipboard": "zenorocha/clipboard.js#v2.0.4",
"@bower_components/davclient.js": "owncloud/davclient.js#0.1.3",
"@bower_components/es6-promise": "components/es6-promise#v4.2.4",
Expand All @@ -26,7 +24,6 @@
"@bower_components/jquery": "jquery/jquery-dist#2.2.4",
"@bower_components/jquery-ui": "components/jqueryui#1.12.1",
"@bower_components/jsTimezoneDetect": "HenningM/jstimezonedetect#1.0.5",
"@bower_components/jstzdetect": "HenningM/jstimezonedetect#1.0.6",
"@bower_components/moment": "moment/moment#2.24.0",
"@bower_components/select2": "ivaynberg/select2#3.5.4",
"@bower_components/showdown": "showdownjs/showdown#1.9.0",
Expand Down Expand Up @@ -57,6 +54,6 @@
},
"scripts": {
"clean-modules": "modclean -r --patterns=\"default:safe,owncloud:basic\"",
"postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), '../core/vendor', 'junction') } catch (e) { }\""
"postinstall": "modclean -r --patterns=\"default:safe\" && node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), '../core/vendor', 'junction') } catch (e) { }\""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is different to the mentioned PR https://github.com/owncloud/core/pull/33665/files#diff-c5776441e263bb28be0b4b6e51fd527fR58

also 5f114b1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@individual-it I updated the description to point to another commit in #34784
There is so much of this dependency stuff that was done slightly different ways and orders in master and stable10!

}
}
98 changes: 74 additions & 24 deletions build/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
# yarn lockfile v1


"@bower_components/Jcrop@tapmodo/Jcrop#2.0.4":
version "2.0.4"
resolved "https://codeload.github.com/tapmodo/Jcrop/tar.gz/80f645b69fc938b3823d92d74e5019036d04a9ca"

"@bower_components/Snap.js@jakiestfu/Snap.js#1.9.3":
version "0.0.0"
resolved "https://codeload.github.com/jakiestfu/Snap.js/tar.gz/8538051df8e2c82a39d2603b6dfd8219ce8f04e6"

"@bower_components/backbone@jashkenas/backbone#1.3.3":
version "1.3.3"
resolved "https://codeload.github.com/jashkenas/backbone/tar.gz/8ec88604732944f197b352a6be22c8216ea9d3a1"
Expand Down Expand Up @@ -72,10 +64,6 @@
version "1.0.5"
resolved "https://codeload.github.com/HenningM/jstimezonedetect/tar.gz/2efb16c850d8447109eff40d4b1495acd8168812"

"@bower_components/jstzdetect@HenningM/jstimezonedetect#1.0.6":
version "1.0.6"
resolved "https://codeload.github.com/HenningM/jstimezonedetect/tar.gz/bd595ed253292934991a414979007f3d51a1547d"

"@bower_components/moment@moment/moment#2.24.0":
version "2.24.0"
resolved "https://codeload.github.com/moment/moment/tar.gz/96d0d6791ab495859d09a868803d31a55c917de1"
Expand Down Expand Up @@ -106,18 +94,36 @@
version "4.4.2"
resolved "https://codeload.github.com/dropbox/zxcvbn/tar.gz/f0735425180b130d6c57efbc044a47c0c8f1fd65"

"@sinonjs/commons@^1.0.2", "@sinonjs/commons@^1.3.0":
"@sinonjs/commons@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.0.2.tgz#3e0ac737781627b8844257fadc3d803997d0526e"
dependencies:
type-detect "4.0.8"

"@sinonjs/commons@^1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.3.0.tgz#50a2754016b6f30a994ceda6d9a0a8c36adda849"
dependencies:
type-detect "4.0.8"

"@sinonjs/formatio@3.0.0", "@sinonjs/formatio@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.0.0.tgz#9d282d81030a03a03fa0c5ce31fd8786a4da311a"
dependencies:
"@sinonjs/samsam" "2.1.0"

"@sinonjs/formatio@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.1.0.tgz#6ac9d1eb1821984d84c4996726e45d1646d8cce5"
dependencies:
"@sinonjs/samsam" "^2 || ^3"

"@sinonjs/samsam@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-2.1.0.tgz#b8b8f5b819605bd63601a6ede459156880f38ea3"
dependencies:
array-from "^2.1.1"

"@sinonjs/samsam@^2 || ^3", "@sinonjs/samsam@^3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.1.1.tgz#8e2eceb2353f6626e2867352e3def951d3366240"
Expand All @@ -126,6 +132,10 @@
array-from "^2.1.1"
lodash "^4.17.11"

"@sinonjs/samsam@^2.1.2":
version "2.1.2"
resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-2.1.2.tgz#16947fce5f57258d01f1688fdc32723093c55d3f"

"@sinonjs/text-encoding@^0.7.1":
version "0.7.1"
resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
Expand Down Expand Up @@ -629,8 +639,8 @@ cross-spawn@^5.0.1:
which "^1.2.9"

cryptiles@3.x.x:
version "3.1.3"
resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.3.tgz#5e32ef824569ef14c782aefd45c1617d9795359d"
version "3.1.4"
resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.4.tgz#769a68c95612b56faadfcebf57ac86479cbe8322"
dependencies:
boom "5.x.x"

Expand Down Expand Up @@ -1115,7 +1125,7 @@ glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
once "^1.3.0"
path-is-absolute "^1.0.0"

good-listener@^1.2.2:
good-listener@^1.1.6:
version "1.2.2"
resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
dependencies:
Expand Down Expand Up @@ -1556,6 +1566,10 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"

just-extend@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-3.0.0.tgz#cee004031eaabf6406da03a7b84e4fe9d78ef288"

just-extend@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz#f3f47f7dfca0f989c55410a7ebc8854b07108afc"
Expand Down Expand Up @@ -1695,6 +1709,10 @@ lodash.debounce@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"

lodash.get@^4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"

lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
Expand Down Expand Up @@ -1723,6 +1741,10 @@ lolex@^2.3.2:
version "2.7.1"
resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.1.tgz#e40a8c4d1f14b536aa03e42a537c7adbaf0c20be"

lolex@^2.7.5:
version "2.7.5"
resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"

lolex@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lolex/-/lolex-3.1.0.tgz#1a7feb2fefd75b3e3a7f79f0e110d9476e294434"
Expand Down Expand Up @@ -1957,6 +1979,16 @@ nise@^1.4.10:
lolex "^2.3.2"
path-to-regexp "^1.7.0"

nise@^1.4.5:
version "1.4.5"
resolved "https://registry.yarnpkg.com/nise/-/nise-1.4.5.tgz#979a97a19c48d627bb53703726ae8d53ce8d4b3e"
dependencies:
"@sinonjs/formatio" "3.0.0"
just-extend "^3.0.0"
lolex "^2.3.2"
path-to-regexp "^1.7.0"
text-encoding "^0.6.4"

node-pre-gyp@^0.10.0:
version "0.10.2"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz#e8945c20ef6795a20aac2b44f036eb13cf5146e3"
Expand Down Expand Up @@ -2472,7 +2504,7 @@ sax@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"

select@^1.1.2:
select@^1.0.6:
version "1.1.2"
resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"

Expand Down Expand Up @@ -2524,7 +2556,21 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"

"sinon@>= 1.7.1", sinon@^7.2.4:
"sinon@>= 1.7.1":
version "6.3.5"
resolved "https://registry.yarnpkg.com/sinon/-/sinon-6.3.5.tgz#0f6d6a5b4ebaad1f6e8e019395542d1d02c144a0"
dependencies:
"@sinonjs/commons" "^1.0.2"
"@sinonjs/formatio" "^3.0.0"
"@sinonjs/samsam" "^2.1.2"
diff "^3.5.0"
lodash.get "^4.4.2"
lolex "^2.7.5"
nise "^1.4.5"
supports-color "^5.5.0"
type-detect "^4.0.8"

sinon@^7.2.4:
version "7.2.4"
resolved "https://registry.yarnpkg.com/sinon/-/sinon-7.2.4.tgz#d834b9a38d8533b4ca3274a9a9ffa8e54c95d10c"
dependencies:
Expand Down Expand Up @@ -2664,8 +2710,8 @@ sprintf-js@~1.0.2:
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"

sshpk@^1.7.0:
version "1.15.1"
resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.1.tgz#b79a089a732e346c6e0714830f36285cd38191a2"
version "1.16.0"
resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de"
dependencies:
asn1 "~0.2.3"
assert-plus "^1.0.0"
Expand Down Expand Up @@ -2792,13 +2838,17 @@ tar@^4:
safe-buffer "^5.1.2"
yallist "^3.0.2"

text-encoding@^0.6.4:
version "0.6.4"
resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"

throttleit@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"

tiny-emitter@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
tiny-emitter@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-1.2.0.tgz#6dc845052cb08ebefc1874723b58f24a648c3b6f"

tmp@0.0.33, tmp@0.0.x:
version "0.0.33"
Expand Down Expand Up @@ -2858,7 +2908,7 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"

type-detect@4.0.8:
type-detect@4.0.8, type-detect@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"

Expand Down