Skip to content

Commit 2da40ad

Browse files
jonasjabarijonasjabari
committed
Merge branch 'develop' into fix-4-anchor-link
2 parents 6a5003d + 42391c1 commit 2da40ad

File tree

84 files changed

+18478
-16989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+18478
-16989
lines changed

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gem "cells-haml"
2020
group :development, :test do
2121
gem 'rspec-rails', '~> 3.8'
2222
gem 'capybara'
23-
gem 'webpacker', '~> 3.5'
23+
gem 'webpacker', '~> 4.0'
2424
gem 'sqlite3', '~> 1.3.13'
2525
gem 'selenium-webdriver'
2626
gem 'puma'

‎Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ GEM
240240
addressable (>= 2.3.6)
241241
crack (>= 0.3.2)
242242
hashdiff
243-
webpacker (3.5.5)
243+
webpacker (4.2.2)
244244
activesupport (>= 4.2)
245245
rack-proxy (>= 0.6.1)
246246
railties (>= 4.2)
@@ -271,7 +271,7 @@ DEPENDENCIES
271271
trailblazer-rails
272272
webdrivers (~> 4.1)
273273
webmock
274-
webpacker (~> 3.5)
274+
webpacker (~> 4.0)
275275

276276
BUNDLED WITH
277277
2.1.4

‎Rakefile

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,35 @@ require 'rake/testtask'
3232
# end
3333
#
3434
# task default: :test
35+
36+
task :webpack => 'webpack:build'
37+
38+
namespace :webpack do
39+
task :build => ['build:development', 'build:production']
40+
41+
namespace :build do
42+
task :development => 'yarn:install' do
43+
Bundler.with_clean_env do
44+
sh "cd builder && bin/webpack"
45+
end
46+
end
47+
task :production => 'yarn:install' do
48+
Bundler.with_clean_env do
49+
sh "cd builder && bin/rake webpacker:compile"
50+
end
51+
end
52+
end
53+
54+
task :watch => 'yarn:install' do
55+
Bundler.with_clean_env do
56+
sh "cd builder && bin/webpack --watch"
57+
end
58+
end
59+
60+
namespace :yarn do
61+
task :install do
62+
sh "yarn install && cd builder && yarn install"
63+
end
64+
end
65+
end
66+

‎app/concepts/matestack/ui/core/action/action.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ import Vue from 'vue/dist/vue.esm'
22
import Vuex from 'vuex'
33
import axios from 'axios'
44

5-
import matestackEventHub from 'js/event-hub'
6-
7-
import componentMixin from 'component/component'
5+
import matestackEventHub from '../js/event-hub'
6+
import componentMixin from '../component/component'
87

98
const componentDef = {
109
mixins: [componentMixin],

‎app/concepts/matestack/ui/core/app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Vue from 'vue/dist/vue.esm'
22
import VRuntimeTemplate from "v-runtime-template"
33
import Vuex from 'vuex'
4-
import isNavigatingToAnotherPage from "app/location"
4+
import isNavigatingToAnotherPage from "./location"
55

66
const componentDef = {
77
props: ['appConfig', 'params'],

‎app/concepts/matestack/ui/core/app/store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Vue from 'vue/dist/vue.esm'
22
import Vuex from 'vuex'
33
import axios from 'axios'
4-
import matestackEventHub from 'js/event-hub'
4+
import matestackEventHub from '../js/event-hub'
55

66
Vue.use(Vuex)
77

‎app/concepts/matestack/ui/core/async/async.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Vue from 'vue/dist/vue.esm'
2-
import matestackEventHub from 'js/event-hub'
3-
import componentMixin from 'component/component'
2+
import matestackEventHub from '../js/event-hub'
3+
import componentMixin from '../component/component'
44

55
const componentDef = {
66
mixins: [componentMixin],

‎app/concepts/matestack/ui/core/collection/content/content.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Vue from 'vue/dist/vue.esm'
2-
import matestackEventHub from 'js/event-hub'
3-
import queryParamsHelper from 'js/helpers/query-params-helper'
4-
import componentMixin from 'component/component'
5-
import asyncMixin from 'async/async'
2+
import matestackEventHub from '../../js/event-hub'
3+
import queryParamsHelper from '../../js/helpers/query-params-helper'
4+
import componentMixin from '../../component/component'
5+
import asyncMixin from '../../async/async'
66

77
const componentDef = {
88
mixins: [componentMixin, asyncMixin],

‎app/concepts/matestack/ui/core/collection/filter/filter.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Vue from 'vue/dist/vue.esm'
2-
import matestackEventHub from 'js/event-hub'
3-
import queryParamsHelper from 'js/helpers/query-params-helper'
4-
import componentMixin from 'component/component'
2+
import matestackEventHub from '../../js/event-hub'
3+
import queryParamsHelper from '../../js/helpers/query-params-helper'
4+
import componentMixin from '../../component/component'
55

66
const componentDef = {
77
mixins: [componentMixin],

‎app/concepts/matestack/ui/core/collection/order/order.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Vue from 'vue/dist/vue.esm'
2-
import matestackEventHub from 'js/event-hub'
3-
import queryParamsHelper from 'js/helpers/query-params-helper'
4-
import componentMixin from 'component/component'
2+
import matestackEventHub from '../../js/event-hub'
3+
import queryParamsHelper from '../../js/helpers/query-params-helper'
4+
import componentMixin from '../../component/component'
55

66
const componentDef = {
77
mixins: [componentMixin],

0 commit comments

Comments
 (0)