build: drop dist6 related targets

BREAKING CHANGE: Support for Node.js version lower than 8.0 has been dropped. Please upgrade to the latest Node.js 8.x LTS version. Co-Authored-by: Taranveer Virk <[email protected]>
loopbackio · Feb 2, 2018 · 6955730 · 6955730
1 parent 05de86c
commit 6955730
Show file tree

Hide file tree

Showing 35 changed files with 84 additions and 128 deletions.
diff --git a/package.json b/package.json
@@ -35,9 +35,8 @@
     "clean": "lerna run clean --loglevel=silent --parallel",
     "clean:lerna": "lerna clean --yes --parallel --loglevel=silent",
     "build": "lerna run build --parallel --loglevel=silent",
-    "build:current": "lerna run build:current --parallel --loglevel=silent",
     "build:full": "npm run clean:lerna && npm run bootstrap && npm run build && npm run mocha && npm run lint",
-    "pretest": "npm run clean && npm run build:current",
+    "pretest": "npm run clean && npm run build",
     "test": "node packages/build/bin/run-nyc npm run mocha",
     "mocha": "node packages/build/bin/run-mocha \"packages/*/DIST/test/**/*.js\" \"packages/cli/test/*.js\"",
     "posttest": "npm run lint"

diff --git a/packages/authentication/index.js b/packages/authentication/index.js
@@ -3,5 +3,6 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-module.exports = nodeMajorVersion >= 7 ? require('./dist') : require('./dist6');
+module.exports = require('./dist');
diff --git a/packages/authentication/package.json b/packages/authentication/package.json
@@ -7,15 +7,12 @@
   },
   "scripts": {
     "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
-    "build": "npm run build:dist && npm run build:dist6",
-    "build:current": "lb-tsc",
-    "build:dist": "lb-tsc es2017",
-    "build:dist6": "lb-tsc es2015",
+    "build": "lb-tsc es2017",
     "build:apidocs": "lb-apidocs",
-    "clean": "lb-clean loopback-authentication*.tgz dist dist6 package api-docs",
+    "clean": "lb-clean loopback-authentication*.tgz dist package api-docs",
     "integration": "lb-mocha \"DIST/test/integration/**/*.js\"",
     "prepublishOnly": "npm run build && npm run build:apidocs",
-    "pretest": "npm run build:current",
+    "pretest": "npm run build",
     "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
     "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-authentication*.tgz && tree package && npm run clean"
@@ -48,7 +45,6 @@
     "index.js",
     "index.d.ts",
     "dist/src",
-    "dist6/src",
     "api-docs",
     "src"
   ],

diff --git a/packages/cli/generators/app/templates/index.js b/packages/cli/generators/app/templates/index.js
@@ -3,8 +3,9 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-const dist = nodeMajorVersion >= 7 ? './dist' : './dist6';
+const dist = './dist';
 
 const application = (module.exports = require(dist));
 

