feat: remove backwards compatibility support for "engine" (#721)

* feat: revert backwards compatibility support for "engine"
salesforce · Oct 11, 2018 · e312f54 · e312f54
1 parent 81e8c2b
commit e312f54
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 35 deletions.
diff --git a/packages/babel-plugin-transform-lwc-class/src/__tests__/component.spec.js b/packages/babel-plugin-transform-lwc-class/src/__tests__/component.spec.js
@@ -48,14 +48,15 @@ describe('Element import', () => {
         export default class Test extends Component {}
     `, {
         output: {
-            code: `import _tmpl from "./test.html";
-import { LightningElement as Component } from 'lwc';
-export default class Test extends Component {
-  render() {
-    return _tmpl;
-  }
+            code: `
+            import _tmpl from "./test.html";
+            import { LightningElement as Component } from 'lwc';
+            export default class Test extends Component {
+                render() {
+                    return _tmpl;
+                }
 
-}`
+            }`
         }
     });
 });
@@ -84,29 +85,43 @@ describe('render method', () => {
         export default class Test extends LightningElement {}
     `, {
         output: {
-            code: `import _tmpl from "./test.html";
-import { LightningElement } from "lwc";
-export default class Test extends LightningElement {
-  render() {
-    return _tmpl;
-  }
+            code: `
+            import _tmpl from "./test.html";
+            import { LightningElement } from "lwc";
+            export default class Test extends LightningElement {
+                render() {
+                    return _tmpl;
+                }
 
-}`
+            }`
         }
     });
 
+    describe('does not insert render method when extending from legacy "engine" Element', () => {
+        pluginTest('inject render method', `
+            import { Element } from "engine";
+            export default class Test extends Element {}
+        `, {
+            output: {
+                code: `
+                import { Element } from "engine";
+                export default class Test extends Element {}`
+            }
+        });
+
     pluginTest(`keep the render method if present`, `
         import { LightningElement } from "lwc";
         export default class Test extends LightningElement {
             render() {}
         }
     `, {
         output: {
-            code: `import { LightningElement } from "lwc";
-export default class Test extends LightningElement {
-  render() {}
+            code: `
+            import { LightningElement } from "lwc";
+            export default class Test extends LightningElement {
+                render() {}
 
-}`
+            }`
         }
     });
 
@@ -118,17 +133,18 @@ export default class Test extends LightningElement {
         export default class Test2 extends LightningElement {}
     `, {
         output: {
-            code: `import _tmpl from "./test.html";
-import { LightningElement } from 'lwc';
+            code: `
+            import _tmpl from "./test.html";
+            import { LightningElement } from 'lwc';
 
-class Test1 extends LightningElement {}
+            class Test1 extends LightningElement {}
 
-export default class Test2 extends LightningElement {
-  render() {
-    return _tmpl;
-  }
+            export default class Test2 extends LightningElement {
+                render() {
+                    return _tmpl;
+                }
 
-}`
+            }`
         }
     })
 });
@@ -459,5 +475,4 @@ describe('metadata', () => {
             }
         }
     );
-
 });
diff --git a/packages/babel-plugin-transform-lwc-class/src/component.js b/packages/babel-plugin-transform-lwc-class/src/component.js
@@ -11,7 +11,7 @@ module.exports = function ({ types: t }) {
 
             // Store on state local identifiers referencing engine base component
             state.componentBaseClassImports = engineImportSpecifiers.filter(({ name }) => (
-                name === LWC_PACKAGE_EXPORTS.BASE_COMPONENT || name === LWC_PACKAGE_EXPORTS.BASE_COMPONENT_LEGACY
+                name === LWC_PACKAGE_EXPORTS.BASE_COMPONENT
             )).map(({ path }) => (
                 path.get('local')
             ));

diff --git a/packages/babel-plugin-transform-lwc-class/src/constants.js b/packages/babel-plugin-transform-lwc-class/src/constants.js
@@ -48,10 +48,8 @@ const DISALLOWED_PROP_SET = new Set([
 ]);
 
 const LWC_PACKAGE_ALIAS = 'lwc';
-const LWC_PACKAGE_ALIAS_LEGACY = 'engine';
 
 const LWC_PACKAGE_EXPORTS = {
-    BASE_COMPONENT_LEGACY: 'Element',
     BASE_COMPONENT: 'LightningElement',
     API_DECORATOR: 'api',
     TRACK_DECORATOR: 'track',
@@ -86,7 +84,6 @@ module.exports = {
     GLOBAL_ATTRIBUTE_MAP,
     LWC_DECORATORS,
     LWC_PACKAGE_ALIAS,
-    LWC_PACKAGE_ALIAS_LEGACY,
     LWC_PACKAGE_EXPORTS,
 
     LWC_COMPONENT_PROPERTIES,

diff --git a/packages/babel-plugin-transform-lwc-class/src/utils.js b/packages/babel-plugin-transform-lwc-class/src/utils.js
@@ -1,4 +1,4 @@
-const { LWC_PACKAGE_ALIAS, LWC_PACKAGE_ALIAS_LEGACY, LWC_PACKAGE_EXPORTS } = require('./constants');
+const { LWC_PACKAGE_ALIAS, LWC_PACKAGE_EXPORTS } = require('./constants');
 
 function findClassMethod(path, name, properties = {}) {
     path.assertClassBody();
@@ -46,7 +46,7 @@ function getEngineImportsStatements(path) {
 
     return programPath.get('body').filter(node => {
         const source = node.get('source');
-        return node.isImportDeclaration() && (source.isStringLiteral({ value: LWC_PACKAGE_ALIAS }) || source.isStringLiteral({ value: LWC_PACKAGE_ALIAS_LEGACY }))
+        return node.isImportDeclaration() && (source.isStringLiteral({ value: LWC_PACKAGE_ALIAS }))
     });
 }
 

diff --git a/packages/lwc-engine/package.json b/packages/lwc-engine/package.json
@@ -23,7 +23,6 @@
   },
   "lwc": {
     "modules": {
-      "engine": "dist/modules/es2017/engine.js",
       "lwc": "dist/modules/es2017/engine.js"
     }
   },

diff --git a/packages/lwc-jest-resolver/src/index.js b/packages/lwc-jest-resolver/src/index.js
@@ -14,7 +14,7 @@ function getLwcPath(path) {
 
     if (lwcMap[path]) {
         // Handle magic LWC imports
-        if (path === 'lwc' || /* deprecated */ path === 'engine') {
+        if (path === 'lwc') {
             return require.resolve('lwc-engine');
         } else if (path === 'wire-service') {
             return require.resolve('lwc-wire-service');