Skip to content

Commit

Permalink
Merge pull request #6855 from owncloud/decrease-dev-time
Browse files Browse the repository at this point in the history 
[full-ci] fix docker dev env and decrease build time
  • Loading branch information
@kulmann
kulmann authored May 4, 2022
2 parents 5df0396 + e93f0ea commit dd190a2
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 68 deletions.
6 changes: 6 additions & 0 deletions changelog/unreleased/bugfix-build-time
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Decrease build time and fix faulty oc10 docker dev env

We've fixed a bug where build times increased on every file change in dev mode,
it also fixes the faulty file sync during docker development for oc10.

https://github.com/owncloud/web/pull/6855
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"@cucumber/pretty-formatter": "^1.0.0-alpha.1",
"@noble/hashes": "^1.0.0",
"@playwright/test": "^1.21.1",
"@rollup-extras/plugin-copy": "^1.2.3",
"@rollup/plugin-alias": "^3.1.9",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-html": "^0.2.4",
Expand Down Expand Up @@ -109,7 +110,6 @@
"requirejs": "^2.3.6",
"rollup": "^2.52.7",
"rollup-plugin-babel": "^4.4.0",
"rollup-plugin-copy-watch": "^0.0.1",
"rollup-plugin-delete": "^2.0.0",
"rollup-plugin-gzip": "^2.5.0",
"rollup-plugin-livereload": "^2.0.5",
Expand Down
42 changes: 21 additions & 21 deletions rollup.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import resolve from 'rollup-plugin-node-resolve'
import json from '@rollup/plugin-json'
import commonjs from '@rollup/plugin-commonjs'
import babel from 'rollup-plugin-babel'
import copy from 'rollup-plugin-copy-watch'
import modify from 'rollup-plugin-modify'
import { terser } from 'rollup-plugin-terser'
import visualizer from 'rollup-plugin-visualizer'
Expand All @@ -21,6 +20,7 @@ import ts from 'rollup-plugin-ts'
import nodePolyfills from 'rollup-plugin-polyfill-node'
import alias from '@rollup/plugin-alias'
import inject from '@rollup/plugin-inject'
import copy from '@rollup-extras/plugin-copy'

const production = !process.env.ROLLUP_WATCH
const sourcemap = process.env.SOURCE_MAP === 'true'
Expand All @@ -36,11 +36,6 @@ if (process.env.REQUIRE_TIMEOUT) {
}