diff --git a/...i/generators/project/templates/index.d.ts → ...generators/extension/templates/index.d.ts b/...i/generators/project/templates/index.d.ts → ...generators/extension/templates/index.d.ts
diff --git a/packages/cli/generators/extension/templates/index.js b/packages/cli/generators/extension/templates/index.js
@@ -3,6 +3,6 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-const dist = nodeMajorVersion >= 7 ? './dist' : './dist6';
-module.exports = require(dist);
+module.exports = require('./dist');
diff --git a/packages/cli/generators/project/templates/package.json b/packages/cli/generators/project/templates/package.json
@@ -11,8 +11,8 @@
     "node": ">=8"
   },
   "scripts": {
-    "build": "lb-tsc",
-    "build:watch": "lb-tsc --watch",
+    "build": "lb-tsc es2017",
+    "build:watch": "lb-tsc es2017 --watch",
     "clean": "lb-clean",
 <% if (project.prettier && project.tslint) { -%>
     "lint": "npm run prettier:check && npm run tslint",
@@ -54,8 +54,7 @@
     "README.md",
     "index.js",
     "index.d.ts",
-    "dist",
-    "dist6"
+    "dist"
   ],
   "dependencies": {
     "@loopback/context": ">=4.0.0-alpha.18",

diff --git a/packages/context/index.js b/packages/context/index.js
@@ -3,5 +3,6 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-module.exports = nodeMajorVersion >= 7 ? require('./dist') : require('./dist6');
+module.exports = require('./dist');
diff --git a/packages/context/package.json b/packages/context/package.json
@@ -7,14 +7,11 @@
   },
   "scripts": {
     "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
-    "build": "npm run build:dist && npm run build:dist6",
-    "build:current": "lb-tsc",
-    "build:dist": "lb-tsc es2017",
-    "build:dist6": "lb-tsc es2015",
+    "build": "lb-tsc es2017",
     "build:apidocs": "lb-apidocs",
-    "clean": "lb-clean loopback-context*.tgz dist dist6 package api-docs",
+    "clean": "lb-clean loopback-context*.tgz dist package api-docs",
     "prepublishOnly": "npm run build && npm run build:apidocs",
-    "pretest": "npm run build:current",
+    "pretest": "npm run build",
     "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
     "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-context*.tgz && tree package && npm run clean"
@@ -47,7 +44,6 @@
     "index.js",
     "index.d.ts",
     "dist/src",
-    "dist6/src",
     "api-docs",
     "src"
   ],

diff --git a/packages/core/index.js b/packages/core/index.js
@@ -3,5 +3,6 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-module.exports = nodeMajorVersion >= 7 ? require('./dist') : require('./dist6');
+module.exports = require('./dist');
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -7,14 +7,11 @@
   },
   "scripts": {
     "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
-    "build": "npm run build:dist && npm run build:dist6",
-    "build:current": "lb-tsc",
-    "build:dist": "lb-tsc es2017",
-    "build:dist6": "lb-tsc es2015",
+    "build": "lb-tsc es2017",
     "build:apidocs": "lb-apidocs",
-    "clean": "lb-clean loopback-core*.tgz dist dist6 package api-docs",
+    "clean": "lb-clean loopback-core*.tgz dist package api-docs",
     "prepublishOnly": "npm run build && npm run build:apidocs",
-    "pretest": "npm run build:current",
+    "pretest": "npm run build",
     "integration": "lb-mocha \"DIST/test/integration/**/*.js\"",
     "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
     "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
@@ -36,8 +33,10 @@
     "README.md",
     "index.js",
     "index.d.ts",
+    "dist/index.js",
     "dist/src",
-    "dist6/src",
+    "dist/index.d.ts",
+    "dist/index.js.map",
     "api-docs",
     "src"
   ],

diff --git a/packages/example-getting-started/index.js b/packages/example-getting-started/index.js
@@ -3,10 +3,10 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-const dist = nodeMajorVersion >= 7 ? './dist' : './dist6';
 
