Skip to content

Commit 37b75ea

Browse files
jryansjryans
authored
Merge branch 'develop' into resynth1943-patch-riot-to-element
2 parents 622ea3e + 223e55d commit 37b75ea

File tree

4 files changed

+7
-68
lines changed

4 files changed

+7
-68
lines changed

‎docs/labs.md‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,3 @@ adds an ability for end users to add themes themselves by using a URL to the JSO
9494
theme definition.
9595

9696
For some sample themes, check out [aaronraimist/element-themes](https://github.com/aaronraimist/element-themes).
97-
98-
## New room list
99-
100-
A complete rewrite of the room list is underway to increase performance, stability,
101-
and general usability.
102-
103-
In the event the new room list needs to be disabled, add this to your config.json:
104-
```json
105-
{
106-
"settingDefaults": {
107-
"feature_new_room_list": false
108-
}
109-
}
110-
```
111-
112-
Note: In a future release the new room list will not be optional.

‎package.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
"build:genfiles": "yarn reskindex && yarn build:res && yarn build:jitsi",
4343
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
4444
"build:compile": "babel -d lib --verbose --extensions \".ts,.js,.tsx\" src",
45-
"build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production",
46-
"build:bundle-stats": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production --json > webpack-stats.json",
45+
"build:bundle": "webpack --progress --bail --mode production",
46+
"build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json",
4747
"build:types": "tsc --emitDeclarationOnly --jsx react",
4848
"dist": "scripts/package.sh",
4949
"start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,riot-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js\"",
@@ -100,7 +100,6 @@
100100
"chokidar": "^3.3.1",
101101
"concurrently": "^4.0.1",
102102
"cpx": "^1.3.2",
103-
"cross-env": "^6.0.3",
104103
"css-loader": "^3.3.2",
105104
"eslint": "^5.8.0",
106105
"eslint-config-google": "^0.7.1",

‎webpack.config.js‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@ if (!og_image_url) og_image_url = 'https://app.element.io/themes/element/img/log
1111
module.exports = (env, argv) => {
1212
if (process.env.CI_PACKAGE) {
1313
// Don't run minification for CI builds (this is only set for runs on develop)
14+
// We override this via environment variable to avoid duplicating the scripts
15+
// in `package.json` just for a different mode.
1416
argv.mode = "development";
1517
}
1618

1719
const development = {};
18-
if (argv.mode !== "production") {
20+
if (argv.mode === "production") {
21+
development['devtool'] = 'nosources-source-map';
22+
} else {
1923
// This makes the sourcemaps human readable for developers. We use eval-source-map
2024
// because the plain source-map devtool ruins the alignment.
2125
development['devtool'] = 'eval-source-map';
22-
} else {
23-
development['devtool'] = 'nosources-source-map';
2426
}
2527

2628
// Resolve the directories for the react-sdk and js-sdk for later use. We resolve these early so we
@@ -296,12 +298,6 @@ module.exports = (env, argv) => {
296298
},
297299

298300
plugins: [
299-
new webpack.DefinePlugin({
300-
'process.env': {
301-
NODE_ENV: JSON.stringify(process.env.NODE_ENV),
302-
},
303-
}),
304-
305301
// This exports our CSS using the splitChunks and loaders above.
306302
new MiniCssExtractPlugin({
307303
filename: 'bundles/[hash]/[name].css',

‎yarn.lock‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3058,13 +3058,6 @@ create-react-class@^15.6.0:
30583058
loose-envify "^1.3.1"
30593059
object-assign "^4.1.1"
30603060

3061-
cross-env@^6.0.3:
3062-
version "6.0.3"
3063-
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
3064-
integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
3065-
dependencies:
3066-
cross-spawn "^7.0.0"
3067-
30683061
cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
30693062
version "6.0.5"
30703063
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -3076,15 +3069,6 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
30763069
shebang-command "^1.2.0"
30773070
which "^1.2.9"
30783071

3079-
cross-spawn@^7.0.0:
3080-
version "7.0.3"
3081-
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
3082-
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
3083-
dependencies:
3084-
path-key "^3.1.0"
3085-
shebang-command "^2.0.0"
3086-
which "^2.0.1"
3087-
30883072
crypto-browserify@^3.11.0:
30893073
version "3.12.0"
30903074
resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -8141,11 +8125,6 @@ path-key@^2.0.0, path-key@^2.0.1:
81418125
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
81428126
integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
81438127

8144-
path-key@^3.1.0:
8145-
version "3.1.1"
8146-
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
8147-
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
8148-
81498128
path-parse@^1.0.6:
81508129
version "1.0.6"
81518130
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -10199,23 +10178,11 @@ shebang-command@^1.2.0:
1019910178
dependencies:
1020010179
shebang-regex "^1.0.0"
1020110180

10202-
shebang-command@^2.0.0:
10203-
version "2.0.0"
10204-
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
10205-
integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
10206-
dependencies:
10207-
shebang-regex "^3.0.0"
10208-
1020910181
shebang-regex@^1.0.0:
1021010182
version "1.0.0"
1021110183
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
1021210184
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
1021310185

10214-
shebang-regex@^3.0.0:
10215-
version "3.0.0"
10216-
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
10217-
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
10218-
1021910186
shell-escape@^0.2.0:
1022010187
version "0.2.0"
1022110188
resolved "https://registry.yarnpkg.com/shell-escape/-/shell-escape-0.2.0.tgz#68fd025eb0490b4f567a027f0bf22480b5f84133"
@@ -11860,13 +11827,6 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
1186011827
dependencies:
1186111828
isexe "^2.0.0"
1186211829

11863-
which@^2.0.1:
11864-
version "2.0.2"
11865-
resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
11866-
integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
11867-
dependencies:
11868-
isexe "^2.0.0"
11869-
1187011830
wide-align@^1.1.0:
1187111831
version "1.1.3"
1187211832
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"

0 commit comments

Comments
 (0)