about summary refs log tree commit diff
path: root/config/webpack
AgeCommit message (Collapse)Author
2019-11-20Revert CircleCI and some webpack changes to match upstreamThibaut Girka
2019-11-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-11-20Bump webpacker from 4.0.7 to 4.2.0 (#12416)dependabot-preview[bot]
* Bump webpacker from 4.0.7 to 4.2.0 Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.7 to 4.2.0. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v4.0.7...v4.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Use NODE_ENV=tests instead of test, to work around async modules not having a chunk
2019-11-07Fix build with new sass-loaderThibaut Girka
2019-11-07Disable minimization in test environmentThibaut Girka
2019-08-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json
2019-08-15Add OCR tool to media editing modal (#11566)Eugen Rochko
2019-07-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-07-23Remove modules.localIdentName (#11398)Yamagishi Kazutoshi
2019-07-23Bump css-loader from 2.1.1 to 3.1.0 (#11382)dependabot-preview[bot]
* Bump css-loader from 2.1.1 to 3.1.0 Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.1.1 to 3.1.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v2.1.1...v3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * localIdentName -> modules.localIdentName
2019-06-04Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-04Replace from uglifyjs to terser (#10956)Yamagishi Kazutoshi
2019-06-03Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock
2019-05-30Remove dependency on fibers (#10902)Yamagishi Kazutoshi
2019-03-30Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 ↵Eugen Rochko
(#10413) Fix #10315 This reverts commit db06b25376ac7e844e86fb9890fa9f1c2edd2d60.
2019-03-27Revert "fix: update to emoji-mart 2.10.0 (#10281)"Thibaut Girka
This reverts commit db06b25376ac7e844e86fb9890fa9f1c2edd2d60.
2019-03-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts.
2019-03-16fix: update to emoji-mart 2.10.0 (#10281)Nolan Lawson
* fix: update to emoji-mart 2.10.0 * remove useless change * fix CSS style of emoji picker, improve a11y * fix missing newline in scss * fix the title and input fonts
2019-03-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.
2019-03-16Do not use @babel/preset-env to compile node_modules (#10289)Yamagishi Kazutoshi
2019-03-16perf: remove stats.json generation in webpack (#10290)Nolan Lawson
* perf: remove stats.json generation in webpack * fix code comment
2019-03-16perf: remove zopfli to speed up webpack (#10288)Nolan Lawson
2019-03-15Bump webpacker from 3.5.5 to 4.0.2 (#10277)Yamagishi Kazutoshi
Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2019-03-15Upgrade yargs to v12.0 (#9862)Yamagishi Kazutoshi
2019-01-02Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
2018-12-31Update dependencies for Node.js (2018-12-31) (#9669)Yamagishi Kazutoshi
* Update react-* to v16.7.0 * Upgrade react-hotkeys to v1.1.4 * Update react-intl to v2.7.2 * Update react-select to v2.2.0 * Update react-swipeable-views to v0.13.0 * Upgrade react-textarea-autosize to v7.1.0 * Upgrade redux to v4.0.1 * Upgrade reselect to v4.0.0 * Update raf to v3.4.1 * Update enzyme to v3.8.0 * Update rails-ujs to v5.2.2 * Update axios to v0.18.0 * Update http-link-header to v1.0.2 * Update rellax to v1.7.1 * Update intersection-observer to v0.5.1 * Update stringz to v1.0.0 * Upgrade babel-eslint to v10.0.1 * Update @babel/* to v7.2.x * Update babel-plugin-react-intl to v3.0.1 * Update babel-plugin-transform-react-remove-prop-types to v0.4.21 * Upgrade dotenv to v6.2.0 * Update express to v4.16.4 * Update webpack to v4.28.3 * Upgrade autoprefixer to v9.4.3 * Update babel-loader to v8.0.4 * Upgrade css-loader to v2.1.0 * Upgrade file-loader to v3.0.1 * Update marky to v1.2.1 * Update mini-css-extract-plugin to v0.5.0 * Update offline-plugin to v5.0.6 * Update style-loader to v0.23.1 * Update eslint-plugin-jsx-a11y to v6.1.2 * yarn upgrade * fix * Replace webpack-manifest-plugin to webpack-assets-manifest * Replace node-zopfli to @gfz/zopfli * Remove monkey-patch for http-link-header
2018-10-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-06Improve production build config (#8899)bsky
2018-09-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js
2018-09-14Upgrade Babel to version 7.0.0 (#5925)Yamagishi Kazutoshi
2018-09-13Fix building assets in test environmentThibaut Girka
Webpacker (Ruby wrapper to webpack) uses RAILS_ENV-based environments while the javascript configuration for webpack re-reads this configuration file using the NODE_ENV environment variable. This means that when RAILS_ENV=test, running “assets:precompile” compiled the production packs in “public/packs” while webpacker expects them in “public/packs-test”. This causes Ruby to recompile them on-the-fly, possibly leading to race conditions in parallel_tests. This changes: - Disables on-the-fly compilation in test environment - Changes the javascript part to read the correct environment
2018-09-13Fix building assets in test environment (#8691)ThibG
Webpacker (Ruby wrapper to webpack) uses RAILS_ENV-based environments while the javascript configuration for webpack re-reads this configuration file using the NODE_ENV environment variable. This means that when RAILS_ENV=test, running “assets:precompile” compiled the production packs in “public/packs” while webpacker expects them in “public/packs-test”. This causes Ruby to recompile them on-the-fly, possibly leading to race conditions in parallel_tests. This changes: - Disables on-the-fly compilation in test environment - Changes the javascript part to read the correct environment
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.
2018-08-25Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)M Somerville
Still check for S3_CLOUDFRONT_HOST for existing installs.
2018-07-28Reduce assets precompilation time by about 20%Thibaut Girka
Bundle most common webpack chunks into a “common” pack, in a way similar to what upstream does.
2018-07-17Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-07-17Update supported Node.js version (#8041)abcang
2018-07-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
2018-07-14Upgrade webpack to version v4.x (#6655)Yamagishi Kazutoshi
2018-06-12Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-06-10Rename emoji sheet to avoid caching issue (#7777)Renato "Lond" Cerqueira
2018-05-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-29Use URL polyfill (#7664)Yamagishi Kazutoshi
2018-05-29Cache attachments on external host with service worker (#7493)Akihiko Odaki
2018-05-14Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-14Limit environment variables to expose to webpack (#7480)Akihiko Odaki
2018-03-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-03-27Cache media (#6902)Akihiko Odaki
2018-01-28Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml
2018-01-29ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-01 09:06:01 +0000