-const application = (module.exports = require(dist));
+const application = (module.exports = require('./dist'));
 
 if (require.main === module) {
   // Run the application

diff --git a/packages/example-getting-started/package.json b/packages/example-getting-started/package.json
@@ -9,14 +9,11 @@
   },
   "scripts": {
     "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
-    "build": "npm run build:dist && npm run build:dist6",
-    "build:current": "lb-tsc",
-    "build:dist": "lb-tsc es2017",
-    "build:dist6": "lb-tsc es2015",
+    "build": "lb-tsc es2017",
     "build:apidocs": "lb-apidocs",
-    "clean": "lb-clean *example-getting-started*.tgz dist dist6 package api-docs",
+    "clean": "lb-clean *example-getting-started*.tgz dist package api-docs",
     "prepublishOnly": "npm run build && npm run build:apidocs",
-    "pretest": "npm run build:current",
+    "pretest": "npm run build",
     "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
     "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-getting-started*.tgz && tree package && npm run clean",

diff --git a/packages/example-hello-world/index.js b/packages/example-hello-world/index.js
@@ -3,10 +3,10 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-const dist = nodeMajorVersion >= 7 ? './dist' : './dist6';
 
-const application = (module.exports = require(dist));
+const application = (module.exports = require('./dist'));
 
 if (require.main === module) {
   // Run the application

diff --git a/packages/example-hello-world/package.json b/packages/example-hello-world/package.json
@@ -9,12 +9,9 @@
   },
   "scripts": {
     "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
-    "build": "npm run build:dist && npm run build:dist6",
-    "build:current": "lb-tsc",
-    "build:dist": "lb-tsc es2017",
-    "build:dist6": "lb-tsc es2015",
+    "build": "lb-tsc es2017",
     "build:apidocs": "lb-apidocs",
-    "clean": "lb-clean *example-hello-world*.tgz dist dist6 package api-docs",
+    "clean": "lb-clean *example-hello-world*.tgz dist package api-docs",
     "prepublishOnly": "npm run build && npm run build:apidocs",
     "verify": "npm pack && tar xf *example-hello-world*.tgz && tree package && npm run clean",
     "start": "npm run build && node ."

diff --git a/packages/example-log-extension/index.js b/packages/example-log-extension/index.js
@@ -3,6 +3,6 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-const dist = nodeMajorVersion >= 7 ? './dist' : './dist6';
-module.exports = require(dist);
+module.exports = require('./dist');
diff --git a/packages/example-log-extension/package.json b/packages/example-log-extension/package.json
@@ -8,13 +8,10 @@
     "node": ">=8"
   },
   "scripts": {
-    "build": "npm run build:dist && npm run build:dist6",
-    "build:current": "lb-tsc",
-    "build:dist": "lb-tsc es2017",
-    "build:dist6": "lb-tsc es2015",
+    "build": "lb-tsc es2017",
     "build:apidocs": "lb-apidocs",
-    "build:watch": "lb-tsc --watch",
-    "clean": "lb-clean *example-log-extension-*.tgz dist dist6 package api-docs",
+    "build:watch": "lb-tsc es2017 --watch",
+    "clean": "lb-clean *example-log-extension-*.tgz dist package api-docs",
     "lint": "npm run prettier:check && npm run tslint",
     "lint:fix": "npm run prettier:fix && npm run tslint",
     "prettier:cli": "lb-prettier \"**/*.ts\" \"**/*.js\"",
@@ -23,7 +20,7 @@
     "tslint": "lb-tslint",
     "tslint:fix": "npm run tslint -- --fix",
     "prepublishOnly": "npm run build",
-    "pretest": "npm run clean && npm run build:current",
+    "pretest": "npm run clean && npm run build",
     "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
     "posttest": "npm run lint",
     "verify": "npm pack && tar xf *example-log-extension*.tgz && tree package && npm run clean"

diff --git a/packages/example-rpc-server/index.js b/packages/example-rpc-server/index.js
@@ -3,10 +3,10 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-const dist = nodeMajorVersion >= 7 ? './dist' : './dist6';
 
-const application = (module.exports = require(dist));
+const application = (module.exports = require('./dist'));
 
 if (require.main === module) {
   // Run the application

diff --git a/packages/example-rpc-server/package.json b/packages/example-rpc-server/package.json
@@ -11,11 +11,8 @@
     "node": ">=8"
   },
   "scripts": {
-    "build": "npm run build:dist && npm run build:dist6",
-    "build:current": "lb-tsc",
-    "build:dist": "lb-tsc es2017",
-    "build:dist6": "lb-tsc es2015",
-    "build:watch": "lb-tsc --watch",
+    "build": "lb-tsc es2017",
+    "build:watch": "lb-tsc es2017 --watch",
     "clean": "lb-clean",
     "lint": "npm run prettier:check && npm run tslint",
     "lint:fix": "npm run prettier:fix && npm run tslint:fix",
@@ -24,7 +21,7 @@
     "prettier:fix": "npm run prettier:cli -- --write",
     "tslint": "lb-tslint",
     "tslint:fix": "npm run tslint -- --fix",
-    "pretest": "npm run clean && npm run build:current",
+    "pretest": "npm run clean && npm run build",
     "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts DIST/test",
     "posttest": "npm run lint",
     "start": "npm run build && node .",
@@ -40,8 +37,7 @@
     "README.md",
     "index.js",
     "index.d.ts",
-    "dist",
-    "dist6"
+    "dist"
   ],
   "dependencies": {
     "@loopback/context": "^4.0.0-alpha.29",

diff --git a/packages/metadata/index.js b/packages/metadata/index.js
@@ -3,5 +3,6 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-module.exports = nodeMajorVersion >= 7 ? require('./dist') : require('./dist6');
+module.exports = require('./dist');
diff --git a/packages/metadata/package.json b/packages/metadata/package.json
@@ -7,14 +7,11 @@
   },
   "scripts": {
     "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
-    "build": "npm run build:dist && npm run build:dist6",
-    "build:current": "lb-tsc",
-    "build:dist": "lb-tsc es2017",
-    "build:dist6": "lb-tsc es2015",
+    "build": "lb-tsc es2017",
     "build:apidocs": "lb-apidocs",
-    "clean": "lb-clean loopback-metadata*.tgz dist dist6 package api-docs",
+    "clean": "lb-clean loopback-metadata*.tgz dist package api-docs",
     "prepublishOnly": "npm run build && npm run build:apidocs",
-    "pretest": "npm run build:current",
+    "pretest": "npm run build",
     "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
     "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-metadata*.tgz && tree package && npm run clean"
@@ -43,7 +40,6 @@
     "index.js",
     "index.d.ts",
     "dist/src",
-    "dist6/src",
     "api-docs",
     "src"
   ],

diff --git a/packages/openapi-spec-builder/index.js b/packages/openapi-spec-builder/index.js
@@ -3,5 +3,6 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-module.exports = nodeMajorVersion >= 7 ? require('./dist') : require('./dist6');
+module.exports = require('./dist');
diff --git a/packages/openapi-spec-builder/package.json b/packages/openapi-spec-builder/package.json
@@ -6,12 +6,9 @@
     "node": ">=8"
   },
   "scripts": {
-    "build": "npm run build:dist && npm run build:dist6",
-    "build:current": "lb-tsc",
-    "build:dist": "lb-tsc es2017",
-    "build:dist6": "lb-tsc es2015",
+    "build": "lb-tsc es2017",
     "build:apidocs": "lb-apidocs",
-    "clean": "lb-clean loopback-openapi-spec*.tgz dist dist6 package api-docs",
+    "clean": "lb-clean loopback-openapi-spec*.tgz dist package api-docs",
     "prepublishOnly": "npm run build && npm run build:apidocs",
     "verify": "npm pack && tar xf loopback-openapi-spec*.tgz && tree package && npm run clean"
   },
@@ -36,7 +33,6 @@
     "index.js",
     "index.d.ts",
     "dist/src",
-    "dist6/src",
     "api-docs",
     "src"
   ],

