Skip to content

Commit

Permalink
Merge pull request #684 from orbitjs/fix-packaging
Browse files Browse the repository at this point in the history
Target ES-latest by default + Fix ES5 builds
  • Loading branch information
dgeb authored Aug 16, 2019
2 parents b3515b1 + fe5bbbb commit 11a1428
Show file tree
Hide file tree
Showing 48 changed files with 3,518 additions and 1,421 deletions.
9 changes: 5 additions & 4 deletions packages/@orbit/coordinator/Brocfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use strict";
'use strict';

const build = require('@glimmer/build');
const packageDist = require('@glimmer/build/lib/package-dist');
Expand All @@ -9,10 +9,11 @@ let buildOptions = {

if (process.env.BROCCOLI_ENV === 'tests') {
buildOptions.vendorTrees = [
packageDist('@orbit/utils'),
packageDist('@orbit/core'),
packageDist('@orbit/data')
packageDist('@orbit/utils', { lang: 'es2017' }),
packageDist('@orbit/core', { lang: 'es2017' }),
packageDist('@orbit/data', { lang: 'es2017' })
];
buildOptions.test = { es5: false };
}

module.exports = build(buildOptions);
6 changes: 3 additions & 3 deletions packages/@orbit/coordinator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
],
"repository": "https://github.com/orbitjs/orbit",
"license": "MIT",
"main": "dist/commonjs/es5/index.js",
"module": "dist/modules/es5/index.js",
"main": "dist/commonjs/es2017/index.js",
"module": "dist/modules/es2017/index.js",
"types": "dist/types/index.d.ts",
"scripts": {
"build": "rm -rf dist && BROCCOLI_ENV=dist broccoli build dist",
Expand All @@ -31,7 +31,7 @@
"@orbit/utils": "^0.16.0"
},
"devDependencies": {
"@glimmer/build": "^0.10.1",
"@glimmer/build": "^0.10.3",
"@typescript-eslint/eslint-plugin": "^1.10.2",
"@typescript-eslint/parser": "^1.10.2",
"eslint": "^5.16.0",
Expand Down
346 changes: 249 additions & 97 deletions packages/@orbit/coordinator/yarn.lock

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions packages/@orbit/core/Brocfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use strict";
'use strict';

const build = require('@glimmer/build');
const packageDist = require('@glimmer/build/lib/package-dist');
Expand All @@ -8,9 +8,8 @@ let buildOptions = {
};

if (process.env.BROCCOLI_ENV === 'tests') {
buildOptions.vendorTrees = [
packageDist('@orbit/utils')
];
buildOptions.vendorTrees = [packageDist('@orbit/utils', { lang: 'es2017' })];
buildOptions.test = { es5: false };
}

module.exports = build(buildOptions);
6 changes: 3 additions & 3 deletions packages/@orbit/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
],
"repository": "https://github.com/orbitjs/orbit",
"license": "MIT",
"main": "dist/commonjs/es5/index.js",
"module": "dist/modules/es5/index.js",
"main": "dist/commonjs/es2017/index.js",
"module": "dist/modules/es2017/index.js",
"types": "dist/types/index.d.ts",
"scripts": {
"build": "rm -rf dist && BROCCOLI_ENV=dist broccoli build dist",
Expand All @@ -29,7 +29,7 @@
"@orbit/utils": "^0.16.0"
},
"devDependencies": {
"@glimmer/build": "^0.10.1",
"@glimmer/build": "^0.10.3",
"@typescript-eslint/eslint-plugin": "^1.10.2",
"@typescript-eslint/parser": "^1.10.2",
"eslint": "^5.16.0",
Expand Down
44 changes: 32 additions & 12 deletions packages/@orbit/core/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"

"@babel/plugin-transform-for-of@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"

"@babel/plugin-transform-modules-commonjs@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz#0bef4713d30f1d78c2e59b3d6db40e60192cac1e"
Expand All @@ -243,6 +250,13 @@
"@babel/helper-plugin-utils" "^7.0.0"
lodash "^4.17.11"

"@babel/plugin-transform-regenerator@^7.4.5":
version "7.4.5"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f"
integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==
dependencies:
regenerator-transform "^0.14.0"

"@babel/plugin-transform-shorthand-properties@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
Expand Down Expand Up @@ -314,10 +328,10 @@
exec-sh "^0.3.2"
minimist "^1.2.0"

"@glimmer/build@^0.10.1":
version "0.10.1"
resolved "https://registry.yarnpkg.com/@glimmer/build/-/build-0.10.1.tgz#6086e0ec8be1848f403ed73f73cf8eae41afde70"
integrity sha512-n40btDpin0GnVgKepVeM5LawSBO3ARSQz+C1vk3xvu/clyz6N9DBIR1T9w0MhgybrbNEWHMTl3Vd5KCSPi2g0g==
"@glimmer/build@^0.10.2":
version "0.10.2"
resolved "https://registry.yarnpkg.com/@glimmer/build/-/build-0.10.2.tgz#d4c0fe803d734d37b55314dda9f2ecfb6442ef38"
integrity sha512-CupbhG8LMbq9bLnvBrTrvfsZY0zi67widsUAk8ZDvzWlHCXKO8PlGLadYv13nZQgCci41DzR/6dtgPt9lxLraw==
dependencies:
"@babel/core" "^7.4.4"
"@babel/generator" "^7.4.4"
Expand All @@ -327,9 +341,11 @@
"@babel/plugin-transform-classes" "^7.4.4"
"@babel/plugin-transform-computed-properties" "^7.2.0"
"@babel/plugin-transform-destructuring" "^7.4.4"
"@babel/plugin-transform-for-of" "^7.4.4"
"@babel/plugin-transform-modules-commonjs" "^7.4.4"
"@babel/plugin-transform-parameters" "^7.4.4"
"@babel/plugin-transform-proto-to-assign" "^7.4.4"
"@babel/plugin-transform-regenerator" "^7.4.5"
"@babel/plugin-transform-shorthand-properties" "^7.2.0"
"@babel/plugin-transform-spread" "^7.2.2"
"@babel/plugin-transform-template-literals" "^7.4.4"
Expand All @@ -338,7 +354,6 @@
amd-name-resolver "^1.3.1"
babel-plugin-check-es2015-constants "^6.22.0"
babel-plugin-debug-macros "^0.3.1"
babel-plugin-external-helpers "^6.22.0"
babel-plugin-feature-flags "^0.3.1"
babel-plugin-filter-imports "~3.0.0"
babel-plugin-strip-glimmer-utils "^0.1.1"
Expand Down Expand Up @@ -616,13 +631,6 @@ babel-plugin-debug-macros@^0.3.1:
dependencies:
semver "^5.3.0"

babel-plugin-external-helpers@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-plugin-external-helpers/-/babel-plugin-external-helpers-6.22.0.tgz#2285f48b02bd5dede85175caf8c62e86adccefa1"
integrity sha1-IoX0iwK9Xe3oUXXK+MYuhq3M76E=
dependencies:
babel-runtime "^6.22.0"

babel-plugin-feature-flags@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/babel-plugin-feature-flags/-/babel-plugin-feature-flags-0.3.1.tgz#9c827cf9a4eb9a19f725ccb239e85cab02036fc1"
Expand Down Expand Up @@ -3393,6 +3401,11 @@ printf@^0.5.1:
resolved "https://registry.yarnpkg.com/printf/-/printf-0.5.1.tgz#e0466788260859ed153006dc6867f09ddf240cf3"
integrity sha512-UaE/jO0hNsrvPGQEb4LyNzcrJv9Z00tsreBduOSxMtrebvoUhxiEJ4YCHX8YHf6akwfKsC2Gyv5zv47UXhMiLg==

private@^0.1.6:
version "0.1.8"
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==

process-nextick-args@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
Expand Down Expand Up @@ -3513,6 +3526,13 @@ regenerator-runtime@^0.13.2:
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==

regenerator-transform@^0.14.0:
version "0.14.1"
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==
dependencies:
private "^0.1.6"

regex-not@^1.0.0, regex-not@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
Expand Down
7 changes: 4 additions & 3 deletions packages/@orbit/data/Brocfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use strict";
'use strict';

const build = require('@glimmer/build');
const packageDist = require('@glimmer/build/lib/package-dist');
Expand All @@ -9,9 +9,10 @@ let buildOptions = {

if (process.env.BROCCOLI_ENV === 'tests') {
buildOptions.vendorTrees = [
packageDist('@orbit/utils'),
packageDist('@orbit/core')
packageDist('@orbit/utils', { lang: 'es2017' }),
packageDist('@orbit/core', { lang: 'es2017' })
];
buildOptions.test = { es5: false };
}

module.exports = build(buildOptions);
6 changes: 3 additions & 3 deletions packages/@orbit/data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
],
"repository": "https://github.com/orbitjs/orbit",
"license": "MIT",
"main": "dist/commonjs/es5/index.js",
"module": "dist/modules/es5/index.js",
"main": "dist/commonjs/es2017/index.js",
"module": "dist/modules/es2017/index.js",
"types": "dist/types/index.d.ts",
"scripts": {
"build": "rm -rf dist && BROCCOLI_ENV=dist broccoli build dist",
Expand All @@ -30,7 +30,7 @@
"@orbit/utils": "^0.16.0"
},
"devDependencies": {
"@glimmer/build": "^0.10.1",
"@glimmer/build": "^0.10.3",
"@typescript-eslint/eslint-plugin": "^1.10.2",
"@typescript-eslint/parser": "^1.10.2",
"eslint": "^5.16.0",
Expand Down
Loading

0 comments on commit 11a1428

Please sign in to comment.