From a149466001822ffda07bbf27f4462bf5ca778b74 Mon Sep 17 00:00:00 2001 From: Logan Smyth Date: Tue, 15 May 2018 12:55:33 -0700 Subject: [PATCH] Move build-dist script to the runtime transform. --- .eslintignore | 2 +- Makefile | 4 ++-- packages/babel-plugin-transform-runtime/.npmignore | 1 + packages/babel-plugin-transform-runtime/package.json | 7 ++++++- .../scripts/build-dist.js | 6 +++--- packages/babel-plugin-transform-runtime/src/index.js | 2 -- packages/babel-runtime/.npmignore | 1 - packages/babel-runtime/package.json | 8 -------- 8 files changed, 13 insertions(+), 18 deletions(-) rename packages/{babel-runtime => babel-plugin-transform-runtime}/scripts/build-dist.js (94%) diff --git a/.eslintignore b/.eslintignore index 4a10dadac2..c84198bb07 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,7 +4,7 @@ package.json lerna.json packages/babel-runtime -!packages/babel-runtime/scripts +!packages/babel-plugin-transform-runtime/scripts !packages/babel-runtime/core-js.js packages/*/node_modules packages/*/lib diff --git a/Makefile b/Makefile index 2ed85e6bbb..0fba2cf04a 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ build-preset-env-standalone: build-dist: build cd packages/babel-polyfill; \ scripts/build-dist.sh - cd packages/babel-runtime; \ + cd packages/babel-plugin-transform-runtime; \ node scripts/build-dist.js watch: clean clean-lib @@ -120,7 +120,7 @@ bootstrap: clean-all yarn --ignore-engines ./node_modules/.bin/lerna bootstrap -- --ignore-engines make build - cd packages/babel-runtime; \ + cd packages/babel-plugin-transform-runtime; \ node scripts/build-dist.js clean-lib: diff --git a/packages/babel-plugin-transform-runtime/.npmignore b/packages/babel-plugin-transform-runtime/.npmignore index f980694583..57e1671459 100644 --- a/packages/babel-plugin-transform-runtime/.npmignore +++ b/packages/babel-plugin-transform-runtime/.npmignore @@ -1,3 +1,4 @@ +scripts src test *.log diff --git a/packages/babel-plugin-transform-runtime/package.json b/packages/babel-plugin-transform-runtime/package.json index 25e94b2d32..d0ef406110 100644 --- a/packages/babel-plugin-transform-runtime/package.json +++ b/packages/babel-plugin-transform-runtime/package.json @@ -17,6 +17,11 @@ }, "devDependencies": { "@babel/core": "7.0.0-beta.55", - "@babel/helper-plugin-test-runner": "7.0.0-beta.55" + "@babel/helpers": "7.0.0-beta.55", + "@babel/helper-plugin-test-runner": "7.0.0-beta.55", + "@babel/plugin-transform-runtime": "7.0.0-beta.55", + "@babel/template": "7.0.0-beta.55", + "@babel/preset-env": "7.0.0-beta.55", + "@babel/types": "7.0.0-beta.53" } } diff --git a/packages/babel-runtime/scripts/build-dist.js b/packages/babel-plugin-transform-runtime/scripts/build-dist.js similarity index 94% rename from packages/babel-runtime/scripts/build-dist.js rename to packages/babel-plugin-transform-runtime/scripts/build-dist.js index ff2d79dbaa..03e6aab853 100644 --- a/packages/babel-runtime/scripts/build-dist.js +++ b/packages/babel-plugin-transform-runtime/scripts/build-dist.js @@ -7,10 +7,10 @@ const babel = require("@babel/core"); const template = require("@babel/template"); const t = require("@babel/types"); -const transformRuntime = require("@babel/plugin-transform-runtime"); -const corejs2Definitions = require("@babel/plugin-transform-runtime").definitions; +const transformRuntime = require("../"); +const corejs2Definitions = require("../lib/definitions").default; -const runtimeRoot = path.resolve(__dirname, ".."); +const runtimeRoot = path.resolve(__dirname, "..", "..", "babel-runtime"); writeCoreJS2(runtimeRoot); diff --git a/packages/babel-plugin-transform-runtime/src/index.js b/packages/babel-plugin-transform-runtime/src/index.js index 876fea7641..546938be12 100644 --- a/packages/babel-plugin-transform-runtime/src/index.js +++ b/packages/babel-plugin-transform-runtime/src/index.js @@ -227,5 +227,3 @@ export default declare((api, options) => { }, }; }); - -export { definitions }; diff --git a/packages/babel-runtime/.npmignore b/packages/babel-runtime/.npmignore index 57e1671459..f980694583 100644 --- a/packages/babel-runtime/.npmignore +++ b/packages/babel-runtime/.npmignore @@ -1,4 +1,3 @@ -scripts src test *.log diff --git a/packages/babel-runtime/package.json b/packages/babel-runtime/package.json index aa44500199..79fc3de77f 100644 --- a/packages/babel-runtime/package.json +++ b/packages/babel-runtime/package.json @@ -8,13 +8,5 @@ "dependencies": { "core-js": "^2.5.7", "regenerator-runtime": "^0.12.0" - }, - "devDependencies": { - "@babel/core": "7.0.0-beta.55", - "@babel/helpers": "7.0.0-beta.55", - "@babel/plugin-transform-runtime": "7.0.0-beta.55", - "@babel/template": "7.0.0-beta.55", - "@babel/preset-env": "7.0.0-beta.55", - "@babel/types": "7.0.0-beta.55" } }