Skip to content

Commit

Permalink
Merge pull request #86 from fink-lang/fix-imports
Browse files Browse the repository at this point in the history
fix(esm): use explicit imports
  • Loading branch information
kollhof authored Oct 6, 2020
2 parents d041858 + bc1b45b commit 6d97beb
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 13 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@babel/traverse": "^7.10.5",
"@babel/types": "^7.10.5",
"@fink/js-interop": "^2.0.0",
"@fink/std-lib": "^5.0.0",
"@fink/snippet": "^2.0.0"
"@fink/snippet": "^2.0.1",
"@fink/std-lib": "^5.0.0"
}
}
4 changes: 2 additions & 2 deletions src/lang/call/pipe.fnk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{callExpression} = import'@babel/types'
{is_empty} = import'@fink/std-lib/iter'
{callExpression} = import '@babel/types'
{is_empty} = import '@fink/std-lib/iter.fnk'

{assign, lets, expr_block, undef} = import '../../js/types.fnk'
{transform_value} = import '../partial/init.fnk'
Expand Down
2 changes: 1 addition & 1 deletion src/lang/iterable/filter.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ifStatement} = import'@babel/types'
{ifStatement} = import '@babel/types'

{generator, for_of, yields} = import '../../js/types.fnk'

Expand Down
2 changes: 1 addition & 1 deletion src/lang/iterable/find.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{returnStatement, ifStatement} = import'@babel/types'
{returnStatement, ifStatement} = import '@babel/types'

{func, for_of, undef} = import '../../js/types.fnk'

Expand Down
2 changes: 1 addition & 1 deletion src/lang/iterable/until.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{returnStatement, ifStatement} = import'@babel/types'
{returnStatement, ifStatement} = import '@babel/types'

{generator, for_of, yields, eq, true_} = import '../../js/types.fnk'

Expand Down
2 changes: 1 addition & 1 deletion src/lang/iterable/while.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{returnStatement, ifStatement} = import'@babel/types'
{returnStatement, ifStatement} = import '@babel/types'

{generator, for_of, yields, neq, true_} = import '../../js/types.fnk'

Expand Down
2 changes: 1 addition & 1 deletion src/lang/logical/in.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{identifier, optionalCallExpression, optionalMemberExpression, memberExpression, callExpression, logicalExpression} = import'@babel/types'
{identifier, optionalCallExpression, optionalMemberExpression, memberExpression, callExpression, logicalExpression} = import '@babel/types'


transform_in = fn node, ctx:
Expand Down
3 changes: 2 additions & 1 deletion src/testing/generate.fnk
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{parse} = import '@fink/larix'
{parse} = import '@fink/larix/parser.fnk'
{is_empty} = import '@fink/std-lib/iter.fnk'

{generate} = import '../generate.fnk'



fink2js = fn source, options:
filename = 'test.fnk'
ast = parse source, filename
Expand Down

0 comments on commit 6d97beb

Please sign in to comment.