const plugins = [
del({
runOnce: true,
targets: path.join('dist', '*'),
dot: true
}),
postcss({
extract: path.join('css', 'web.css'),
minimize: production,
Expand Down Expand Up @@ -85,23 +80,21 @@ const plugins = [
}),
json(),
copy({
watch: !production && ['./config', './packages/web-runtime/themes'],
targets: [
{ src: './packages/web-container/img', dest: 'dist' },
{ src: './packages/web-container/oidc-callback.html', dest: 'dist' },
{
src: './packages/web-container/oidc-silent-redirect.html',
dest: 'dist'
},
{ src: './packages/web-container/manifest.json', dest: 'dist' },
{ src: './packages/web-container/robots.txt', dest: 'dist' },
{ src: './packages/web-runtime/themes', dest: 'dist' },
{ src: 'node_modules/requirejs/require.js', dest: 'js' },
{
src: `./config/${production ? 'config.dist.json' : 'config.json'}`,
dest: 'dist'
},
{ src: 'node_modules/requirejs/require.js', dest: 'dist/js' },
{ src: 'node_modules/owncloud-design-system/dist/system/icons', dest: 'dist/' }
src: 'node_modules/owncloud-design-system/dist/system/icons/*',
dest: 'icons'
}
],
watch: false
}),
copy({
targets: [
{ src: './packages/web-container/img/*', dest: 'img' },
{ src: './packages/web-container/*.{html,json,txt}' },
{ src: './packages/web-runtime/themes/**/*', dest: 'themes' },
{ src: `./config/${production ? 'config.json.dist' : 'config.json'}` }
]
}),
html({
Expand Down Expand Up @@ -183,6 +176,13 @@ const plugins = [

if (production) {
plugins.push(terser())
plugins.push(
del({
runOnce: true,
targets: path.join('dist', '*'),
dot: true
})
)
}

if (process.env.SERVER === 'true') {
Expand Down
141 changes: 95 additions & 46 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1915,6 +1915,15 @@ __metadata:
languageName: node
linkType: hard

"@niceties/logger@npm:^1.1.3":
version: 1.1.3
resolution: "@niceties/logger@npm:1.1.3"
dependencies:
kleur: ^4.1.4
checksum: a5a9033d9339dfb4d9dd41ebb579a197fdd4cab0a080792bed6d989b26ca25f07ca6eca17d0a6b8b2fda85beb0df44d9ef97df06fd3f0b7c3cc64bc8cb4f817e
languageName: node
linkType: hard

"@noble/hashes@npm:^1.0.0":
version: 1.0.0
resolution: "@noble/hashes@npm:1.0.0"
Expand Down Expand Up @@ -2020,6 +2029,34 @@ __metadata:
languageName: node
linkType: hard

"@rollup-extras/plugin-copy@npm:^1.2.3":
version: 1.2.3
resolution: "@rollup-extras/plugin-copy@npm:1.2.3"
dependencies:
"@niceties/logger": ^1.1.3
"@rollup-extras/utils": ^1.2.1
"@types/glob": ^7.2.0
"@types/glob-parent": ^5.1.1
glob: ^7.2.0
glob-parent: ^6.0.2
glob-promise: ^4.2.2
peerDependencies:
rollup: ^2.60.1
checksum: abb3814763d90d7bb0b3040750a49732d2c7a2c22fa8229cc2fb4efefb81be00a8d45f117694db91f7f341e45b6a48360b41478956bd192bfe22c70543289c58
languageName: node
linkType: hard

"@rollup-extras/utils@npm:^1.2.1":
version: 1.2.1
resolution: "@rollup-extras/utils@npm:1.2.1"
dependencies:
"@niceties/logger": ^1.1.3
peerDependencies:
rollup: ^2.60.1
checksum: ab3bd148e1f8d7da7ffa059e49cc3f63ee091ee31e658f05b4a28e438779d3ed9f3e1a632ad9b2dc4c6a009406bef18d66ae9087566136b0fe7d0fc5b05c39bc
languageName: node
linkType: hard

"@rollup/plugin-alias@npm:^3.1.9":
version: 3.1.9
resolution: "@rollup/plugin-alias@npm:3.1.9"
Expand Down Expand Up @@ -2235,12 +2272,10 @@ __metadata:
languageName: node
linkType: hard

"@types/fs-extra@npm:^8.0.1":
version: 8.1.1
resolution: "@types/fs-extra@npm:8.1.1"
dependencies:
"@types/node": "*"
checksum: d7d564b84b86e51241984c9bec16f683056d45510e2c63e1bfe9282026685bd14e5ca406ee809453f1e2fd8c9aa76c5712a3019492eb946dd46de327ccb0e1b1
"@types/glob-parent@npm:^5.1.1":
version: 5.1.1
resolution: "@types/glob-parent@npm:5.1.1"
checksum: bb23a9048276e896acfe7babb3a78bd16b65c774fdc7ad456ae532dd0200e92e708a7d9170f1147cbd322e6ece10ba52b77429c45fa33f007fa3de8732385982
languageName: node
linkType: hard

Expand All @@ -2254,6 +2289,16 @@ __metadata:
languageName: node
linkType: hard

"@types/glob@npm:^7.1.3, @types/glob@npm:^7.2.0":
version: 7.2.0
resolution: "@types/glob@npm:7.2.0"
dependencies:
"@types/minimatch": "*"
"@types/node": "*"
checksum: 6ae717fedfdfdad25f3d5a568323926c64f52ef35897bcac8aca8e19bc50c0bd84630bbd063e5d52078b2137d8e7d3c26eabebd1a2f03ff350fff8a91e79fc19
languageName: node
linkType: hard

"@types/graceful-fs@npm:^4.1.2":
version: 4.1.5
resolution: "@types/graceful-fs@npm:4.1.5"
Expand Down Expand Up @@ -4096,7 +4141,7 @@ __metadata:
languageName: node
linkType: hard

"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.0, chokidar@npm:^3.5.0":
"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.5.0":
version: 3.5.2
resolution: "chokidar@npm:3.5.2"
dependencies:
Expand Down Expand Up @@ -4293,7 +4338,7 @@ __metadata:
languageName: node
linkType: hard

"colorette@npm:^1.1.0, colorette@npm:^1.2.2":
"colorette@npm:^1.2.2":
version: 1.2.2
resolution: "colorette@npm:1.2.2"
checksum: 69fec14ddaedd0f5b00e4bae40dc4bc61f7050ebdc82983a595d6fd64e650b9dc3c033fff378775683138e992e0ddd8717ac7c7cec4d089679dcfbe3cd921b04
Expand Down Expand Up @@ -6575,6 +6620,26 @@ __metadata:
languageName: node
linkType: hard

"glob-parent@npm:^6.0.2":
version: 6.0.2
resolution: "glob-parent@npm:6.0.2"
dependencies:
is-glob: ^4.0.3
checksum: c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8
languageName: node
linkType: hard

"glob-promise@npm:^4.2.2":
version: 4.2.2
resolution: "glob-promise@npm:4.2.2"
dependencies:
"@types/glob": ^7.1.3
peerDependencies:
glob: ^7.1.6
checksum: c1a3d95f7c8393e4151d4899ec4e42bb2e8237160f840ad1eccbe9247407da8b6c13e28f463022e011708bc40862db87b9b77236d35afa3feb8aa86d518f2dfe
languageName: node
linkType: hard

"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6":
version: 7.1.7
resolution: "glob@npm:7.1.7"
Expand All @@ -6589,6 +6654,20 @@ __metadata:
languageName: node
linkType: hard

"glob@npm:^7.2.0":
version: 7.2.0
resolution: "glob@npm:7.2.0"
dependencies:
fs.realpath: ^1.0.0
inflight: ^1.0.4
inherits: 2
minimatch: ^3.0.4
once: ^1.3.0
path-is-absolute: ^1.0.0
checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134
languageName: node
linkType: hard

"globals@npm:^11.1.0":
version: 11.12.0
resolution: "globals@npm:11.12.0"
Expand All @@ -6612,22 +6691,6 @@ __metadata:
languageName: node
linkType: hard

"globby@npm:10.0.1":
version: 10.0.1
resolution: "globby@npm:10.0.1"
dependencies:
"@types/glob": ^7.1.1
array-union: ^2.1.0
dir-glob: ^3.0.1
fast-glob: ^3.0.3
glob: ^7.1.3
ignore: ^5.1.1
merge2: ^1.2.3
slash: ^3.0.0
checksum: a16754b93eff58c1070ca9b0a92c69d9d97a184870fbc7dcb1b99a3ff202311ae66dd5662cbec874deaa888d0172024332e14d04d038c23949d5f8e29341dad2
languageName: node
linkType: hard

"globby@npm:^10.0.1":
version: 10.0.2
resolution: "globby@npm:10.0.2"
Expand Down Expand Up @@ -7323,13 +7386,6 @@ __metadata:
languageName: node
linkType: hard

"is-plain-object@npm:^3.0.0":
version: 3.0.1
resolution: "is-plain-object@npm:3.0.1"
checksum: d13fe75db350d4ac669595cdfe0242ae87fcecddf2bca858d2dd443a6ed6eb1f69951fac8c2fa85b16106c6b0d7738fea86c2aca2ecee7fd61de15c1574f2cc5
languageName: node
linkType: hard

"is-plain-object@npm:^5.0.0":
version: 5.0.0
resolution: "is-plain-object@npm:5.0.0"
Expand Down Expand Up @@ -8373,6 +8429,13 @@ __metadata:
languageName: node
linkType: hard

"kleur@npm:^4.1.4":
version: 4.1.4
resolution: "kleur@npm:4.1.4"
checksum: 7f6db36e378045dec14acd3cbf0b1e59130c09e984ee8b8ce56dd2d2257cfff90389c1e8f8b19bd09dd5d241080566a814b4ccd99fdcef91f59ef93ec33c8a44
languageName: node
linkType: hard

"knuth-shuffle-seeded@npm:^1.0.6":
version: 1.0.6
resolution: "knuth-shuffle-seeded@npm:1.0.6"
Expand Down Expand Up @@ -11428,20 +11491,6 @@ __metadata:
languageName: node
linkType: hard

"rollup-plugin-copy-watch@npm:^0.0.1":
version: 0.0.1
resolution: "rollup-plugin-copy-watch@npm:0.0.1"
dependencies:
"@types/fs-extra": ^8.0.1
chokidar: ^3.4.0
colorette: ^1.1.0
fs-extra: ^8.1.0
globby: 10.0.1
is-plain-object: ^3.0.0
checksum: 0ec2c929a056117e0ab21963989c4b3c6b887df2156ab11eb5877d34e5baa5ce2c6ab8fe9dee0ed8895c8e849e9577eab8a29c815aac33417fa5a0a71f2acf9b
languageName: node
linkType: hard

"rollup-plugin-delete@npm:^2.0.0":
version: 2.0.0
resolution: "rollup-plugin-delete@npm:2.0.0"
Expand Down Expand Up @@ -11665,6 +11714,7 @@ __metadata:
"@cucumber/pretty-formatter": ^1.0.0-alpha.1
"@noble/hashes": ^1.0.0
"@playwright/test": ^1.21.1
"@rollup-extras/plugin-copy": ^1.2.3
"@rollup/plugin-alias": ^3.1.9
"@rollup/plugin-commonjs": ^17.0.0
"@rollup/plugin-html": ^0.2.4
Expand Down Expand Up @@ -11721,7 +11771,6 @@ __metadata:
requirejs: ^2.3.6
rollup: ^2.52.7
rollup-plugin-babel: ^4.4.0
rollup-plugin-copy-watch: ^0.0.1
rollup-plugin-delete: ^2.0.0
rollup-plugin-gzip: ^2.5.0
rollup-plugin-livereload: ^2.0.5
Expand Down

0 comments on commit dd190a2

Please sign in to comment.