chore: switch to single distribution for es2017

loopbackio · Sep 28, 2018 · 63a0cca · 63a0cca
1 parent 729be0a
commit 63a0cca
Show file tree

Hide file tree

Showing 60 changed files with 111 additions and 181 deletions.
diff --git a/benchmark/package.json b/benchmark/package.json
@@ -8,15 +8,12 @@
     "performance",
     "benchmark"
   ],
-  "types": "./dist10/index.d.ts",
+  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=8.9"
   },
   "scripts": {
-    "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build": "lb-tsc",
-    "build:dist8": "lb-tsc es2017",
-    "build:dist10": "lb-tsc es2018",
     "clean": "lb-clean dist*",
     "pretest": "npm run clean && npm run build",
     "test": "lb-mocha \"DIST/__tests__\"",

diff --git a/benchmark/tsconfig.build.json b/benchmark/tsconfig.build.json
@@ -4,8 +4,8 @@
   "compilerOptions": {
     "rootDir": "src",
     "composite": true,
-    "target": "es2018",
-    "outDir": "dist10"
+    "target": "es2017",
+    "outDir": "dist"
   },
   "references": [
     {

diff --git a/examples/hello-world/package.json b/examples/hello-world/package.json
@@ -6,14 +6,11 @@
   "engines": {
     "node": ">=8.9"
   },
-  "types": "./dist10/index.d.ts",
+  "types": "./dist/index.d.ts",
   "scripts": {
     "acceptance": "lb-mocha \"DIST/__tests__/acceptance/**/*.js\"",
-    "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc",
-    "build:dist8": "lb-tsc es2017",
-    "build:dist10": "lb-tsc es2018",
     "build:watch": "lb-tsc --watch",
     "clean": "lb-clean *example-hello-world*.tgz dist* package api-docs",
     "verify": "npm pack && tar xf *example-hello-world*.tgz && tree package && npm run clean",

diff --git a/examples/hello-world/tsconfig.build.json b/examples/hello-world/tsconfig.build.json
@@ -4,8 +4,8 @@
   "compilerOptions": {
     "rootDir": "src",
     "composite": true,
-    "target": "es2018",
-    "outDir": "dist10"
+    "target": "es2017",
+    "outDir": "dist"
   },
   "references": [
     {

diff --git a/examples/log-extension/package.json b/examples/log-extension/package.json
@@ -6,13 +6,10 @@
   "engines": {
     "node": ">=8.9"
   },
-  "types": "./dist10/index.d.ts",
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc",
-    "build:dist8": "lb-tsc es2017",
-    "build:dist10": "lb-tsc es2018",
     "build:watch": "lb-tsc --watch",
     "clean": "lb-clean *example-log-extension-*.tgz dist* package api-docs",
     "lint": "npm run prettier:check && npm run tslint",

diff --git a/examples/log-extension/tsconfig.build.json b/examples/log-extension/tsconfig.build.json
@@ -4,8 +4,8 @@
   "compilerOptions": {
     "rootDir": "src",
     "composite": true,
-    "target": "es2018",
-    "outDir": "dist10"
+    "target": "es2017",
+    "outDir": "dist"
   },
   "references": [
     {

diff --git a/examples/rpc-server/package.json b/examples/rpc-server/package.json
@@ -9,13 +9,10 @@
   "engines": {
     "node": ">=8.9"
   },
-  "types": "./dist10/index.d.ts",
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc",
-    "build:dist8": "lb-tsc es2017",
-    "build:dist10": "lb-tsc es2018",
     "build:watch": "lb-tsc --watch",
     "clean": "lb-clean dist*",
     "lint": "npm run prettier:check && npm run tslint",

diff --git a/examples/soap-calculator/package.json b/examples/soap-calculator/package.json
@@ -13,13 +13,10 @@
   "engines": {
     "node": ">=8.9"
   },
-  "types": "./dist10/index.d.ts",
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc",
-    "build:dist8": "lb-tsc es2017",
-    "build:dist10": "lb-tsc es2018",
     "build:watch": "lb-tsc --watch",
     "clean": "lb-clean *example-soap*.tgz dist* package api-docs dist*",
     "lint": "npm run prettier:check && npm run tslint",

diff --git a/examples/soap-calculator/tsconfig.build.json b/examples/soap-calculator/tsconfig.build.json
@@ -4,8 +4,8 @@
   "compilerOptions": {
     "rootDir": "src",
     "composite": true,
-    "target": "es2018",
-    "outDir": "dist10"
+    "target": "es2017",
+    "outDir": "dist"
   },
   "references": [
     {

diff --git a/examples/todo-list/package.json b/examples/todo-list/package.json
@@ -6,13 +6,10 @@
   "engines": {
     "node": ">=8.9"
   },
-  "types": "./dist10/index.d.ts",
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc",
-    "build:dist8": "lb-tsc es2017",
-    "build:dist10": "lb-tsc es2018",
     "build:watch": "lb-tsc --watch",
     "clean": "lb-clean *example-todo-list*.tgz dist* package api-docs",
     "lint": "npm run prettier:check && npm run tslint",

diff --git a/examples/todo-list/tsconfig.build.json b/examples/todo-list/tsconfig.build.json
@@ -4,8 +4,8 @@
   "compilerOptions": {
     "rootDir": "src",
     "composite": true,
-    "target": "es2018",
-    "outDir": "dist10"
+    "target": "es2017",
+    "outDir": "dist"
   },
   "references": [
     {

diff --git a/examples/todo/package.json b/examples/todo/package.json
@@ -6,13 +6,10 @@
   "engines": {
     "node": ">=8.9"
   },
-  "types": "./dist10/index.d.ts",
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc",
-    "build:dist8": "lb-tsc es2017",
-    "build:dist10": "lb-tsc es2018",
     "build:watch": "lb-tsc --watch",
     "clean": "lb-clean *example-todo*.tgz dist* package api-docs",
     "lint": "npm run prettier:check && npm run tslint",

diff --git a/examples/todo/tsconfig.build.json b/examples/todo/tsconfig.build.json
@@ -4,8 +4,8 @@
   "compilerOptions": {
     "rootDir": "src",
     "composite": true,
-    "target": "es2018",
-    "outDir": "dist10"
+    "target": "es2017",
+    "outDir": "dist"
   },
   "references": [
     {

diff --git a/package.json b/package.json
@@ -40,8 +40,7 @@
     "clean": "lerna run clean && node packages/build/bin/run-clean \"packages/*/dist*\" \"examples/*/dist*\"",
     "clean:lerna": "lerna clean",
     "build": "node bin/run-lerna run build",
-    "build:all-dist": "node bin/run-lerna run build:all-dist",
-    "build:full": "npm run clean:lerna && npm install && npm run build:all-dist",
+    "build:full": "npm run clean:lerna && npm install && npm run build",
     "pretest": "npm run clean && npm run build",
     "test": "node packages/build/bin/run-nyc npm run mocha --scripts-prepend-node-path",
     "pretest:ci": "npm run build",

diff --git a/packages/authentication/package.json b/packages/authentication/package.json
@@ -5,14 +5,11 @@
   "engines": {
     "node": ">=8.9"
   },
-  "types": "./dist10/index.d.ts",
+  "types": "./dist/index.d.ts",
   "scripts": {
     "acceptance": "lb-mocha \"DIST/__tests__/acceptance/**/*.js\"",
-    "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc",
-    "build:dist8": "lb-tsc es2017",
-    "build:dist10": "lb-tsc es2018",
     "clean": "lb-clean loopback-authentication*.tgz dist* package api-docs",
     "integration": "lb-mocha \"DIST/__tests__/integration/**/*.js\"",
     "pretest": "npm run build",

diff --git a/packages/authentication/tsconfig.build.json b/packages/authentication/tsconfig.build.json
@@ -4,8 +4,8 @@
   "compilerOptions": {
     "rootDir": "src",
     "composite": true,
-    "target": "es2018",
-    "outDir": "dist10"
+    "target": "es2017",
+    "outDir": "dist"
   },
   "references": [
     {

diff --git a/packages/boot/package.json b/packages/boot/package.json
@@ -5,17 +5,14 @@
   "engines": {
     "node": ">=8.9"
   },
-  "types": "./dist10/index.d.ts",
+  "types": "./dist/index.d.ts",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
     "acceptance": "lb-mocha \"DIST/__tests__/acceptance/**/*.js\"",
-    "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc",
-    "build:dist8": "lb-tsc es2017",
-    "build:dist10": "lb-tsc es2018",
     "clean": "lb-clean loopback-boot*.tgz dist* package api-docs",
     "pretest": "npm run build",
     "integration": "lb-mocha \"DIST/__tests__/integration/**/*.js\"",

diff --git a/packages/boot/tsconfig.build.json b/packages/boot/tsconfig.build.json
@@ -4,8 +4,8 @@
   "compilerOptions": {
     "rootDir": "src",
     "composite": true,
-    "target": "es2018",
-    "outDir": "dist10"
+    "target": "es2017",
+    "outDir": "dist"
   },
   "references": [
     {

diff --git a/packages/build/README.md b/packages/build/README.md
@@ -81,7 +81,7 @@ Now you run the scripts, such as:
     }
     ```
 
-  - Set options explicity for the script
+  - Set options explicitly for the script
 
     ```sh
     lb-tsc -p tsconfig.json --target es2017 --outDir dist

diff --git a/packages/build/bin/compile-package.js b/packages/build/bin/compile-package.js
@@ -10,7 +10,7 @@
 Usage:
   node ./bin/compile-package <target>
 
-Where <target> is one of es2015, es2017 or es2018.
+Where <target> is one of es2015, es2017 or es2017.
 
 ========
 */
@@ -108,12 +108,11 @@ function run(argv, options) {
         JSON.stringify(
           {
             extends: baseConfigFile,
-            exclude: [
-              'node_modules/**',
-              'packages/*/node_modules/**',
-              'examples/*/node_modules/**',
-              '**/*.d.ts',
-            ],
+            compilerOptions: {
+              target: 'es2017',
+              outDir: 'dist',
+            },
+            exclude: ['**/*.d.ts'],
           },
           null,
           '  ',

diff --git a/packages/build/bin/run-mocha.js b/packages/build/bin/run-mocha.js
@@ -17,7 +17,6 @@ Usage:
 
 function run(argv, options) {
   const utils = require('./utils');
-  const path = require('path');
 
   // Substitute the DIST variable with the dist folder
   const dist = utils.getDistribution();
@@ -43,7 +42,7 @@ function run(argv, options) {
     // Fail any tests that are printing to console.
     mochaOpts.unshift(
       '--require',
-      require.resolve('../src/fail-on-console-logs'),
+      require.resolve('../lib/fail-on-console-logs'),
     );
   } else {
     // Allow tests to print to console, remove --allow-console-logs argument

diff --git a/packages/build/bin/utils.js b/packages/build/bin/utils.js
@@ -17,7 +17,7 @@ const debug = require('debug')('loopback:build');
 function getCompilationTarget() {
   const nodeMajorVersion = +process.versions.node.split('.')[0];
   return nodeMajorVersion >= 10
-    ? 'es2018'
+    ? 'es2017'
     : nodeMajorVersion >= 7
       ? 'es2017'
       : 'es2015';
@@ -37,7 +37,7 @@ function getDistribution(target) {
       dist = 'dist10';
       break;
     case 'es2017':
-      dist = 'dist8';
+      dist = 'dist';
       break;
     case 'es2015':
       dist = 'dist6';

diff --git a/packages/build/config/tsconfig.build.json b/packages/build/config/tsconfig.build.json
@@ -1,11 +1,8 @@
 {
   "extends": "./tsconfig.common.json",
   "compilerOptions": {
-    "rootDir": "."
+    "rootDir": "src",
+    "outDir": "dist"
   },
-  "include": [
-    "src",
-    "test"
-  ],
   "exclude": ["node_modules/**", "**/*.d.ts"]
 }
diff --git a/packages/build/config/tsconfig.common.json b/packages/build/config/tsconfig.common.json
@@ -6,11 +6,12 @@
     "noImplicitAny": true,
     "strictNullChecks": true,
 
-    "lib": ["es2018", "dom", "esnext.asynciterable"],
+    "lib": ["es2017", "dom", "esnext.asynciterable"],
     "module": "commonjs",
     "moduleResolution": "node",
-    "target": "es2017",
     "sourceMap": true,
-    "declaration": true
+    "declaration": true,
+    "target": "es2017",
+    "composite": true
   }
 }
diff --git a/packages/build/src/fail-on-console-logs.js → packages/build/lib/fail-on-console-logs.js b/packages/build/src/fail-on-console-logs.js → packages/build/lib/fail-on-console-logs.js
diff --git a/packages/cli/generators/extension/templates/index.d.ts.ejs b/packages/cli/generators/extension/templates/index.d.ts.ejs
@@ -1 +1 @@
-export * from './dist8';
+export * from './dist';
diff --git a/packages/cli/generators/project/templates/package.json.ejs b/packages/cli/generators/project/templates/package.json.ejs
@@ -11,11 +11,8 @@
     "node": ">=8.9"
   },
   "scripts": {
-    "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc",
-    "build:dist8": "lb-tsc es2017",
-    "build:dist10": "lb-tsc es2018",
     "build:watch": "lb-tsc --watch",
     "clean": "lb-clean dist*",
 <% if (project.prettier && project.tslint) { -%>

diff --git a/packages/cli/generators/project/templates/package.plain.json.ejs b/packages/cli/generators/project/templates/package.plain.json.ejs
@@ -11,9 +11,8 @@
     "node": ">=8.9"
   },
   "scripts": {
-    "build": "tsc --outDir dist --target es2017",
-    "build:all-dist": "npm run build",
-    "build:watch": "tsc --outDir dist --target es2017 --watch",
+    "build": "tsc",
+    "build:watch": "tsc --watch",
     "clean": "rimraf dist",
 <% if (project.prettier && project.tslint) { -%>
     "lint": "npm run prettier:check && npm run tslint",

diff --git a/packages/cli/generators/project/templates/tsconfig.json.ejs b/packages/cli/generators/project/templates/tsconfig.json.ejs
@@ -4,7 +4,7 @@
   "extends": "./node_modules/@loopback/build/config/tsconfig.common.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "dist10"
+    "outDir": "dist"
   },
 <% } else { -%>
   "compilerOptions": {
@@ -13,14 +13,14 @@
     "noImplicitAny": true,
     "strictNullChecks": true,
 
-    "lib": ["es2018", "dom", "esnext.asynciterable"],
+    "lib": ["es2017", "dom", "esnext.asynciterable"],
     "module": "commonjs",
     "moduleResolution": "node",
     "target": "es2017",
     "sourceMap": true,
     "declaration": true,
     "rootDir": "src",
-    "outDir": "dist10"
+    "outDir": "dist"
   },
 <% } -%>
   "exclude": [