From f5bf5ebb82e3af420dcd23d602b1be6cc86838e1 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 3 May 2017 02:04:16 +0200 Subject: Replace sprockets/browserify with Webpack (#2617) * Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time --- spec/javascript/components/avatar.test.jsx | 2 +- spec/javascript/components/button.test.jsx | 2 +- spec/javascript/components/display_name.test.jsx | 2 +- spec/javascript/components/dropdown_menu.test.jsx | 2 +- spec/javascript/components/features/ui/components/column.test.jsx | 4 ++-- spec/javascript/components/loading_indicator.test.jsx | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'spec/javascript') diff --git a/spec/javascript/components/avatar.test.jsx b/spec/javascript/components/avatar.test.jsx index 7131bbec7..f70173880 100644 --- a/spec/javascript/components/avatar.test.jsx +++ b/spec/javascript/components/avatar.test.jsx @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { render } from 'enzyme'; -import Avatar from '../../../app/assets/javascripts/components/components/avatar' +import Avatar from '../../../app/javascript/mastodon/components/avatar' describe('', () => { const src = '/path/to/image.jpg'; diff --git a/spec/javascript/components/button.test.jsx b/spec/javascript/components/button.test.jsx index 13bbe95a2..c32fae32a 100644 --- a/spec/javascript/components/button.test.jsx +++ b/spec/javascript/components/button.test.jsx @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { shallow } from 'enzyme'; import sinon from 'sinon'; -import Button from '../../../app/assets/javascripts/components/components/button'; +import Button from '../../../app/javascript/mastodon/components/button'; describe('