Compatibility fixes for Babel 7 #211

NilSet · 2018-03-14T02:10:04Z

Fixed an issue where modules were interpreted as commonjs even when es6
Removed direct imports of babel-types and babel-template

Fixes #209 maybe

Fixes speedskater#184

ilias-t · 2018-03-14T17:30:35Z

src/RewireState.js

 import { wasProcessed, noRewire } from './RewireHelpers.js';
-import * as t from 'babel-types';
+var t;
+var universalAccesorsTemplate;


Why not use scope these variables to the RewireState class with this.<variable>, similar to this.isES6Module and the others? Also we should probably prefer const or let to var.

I ran into issues with this.t, because of a few places it is referenced from unbound functions. Also it was a larger change. This way we just inject the lib at the top level when we get it from babel invoking us.

ilias-t · 2018-03-14T17:31:54Z

src/RewireState.js

@@ -126,6 +134,8 @@ export default class RewireState {
 			UNIVERSAL_RESETTER_ID :this.getUniversalResetterID(),
 			UNIVERSAL_WITH_ID :this.getUniversalWithID(),
 			API_OBJECT_ID: this.getAPIObjectID(),
+			INTENTIONAL_UNDEFINED: t.identifier('INTENTIONAL_UNDEFINED'),
+			__INTENTIONAL_UNDEFINED__: '__INTENTIONAL_UNDEFINED__',


What is this one used for?

babel 7's template is more picky about strings that look like placeholders but are not filled in. This was the simplest way to fix it without changing the generated code.

ilias-t · 2018-03-14T17:32:27Z

src/Templates.js

+	if (REWIRED_DATA_IDENTIFIER === undefined || REWIRED_DATA_IDENTIFIER[variableName] === undefined) {
+		return ORIGINAL_VARIABLE_ACCESSOR_IDENTIFIER(variableName);
+	} else {
+		var value = REWIRED_DATA_IDENTIFIER[variableName];


I just fixed the tabs to be consistent.

All of these vars and so on are from original code, so should probably not be changed in this PR.

NilSet · 2018-03-14T18:54:46Z

@speedskater I just noticed the version-1.1.0 branch. Should I have based this off of that branch?

Fixed an issue where modules were interpreted as commonjs even when es6 Removed direct imports of babel-types and babel-template

damassi · 2018-03-14T21:54:10Z

Can confirm this PR works in our new Babel 7 codebase

speedskater · 2018-03-14T21:55:14Z

@NilSet, @ilias-t, @damassi thank you all for your work on this pull request. I am currently not in the office but I will review it tomorrow in the evening. Regarding the branch, i think the current branch would indeed be version-1.1.0 branch. Neverthless I will try to merge the version 1.1.0 branch into master and than using this PR an if possible some other open PRs to create a 1.2.0 branch and based on this a 1.2.0-RC1.

Regarding the var/const/let issues I would propose to remain with the vars until we reach babel 7 support, and to tackle this in a separate branch/PR.

Is this procedure okay for you?

damassi · 2018-03-14T22:08:21Z

That would be fantastic, thanks @speedskater 👍

NilSet · 2018-03-14T23:16:43Z

I have a rebase onto 1.1.0 mostly done. I may switch to a less hacky solution for the template placeholder thing.

NilSet · 2018-03-14T23:53:39Z

I'll keep this pointed at master, but compare the branch with version-1.1.0 to see only my changes

speedskater · 2018-03-15T22:22:37Z

@NilSet thanks again for you PR. I have merged it into the 1.2.0 branch and puglished 1.2.0-rc.1 and on npm as a prerelease.
Could you all please test this release in your code bases. If I won't get any negativ feedback till next monday I will convert it to the final 1.2.0 and will then merge it onto master.
@damassi could you please test it in your babel 7 codebase ?

speedskater · 2018-03-15T22:25:15Z

@NilSet I also added you as a contributor to the README. I hope this is okay with you?

NilSet · 2018-03-15T22:49:29Z

1.2.0-rc.1 seems to be working great!

NilSet · 2018-03-26T00:10:04Z

@speedskater How has the feedback been? Do we look ok to merge version-1.2.0 into master and release it as latest?

augbog · 2018-05-17T20:27:04Z

Also curious about the progress of this? Would love to see this merged :)

villesau · 2018-06-20T06:00:20Z

Would love to see this merged!

adamnoakes · 2018-08-30T12:08:25Z

I've tried 1.2.0-rc.1 with the 7.0.0 babel release and am having an issue

export { _get__2 as __get__, _get__2 as __GetDependency__, _set__2 as __Rewire__, _set__2 as __set__, _reset__2 as __ResetDependency__, _RewireAPI__2 as __RewireAPI__ };
^^^^^^

SyntaxError: Unexpected token export

Has anyone else tried with 7.0.0?

ghost · 2018-08-30T21:46:20Z

@adamnoakes - I've tested with babel 7, seems to be working.

ilias-t · 2018-08-31T01:20:56Z

Commit history doesn't look clean, @NilSet are you pointing to the correct branch or maybe to rebase again?

adamnoakes · 2018-08-31T07:40:48Z

@miguel-orange i done some more investigation and it works ok for me when i use babel cli but when using babel register i get the issues, not sure if it's an issue with this, babel register or my setup. Are you using babel-register?

When i remove this plugin, everything compiles fine using babel-register.

kibertoad · 2018-09-11T11:06:05Z

@speedskater Does this still need anything to be done before it can be merged to master?

damassi · 2018-09-11T16:29:39Z

@speedskater has unfortunately gone missing :( That said, the rc candidate release works great.

speedskater · 2018-09-13T20:04:01Z

@kibertoad @damassi sorry for beeing not available for the project over the last month and neglecting the project. Unfortunately, I am currently changing jobs and finishing my PhD thesis at the same time. Therefore it won't get better soon. I hope I will be able to contribute some improvement in the future, but it will take some time.
In the meantime I will add a former coworker of mine as a contributer to the project, so he will be able to provide bugfixes.

Robert Binna and others added 6 commits November 21, 2016 13:21

issue speedskater#114 fix. added support for reset all.

87a321c

Avoid rewiring left of ForInStatement.

8484dd7

Fixes speedskater#184

Fix spacing in titles

23b6615

added sample test for issue 184 forIn Loop.

ae8551c

Modified issue184. Merged on version-1.1.0 branch.

eaac0b2

added contribution information for mike sherov

7805981

ilias-t reviewed Mar 14, 2018

View reviewed changes

Thomas Levy added 3 commits March 14, 2018 12:41

Compatibility fixes for Babel 7

35237cc

Fixed an issue where modules were interpreted as commonjs even when es6 Removed direct imports of babel-types and babel-template

babel 7 templte is pickier about unmatched placeholders

aa73334

add removed peer dependencies to dev dependencies

da552ff

damassi mentioned this pull request Mar 14, 2018

@damassi => Add TS support- Use babel to transpile artsy/metaphysics#974

Merged

Use a placeholder whitelist to fix ambiguous template

2455d34

NilSet force-pushed the babel7-compat branch from e6ac4ac to 2455d34 Compare March 14, 2018 23:48

speedskater merged commit 2455d34 into speedskater:master Sep 13, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Compatibility fixes for Babel 7 #211

Compatibility fixes for Babel 7 #211

NilSet commented Mar 14, 2018

ilias-t Mar 14, 2018

NilSet Mar 14, 2018

ilias-t Mar 14, 2018

NilSet Mar 14, 2018

ilias-t Mar 14, 2018

NilSet Mar 14, 2018

damassi Mar 14, 2018

NilSet commented Mar 14, 2018

damassi commented Mar 14, 2018

speedskater commented Mar 14, 2018

damassi commented Mar 14, 2018

NilSet commented Mar 14, 2018

NilSet commented Mar 14, 2018

speedskater commented Mar 15, 2018

speedskater commented Mar 15, 2018 •

edited

Loading

NilSet commented Mar 15, 2018

NilSet commented Mar 26, 2018

augbog commented May 17, 2018

villesau commented Jun 20, 2018

adamnoakes commented Aug 30, 2018 •

edited

Loading

ghost commented Aug 30, 2018

ilias-t commented Aug 31, 2018

adamnoakes commented Aug 31, 2018 •

edited

Loading

kibertoad commented Sep 11, 2018

damassi commented Sep 11, 2018 •

edited

Loading

speedskater commented Sep 13, 2018

Compatibility fixes for Babel 7 #211

Compatibility fixes for Babel 7 #211

Conversation

NilSet commented Mar 14, 2018

ilias-t Mar 14, 2018

Choose a reason for hiding this comment

NilSet Mar 14, 2018

Choose a reason for hiding this comment

ilias-t Mar 14, 2018

Choose a reason for hiding this comment

NilSet Mar 14, 2018

Choose a reason for hiding this comment

ilias-t Mar 14, 2018

Choose a reason for hiding this comment

NilSet Mar 14, 2018

Choose a reason for hiding this comment

damassi Mar 14, 2018

Choose a reason for hiding this comment

NilSet commented Mar 14, 2018

damassi commented Mar 14, 2018

speedskater commented Mar 14, 2018

damassi commented Mar 14, 2018

NilSet commented Mar 14, 2018

NilSet commented Mar 14, 2018

speedskater commented Mar 15, 2018

speedskater commented Mar 15, 2018 • edited Loading

NilSet commented Mar 15, 2018

NilSet commented Mar 26, 2018

augbog commented May 17, 2018

villesau commented Jun 20, 2018

adamnoakes commented Aug 30, 2018 • edited Loading

ghost commented Aug 30, 2018

ilias-t commented Aug 31, 2018

adamnoakes commented Aug 31, 2018 • edited Loading

kibertoad commented Sep 11, 2018

damassi commented Sep 11, 2018 • edited Loading

speedskater commented Sep 13, 2018

speedskater commented Mar 15, 2018 •

edited

Loading

adamnoakes commented Aug 30, 2018 •

edited

Loading

adamnoakes commented Aug 31, 2018 •

edited

Loading

damassi commented Sep 11, 2018 •

edited

Loading