diff --git a/.gitignore b/.gitignore index 0fa74525b692..db351d2677dd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,9 @@ coverage .nyc_output api-docs **/*.tgz -packages/*/dist* -examples/*/dist* -benchmark/dist* +packages/*/dist +examples/*/dist +benchmark/dist **/package .sandbox packages/cli/generators/datasource/connectors.json diff --git a/.nycrc b/.nycrc index c71ed2b4306d..736832778af9 100644 --- a/.nycrc +++ b/.nycrc @@ -1,13 +1,13 @@ { "include": [ - "packages/*/dist*/", + "packages/*/dist", "packages/cli/", - "examples/*/dist*/" + "examples/*/dist" ], "exclude": [ - "packages/*/dist*/test/", + "packages/*/dist/test/", "packages/cli/test/", - "examples/*/dist*/test/", + "examples/*/dist/test/", "**/.sandbox/" ], "extension": [ diff --git a/.prettierignore b/.prettierignore index b2fefd015d02..e8c9b7b64619 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,9 +2,9 @@ **/*/api-docs packages/cli/generators/*/templates **/.sandbox -packages/*/dist* -examples/*/dist* -benchmark/dist* +packages/*/dist +examples/*/dist +benchmark/dist sandbox/**/* *.json CHANGELOG.md diff --git a/.vscode/launch.json b/.vscode/launch.json index d8d3e06f66a1..8f47306af72a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -13,7 +13,7 @@ "args": [ "--opts", "${workspaceRoot}/test/mocha.opts", - "packages/*/dist*/test/**/*.js", + "packages/*/dist/test/**/*.js", "-t", "0" ] diff --git a/.vscode/settings.json b/.vscode/settings.json index 650638a01a99..96fcbb8717c7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,10 +15,10 @@ "**/CVS": true, ".nyc_output": true, "coverage": true, - "benchmark/dist*": true, - "packages/*/dist*": true, + "benchmark/dist": true, + "packages/*/dist": true, "packages/*/api-docs": true, - "examples/*/dist*": true, + "examples/*/dist": true, "**/.sandbox": true }, "files.insertFinalNewline": true, diff --git a/benchmark/index.js b/benchmark/index.js index e2f365a109bf..546939e018ec 100644 --- a/benchmark/index.js +++ b/benchmark/index.js @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -const bench = require('@loopback/dist-util').loadDist(__dirname); +const bench = require('./dist'); module.exports = bench; diff --git a/benchmark/package.json b/benchmark/package.json index 90b3c285705e..1e71dcf9e8f4 100644 --- a/benchmark/package.json +++ b/benchmark/package.json @@ -13,13 +13,10 @@ "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*", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean dist", "pretest": "npm run clean && npm run build", - "test": "lb-mocha \"DIST/test\"", + "test": "lb-mocha \"dist/test\"", "prestart": "npm run build", "start": "node ." }, @@ -32,12 +29,11 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "dependencies": { - "@loopback/dist-util": "^0.3.7", "@loopback/example-todo": "^0.21.0", "@types/byline": "^4.2.31", "@types/debug": "0.0.30", diff --git a/examples/hello-world/.prettierignore b/examples/hello-world/.prettierignore index bc1199efffac..c6911da9e1e8 100644 --- a/examples/hello-world/.prettierignore +++ b/examples/hello-world/.prettierignore @@ -1,2 +1,2 @@ -dist* +dist *.json diff --git a/examples/hello-world/.vscode/settings.json b/examples/hello-world/.vscode/settings.json index 0e1c0089f810..1ab6ad13bde0 100644 --- a/examples/hello-world/.vscode/settings.json +++ b/examples/hello-world/.vscode/settings.json @@ -11,7 +11,7 @@ "**/.hg": true, "**/.svn": true, "**/CVS": true, - "dist*": true, + "dist": true, }, "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, diff --git a/examples/hello-world/index.d.ts b/examples/hello-world/index.d.ts index 7d292d920dc8..5b23fa367144 100644 --- a/examples/hello-world/index.d.ts +++ b/examples/hello-world/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/examples/hello-world/index.js b/examples/hello-world/index.js index 17ee4ce921b7..23bcda999e32 100644 --- a/examples/hello-world/index.js +++ b/examples/hello-world/index.js @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -const application = require('@loopback/dist-util').loadDist(__dirname); +const application = require('./dist'); module.exports = application; diff --git a/examples/hello-world/package.json b/examples/hello-world/package.json index d0dd7463a0ef..aca66fb66181 100644 --- a/examples/hello-world/package.json +++ b/examples/hello-world/package.json @@ -7,14 +7,11 @@ "node": ">=8.9" }, "scripts": { - "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"", - "build:all-dist": "npm run build:dist8 && npm run build:dist10", + "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"", "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", + "build": "lb-tsc es2017 --outDir dist", + "build:watch": "lb-tsc es2017 --outDir dist --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", "lint": "npm run prettier:check && npm run tslint", "lint:fix": "npm run tslint:fix && npm run prettier:fix", @@ -24,9 +21,9 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run clean && npm run build", - "test": "lb-mocha --allow-console-logs \"DIST/test\"", + "test": "lb-mocha --allow-console-logs \"dist/test\"", "posttest": "npm run lint", - "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest", + "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", "prestart": "npm run build", "start": "node ." }, @@ -40,7 +37,6 @@ "license": "MIT", "dependencies": { "@loopback/core": "^0.11.15", - "@loopback/dist-util": "^0.3.7", "@loopback/rest": "^0.25.3" }, "devDependencies": { diff --git a/examples/log-extension/.prettierignore b/examples/log-extension/.prettierignore index bc1199efffac..c6911da9e1e8 100644 --- a/examples/log-extension/.prettierignore +++ b/examples/log-extension/.prettierignore @@ -1,2 +1,2 @@ -dist* +dist *.json diff --git a/examples/log-extension/.vscode/settings.json b/examples/log-extension/.vscode/settings.json index 0e1c0089f810..1ab6ad13bde0 100644 --- a/examples/log-extension/.vscode/settings.json +++ b/examples/log-extension/.vscode/settings.json @@ -11,7 +11,7 @@ "**/.hg": true, "**/.svn": true, "**/CVS": true, - "dist*": true, + "dist": true, }, "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, diff --git a/examples/log-extension/index.d.ts b/examples/log-extension/index.d.ts index 29ee3a6b7263..e31447d2ed98 100644 --- a/examples/log-extension/index.d.ts +++ b/examples/log-extension/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/examples/log-extension/index.js b/examples/log-extension/index.js index 89a6686cf031..5a959bde84af 100644 --- a/examples/log-extension/index.js +++ b/examples/log-extension/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/examples/log-extension/package.json b/examples/log-extension/package.json index 586e948eccf3..dccdf5f94b16 100644 --- a/examples/log-extension/package.json +++ b/examples/log-extension/package.json @@ -7,13 +7,10 @@ "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 *example-log-extension-*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "build:watch": "lb-tsc es2017 --outDir dist --watch", + "clean": "lb-clean *example-log-extension-*.tgz dist package api-docs", "lint": "npm run prettier:check && npm run tslint", "lint:fix": "npm run tslint:fix && npm run prettier:fix", "prettier:cli": "lb-prettier \"**/*.ts\" \"**/*.js\"", @@ -22,9 +19,9 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run clean && npm run build", - "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"", + "test": "lb-mocha \"dist/test/unit/**/*.js\" \"dist/test/acceptance/**/*.js\"", "posttest": "npm run lint", - "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest", + "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", "verify": "npm pack && tar xf *example-log-extension*.tgz && tree package && npm run clean" }, "repository": { @@ -52,7 +49,6 @@ "dependencies": { "@loopback/context": "^0.13.0", "@loopback/core": "^0.11.15", - "@loopback/dist-util": "^0.3.7", "@loopback/openapi-v3": "^0.15.3", "@loopback/rest": "^0.25.3", "chalk": "^2.3.2", diff --git a/examples/rpc-server/.prettierignore b/examples/rpc-server/.prettierignore index bc1199efffac..c6911da9e1e8 100644 --- a/examples/rpc-server/.prettierignore +++ b/examples/rpc-server/.prettierignore @@ -1,2 +1,2 @@ -dist* +dist *.json diff --git a/examples/rpc-server/.vscode/settings.json b/examples/rpc-server/.vscode/settings.json index 0e1c0089f810..1ab6ad13bde0 100644 --- a/examples/rpc-server/.vscode/settings.json +++ b/examples/rpc-server/.vscode/settings.json @@ -11,7 +11,7 @@ "**/.hg": true, "**/.svn": true, "**/CVS": true, - "dist*": true, + "dist": true, }, "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, diff --git a/examples/rpc-server/index.d.ts b/examples/rpc-server/index.d.ts index 6668d63453bc..7186fd6eda1a 100644 --- a/examples/rpc-server/index.d.ts +++ b/examples/rpc-server/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/examples/rpc-server/index.js b/examples/rpc-server/index.js index f9d226a97c7a..b4ed4779f5dd 100644 --- a/examples/rpc-server/index.js +++ b/examples/rpc-server/index.js @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -const application = require('@loopback/dist-util').loadDist(__dirname); +const application = require('./dist'); module.exports = application; diff --git a/examples/rpc-server/package.json b/examples/rpc-server/package.json index 689b916c1c73..b638d62ededa 100644 --- a/examples/rpc-server/package.json +++ b/examples/rpc-server/package.json @@ -10,13 +10,10 @@ "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*", + "build": "lb-tsc es2017 --outDir dist", + "build:watch": "lb-tsc es2017 --outDir dist --watch", + "clean": "lb-clean dist", "lint": "npm run prettier:check && npm run tslint", "lint:fix": "npm run tslint:fix && npm run prettier:fix", "prettier:cli": "lb-prettier \"**/*.ts\"", @@ -25,9 +22,9 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run clean && npm run build", - "test": "lb-mocha DIST/test", + "test": "lb-mocha dist/test", "posttest": "npm run lint", - "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest", + "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", "prestart": "npm run build", "start": "node ." }, @@ -43,7 +40,6 @@ "dependencies": { "@loopback/context": "^0.13.0", "@loopback/core": "^0.11.15", - "@loopback/dist-util": "^0.3.7", "express": "^4.16.3", "p-event": "^2.1.0" }, diff --git a/examples/soap-calculator/.prettierignore b/examples/soap-calculator/.prettierignore index bc1199efffac..c6911da9e1e8 100644 --- a/examples/soap-calculator/.prettierignore +++ b/examples/soap-calculator/.prettierignore @@ -1,2 +1,2 @@ -dist* +dist *.json diff --git a/examples/soap-calculator/.vscode/settings.json b/examples/soap-calculator/.vscode/settings.json index 0e1c0089f810..1ab6ad13bde0 100644 --- a/examples/soap-calculator/.vscode/settings.json +++ b/examples/soap-calculator/.vscode/settings.json @@ -11,7 +11,7 @@ "**/.hg": true, "**/.svn": true, "**/CVS": true, - "dist*": true, + "dist": true, }, "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, diff --git a/examples/soap-calculator/index.d.ts b/examples/soap-calculator/index.d.ts index 8044e0512741..8a708ab9235e 100644 --- a/examples/soap-calculator/index.d.ts +++ b/examples/soap-calculator/index.d.ts @@ -2,4 +2,4 @@ // Node module: @loopback/example-soap-calculator // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/examples/soap-calculator/index.js b/examples/soap-calculator/index.js index 3cb10e1fdfc5..12484ccad1c7 100644 --- a/examples/soap-calculator/index.js +++ b/examples/soap-calculator/index.js @@ -1,4 +1,4 @@ -const application = require('@loopback/dist-util').loadDist(__dirname); +const application = require('./dist'); module.exports = application; diff --git a/examples/soap-calculator/package.json b/examples/soap-calculator/package.json index 346fd697cf38..8cd50c83b3a5 100644 --- a/examples/soap-calculator/package.json +++ b/examples/soap-calculator/package.json @@ -14,13 +14,10 @@ "node": ">=8" }, "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*", + "build": "lb-tsc es2017 --outDir dist", + "build:watch": "lb-tsc es2017 --outDir dist --watch", + "clean": "lb-clean *example-soap*.tgz dist package api-docs dist", "lint": "npm run prettier:check && npm run tslint", "lint:fix": "npm run tslint:fix && npm run prettier:fix", "prettier:cli": "lb-prettier \"**/*.ts\" \"**/*.js\"", @@ -29,9 +26,9 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run clean && npm run build", - "test": "lb-mocha \"DIST/test\"", + "test": "lb-mocha \"dist/test\"", "posttest": "npm run lint", - "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest", + "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", "prestart": "npm run build", "start": "node ." }, @@ -46,7 +43,6 @@ "@loopback/boot": "^0.14.4", "@loopback/context": "^0.13.0", "@loopback/core": "^0.11.15", - "@loopback/dist-util": "^0.3.7", "@loopback/openapi-v3": "^0.15.3", "@loopback/repository": "^0.20.0", "@loopback/rest": "^0.25.3", diff --git a/examples/todo-list/.prettierignore b/examples/todo-list/.prettierignore index bc1199efffac..c6911da9e1e8 100644 --- a/examples/todo-list/.prettierignore +++ b/examples/todo-list/.prettierignore @@ -1,2 +1,2 @@ -dist* +dist *.json diff --git a/examples/todo-list/.vscode/settings.json b/examples/todo-list/.vscode/settings.json index 0e1c0089f810..1ab6ad13bde0 100644 --- a/examples/todo-list/.vscode/settings.json +++ b/examples/todo-list/.vscode/settings.json @@ -11,7 +11,7 @@ "**/.hg": true, "**/.svn": true, "**/CVS": true, - "dist*": true, + "dist": true, }, "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, diff --git a/examples/todo-list/index.d.ts b/examples/todo-list/index.d.ts index 19e5f31aa77d..32b8c39950d7 100644 --- a/examples/todo-list/index.d.ts +++ b/examples/todo-list/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/examples/todo-list/index.js b/examples/todo-list/index.js index e7999bd9ac08..f60622546c19 100644 --- a/examples/todo-list/index.js +++ b/examples/todo-list/index.js @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -const application = require('@loopback/dist-util').loadDist(__dirname); +const application = require('./dist'); module.exports = application; diff --git a/examples/todo-list/package.json b/examples/todo-list/package.json index 496d8e79e142..3a571353a6e9 100644 --- a/examples/todo-list/package.json +++ b/examples/todo-list/package.json @@ -7,13 +7,10 @@ "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 *example-todo-list*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "build:watch": "lb-tsc es2017 --outDir dist --watch", + "clean": "lb-clean *example-todo-list*.tgz dist package api-docs", "lint": "npm run prettier:check && npm run tslint", "lint:fix": "npm run tslint:fix && npm run prettier:fix", "prettier:cli": "lb-prettier \"**/*.ts\"", @@ -22,8 +19,8 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/*/**/*.js\"", - "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest", + "test": "lb-mocha \"dist/test/*/**/*.js\"", + "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", "verify": "npm pack && tar xf loopback-todo-list*.tgz && tree package && npm run clean", "prestart": "npm run build", "start": "node ." @@ -40,7 +37,6 @@ "@loopback/boot": "^0.14.4", "@loopback/context": "^0.13.0", "@loopback/core": "^0.11.15", - "@loopback/dist-util": "^0.3.7", "@loopback/openapi-v3": "^0.15.3", "@loopback/openapi-v3-types": "^0.9.6", "@loopback/repository": "^0.20.0", diff --git a/examples/todo/.prettierignore b/examples/todo/.prettierignore index bc1199efffac..c6911da9e1e8 100644 --- a/examples/todo/.prettierignore +++ b/examples/todo/.prettierignore @@ -1,2 +1,2 @@ -dist* +dist *.json diff --git a/examples/todo/.vscode/settings.json b/examples/todo/.vscode/settings.json index 0e1c0089f810..1ab6ad13bde0 100644 --- a/examples/todo/.vscode/settings.json +++ b/examples/todo/.vscode/settings.json @@ -11,7 +11,7 @@ "**/.hg": true, "**/.svn": true, "**/CVS": true, - "dist*": true, + "dist": true, }, "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, diff --git a/examples/todo/index.d.ts b/examples/todo/index.d.ts index 08773ce1da9d..e6b3921eb310 100644 --- a/examples/todo/index.d.ts +++ b/examples/todo/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/examples/todo/index.js b/examples/todo/index.js index dead637ab665..08ea81118b44 100644 --- a/examples/todo/index.js +++ b/examples/todo/index.js @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -const application = require('@loopback/dist-util').loadDist(__dirname); +const application = require('./dist'); module.exports = application; diff --git a/examples/todo/package.json b/examples/todo/package.json index a02a1e42fb24..0d85ba3ef40f 100644 --- a/examples/todo/package.json +++ b/examples/todo/package.json @@ -7,13 +7,10 @@ "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 *example-todo*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "build:watch": "lb-tsc es2017 --outDir dist --watch", + "clean": "lb-clean *example-todo*.tgz dist package api-docs", "lint": "npm run prettier:check && npm run tslint", "lint:fix": "npm run tslint:fix && npm run prettier:fix", "prettier:cli": "lb-prettier \"**/*.ts\"", @@ -22,8 +19,8 @@ "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/*/**/*.js\"", - "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest", + "test": "lb-mocha \"dist/test/*/**/*.js\"", + "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", "verify": "npm pack && tar xf loopback-todo*.tgz && tree package && npm run clean", "prestart": "npm run build", "start": "node ." @@ -40,7 +37,6 @@ "@loopback/boot": "^0.14.4", "@loopback/context": "^0.13.0", "@loopback/core": "^0.11.15", - "@loopback/dist-util": "^0.3.7", "@loopback/openapi-v3": "^0.15.3", "@loopback/openapi-v3-types": "^0.9.6", "@loopback/repository": "^0.20.0", diff --git a/package.json b/package.json index 2220e468e849..6db1510746ed 100644 --- a/package.json +++ b/package.json @@ -37,18 +37,17 @@ "prettier:cli": "node packages/build/bin/run-prettier \"**/*.ts\" \"**/*.js\" \"**/*.md\"", "prettier:check": "npm run prettier:cli -- -l", "prettier:fix": "npm run prettier:cli -- --write", - "clean": "lerna run clean && node packages/build/bin/run-clean \"packages/*/dist*\" \"examples/*/dist*\"", + "clean": "lerna run clean && node packages/build/bin/run-clean \"packages/*/dist\" \"examples/*/dist\" \"benchmark/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", "test:ci": "node packages/build/bin/run-nyc npm run mocha --scripts-prepend-node-path", "verify:docs": "npm run build:site -- --verify", "build:site": "./bin/build-docs-site.sh", - "mocha": "node packages/build/bin/run-mocha \"packages/*/DIST/test/**/*.js\" \"examples/*/DIST/test/**/*.js\" \"packages/cli/test/**/*.js\" \"packages/build/test/*/*.js\"", + "mocha": "node packages/build/bin/run-mocha \"packages/*/dist/test/**/*.js\" \"examples/*/dist/test/**/*.js\" \"packages/cli/test/**/*.js\" \"packages/build/test/*/*.js\"", "posttest": "npm run lint" }, "config": { diff --git a/packages/authentication/index.d.ts b/packages/authentication/index.d.ts index 6c2f6b614d8f..daf48757e0b0 100644 --- a/packages/authentication/index.d.ts +++ b/packages/authentication/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/authentication/index.js b/packages/authentication/index.js index d933324be2b4..58a5b15c5d7c 100644 --- a/packages/authentication/index.js +++ b/packages/authentication/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/authentication/package.json b/packages/authentication/package.json index 72b68f277f3d..c59ed5f457a6 100644 --- a/packages/authentication/package.json +++ b/packages/authentication/package.json @@ -6,17 +6,14 @@ "node": ">=8.9" }, "scripts": { - "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"", - "build:all-dist": "npm run build:dist8 && npm run build:dist10", + "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"", "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/test/integration/**/*.js\"", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-authentication*.tgz dist package api-docs", + "integration": "lb-mocha \"dist/test/integration/**/*.js\"", "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\"", + "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" }, "author": "IBM", @@ -25,7 +22,6 @@ "dependencies": { "@loopback/context": "^0.13.0", "@loopback/core": "^0.11.15", - "@loopback/dist-util": "^0.3.7", "@loopback/metadata": "^0.9.13", "@loopback/openapi-v3": "^0.15.3", "@loopback/rest": "^0.25.3", @@ -49,8 +45,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "repository": { diff --git a/packages/boot/index.d.ts b/packages/boot/index.d.ts index 7a46948bd6e3..a298c01feb0e 100644 --- a/packages/boot/index.d.ts +++ b/packages/boot/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/boot/index.js b/packages/boot/index.js index 2e94c007780f..c43b6eb7fb20 100644 --- a/packages/boot/index.js +++ b/packages/boot/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/boot/package.json b/packages/boot/package.json index daf6b0236f82..b29c51f68ac7 100644 --- a/packages/boot/package.json +++ b/packages/boot/package.json @@ -9,17 +9,14 @@ "access": "public" }, "scripts": { - "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"", - "build:all-dist": "npm run build:dist8 && npm run build:dist10", + "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"", "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", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-boot*.tgz dist package api-docs", "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\"", + "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\"", "verify": "npm pack && tar xf loopback-boot*.tgz && tree package && npm run clean" }, "author": "IBM", @@ -28,7 +25,6 @@ "dependencies": { "@loopback/context": "^0.13.0", "@loopback/core": "^0.11.15", - "@loopback/dist-util": "^0.3.7", "@loopback/repository": "^0.20.0", "@loopback/service-proxy": "^0.8.9", "@types/debug": "0.0.30", @@ -48,8 +44,8 @@ "index.js", "index.js.map", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "repository": { diff --git a/packages/build/README.md b/packages/build/README.md index c294fd7da836..79691e59feab 100644 --- a/packages/build/README.md +++ b/packages/build/README.md @@ -40,7 +40,7 @@ To use `@loopback/build` for your package: "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", "pretest": "npm run clean && npm run build", - "test": "lb-mocha \"DIST/test\"", + "test": "lb-mocha \"dist/test\"", "posttest": "npm run lint", "start": "npm run build && node .", "prepublishOnly": "npm run test" diff --git a/packages/build/bin/run-mocha.js b/packages/build/bin/run-mocha.js index 417caf513c37..3e1fcd63d38b 100755 --- a/packages/build/bin/run-mocha.js +++ b/packages/build/bin/run-mocha.js @@ -19,7 +19,7 @@ function run(argv, options) { const utils = require('./utils'); const path = require('path'); - // Substitute the DIST variable with the dist folder + // Substitute the dist variable with the dist folder const dist = utils.getDistribution(); const mochaOpts = argv.slice(2).map(a => a.replace(/\bDIST\b/g, dist)); diff --git a/packages/build/bin/select-dist.js b/packages/build/bin/select-dist.js index af9fed00ed97..84dccbb4282a 100755 --- a/packages/build/bin/select-dist.js +++ b/packages/build/bin/select-dist.js @@ -11,14 +11,14 @@ Usage: node ./bin/select-dist command [arguments...] The script will scan all arguments (including the command) and replace -the string DIST with either dist or dist6, depending on the current +the string dist with either dist or dist6, depending on the current Node.js version. Then the provided command is executed with the modified arguments. Example usage: - node ./bin/select-dist mocha DIST/test + node ./bin/select-dist mocha dist/test ======== */ diff --git a/packages/build/test/integration/fixtures/.gitignore b/packages/build/test/integration/fixtures/.gitignore index a29a9f4835a4..312012b060f4 100644 --- a/packages/build/test/integration/fixtures/.gitignore +++ b/packages/build/test/integration/fixtures/.gitignore @@ -1,2 +1,2 @@ tsconfig.json -dist +dist* diff --git a/packages/cli/generators/extension/templates/index.d.ts.ejs b/packages/cli/generators/extension/templates/index.d.ts.ejs index b13ff95b850f..5703fb5fd91d 100644 --- 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/.prettierignore b/packages/cli/generators/project/templates/.prettierignore index bc1199efffac..c6911da9e1e8 100644 --- a/packages/cli/generators/project/templates/.prettierignore +++ b/packages/cli/generators/project/templates/.prettierignore @@ -1,2 +1,2 @@ -dist* +dist *.json diff --git a/packages/cli/generators/project/templates/.vscode/settings.json b/packages/cli/generators/project/templates/.vscode/settings.json index 0e1c0089f810..1ab6ad13bde0 100644 --- a/packages/cli/generators/project/templates/.vscode/settings.json +++ b/packages/cli/generators/project/templates/.vscode/settings.json @@ -11,7 +11,7 @@ "**/.hg": true, "**/.svn": true, "**/CVS": true, - "dist*": true, + "dist": true, }, "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, diff --git a/packages/cli/generators/project/templates/_.gitignore b/packages/cli/generators/project/templates/_.gitignore index ab35c80b97a7..050eec5fe6eb 100644 --- a/packages/cli/generators/project/templates/_.gitignore +++ b/packages/cli/generators/project/templates/_.gitignore @@ -61,4 +61,4 @@ typings/ api-docs/ # Transpiled JavaScript files from Typescript -/dist*/ +/dist diff --git a/packages/cli/generators/project/templates/package.json.ejs b/packages/cli/generators/project/templates/package.json.ejs index b0e7433686c3..3ebb82b5e1c9 100644 --- a/packages/cli/generators/project/templates/package.json.ejs +++ b/packages/cli/generators/project/templates/package.json.ejs @@ -11,13 +11,10 @@ "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": "lb-tsc es2017 --outDir dist", "build:watch": "lb-tsc --watch", - "clean": "lb-clean dist*", + "clean": "lb-clean dist", <% if (project.prettier && project.tslint) { -%> "lint": "npm run prettier:check && npm run tslint", "lint:fix": "npm run tslint:fix && npm run prettier:fix", @@ -39,15 +36,15 @@ <% } -%> "pretest": "npm run clean && npm run build", <% if (project.mocha) { -%> - "test": "lb-mocha --allow-console-logs \"DIST/test\"", + "test": "lb-mocha --allow-console-logs \"dist/test\"", <% } -%> <% if (project.prettier || project.tslint) { -%> "posttest": "npm run lint", <% } -%> <% if (project.mocha && (project.prettier || project.tslint)) { -%> - "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest", + "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js && npm run posttest", <% } else if (project.mocha) { -%> - "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js", + "test:dev": "lb-mocha --allow-console-logs dist/test/**/*.js", <% } -%> <% if (project.projectType === 'application') { -%> "prestart": "npm run build", @@ -67,8 +64,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "dependencies": { diff --git a/packages/cli/generators/project/templates/package.plain.json.ejs b/packages/cli/generators/project/templates/package.plain.json.ejs index b8bcf52e2bde..601008f1a1e1 100644 --- a/packages/cli/generators/project/templates/package.plain.json.ejs +++ b/packages/cli/generators/project/templates/package.plain.json.ejs @@ -12,7 +12,6 @@ }, "scripts": { "build": "tsc --outDir dist --target es2017", - "build:all-dist": "npm run build", "build:watch": "tsc --outDir dist --target es2017 --watch", "clean": "rimraf dist", <% if (project.prettier && project.tslint) { -%> diff --git a/packages/cli/package.json b/packages/cli/package.json index a8c6cbfbdf8a..ad752134c663 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -65,7 +65,6 @@ }, "scripts": { "build": "node ./bin/download-connector-list.js", - "build:all-dist": "npm run build", "test": "lb-mocha \"test/**/*.js\"", "smoke-test": "lb-mocha --allow-console-logs \"smoke-test/**/*.smoke.js\"" }, @@ -109,7 +108,6 @@ "@loopback/example-rpc-server": "^0.11.12", "@loopback/example-todo": "^0.21.0", "@loopback/example-soap-calculator": "^0.4.4", - "@loopback/dist-util": "^0.3.7", "@loopback/service-proxy": "^0.8.9", "@loopback/http-caching-proxy": "^0.3.12", "@loopback/http-server": "^0.4.4", diff --git a/packages/context/index.d.ts b/packages/context/index.d.ts index 8f970b6668e8..5002bc7a32ab 100644 --- a/packages/context/index.d.ts +++ b/packages/context/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/context/index.js b/packages/context/index.js index 6e9e5dfd690d..02b88d34ff0f 100644 --- a/packages/context/index.js +++ b/packages/context/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/context/package.json b/packages/context/package.json index 890917a6fbbe..6c72307fe630 100644 --- a/packages/context/package.json +++ b/packages/context/package.json @@ -6,23 +6,19 @@ "node": ">=8.9" }, "scripts": { - "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"", - "build:all-dist": "npm run build:dist8 && npm run build:dist10", + "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"", "build:apidocs": "lb-apidocs", - "build": "lb-tsc", - "build:dist8": "lb-tsc es2017", - "build:dist10": "lb-tsc es2018", - "clean": "lb-clean loopback-context*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-context*.tgz dist package api-docs", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"", - "unit": "lb-mocha \"DIST/test/unit/**/*.js\"", + "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" }, "author": "IBM", "copyright.owner": "IBM Corp.", "license": "MIT", "dependencies": { - "@loopback/dist-util": "^0.3.7", "@loopback/metadata": "^0.9.13", "debug": "^4.0.1", "uuid": "^3.2.1" @@ -49,8 +45,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "repository": { diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts index 1d49138ccdfb..d4e09365e55e 100644 --- a/packages/core/index.d.ts +++ b/packages/core/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/core/index.js b/packages/core/index.js index 17b65021fb95..5ffcc4e9d9a2 100644 --- a/packages/core/index.js +++ b/packages/core/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/core/package.json b/packages/core/package.json index 67acdd91b4b2..94cac7229173 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -6,25 +6,21 @@ "node": ">=8.9" }, "scripts": { - "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"", - "build:all-dist": "npm run build:dist8 && npm run build:dist10", + "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"", "build:apidocs": "lb-apidocs", - "build": "lb-tsc", - "build:dist8": "lb-tsc es2017", - "build:dist10": "lb-tsc es2018", - "clean": "lb-clean loopback-core*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-core*.tgz dist package api-docs", "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\"", + "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\"", "verify": "npm pack && tar xf loopback-core*.tgz && tree package && npm run clean" }, "author": "IBM", "copyright.owner": "IBM Corp.", "license": "MIT", "dependencies": { - "@loopback/context": "^0.13.0", - "@loopback/dist-util": "^0.3.7" + "@loopback/context": "^0.13.0" }, "devDependencies": { "@loopback/build": "^0.7.5", @@ -35,8 +31,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "repository": { diff --git a/packages/http-caching-proxy/index.d.ts b/packages/http-caching-proxy/index.d.ts index 31de78c4942c..bb4a4c7072d5 100644 --- a/packages/http-caching-proxy/index.d.ts +++ b/packages/http-caching-proxy/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/http-caching-proxy/index.js b/packages/http-caching-proxy/index.js index dcfa99519244..c3d07d2cdd19 100644 --- a/packages/http-caching-proxy/index.js +++ b/packages/http-caching-proxy/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/http-caching-proxy/package.json b/packages/http-caching-proxy/package.json index 7a9509aa7b57..d8c847a2fc66 100644 --- a/packages/http-caching-proxy/package.json +++ b/packages/http-caching-proxy/package.json @@ -6,21 +6,17 @@ "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", - "clean": "lb-clean loopback-caching-proxy*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-caching-proxy*.tgz dist package api-docs", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/integration/**/*.js\"", + "test": "lb-mocha \"dist/test/integration/**/*.js\"", "verify": "npm pack && tar xf loopback-caching-proxy*.tgz && tree package && npm run clean" }, "author": "IBM", "copyright.owner": "IBM Corp.", "license": "MIT", "dependencies": { - "@loopback/dist-util": "^0.3.7", "cacache": "^11.0.2", "debug": "^4.0.1", "p-event": "^2.1.0", @@ -49,8 +45,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "publishConfig": { diff --git a/packages/http-server/index.d.ts b/packages/http-server/index.d.ts index b13ff95b850f..5703fb5fd91d 100644 --- a/packages/http-server/index.d.ts +++ b/packages/http-server/index.d.ts @@ -1 +1 @@ -export * from './dist8'; +export * from './dist'; diff --git a/packages/http-server/index.js b/packages/http-server/index.js index b46af17f12e9..b21de86e1aea 100644 --- a/packages/http-server/index.js +++ b/packages/http-server/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/http-server/package.json b/packages/http-server/package.json index 8f805a99fbbf..0bd9decba4d4 100644 --- a/packages/http-server/package.json +++ b/packages/http-server/package.json @@ -6,21 +6,17 @@ "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", - "clean": "lb-clean loopback-http-server*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-http-server*.tgz dist package api-docs", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/**/*.js\"", + "test": "lb-mocha \"dist/test/**/*.js\"", "verify": "npm pack && tar xf loopback-http-server*.tgz && tree package && npm run clean" }, "author": "IBM", "copyright.owner": "IBM Corp.", "license": "MIT", "dependencies": { - "@loopback/dist-util": "^0.3.7", "p-event": "^2.0.0" }, "devDependencies": { @@ -36,8 +32,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "publishConfig": { diff --git a/packages/metadata/index.d.ts b/packages/metadata/index.d.ts index e7f7bd36255e..5ad88365eb71 100644 --- a/packages/metadata/index.d.ts +++ b/packages/metadata/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/metadata/index.js b/packages/metadata/index.js index a080f66122ca..abe1a945f2d7 100644 --- a/packages/metadata/index.js +++ b/packages/metadata/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/metadata/package.json b/packages/metadata/package.json index df91ec6d44bb..fd33e2eb79b6 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -6,16 +6,13 @@ "node": ">=8.9" }, "scripts": { - "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"", - "build:all-dist": "npm run build:dist8 && npm run build:dist10", + "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"", "build:apidocs": "lb-apidocs", - "build": "lb-tsc", - "build:dist8": "lb-tsc es2017", - "build:dist10": "lb-tsc es2018", - "clean": "lb-clean loopback-metadata*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-metadata*.tgz dist package api-docs", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"", - "unit": "lb-mocha \"DIST/test/unit/**/*.js\"", + "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" }, "author": "IBM", @@ -28,7 +25,6 @@ }, "devDependencies": { "@loopback/build": "^0.7.5", - "@loopback/dist-util": "^0.3.7", "@loopback/testlab": "^0.15.0", "@types/debug": "^0.0.30", "@types/lodash": "^4.14.106", @@ -43,8 +39,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "publishConfig": { diff --git a/packages/openapi-spec-builder/index.d.ts b/packages/openapi-spec-builder/index.d.ts index 2749c24f8c98..e6c72e4498a7 100644 --- a/packages/openapi-spec-builder/index.d.ts +++ b/packages/openapi-spec-builder/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/openapi-spec-builder/index.js b/packages/openapi-spec-builder/index.js index e5fc4f3f0842..787bb07128bd 100644 --- a/packages/openapi-spec-builder/index.js +++ b/packages/openapi-spec-builder/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/openapi-spec-builder/package.json b/packages/openapi-spec-builder/package.json index 535406dab0e6..57fc66cf36da 100644 --- a/packages/openapi-spec-builder/package.json +++ b/packages/openapi-spec-builder/package.json @@ -6,12 +6,9 @@ "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", - "clean": "lb-clean loopback-openapi-spec-builder*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-openapi-spec-builder*.tgz dist package api-docs", "verify": "npm pack && tar xf loopback-openapi-spec-builder*.tgz && tree package && npm run clean" }, "author": "IBM", @@ -25,7 +22,6 @@ "Testing" ], "dependencies": { - "@loopback/dist-util": "^0.3.7", "@loopback/openapi-v3-types": "^0.9.6" }, "devDependencies": { @@ -36,8 +32,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "repository": { diff --git a/packages/openapi-v3-types/index.d.ts b/packages/openapi-v3-types/index.d.ts index 4a5a6db29e3d..d49171a80f1a 100644 --- a/packages/openapi-v3-types/index.d.ts +++ b/packages/openapi-v3-types/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/openapi-v3-types/index.js b/packages/openapi-v3-types/index.js index 99284032af16..60837a5e3385 100644 --- a/packages/openapi-v3-types/index.js +++ b/packages/openapi-v3-types/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/openapi-v3-types/package.json b/packages/openapi-v3-types/package.json index 4bef9cdd06b7..36802e5a9ddc 100644 --- a/packages/openapi-v3-types/package.json +++ b/packages/openapi-v3-types/package.json @@ -6,7 +6,6 @@ "node": ">=8.9" }, "dependencies": { - "@loopback/dist-util": "^0.3.7", "openapi3-ts": "^1.0.0" }, "devDependencies": { @@ -15,16 +14,13 @@ "@types/node": "^10.11.2" }, "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", - "clean": "lb-clean loopback-openapi-v3-types*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-openapi-v3-types*.tgz dist package api-docs", "verify": "npm pack && tar xf loopback-openapi-v3-types*.tgz && tree package && npm run clean", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/**/*.js\"", - "unit": "npm run build && lb-mocha \"DIST/test/unit/**/*.js\"" + "test": "lb-mocha \"dist/test/**/*.js\"", + "unit": "npm run build && lb-mocha \"dist/test/unit/**/*.js\"" }, "author": "IBM", "copyright.owner": "IBM Corp.", @@ -38,8 +34,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "publishConfig": { diff --git a/packages/openapi-v3/index.d.ts b/packages/openapi-v3/index.d.ts index 6c2772308a12..d8870b6ebd1c 100644 --- a/packages/openapi-v3/index.d.ts +++ b/packages/openapi-v3/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/openapi-v3/index.js b/packages/openapi-v3/index.js index a8239d97e598..08a03353b9c9 100644 --- a/packages/openapi-v3/index.js +++ b/packages/openapi-v3/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/openapi-v3/package.json b/packages/openapi-v3/package.json index 0c2a9b8b4bbe..216a66657260 100644 --- a/packages/openapi-v3/package.json +++ b/packages/openapi-v3/package.json @@ -15,16 +15,13 @@ "@types/node": "^10.11.2" }, "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", - "clean": "lb-clean loopback-openapi-v3*.tgz dist* package", - "integration": "lb-mocha \"DIST/test/integration/**/*.js\"", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-openapi-v3*.tgz dist package", + "integration": "lb-mocha \"dist/test/integration/**/*.js\"", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\"", - "unit": "lb-mocha \"DIST/test/unit/**/*.js\"", + "test": "lb-mocha \"dist/test/unit/**/*.js\" \"dist/test/integration/**/*.js\"", + "unit": "lb-mocha \"dist/test/unit/**/*.js\"", "verify": "npm pack && tar xf loopback-openapi-v3*.tgz && tree package && npm run clean" }, "author": "IBM", @@ -39,8 +36,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "publishConfig": { @@ -52,7 +49,6 @@ }, "dependencies": { "@loopback/context": "^0.13.0", - "@loopback/dist-util": "^0.3.7", "@loopback/openapi-v3-types": "^0.9.6", "@loopback/repository-json-schema": "^0.11.3", "debug": "^4.0.1", diff --git a/packages/repository-json-schema/index.d.ts b/packages/repository-json-schema/index.d.ts index 11310587115a..336c25da6d11 100644 --- a/packages/repository-json-schema/index.d.ts +++ b/packages/repository-json-schema/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/repository-json-schema/index.js b/packages/repository-json-schema/index.js index 5c3080813d75..63d928e335a0 100644 --- a/packages/repository-json-schema/index.js +++ b/packages/repository-json-schema/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/repository-json-schema/package.json b/packages/repository-json-schema/package.json index b498960bafde..6f78107253d8 100644 --- a/packages/repository-json-schema/package.json +++ b/packages/repository-json-schema/package.json @@ -6,14 +6,11 @@ "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", - "clean": "lb-clean loopback-json-schema*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-json-schema*.tgz dist package api-docs", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"", + "test": "lb-mocha \"dist/test/unit/**/*.js\" \"dist/test/integration/**/*.js\" \"dist/test/acceptance/**/*.js\"", "verify": "npm pack && tar xf loopback-json-schema*.tgz && tree package && npm run clean" }, "author": "IBM", @@ -28,7 +25,6 @@ }, "dependencies": { "@loopback/context": "^0.13.0", - "@loopback/dist-util": "^0.3.7", "@loopback/metadata": "^0.9.13", "@loopback/repository": "^0.20.0", "@types/json-schema": "^7.0.1" @@ -43,8 +39,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "repository": { diff --git a/packages/repository/index.d.ts b/packages/repository/index.d.ts index 2b1d6d1c4559..c79fbf1f353c 100644 --- a/packages/repository/index.d.ts +++ b/packages/repository/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/repository/index.js b/packages/repository/index.js index ad25d9c49725..062e5fcd6297 100644 --- a/packages/repository/index.js +++ b/packages/repository/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/repository/package.json b/packages/repository/package.json index 3bb79815343f..c642bde06f63 100644 --- a/packages/repository/package.json +++ b/packages/repository/package.json @@ -7,15 +7,12 @@ }, "main": "index", "scripts": { - "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"", - "build:all-dist": "npm run build:dist8 && npm run build:dist10", + "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"", "build:apidocs": "lb-apidocs", - "build": "lb-tsc", - "build:dist8": "lb-tsc es2017", - "build:dist10": "lb-tsc es2018", - "clean": "lb-clean loopback-repository*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-repository*.tgz dist package api-docs", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/**/*.js\"", + "test": "lb-mocha \"dist/test/**/*.js\"", "verify": "npm pack && tar xf loopback-repository*.tgz && tree package && npm run clean" }, "author": "IBM", @@ -30,7 +27,6 @@ "dependencies": { "@loopback/context": "^0.13.0", "@loopback/core": "^0.11.15", - "@loopback/dist-util": "^0.3.7", "@types/debug": "0.0.30", "debug": "^4.0.1", "lodash": "^4.17.10", @@ -40,8 +36,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "repository": { diff --git a/packages/rest/index.d.ts b/packages/rest/index.d.ts index 1f9190687ced..3e45f53534a9 100644 --- a/packages/rest/index.d.ts +++ b/packages/rest/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/rest/index.js b/packages/rest/index.js index fc66161622d8..a783530a92cb 100644 --- a/packages/rest/index.js +++ b/packages/rest/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/rest/package.json b/packages/rest/package.json index 1f5221cc0c97..38830fd57f26 100644 --- a/packages/rest/package.json +++ b/packages/rest/package.json @@ -6,17 +6,14 @@ "node": ">=8.9" }, "scripts": { - "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"", - "build:all-dist": "npm run build:dist8 && npm run build:dist10", + "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"", "build:apidocs": "lb-apidocs", - "build": "lb-tsc", - "build:dist8": "lb-tsc es2017", - "build:dist10": "lb-tsc es2018", - "clean": "lb-clean loopback-rest*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-rest*.tgz dist package api-docs", "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\"", + "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\"", "verify": "npm pack && tar xf loopback-rest*.tgz && tree package && npm run clean" }, "author": "IBM", @@ -51,7 +48,6 @@ }, "devDependencies": { "@loopback/build": "^0.7.5", - "@loopback/dist-util": "^0.3.7", "@loopback/openapi-spec-builder": "^0.9.4", "@loopback/repository": "^0.20.0", "@loopback/testlab": "^0.15.0", @@ -64,8 +60,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "repository": { diff --git a/packages/service-proxy/index.d.ts b/packages/service-proxy/index.d.ts index 3edef5ae4310..5d1085bdecf4 100644 --- a/packages/service-proxy/index.d.ts +++ b/packages/service-proxy/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/service-proxy/index.js b/packages/service-proxy/index.js index c8be372de673..4bae4b7000c7 100644 --- a/packages/service-proxy/index.js +++ b/packages/service-proxy/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/service-proxy/package.json b/packages/service-proxy/package.json index 68e94861891f..021af6f8c8c1 100644 --- a/packages/service-proxy/package.json +++ b/packages/service-proxy/package.json @@ -7,17 +7,14 @@ }, "main": "index", "scripts": { - "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"", - "build:all-dist": "npm run build:dist8 && npm run build:dist10", + "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"", "build:apidocs": "lb-apidocs", - "build": "lb-tsc", - "build:dist8": "lb-tsc es2017", - "build:dist10": "lb-tsc es2018", - "clean": "lb-clean loopback-service-proxy*.tgz dist* package api-docs", - "integration": "lb-mocha \"DIST/test/integration/**/*.js\"", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-service-proxy*.tgz dist package api-docs", + "integration": "lb-mocha \"dist/test/integration/**/*.js\"", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\" \"DIST/test/integration/**/*.js\"", - "unit": "lb-mocha \"DIST/test/unit/**/*.js\"", + "test": "lb-mocha \"dist/test/unit/**/*.js\" \"dist/test/acceptance/**/*.js\" \"dist/test/integration/**/*.js\"", + "unit": "lb-mocha \"dist/test/unit/**/*.js\"", "verify": "npm pack && tar xf loopback-service-proxy*.tgz && tree package && npm run clean" }, "publishConfig": { @@ -34,15 +31,14 @@ "dependencies": { "@loopback/context": "^0.13.0", "@loopback/core": "^0.11.15", - "@loopback/dist-util": "^0.3.7", "loopback-datasource-juggler": "^3.23.0" }, "files": [ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "src" ], "repository": { diff --git a/packages/testlab/index.d.ts b/packages/testlab/index.d.ts index 87a5efb360ee..d15be2753161 100644 --- a/packages/testlab/index.d.ts +++ b/packages/testlab/index.d.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './dist8'; +export * from './dist'; diff --git a/packages/testlab/index.js b/packages/testlab/index.js index b7978a24f7eb..6ecdd18d3882 100644 --- a/packages/testlab/index.js +++ b/packages/testlab/index.js @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -module.exports = require('@loopback/dist-util').loadDist(__dirname); +module.exports = require('./dist'); diff --git a/packages/testlab/package.json b/packages/testlab/package.json index 23c4c63b228b..3240d5d65ec7 100644 --- a/packages/testlab/package.json +++ b/packages/testlab/package.json @@ -6,20 +6,16 @@ "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 loopback-testlab*.tgz dist* package api-docs", + "build": "lb-tsc es2017 --outDir dist", + "clean": "lb-clean loopback-testlab*.tgz dist package api-docs", "pretest": "npm run build", - "test": "lb-mocha \"DIST/test\"", + "test": "lb-mocha \"dist/test\"", "verify": "npm pack && tar xf loopback-testlab*.tgz && tree package && npm run clean" }, "author": "IBM", "copyright.owner": "IBM Corp.", "license": "MIT", "dependencies": { - "@loopback/dist-util": "^0.3.7", "@types/express": "^4.11.1", "@types/fs-extra": "^5.0.1", "@types/shot": "^3.4.0", @@ -41,8 +37,8 @@ "README.md", "index.js", "index.d.ts", - "dist*/src", - "dist*/index*", + "dist/src", + "dist/index*", "should-as-function.d.ts", "src" ], diff --git a/sandbox/example/package.json b/sandbox/example/package.json index 3ff72b43fac8..94e5d1819dd1 100644 --- a/sandbox/example/package.json +++ b/sandbox/example/package.json @@ -18,6 +18,5 @@ "url": "https://github.com/strongloop/loopback-next.git" }, "dependencies": { - "@loopback/dist-util": "^0.3.7" } }