Skip to content

Commit

Permalink
Finish upgrading to babel 7
Browse files Browse the repository at this point in the history
  • Loading branch information
Hopding committed Dec 18, 2018
1 parent 70049f8 commit 8d5b29b
Show file tree
Hide file tree
Showing 4 changed files with 230 additions and 606 deletions.
7 changes: 5 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"presets": ["env"],
"plugins": ["transform-decorators-legacy", "transform-class-properties", "transform-runtime"],
"presets": ["@babel/preset-env"],
"plugins": [
["@babel/plugin-proposal-decorators", { "legacy": true }],
["@babel/plugin-proposal-class-properties"]
],
"env": {
"cover": {
"plugins": ["istanbul"]
Expand Down
8 changes: 4 additions & 4 deletions Makefile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ config.fatal = true;
config.verbose = true;

target.all = () => {
// target.clean();
// target.generateTrieJson();
// target.moveTrieJsonToRoot();
target.clean();
target.generateTrieJson();
target.moveTrieJsonToRoot();
target.rollupCjs();
};

Expand All @@ -27,7 +27,7 @@ target.moveTrieJsonToRoot = () => {
};

target.rollupCjs = () => {
// target.moveTrieJsonToRoot();
target.moveTrieJsonToRoot();
exec('rollup -c rollup.config.js -o index.js');
};

Expand Down
12 changes: 3 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@
"author": "Devon Govett <[email protected]>",
"license": "MIT",
"dependencies": {
"babel-plugin-istanbul": "^4.1.3",
"babel-plugin-transform-class-properties": "^6.16.0",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-runtime": "^6.12.0",
"babel-preset-es2015": "^6.14.0",
"babel-register": "^6.14.0",
"babel-runtime": "^6.11.6",
"brfs": "^1.4.0",
"brotli": "^1.2.0",
"browserify-optional": "^1.0.0",
Expand All @@ -51,12 +44,13 @@
"unicode-trie": "^0.3.0"
},
"devDependencies": {
"@babel/cli": "^7.2.0",
"@babel/core": "^7.2.2",
"@babel/node": "^7.2.2",
"@babel/plugin-proposal-class-properties": "^7.2.1",
"@babel/plugin-proposal-decorators": "^7.2.2",
"@babel/preset-env": "^7.2.0",
"babel-cli": "^6.14.0",
"babel-preset-env": "^1.7.0",
"babel-plugin-istanbul": "^4.1.3",
"codepoints": "^1.2.0",
"concat-stream": "^1.4.6",
"cross-env": "^5.0.1",
Expand Down
Loading

0 comments on commit 8d5b29b

Please sign in to comment.