Skip to content

Revert "ES5 transpiling" #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gem "cells-haml"
group :development, :test do
gem 'rspec-rails', '~> 3.8'
gem 'capybara'
gem 'webpacker', '~> 4.0'
gem 'webpacker', '~> 3.5'
gem 'sqlite3', '~> 1.3.13'
gem 'selenium-webdriver'
gem 'poltergeist'
Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ GEM
concurrent-ruby (1.1.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.5)
crass (1.0.4)
declarative (0.0.10)
declarative-builder (0.1.0)
declarative-option (< 0.2.0)
Expand All @@ -97,7 +97,7 @@ GEM
representable (>= 2.4.0, <= 3.1.0)
uber (< 0.2.0)
docile (1.3.1)
erubi (1.9.0)
erubi (1.8.0)
ffi (1.9.25)
generator_spec (0.9.4)
activesupport (>= 3.0.0)
Expand All @@ -108,10 +108,10 @@ GEM
temple (>= 0.8.0)
tilt
hashdiff (0.3.8)
i18n (1.7.0)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
json (2.1.0)
loofah (2.3.1)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -122,9 +122,9 @@ GEM
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.13.0)
minitest (5.11.3)
nio4r (2.5.2)
nokogiri (1.10.5)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
pipetree (0.1.1)
poltergeist (1.18.1)
Expand Down Expand Up @@ -154,15 +154,15 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (13.0.0)
rake (12.3.3)
reform (2.2.4)
disposable (>= 0.4.1)
representable (>= 2.4.0, < 3.1.0)
Expand Down Expand Up @@ -239,7 +239,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
webpacker (4.0.7)
webpacker (3.5.5)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
Expand Down Expand Up @@ -270,7 +270,7 @@ DEPENDENCIES
trailblazer-rails
webdrivers (~> 4.1)
webmock
webpacker (~> 4.0)
webpacker (~> 3.5)

BUNDLED WITH
1.17.3
27 changes: 13 additions & 14 deletions builder/.babelrc
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
{
"presets": [
[
"@babel/preset-env",
{
"modules": "false",
"targets": "> 1%, not dead",
"useBuiltIns": "entry",
"corejs": {
"version": 3
},
"debug": true
}
]
["env", {
"modules": false,
"forceAllTransforms": true,
"targets": {
"browsers": "> 1%",
"uglify": true
},
"useBuiltIns": true
}]
],

"plugins": [
"@babel/syntax-dynamic-import",
["@babel/plugin-proposal-class-properties", { "loose": true }]
"syntax-dynamic-import",
"transform-object-rest-spread",
["transform-class-properties", { "spec": true }]
]
}
21 changes: 13 additions & 8 deletions builder/app/javascript/packs/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@
// To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate
// layout file, like app/views/layouts/application.html.erb

import 'core-js';
import Vue from "vue/dist/vue.esm";
import Vuex from "vuex";
import axios from "axios";
import matestackEventHub from "js/event-hub";
import componentMixin from "component/component";
import Vue from 'vue/dist/vue.esm'
import Vuex from 'vuex'
import axios from 'axios'
import matestackEventHub from 'js/event-hub'
import componentMixin from 'component/component'

import matestackUiCore from "js/core";
import matestackUiCore from 'js/core'

export { Vue, Vuex, axios, matestackEventHub, componentMixin };
export {
Vue,
Vuex,
axios,
matestackEventHub,
componentMixin
}
8 changes: 2 additions & 6 deletions builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@
"name": "builder",
"private": true,
"dependencies": {
"@rails/webpacker": "4.0.7",
"core-js": "3"
"@rails/webpacker": "3.5"
},
"devDependencies": {
"@babel/cli": "^7.6.4",
"@babel/core": "^7.6.4",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/preset-env": "^7.6.3",
"babel-preset-es2015": "^6.24.1",
"webpack-dev-server": "3.1.11",
"webpack-merge": "4.1.4"
}
Expand Down
Loading