From 755ec192e22c6b6e00782e4810366d0166fdbebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Thu, 6 Feb 2020 01:03:36 +0100 Subject: [PATCH] Archive @babel/preset-env-standalone (#10993) * Move @babel/preset-env-standalone to babel-archive babel/babel-archive@a1fadd2d77f965e0d9b036c401c6b2ed185103d5 * Move tests to @babel/standalone * Remove references in build scripts * Update lockfile * Delete duplicated test file. It's already in babel-standalone/test/babel.js --- .circleci/config.yml | 8 --- .eslintignore | 2 - .gitignore | 3 - Gulpfile.js | 56 +--------------- Makefile | 10 +-- babel.config.js | 1 - jest.config.js | 2 - package.json | 1 - .../babel-preset-env-standalone/README.md | 19 ------ .../babel-preset-env-standalone/package.json | 52 --------------- .../src/available-plugins.js | 34 ---------- .../src/caniuse-lite-regions.js | 1 - .../babel-preset-env-standalone/src/index.js | 8 --- .../test/available-plugins.js | 19 ------ .../test/babel-preset-env.js | 64 ------------------- yarn.lock | 7 -- 16 files changed, 3 insertions(+), 284 deletions(-) delete mode 100644 packages/babel-preset-env-standalone/README.md delete mode 100644 packages/babel-preset-env-standalone/package.json delete mode 100644 packages/babel-preset-env-standalone/src/available-plugins.js delete mode 100644 packages/babel-preset-env-standalone/src/caniuse-lite-regions.js delete mode 100644 packages/babel-preset-env-standalone/src/index.js delete mode 100644 packages/babel-preset-env-standalone/test/available-plugins.js delete mode 100644 packages/babel-preset-env-standalone/test/babel-preset-env.js diff --git a/.circleci/config.yml b/.circleci/config.yml index edf8c3c68d42..c527f9cd98d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,12 +25,6 @@ aliases: - &artifact_babel_min path: ~/babel/packages/babel-standalone/babel.min.js - - &artifact_env - path: ~/babel/packages/babel-preset-env-standalone/babel-preset-env.js - - - &artifact_env_min - path: ~/babel/packages/babel-preset-env-standalone/babel-preset-env.min.js - - &test262_workdir working_directory: ~/babel/babel-test262-runner @@ -69,8 +63,6 @@ jobs: - run: yarn jest "\-standalone/test" - store_artifacts: *artifact_babel - store_artifacts: *artifact_babel_min - - store_artifacts: *artifact_env - - store_artifacts: *artifact_env_min - save_cache: *save-node-modules-cache - save_cache: *save-yarn-cache diff --git a/.eslintignore b/.eslintignore index 3425d704e19f..79cf020e6393 100644 --- a/.eslintignore +++ b/.eslintignore @@ -20,8 +20,6 @@ codemods/*/test/tmp packages/babel-compat-data/build packages/babel-preset-env/data/[^(plugin-features|shipped-proposals).js] packages/babel-preset-env/test/debug-fixtures -packages/babel-preset-env-standalone/babel-preset-env.js -packages/babel-preset-env-standalone/babel-preset-env.min.js packages/babel-standalone/babel.js packages/babel-standalone/babel.min.js packages/babel-parser/test/expressions diff --git a/.gitignore b/.gitignore index 4f32ee12788d..e79fadf54508 100644 --- a/.gitignore +++ b/.gitignore @@ -56,9 +56,6 @@ package-lock.json packages/babel-standalone/babel.js packages/babel-standalone/babel.js.map packages/babel-standalone/babel.min.js -packages/babel-preset-env-standalone/babel-preset-env.js -packages/babel-preset-env-standalone/babel-preset-env.js.map -packages/babel-preset-env-standalone/babel-preset-env.min.js /codemods/*/lib /codemods/*/node_modules /packages/babel-parser/build diff --git a/Gulpfile.js b/Gulpfile.js index a78f68ea4914..188a47d2975d 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -11,7 +11,6 @@ const filter = require("gulp-filter"); const gulp = require("gulp"); const path = require("path"); const rollup = require("rollup"); -const rollupAlias = require("@rollup/plugin-alias"); const rollupBabel = require("rollup-plugin-babel"); const rollupBabelSource = require("./scripts/rollup-plugin-babel-source"); const rollupCommonJs = require("rollup-plugin-commonjs"); @@ -88,9 +87,7 @@ function buildRollup(packages) { packages.map( ({ src, format, dest, name, filename, version = babelVersion }) => { const extraPlugins = []; - let inputExternal = undefined, - outputGlobals = undefined, - nodeResolveBrowser = false, + let nodeResolveBrowser = false, babelEnvName = "rollup"; switch (src) { case "packages/babel-standalone": @@ -104,39 +101,6 @@ function buildRollup(packages) { ); } break; - case "packages/babel-preset-env-standalone": - nodeResolveBrowser = true; - babelEnvName = "standalone"; - if (minify) { - extraPlugins.push( - rollupTerser({ - include: /^.+\.min\.js$/, - }) - ); - } - inputExternal = ["@babel/standalone"]; - outputGlobals = { - "@babel/standalone": "Babel", - }; - extraPlugins.push( - rollupAlias({ - entries: [ - { - find: "./available-plugins", - replacement: require.resolve( - path.join(__dirname, src, "./src/available-plugins") - ), - }, - { - find: "caniuse-lite/data/regions", - replacement: require.resolve( - path.join(__dirname, src, "./src/caniuse-lite-regions") - ), - }, - ], - }) - ); - break; } // If this build is part of a pull request, include the pull request number in // the version number. @@ -150,7 +114,6 @@ function buildRollup(packages) { return rollup .rollup({ input, - external: inputExternal, plugins: [ ...extraPlugins, rollupBabelSource(), @@ -208,7 +171,6 @@ function buildRollup(packages) { file: outputFile, format, name, - globals: outputGlobals, sourcemap: sourcemap, }) .then(() => { @@ -232,7 +194,6 @@ function buildRollup(packages) { file: outputFile.replace(/\.js$/, ".min.js"), format, name, - globals: outputGlobals, sourcemap: sourcemap, }); }); @@ -262,24 +223,9 @@ const standaloneBundle = [ }, ]; -const presetEnvStandaloneBundle = [ - { - src: "packages/babel-preset-env-standalone", - format: "umd", - name: "BabelPresetEnv", - filename: "babel-preset-env.js", - dest: "", - version: require("./packages/babel-preset-env/package").version, - }, -]; - gulp.task("build-rollup", () => buildRollup(libBundles)); gulp.task("build-babel-standalone", () => buildRollup(standaloneBundle)); -gulp.task("build-babel-preset-env-standalone", () => - buildRollup(presetEnvStandaloneBundle) -); - gulp.task("build-babel", () => buildBabel(/* exclude */ libBundles)); gulp.task("build-babel-types", () => buildBabel(/* exclude */ libBundles, "packages/babel-types/src/**/*.js") diff --git a/Makefile b/Makefile index a7a86a86e70f..d1b6415230f8 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ FLOW_COMMIT = a1f9a4c709dcebb27a5084acf47755fbae699c25 TEST262_COMMIT = 28b4fcca4b1b1d278dfe0cc0e69c7d9d59b31aab TYPESCRIPT_COMMIT = 5fc917be2e4dd64c8e9504d36615cd7fbfdd4cd3 -FORCE_PUBLISH = "@babel/runtime,@babel/runtime-corejs2,@babel/runtime-corejs3,@babel/standalone,@babel/preset-env-standalone" +FORCE_PUBLISH = "@babel/runtime,@babel/runtime-corejs2,@babel/runtime-corejs3,@babel/standalone" # Fix color output until TravisCI fixes https://github.com/travis-ci/travis-ci/issues/7967 export FORCE_COLOR = true @@ -50,7 +50,7 @@ build-flow-typings: build-typescript-typings: $(NODE) packages/babel-types/scripts/generators/typescript.js > packages/babel-types/lib/index.d.ts -build-standalone: build-babel-standalone build-preset-env-standalone +build-standalone: build-babel-standalone build-standalone-ci: build-bundle-ci $(MAKE) build-standalone @@ -58,15 +58,9 @@ build-standalone-ci: build-bundle-ci build-babel-standalone: $(YARN) gulp build-babel-standalone -build-preset-env-standalone: - $(YARN) gulp build-babel-preset-env-standalone - prepublish-build-standalone: BABEL_ENV=production IS_PUBLISH=true $(YARN) gulp build-babel-standalone -prepublish-build-preset-env-standalone: - BABEL_ENV=production IS_PUBLISH=true $(YARN) gulp build-babel-preset-env-standalone - build-dist: build-polyfill-dist build-plugin-transform-runtime-dist build-polyfill-dist: diff --git a/babel.config.js b/babel.config.js index ae2cb5a99cb3..1746d9728970 100644 --- a/babel.config.js +++ b/babel.config.js @@ -89,7 +89,6 @@ module.exports = function(api) { "packages/*/test/fixtures", ignoreLib ? "packages/*/lib" : null, "packages/babel-standalone/babel.js", - "packages/babel-preset-env-standalone/babel-preset-env.js", ].filter(Boolean), presets: [["@babel/env", envOpts]], plugins: [ diff --git a/jest.config.js b/jest.config.js index 667ea5395c29..29ed2f0b805d 100644 --- a/jest.config.js +++ b/jest.config.js @@ -45,14 +45,12 @@ module.exports = { transformIgnorePatterns: [ "/node_modules/", "/packages/babel-standalone/babel(\\.min)?\\.js", - "/packages/babel-preset-env-standalone/babel-preset-env(\\.min)?\\.js", "/test/(fixtures|tmp|__data__)/", "/(packages|codemods|eslint)/[^/]+/lib/", ], coveragePathIgnorePatterns: [ "/node_modules/", "/packages/babel-standalone/babel(\\.min)?\\.js", - "/packages/babel-preset-env-standalone/babel-preset-env(\\.min)?\\.js", "/test/(fixtures|tmp|__data__)/", ], modulePathIgnorePatterns: [ diff --git a/package.json b/package.json index 954b939a3748..4aac94157afa 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "@babel/preset-flow": "^7.8.3", "@babel/register": "^7.8.3", "@babel/runtime": "^7.8.4", - "@rollup/plugin-alias": "^2.2.0", "@rollup/plugin-json": "^4.0.0", "babel-eslint": "^11.0.0-beta.2", "babel-jest": "^24.9.0", diff --git a/packages/babel-preset-env-standalone/README.md b/packages/babel-preset-env-standalone/README.md deleted file mode 100644 index e4de61fa68de..000000000000 --- a/packages/babel-preset-env-standalone/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# @babel/preset-env-standalone - -> Standalone build of babel-preset-env for use in non-Node.js environments. - -See our website [@babel/preset-env-standalone](https://babeljs.io/docs/en/next/babel-preset-env-standalone.html) for more information. - -## Install - -Using npm: - -```sh -npm install --save-dev @babel/preset-env-standalone -``` - -or using yarn: - -```sh -yarn add @babel/preset-env-standalone --dev -``` diff --git a/packages/babel-preset-env-standalone/package.json b/packages/babel-preset-env-standalone/package.json deleted file mode 100644 index eea41b28bd8b..000000000000 --- a/packages/babel-preset-env-standalone/package.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "@babel/preset-env-standalone", - "version": "7.8.3", - "description": "Standalone build of babel-preset-env for use in non-Node.js environments.", - "main": "babel-preset-env.js", - "files": [ - "babel-preset-env.js", - "babel-preset-env.min.js" - ], - "scripts": { - "prepublishOnly": "cd ../.. && make prepublish-build-preset-env-standalone" - }, - "devDependencies": { - "@babel/plugin-proposal-dynamic-import": "^7.8.3", - "@babel/plugin-proposal-json-strings": "^7.8.3", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-proposal-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.0", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0", - "@babel/plugin-syntax-top-level-await": "^7.8.3", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", - "@babel/plugin-transform-new-target": "^7.8.3", - "@babel/preset-env": "^7.8.3", - "@babel/standalone": "^7.8.3", - "lodash": "^4.17.13" - }, - "keywords": [ - "babel", - "babel-preset-env", - "babeljs", - "6to5", - "transpile", - "preset", - "standalone", - "transpiler" - ], - "license": "MIT", - "publishConfig": { - "access": "public" - }, - "bugs": { - "url": "https://github.com/babel/babel/issues" - }, - "homepage": "https://github.com/babel/babel/packages/babel-preset-env-standalone#readme", - "jest": { - "transformIgnorePatterns": [ - "/node_modules/", - "babel-preset-env.js" - ] - } -} diff --git a/packages/babel-preset-env-standalone/src/available-plugins.js b/packages/babel-preset-env-standalone/src/available-plugins.js deleted file mode 100644 index bb66ed7777ec..000000000000 --- a/packages/babel-preset-env-standalone/src/available-plugins.js +++ /dev/null @@ -1,34 +0,0 @@ -/* eslint sort-keys: "error" */ - -import { availablePlugins, registerPlugin } from "@babel/standalone"; -import proposalJsonStrings from "@babel/plugin-proposal-json-strings"; -import proposalDynamicImport from "@babel/plugin-proposal-dynamic-import"; -import proposalNullishCoalescingOperator from "@babel/plugin-proposal-nullish-coalescing-operator"; -import proposalOptionalChaining from "@babel/plugin-proposal-optional-chaining"; -import syntaxJsonStrings from "@babel/plugin-syntax-json-strings"; -import syntaxNullishCoalescingOperator from "@babel/plugin-syntax-nullish-coalescing-operator"; -import syntaxOptionalChaining from "@babel/plugin-syntax-nullish-coalescing-operator"; -import syntaxTopLevelAwait from "@babel/plugin-syntax-top-level-await"; -import transformNamedCapturingGroupsRegex from "@babel/plugin-transform-named-capturing-groups-regex"; -import transformNewTarget from "@babel/plugin-transform-new-target"; - -const notIncludedPlugins = { - "proposal-dynamic-import": proposalDynamicImport, - "proposal-json-strings": proposalJsonStrings, - "proposal-nullish-coalescing-operator": proposalNullishCoalescingOperator, - "proposal-optional-chaining": proposalOptionalChaining, - "syntax-json-strings": syntaxJsonStrings, - "syntax-nullish-coalescing-operator": syntaxNullishCoalescingOperator, - "syntax-optional-chaining": syntaxOptionalChaining, - "syntax-top-level-await": syntaxTopLevelAwait, - "transform-named-capturing-groups-regex": transformNamedCapturingGroupsRegex, - "transform-new-target": transformNewTarget, -}; - -Object.keys(notIncludedPlugins).forEach(pluginName => { - if (!availablePlugins[pluginName]) { - registerPlugin(pluginName, notIncludedPlugins[pluginName]); - } -}); - -export default availablePlugins; diff --git a/packages/babel-preset-env-standalone/src/caniuse-lite-regions.js b/packages/babel-preset-env-standalone/src/caniuse-lite-regions.js deleted file mode 100644 index f053ebf7976e..000000000000 --- a/packages/babel-preset-env-standalone/src/caniuse-lite-regions.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = {}; diff --git a/packages/babel-preset-env-standalone/src/index.js b/packages/babel-preset-env-standalone/src/index.js deleted file mode 100644 index e02ce8176d92..000000000000 --- a/packages/babel-preset-env-standalone/src/index.js +++ /dev/null @@ -1,8 +0,0 @@ -/* global VERSION */ - -import { registerPreset } from "@babel/standalone"; -import babelPresetEnv from "@babel/preset-env"; - -registerPreset("env", babelPresetEnv); - -export const version = VERSION; diff --git a/packages/babel-preset-env-standalone/test/available-plugins.js b/packages/babel-preset-env-standalone/test/available-plugins.js deleted file mode 100644 index bfaa76beac53..000000000000 --- a/packages/babel-preset-env-standalone/test/available-plugins.js +++ /dev/null @@ -1,19 +0,0 @@ -import expectedAvailablePlugins from "@babel/preset-env/lib/available-plugins"; -import difference from "lodash/difference"; - -// build-babel-preset-env-standalone in CI coverage tests is skipped, so we skip this test as well -(process.env.TEST_TYPE === "cov" ? describe.skip : describe)( - "available-plugins", - () => { - const actualAvailablePlugins = require("../lib/available-plugins").default; - it("should be a superset of available-plugins in @babel/preset-env", () => { - const expectedPluginList = Object.keys(expectedAvailablePlugins); - expectedPluginList.sort(); - - const actualPluginList = Object.keys(actualAvailablePlugins); - actualPluginList.sort(); - // If this test is failed, add the missing plugins to ./src/available-plugins - expect(difference(expectedPluginList, actualPluginList)).toEqual([]); - }); - }, -); diff --git a/packages/babel-preset-env-standalone/test/babel-preset-env.js b/packages/babel-preset-env-standalone/test/babel-preset-env.js deleted file mode 100644 index d1d2600ca362..000000000000 --- a/packages/babel-preset-env-standalone/test/babel-preset-env.js +++ /dev/null @@ -1,64 +0,0 @@ -// build-babel-standalone in CI coverage tests is skipped, so we skip this test as well -(process.env.TEST_TYPE === "cov" ? describe.skip : describe)( - "babel-preset-env-standalone", - () => { - const Babel = require("@babel/standalone/babel"); - jest.mock("Babel", () => require("@babel/standalone/babel"), { - virtual: true, - }); - require("../babel-preset-env"); - - it("works w/o targets", () => { - const output = Babel.transform("const a = 1;", { - sourceType: "script", - presets: ["env"], - }).code; - expect(output).toBe("var a = 1;"); - }); - - it("doesn't transpile `const` with chrome 60", () => { - const output = Babel.transform("const a = 1;", { - sourceType: "script", - presets: [ - [ - "env", - { - targets: { - chrome: 60, - }, - }, - ], - ], - }).code; - expect(output).toBe("const a = 1;"); - }); - - it("transpiles `const` with chrome 60 and preset-es2015", () => { - const output = Babel.transform("const a = 1;", { - sourceType: "script", - presets: [ - [ - "env", - { - targets: { - chrome: 60, - }, - }, - ], - "es2015", - ], - }).code; - expect(output).toBe("var a = 1;"); - }); - - it("uses transform-new-targets plugin", () => { - const output = Babel.transform("function Foo() {new.target}", { - sourceType: "script", - presets: ["env"], - }).code; - expect(output).toBe( - "function Foo() {\n this instanceof Foo ? this.constructor : void 0;\n}", - ); - }); - }, -); diff --git a/yarn.lock b/yarn.lock index 338b31fea765..9e8330196f57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1819,13 +1819,6 @@ dependencies: "@types/node" ">= 8" -"@rollup/plugin-alias@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-2.2.0.tgz#3ac52ece8b39583249884adb90fb316484389fe5" - integrity sha512-//6zmlHGbmousaatu4pBlC61gqZykLbH0c2GESBO4JgK5xFZgb/ih0zlg/5/BmTAczX5R/xsHRnsYsu4KyHV5w== - dependencies: - slash "^3.0.0" - "@rollup/plugin-json@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.0.0.tgz#4462e83c7ad5544bef4a601a6e8450daedc4b69b"