Skip to content

Commit 59dccfa

Browse files
remiremi
authored
Ditch ES6, finally! (#357)
1 parent c4c8ba3 commit 59dccfa

17 files changed

Lines changed: 33 additions & 82 deletions

‎.eslintrc.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ module.exports = {
88
extends: ['plugin:mirego/recommended'],
99
globals: {
1010
$: 'readonly',
11-
require: 'readonly',
12-
sortable: 'readonly'
11+
sortable: 'readonly',
12+
KS: 'readonly'
1313
},
1414
rules: {
1515
'operator-linebreak': ['error', 'after']

‎Gemfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ gem 'rexml', '~> 3.4'
2828
gem 'sass-rails', '~> 5.1'
2929
gem 'sentry-rails'
3030
gem 'sentry-ruby'
31-
gem 'sprockets', '3.7.5'
32-
gem 'sprockets-es6'
33-
gem 'sprockets-rails', '3.5.2'
31+
gem 'sprockets'
32+
gem 'sprockets-rails'
3433
gem 'turbolinks', '~> 5.2'
3534
gem 'uglifier', '~> 3.2'
3635
gem 'versionomy'

‎Gemfile.lock‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ GEM
8787
ast (2.4.3)
8888
autoprefixer-rails (6.4.0.1)
8989
execjs
90-
babel-source (5.8.35)
91-
babel-transpiler (0.7.0)
92-
babel-source (>= 4.0, < 6)
93-
execjs (~> 2.0)
9490
base64 (0.3.0)
9591
bcrypt (3.1.22)
9692
benchmark (0.5.0)
@@ -341,10 +337,6 @@ GEM
341337
base64
342338
concurrent-ruby (~> 1.0)
343339
rack (> 1, < 3)
344-
sprockets-es6 (0.9.2)
345-
babel-source (>= 5.8.11)
346-
babel-transpiler
347-
sprockets (>= 3.0.0)
348340
sprockets-rails (3.5.2)
349341
actionpack (>= 6.1)
350342
activesupport (>= 6.1)
@@ -419,9 +411,8 @@ DEPENDENCIES
419411
sentry-ruby
420412
spring
421413
spring-commands-rspec
422-
sprockets (= 3.7.5)
423-
sprockets-es6
424-
sprockets-rails (= 3.5.2)
414+
sprockets
415+
sprockets-rails
425416
turbolinks (~> 5.2)
426417
uglifier (~> 3.2)
427418
versionomy

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ DOCKER_REMOTE_IMAGE = $(DOCKER_REGISTRY)/$(DOCKER_LOCAL_IMAGE)
99
# Linter and formatter configuration
1010
# ----------------------------------
1111

12-
PRETTIER_FILES_PATTERN = '*.config.js' '**/*.{js,es6}' './*.md' './*/*.md'
13-
SCRIPTS_PATTERN = '**/*.es6' '**/*.js'
12+
PRETTIER_FILES_PATTERN = '*.config.js' '**/*.js' './*.md' './*/*.md'
13+
SCRIPTS_PATTERN = '**/*.js'
1414
STYLES_PATTERN = '**/*.scss' '**/*.css'
1515

1616
# Introspection targets

‎app/assets/javascripts/application.js‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
// = require_tree ./components
2-
// = require ./main
1+
// = require ./namespace
2+
// = require ./components/component
3+
// = require ./components/app
4+
// = require ./components/orderable-behavior
5+
// = require ./components/behavior-populate-dropdown
6+
// = require ./components/waiting-bar
37

4-
require(['main']);
8+
$(() => {
9+
window.App = new KS.App();
10+
window.App.registerComponent(KS.OrderableBehavior, '.behaviors-list')
11+
.registerComponent(KS.BehaviorPopulateDropdown, '.behavior-populate')
12+
.registerComponent(KS.WaitingBar, '.waiting-bar')
13+
.initialize();
14+
});

app/assets/javascripts/components/app.es6 renamed to app/assets/javascripts/components/app.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class App {
1+
KS.App = class {
22
constructor() {
33
this.registeredComponents = [];
44
this.instanciatedComponents = [];
@@ -74,6 +74,4 @@ class App {
7474
this.instanciatedComponents.splice(0, this.instanciatedComponents.length);
7575
return this;
7676
}
77-
}
78-
79-
export default App;
77+
};

app/assets/javascripts/components/behavior-populate-dropdown.es6 renamed to app/assets/javascripts/components/behavior-populate-dropdown.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import Component from 'components/component';
2-
3-
class BehaviorPopulateDropdown extends Component {
1+
KS.BehaviorPopulateDropdown = class extends KS.Component {
42
constructor(element) {
53
super(element);
64
this.linkElements = this.$element.find('a');
@@ -31,6 +29,4 @@ class BehaviorPopulateDropdown extends Component {
3129

3230
this.textField.val(templateAsPrettyString);
3331
}
34-
}
35-
36-
export default BehaviorPopulateDropdown;
32+
};

app/assets/javascripts/components/component.es6 renamed to app/assets/javascripts/components/component.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class Component {
1+
KS.Component = class {
22
constructor(element) {
33
this.$element = $(element);
44
}
@@ -9,6 +9,4 @@ class Component {
99

1010
bindEvents() {}
1111
unbindEvents() {}
12-
}
13-
14-
export default Component;
12+
};

app/assets/javascripts/components/orderable-behavior.es6 renamed to app/assets/javascripts/components/orderable-behavior.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import Component from 'components/component';
2-
3-
class OrderableBehavior extends Component {
1+
KS.OrderableBehavior = class extends KS.Component {
42
constructor(element) {
53
super(element);
64

@@ -35,6 +33,4 @@ class OrderableBehavior extends Component {
3533
handleDataToggle(event) {
3634
$(event.target).closest('li').find('.data-row').toggle();
3735
}
38-
}
39-
40-
export default OrderableBehavior;
36+
};

app/assets/javascripts/components/waiting-bar.es6 renamed to app/assets/javascripts/components/waiting-bar.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import Component from 'components/component';
2-
3-
class WaitingBar extends Component {
1+
KS.WaitingBar = class extends KS.Component {
42
constructor(element) {
53
super(element);
64
this.bindEvents();
@@ -17,6 +15,4 @@ class WaitingBar extends Component {
1715
handlePageFetch() {
1816
this.$element.show();
1917
}
20-
}
21-
22-
export default WaitingBar;
18+
};

0 commit comments

Comments
 (0)