diff --git a/packages/openapi-spec/index.js b/packages/openapi-spec/index.js
@@ -3,5 +3,6 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+/* eslint-disable no-unused-vars*/
 const nodeMajorVersion = +process.versions.node.split('.')[0];
-module.exports = nodeMajorVersion >= 7 ? require('./dist') : require('./dist6');
+module.exports = require('./dist');
diff --git a/packages/openapi-spec/package.json b/packages/openapi-spec/package.json
@@ -9,12 +9,9 @@
     "@loopback/build": "^4.0.0-alpha.12"
   },
   "scripts": {
-    "build": "npm run build:dist && npm run build:dist6",
-    "build:current": "lb-tsc",
-    "build:dist": "lb-tsc es2017",
-    "build:dist6": "lb-tsc es2015",
+    "build": "lb-tsc es2017",
     "build:apidocs": "lb-apidocs",
-    "clean": "lb-clean loopback-openapi-spec*.tgz dist dist6 package api-docs",
+    "clean": "lb-clean loopback-openapi-spec*.tgz dist package api-docs",
     "prepublishOnly": "npm run build && npm run build:apidocs",
     "verify": "npm pack && tar xf loopback-openapi-spec*.tgz && tree package && npm run clean"
   },
@@ -32,7 +29,6 @@
     "index.js",
     "index.d.ts",
     "dist/src",
-    "dist6/src",
     "api-docs",
     "src"
   ],