Skip to content

Commit cee1c14

Browse files
Merge pull request #254 from sigfriedCub1990/es5-transpiling
Adding ES5 transpiling
2 parents 46c4adb + 694addb commit cee1c14

File tree

6 files changed

+2023
-2316
lines changed

6 files changed

+2023
-2316
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gem "cells-haml"
2424
group :development, :test do
2525
gem 'rspec-rails', '~> 3.8'
2626
gem 'capybara'
27-
gem 'webpacker', '~> 3.5'
27+
gem 'webpacker', '~> 4.0'
2828
gem 'sqlite3', '~> 1.3.13'
2929
gem 'selenium-webdriver'
3030
gem 'poltergeist'

Gemfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ GEM
8484
concurrent-ruby (1.1.5)
8585
crack (0.4.3)
8686
safe_yaml (~> 1.0.0)
87-
crass (1.0.4)
87+
crass (1.0.5)
8888
declarative (0.0.10)
8989
declarative-builder (0.1.0)
9090
declarative-option (< 0.2.0)
@@ -97,7 +97,7 @@ GEM
9797
representable (>= 2.4.0, <= 3.1.0)
9898
uber (< 0.2.0)
9999
docile (1.3.1)
100-
erubi (1.8.0)
100+
erubi (1.9.0)
101101
ffi (1.9.25)
102102
generator_spec (0.9.4)
103103
activesupport (>= 3.0.0)
@@ -108,10 +108,10 @@ GEM
108108
temple (>= 0.8.0)
109109
tilt
110110
hashdiff (0.3.8)
111-
i18n (1.6.0)
111+
i18n (1.7.0)
112112
concurrent-ruby (~> 1.0)
113113
json (2.1.0)
114-
loofah (2.2.3)
114+
loofah (2.3.1)
115115
crass (~> 1.0.2)
116116
nokogiri (>= 1.5.9)
117117
mail (2.7.1)
@@ -122,9 +122,9 @@ GEM
122122
mimemagic (0.3.3)
123123
mini_mime (1.0.1)
124124
mini_portile2 (2.4.0)
125-
minitest (5.11.3)
125+
minitest (5.13.0)
126126
nio4r (2.5.2)
127-
nokogiri (1.10.4)
127+
nokogiri (1.10.5)
128128
mini_portile2 (~> 2.4.0)
129129
pipetree (0.1.1)
130130
poltergeist (1.18.1)
@@ -154,15 +154,15 @@ GEM
154154
rails-dom-testing (2.0.3)
155155
activesupport (>= 4.2.0)
156156
nokogiri (>= 1.6)
157-
rails-html-sanitizer (1.0.4)
158-
loofah (~> 2.2, >= 2.2.2)
157+
rails-html-sanitizer (1.3.0)
158+
loofah (~> 2.3)
159159
railties (5.2.3)
160160
actionpack (= 5.2.3)
161161
activesupport (= 5.2.3)
162162
method_source
163163
rake (>= 0.8.7)
164164
thor (>= 0.19.0, < 2.0)
165-
rake (12.3.3)
165+
rake (13.0.0)
166166
reform (2.2.4)
167167
disposable (>= 0.4.1)
168168
representable (>= 2.4.0, < 3.1.0)
@@ -239,7 +239,7 @@ GEM
239239
addressable (>= 2.3.6)
240240
crack (>= 0.3.2)
241241
hashdiff
242-
webpacker (3.5.5)
242+
webpacker (4.0.7)
243243
activesupport (>= 4.2)
244244
rack-proxy (>= 0.6.1)
245245
railties (>= 4.2)
@@ -270,7 +270,7 @@ DEPENDENCIES
270270
trailblazer-rails
271271
webdrivers (~> 4.1)
272272
webmock
273-
webpacker (~> 3.5)
273+
webpacker (~> 4.0)
274274

275275
BUNDLED WITH
276276
1.17.3

builder/.babelrc

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"presets": [
3-
["env", {
4-
"modules": false,
5-
"forceAllTransforms": true,
6-
"targets": {
7-
"browsers": "> 1%",
8-
"uglify": true
9-
},
10-
"useBuiltIns": true
11-
}]
3+
[
4+
"@babel/preset-env",
5+
{
6+
"modules": "false",
7+
"targets": "> 1%, not dead",
8+
"useBuiltIns": "entry",
9+
"corejs": {
10+
"version": 3
11+
},
12+
"debug": true
13+
}
14+
]
1215
],
13-
1416
"plugins": [
15-
"syntax-dynamic-import",
16-
"transform-object-rest-spread",
17-
["transform-class-properties", { "spec": true }]
17+
"@babel/syntax-dynamic-import",
18+
["@babel/plugin-proposal-class-properties", { "loose": true }]
1819
]
1920
}

builder/app/javascript/packs/application.js

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,13 @@
77
// To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate
88
// layout file, like app/views/layouts/application.html.erb
99

10-
import Vue from 'vue/dist/vue.esm'
11-
import Vuex from 'vuex'
12-
import axios from 'axios'
13-
import matestackEventHub from 'js/event-hub'
14-
import componentMixin from 'component/component'
10+
import 'core-js';
11+
import Vue from "vue/dist/vue.esm";
12+
import Vuex from "vuex";
13+
import axios from "axios";
14+
import matestackEventHub from "js/event-hub";
15+
import componentMixin from "component/component";
1516

16-
import matestackUiCore from 'js/core'
17+
import matestackUiCore from "js/core";
1718

18-
export {
19-
Vue,
20-
Vuex,
21-
axios,
22-
matestackEventHub,
23-
componentMixin
24-
}
19+
export { Vue, Vuex, axios, matestackEventHub, componentMixin };

builder/package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
"name": "builder",
33
"private": true,
44
"dependencies": {
5-
"@rails/webpacker": "3.5"
5+
"@rails/webpacker": "4.0.7",
6+
"core-js": "3"
67
},
78
"devDependencies": {
8-
"babel-preset-es2015": "^6.24.1",
9+
"@babel/cli": "^7.6.4",
10+
"@babel/core": "^7.6.4",
11+
"@babel/plugin-proposal-class-properties": "^7.5.5",
12+
"@babel/preset-env": "^7.6.3",
913
"webpack-dev-server": "3.1.11",
1014
"webpack-merge": "4.1.4"
1115
}

0 commit comments

Comments
 (0)