diff --git a/projects/npm-tools/packages/npm-scripts/README.md b/projects/npm-tools/packages/npm-scripts/README.md index 48a445d8b..4be5494c4 100644 --- a/projects/npm-tools/packages/npm-scripts/README.md +++ b/projects/npm-tools/packages/npm-scripts/README.md @@ -28,14 +28,12 @@ npm install --save-dev @liferay/npm-scripts ### build -Build script that compiles all necessary JavaScript, soy, and bundles it together using `liferay-npm-bundler`. +Build script that compiles all necessary JavaScript and bundles it together using `liferay-npm-bundler`. ```sh liferay-npm-scripts build ``` -Do you have soy dependencies? `build` should automatically detect them. - Do you need to use `liferay-npm-bridge-generator`? Just add a `.npmbridgerc` file and follow the configuration options [here](https://github.com/liferay/liferay-npm-build-tools/wiki/How-to-use-liferay-npm-bridge-generator). ### check diff --git a/projects/npm-tools/packages/npm-scripts/package.json b/projects/npm-tools/packages/npm-scripts/package.json index 2678c5cd1..341013c19 100644 --- a/projects/npm-tools/packages/npm-scripts/package.json +++ b/projects/npm-tools/packages/npm-scripts/package.json @@ -58,7 +58,6 @@ "liferay-npm-bundler-plugin-replace-browser-modules": "2.29.0", "liferay-npm-bundler-plugin-resolve-linked-dependencies": "2.29.0", "liferay-theme-tasks": "11.5.1", - "metal-tools-soy": "4.3.2", "mini-css-extract-plugin": "0.11.2", "minimist": "^1.2.0", "path-browserify": "^1.0.1", diff --git a/projects/npm-tools/packages/npm-scripts/src/config/jest.config.js b/projects/npm-tools/packages/npm-scripts/src/config/jest.config.js index 2906a012e..5dc69de23 100644 --- a/projects/npm-tools/packages/npm-scripts/src/config/jest.config.js +++ b/projects/npm-tools/packages/npm-scripts/src/config/jest.config.js @@ -19,9 +19,8 @@ module.exports = { transform: { /* eslint-disable sort-keys */ '\\.scss$': path.join(__dirname, '..', 'jest', 'transformSass.js'), - '\\.soy$': path.join(__dirname, '..', 'jest', 'transformSoy.js'), '.+': path.join(__dirname, '..', 'jest', 'transformBabel.js'), /* eslint-enable sort-keys */ }, - transformIgnorePatterns: ['/node_modules/', '/.*\\.soy$'], + transformIgnorePatterns: ['/node_modules/'], }; diff --git a/projects/npm-tools/packages/npm-scripts/src/config/npmscripts.config.js b/projects/npm-tools/packages/npm-scripts/src/config/npmscripts.config.js index 2d5cda838..a287a2d44 100644 --- a/projects/npm-tools/packages/npm-scripts/src/config/npmscripts.config.js +++ b/projects/npm-tools/packages/npm-scripts/src/config/npmscripts.config.js @@ -77,92 +77,15 @@ module.exports = { 'sources': ['src/main/resources/META-INF/resources'], }, - // Passed to: - // - `metalsoy` executable (via `generateSoyDependencies()`). - - dependencies: [ - 'clay-alert', - 'clay-autocomplete', - 'clay-badge', - 'clay-button', - 'clay-card', - 'clay-card-grid', - 'clay-checkbox', - 'clay-collapse', - 'clay-component', - 'clay-data-provider', - 'clay-dataset-display', - 'clay-dropdown', - 'clay-icon', - 'clay-label', - 'clay-link', - 'clay-list', - 'clay-loading-indicator', - 'clay-management-toolbar', - 'clay-modal', - 'clay-multi-select', - 'clay-navigation-bar', - 'clay-pagination', - 'clay-pagination-bar', - 'clay-portal', - 'clay-progress-bar', - 'clay-radio', - 'clay-select', - 'clay-sticker', - 'clay-table', - 'clay-tooltip', - 'frontend-js-metal-web', - 'frontend-js-react-web', - 'frontend-js-web', - 'frontend-taglib-clay', - 'frontend-taglib', - 'hello-soy-web', - 'metal', - 'metal-affix', - 'metal-ajax', - 'metal-anim', - 'metal-aop', - 'metal-assertions', - 'metal-clipboard', - 'metal-component', - 'metal-debounce', - 'metal-dom', - 'metal-drag-drop', - 'metal-events', - 'metal-incremental-dom', - 'metal-jsx', - 'metal-key', - 'metal-keyboard-focus', - 'metal-multimap', - 'metal-pagination', - 'metal-path-parser', - 'metal-position', - 'metal-promise', - 'metal-router', - 'metal-scrollspy', - 'metal-soy', - 'metal-soy-bundle', - 'metal-state', - 'metal-storage', - 'metal-structs', - 'metal-throttle', - 'metal-toggler', - 'metal-uri', - 'metal-useragent', - 'metal-web-component', - ], - // Passed to: // - `babel` executable (via `runBabel()`). // - `jest` executable (via resolver.js). - // - `metalsoy` executable (via `buildSoy()`). input: 'src/main/resources/META-INF/resources', // Passed to: // - `babel` executable (via `runBabel()`). // - `jest` executable (via resolver.js). - // - `translateSoy()`. // - `minify()`. output: 'build/node/packageRunBuild/resources', @@ -176,7 +99,7 @@ module.exports = { ], // Used in various places to keep intermediate artefacts out of Gradle's - // way (see `buildSoy()`, `withTempFile()`, etc). + // way (see `withTempFile()`, etc). temp: 'build/npmscripts', }, diff --git a/projects/npm-tools/packages/npm-scripts/src/jest/resolver.js b/projects/npm-tools/packages/npm-scripts/src/jest/resolver.js index 12c97ce02..432dc9530 100644 --- a/projects/npm-tools/packages/npm-scripts/src/jest/resolver.js +++ b/projects/npm-tools/packages/npm-scripts/src/jest/resolver.js @@ -3,32 +3,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -const path = require('path'); - -const getMergedConfig = require('../utils/getMergedConfig'); - -const BUILD_CONFIG = getMergedConfig('npmscripts', 'build'); -const CWD = process.cwd(); - -const INPUT = BUILD_CONFIG.input.replace('/', path.sep); -const OUTPUT = BUILD_CONFIG.output; - module.exports = function (request, options) { - const {basedir, defaultResolver} = options; - - // Redirect imports to .soy.js files from input to output directory - - if (basedir.startsWith(CWD)) { - if (/\.soy(?:\.js)?$/.test(request)) { - const dir = basedir.replace(INPUT, OUTPUT); - - return path.join( - dir, - path.dirname(request), - path.basename(request, '.js') + '.js' - ); - } - } + const {defaultResolver} = options; // Redirect .css files to our empty.css mock file diff --git a/projects/npm-tools/packages/npm-scripts/src/jest/transformSoy.js b/projects/npm-tools/packages/npm-scripts/src/jest/transformSoy.js deleted file mode 100644 index 0f2c70d82..000000000 --- a/projects/npm-tools/packages/npm-scripts/src/jest/transformSoy.js +++ /dev/null @@ -1,31 +0,0 @@ -/** - * SPDX-FileCopyrightText: © 2019 Liferay, Inc. - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * This transform allows tests to require files of the form "Foo.soy" - * from other projects without blowing up, by substituting no-op - * templates that can be safely passed to `Soy.register()`. - * - * In tests that exercise their own project's Soy templates, we already build - * corresponding "Foo.soy.js" files and have mappings configured so that Jest - * can resolve them. - */ -module.exports = { - canInstrument: true, - - getCacheKey(_src, file, _configString, _options) { - return file; - }, - - process(_src, _file) { - return ` - const render = () => {}; - - const templates = {render}; - - module.exports = templates; - `; - }, -}; diff --git a/projects/npm-tools/packages/npm-scripts/src/scripts/build.js b/projects/npm-tools/packages/npm-scripts/src/scripts/build.js index c0888cd24..6eee43fcf 100644 --- a/projects/npm-tools/packages/npm-scripts/src/scripts/build.js +++ b/projects/npm-tools/packages/npm-scripts/src/scripts/build.js @@ -31,7 +31,6 @@ let runBridge = require('../utils/runBridge'); let runBundler = require('../utils/runBundler'); let runWebpackAsBundler = require('../utils/runWebpackAsBundler'); const setEnv = require('../utils/setEnv'); -let {buildSoy, cleanSoy, soyExists, translateSoy} = require('../utils/soy'); const validateConfig = require('../utils/validateConfig'); let webpack = require('./webpack'); @@ -42,9 +41,7 @@ const CWD = process.cwd(); ({ buildSass, - buildSoy, cleanCache, - cleanSoy, expandGlobs, hasRootConfigChanged, isCacheValid, @@ -55,14 +52,10 @@ const CWD = process.cwd(); runTSC, runWebpackAsBundler, setCache, - soyExists, - translateSoy, webpack, } = instrument({ buildSass, - buildSoy, cleanCache, - cleanSoy, expandGlobs, hasRootConfigChanged, isCacheValid, @@ -73,8 +66,6 @@ const CWD = process.cwd(); runTSC, runWebpackAsBundler, setCache, - soyExists, - translateSoy, webpack, })); @@ -108,7 +99,7 @@ const ROOT_CONFIGS = [ * Babel and liferay-npm-bundler are run unless the disable flag is set, * liferay-npm-bridge-generator and webpack are run if the corresponding * ".npmbridgerc" and "webpack.config.js" files, respectively, are - * present, and soy is run when soy files are detected. + * present. * `minify()` is run unless `NODE_ENV` is `development`. */ module.exports = async function (...args) { @@ -143,7 +134,6 @@ module.exports = async function (...args) { path.join(BUILD_CONFIG.input, '**/*.json'), path.join(BUILD_CONFIG.input, '**/*.jsx'), path.join(BUILD_CONFIG.input, '**/*.scss'), - path.join(BUILD_CONFIG.input, '**/*.soy'), path.join(BUILD_CONFIG.input, '**/*.ts'), path.join(BUILD_CONFIG.input, '**/*.tsx'), ...ROOT_CONFIGS, @@ -181,12 +171,6 @@ module.exports = async function (...args) { log(`BUILD JS: No previous build detected.`); } - const useSoy = soyExists(); - - if (useSoy) { - buildSoy(); - } - if (inputPathExists) { const isTypeScript = fs.existsSync('tsconfig.json'); @@ -303,16 +287,10 @@ module.exports = async function (...args) { ); } - translateSoy(BUILD_CONFIG.output); - if (fs.existsSync(path.join(CWD, '.npmbridgerc'))) { runBridge(); } - if (useSoy) { - cleanSoy(); - } - if (process.env.NODE_ENV !== 'development') { await minify(); } diff --git a/projects/npm-tools/packages/npm-scripts/src/scripts/test.js b/projects/npm-tools/packages/npm-scripts/src/scripts/test.js index 86c9ceb79..7f234eac1 100644 --- a/projects/npm-tools/packages/npm-scripts/src/scripts/test.js +++ b/projects/npm-tools/packages/npm-scripts/src/scripts/test.js @@ -8,7 +8,6 @@ const fs = require('fs'); const SignalHandler = require('../utils/SignalHandler'); const getMergedConfig = require('../utils/getMergedConfig'); const log = require('../utils/log'); -const {buildSoy, cleanSoy, soyExists} = require('../utils/soy'); const spawnSync = require('../utils/spawnSync'); const BABEL_CONFIG = getMergedConfig('babel'); @@ -21,8 +20,6 @@ const PREFIX_BACKUP = 'TEMP-'; * Main script that runs `jest` with a merged config */ module.exports = function (arrArgs = []) { - const useSoy = soyExists(); - const CONFIG_PATH = 'TEMP_jest.config.json'; fs.writeFileSync(CONFIG_PATH, JSON.stringify(JEST_CONFIG)); @@ -34,10 +31,6 @@ module.exports = function (arrArgs = []) { }); try { - if (useSoy) { - buildSoy(); - } - const env = { ...process.env, NODE_ENV: 'test', @@ -59,10 +52,6 @@ module.exports = function (arrArgs = []) { spawnSync('jest', ['--config', CONFIG_PATH, ...arrArgs.slice(1)], { env, }); - - if (useSoy) { - cleanSoy(); - } } finally { dispose(); diff --git a/projects/npm-tools/packages/npm-scripts/src/utils/buildArtifacts.js b/projects/npm-tools/packages/npm-scripts/src/utils/buildArtifacts.js index 512a18b9c..34cb5410d 100644 --- a/projects/npm-tools/packages/npm-scripts/src/utils/buildArtifacts.js +++ b/projects/npm-tools/packages/npm-scripts/src/utils/buildArtifacts.js @@ -136,7 +136,6 @@ function setCache(moduleName, srcFiles, output) { output + '/**/*.jsx', output + '/**/*.map', output + '/**/*.scss', - output + '/**/*.soy', output + '/**/*.ts', output + '/**/*.tsx', ], diff --git a/projects/npm-tools/packages/npm-scripts/src/utils/generateSoyDependencies.js b/projects/npm-tools/packages/npm-scripts/src/utils/generateSoyDependencies.js deleted file mode 100644 index 0661fc928..000000000 --- a/projects/npm-tools/packages/npm-scripts/src/utils/generateSoyDependencies.js +++ /dev/null @@ -1,56 +0,0 @@ -/** - * SPDX-FileCopyrightText: © 2019 Liferay, Inc. - * SPDX-License-Identifier: BSD-3-Clause - */ - -const path = require('path'); -const process = require('process'); -const resolve = require('resolve'); - -/** - * Helper to generate string glob of soy dependencies - * @param {Array.} dependencies - * @returns {string} - */ -function generateSoyDependencies(dependencies) { - const cwd = process.cwd(); - const projectName = path.basename(cwd); - - const stringDependencies = dependencies - .map((dependency) => { - let resolvedDependency = null; - - try { - - // Requires the `package.json` file to avoid resolving - // the main entry point of the package so we can safely - // infer the directory from the package root - - resolvedDependency = path.dirname( - resolve.sync(`${dependency}/package.json`, { - basedir: cwd, - }) - ); - } - catch (error) { - - // Swallow. - - } - - return resolvedDependency; - }) - .filter(Boolean) - .filter( - (dependencyPath) => path.basename(dependencyPath) !== projectName - ); - - const joinedDependencies = - stringDependencies.length === 1 - ? stringDependencies - : `{${stringDependencies.join(',')}}`; - - return `${joinedDependencies}/src/**/*.soy`; -} - -module.exports = generateSoyDependencies; diff --git a/projects/npm-tools/packages/npm-scripts/src/utils/getMergedConfig.js b/projects/npm-tools/packages/npm-scripts/src/utils/getMergedConfig.js index 4e9d38872..241bed887 100644 --- a/projects/npm-tools/packages/npm-scripts/src/utils/getMergedConfig.js +++ b/projects/npm-tools/packages/npm-scripts/src/utils/getMergedConfig.js @@ -33,63 +33,6 @@ function pluck(config, property) { return config[property]; } -function isObject(maybeObject) { - return ( - maybeObject && - Object.prototype.toString.call(maybeObject) === '[object Object]' - ); -} - -/** - * Returns a deep copy of `object`, with any instance of `property` - * transformed using the `callback` (which should accept the value of - * the property and return the new value). - */ -function filter(object, property, callback) { - if (Array.isArray(object)) { - return object.map((item) => filter(item, property, callback)); - } - else if (isObject(object)) { - return Object.entries(object).reduce((acc, [key, value]) => { - return { - ...acc, - [key]: - key === property - ? callback(value) - : filter(value, property, callback), - }; - }, {}); - } - else { - return object; - } -} - -/** - * We want to use @babel-preset/react as a default, but some projects use - * babel-plugin-incremental-dom, and we cannot turn off the preset - * without this hack; see: - * - * - https://github.com/babel/babel/issues/3016 - * - https://babeljs.io/docs/en/babel-preset-env/#exclude - */ -function hackilySupportIncrementalDOM(config) { - const {liferay, ...rest} = config; - - const excludes = (liferay && liferay.excludes) || {}; - - return Object.entries(excludes).reduce((acc, [property, values]) => { - return filter(acc, property, (value) => { - if (Array.isArray(value)) { - return value.filter((v) => !values.includes(v)); - } - else { - return value; - } - }); - }, rest); -} - /** * Helper to get JSON configs * @param {string} type Name of configuration ("babel", "bundler", "jest" etc) @@ -115,15 +58,6 @@ function getMergedConfig(type, property) { [baseConfig, getUserConfig('babel')], deepMerge.MODE.BABEL ); - - // (Temporary) special case required by: - // - // https://github.com/liferay/liferay-npm-tools/issues/303 - // - // TODO: Remove once incremental-dom is no longer used in - // liferay-portal. - - mergedConfig = hackilySupportIncrementalDOM(mergedConfig); } break; diff --git a/projects/npm-tools/packages/npm-scripts/src/utils/soy.js b/projects/npm-tools/packages/npm-scripts/src/utils/soy.js deleted file mode 100644 index 865c64821..000000000 --- a/projects/npm-tools/packages/npm-scripts/src/utils/soy.js +++ /dev/null @@ -1,143 +0,0 @@ -/** - * SPDX-FileCopyrightText: © 2019 Liferay, Inc. - * SPDX-License-Identifier: BSD-3-Clause - */ - -const fs = require('fs-extra'); -const path = require('path'); - -const expandGlobs = require('./expandGlobs'); -const generateSoyDependencies = require('./generateSoyDependencies'); -const getMergedConfig = require('./getMergedConfig'); -const log = require('./log'); -const runBabel = require('./runBabel'); -const spawnSync = require('./spawnSync'); - -const BUILD_CONFIG = getMergedConfig('npmscripts', 'build'); -const SOY_TEMP_DIR = path.join(BUILD_CONFIG.temp, 'soy'); - -/** - * Compiles soy files by running `metalsoy` bin with specified soy dependencies - */ -function buildSoy() { - spawnSync('metalsoy', [ - '-s', - path.join(BUILD_CONFIG.input, '**', '*.soy'), - '-d', - SOY_TEMP_DIR, - '--soyDeps', - generateSoyDependencies(BUILD_CONFIG.dependencies), - '--externalMsgFormat', - "Liferay.Language.get('$2')", - ]); - - runBabel(SOY_TEMP_DIR, '--out-dir', BUILD_CONFIG.output, '--source-maps'); -} - -/** - * Removes any generated soy.js files - */ -function cleanSoy() { - fs.removeSync(SOY_TEMP_DIR); -} - -const EXTERNAL_MSG_REGEX = /var (MSG_EXTERNAL_\d+(?:\$\$\d+)?) = goog\.getMsg\(\s*'([\w,-{}$]+)'\s*(?:,\s*\{([\s\S]+?)\})?\);/g; - -/** - * Scans soy files in `directory` replacing calls to `goog.getMsg()` - * with calls to `Liferay.Language.get()`. - * - * This covers compiled soy that comes in via NPM modules (eg. Clay v2.0 - * packages); in-tree soy is handled by `buildSoy()` and the - * `--externalMsgFormat` option above. - */ -function translateSoy(directory) { - const files = expandGlobs([path.posix.join(directory, '**/*.soy.js')]); - - if (!files.length) { - return; - } - - let changedFiles = 0; - - files.forEach((file) => { - const contents = fs.readFileSync(file, 'utf8'); - - const updated = contents.replace( - EXTERNAL_MSG_REGEX, - (match, binding, _template, params) => { - - /* - * Turn: var MSG_EXTERNAL_3292565618977302987 = goog.getMsg('all-selected'); - * into: var MSG_EXTERNAL_3292565618977302987 = Liferay.Language.get('all-selected'); - */ - let externalMsg = match.replace( - EXTERNAL_MSG_REGEX, - `var $1 = Liferay.Language.get('$2');` - ); - - /* - * Turn this (split across lines for readability; normally this - * would all be on one line): - * - * var MSG_EXTERNAL_65349286544398424 = goog.getMsg( - * '{$selectedItems}-of-{$totalItems}', { - * 'selectedItems': '\u00010\u0001', - * 'totalItems': '\u00011\u0001' - * } - * ); - * - * into: - * - * var MSG_EXTERNAL_65349286544398424 = Liferay.Language.get( - * 'x-of-x', { - * 'selectedItems': '\u00010\u0001', - * 'totalItems': '\u00011\u0001' - * } - * ); - * MSG_EXTERNAL_65349286544398424.replace( - * /{(\d+)}/g, - * '\x01$1\x01' - * ); - * - * @see https://github.com/google/closure-templates/blob/514a6381287d732e41fcab660305ebf33920a42f/java/src/com/google/template/soy/incrementaldomsrc/AssistantForHtmlMsgs.java#L105-L139 - */ - if (params) { - externalMsg = externalMsg.replace(/\{\$[^}]+}/g, 'x'); - - externalMsg = externalMsg += `\n\t${binding} = ${binding}.replace(/{(\\d+)}/g, '\\x01$1\\x01');\n`; - } - - return externalMsg; - } - ); - - if (contents !== updated) { - changedFiles++; - fs.writeFileSync(file, updated); - } - }); - - if (changedFiles) { - const objects = changedFiles === 1 ? 'file' : 'files'; - - log( - `Updated goog.getMsg() -> Liferay.Language.get() in ${changedFiles} ${objects}` - ); - } -} - -/** - * Checks to see if there are any soy files - */ -function soyExists() { - return !!expandGlobs([path.posix.join(BUILD_CONFIG.input, '**/*.soy')]) - .length; -} - -module.exports = { - buildSoy, - cleanSoy, - soyExists, - translateSoy, -}; diff --git a/projects/npm-tools/packages/npm-scripts/test/utils/expandGlobs.js b/projects/npm-tools/packages/npm-scripts/test/utils/expandGlobs.js index 0bebafe2e..415924442 100644 --- a/projects/npm-tools/packages/npm-scripts/test/utils/expandGlobs.js +++ b/projects/npm-tools/packages/npm-scripts/test/utils/expandGlobs.js @@ -31,13 +31,11 @@ const FIXTURES = ` apps/journal/journal-web/classes/META-INF/resources/node_modules/journal-web$lodash.escape@4.0.1/index.js apps/journal/journal-web/src/main/resources/META-INF/resources/js/DDMStructuresManagementToolbarDefaultEventHandler.es.js apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/js/actions/updateRowColumnsNumber.es.js - apps/portal-portlet-bridge/portal-portlet-bridge-soy-impl/src/test/resources/com/liferay/portal/portlet/bridge/soy/internal/dependencies/ES6Command.es.js node_modules/domain-browser/.eslintrc.js node_modules/pako/lib/zlib/gzheader.js node_modules/worker-farm/lib/farm.js npmscripts.config.js sdk/gradle-plugins-theme-builder/src/gradleTest/classic/src/main/webapp/css/liferay-font-awesome/scss/_path-alloy.scss - util/portal-tools-soy-builder/src/test/resources/com/liferay/portal/tools/soy/builder/commands/dependencies/build_soy/expected/hello_world.soy.js util/sass-compiler-jni/src/test/resources/com/liferay/sass/compiler/jni/internal/dependencies/sass-spec/35_varargs_false/input.scss ` .trim() @@ -59,7 +57,6 @@ const PORTAL_IGNORE_GLOBS = [ '!.eslintrc.js', '!npmscripts.config.js', '!.prettierrc.js', - '*.soy.js', 'build/**', 'classes/**', 'css/clay/**', @@ -67,7 +64,6 @@ const PORTAL_IGNORE_GLOBS = [ 'zippableResources/**', 'sdk/**', '/copyright.js', - 'apps/portal-portlet-bridge/portal-portlet-bridge-soy-impl/src/test/resources/com/liferay/portal/portlet/bridge/soy/internal/dependencies/**/*.js', 'apps/fragment/fragment-demo-data-creator-impl/src/main/resources/com/liferay/fragment/demo/data/creator/internal/dependencies/**/*.js', 'apps/fragment/fragment-test/src/testIntegration/resources/com/liferay/fragment/dependencies/**/*.js', '/yarn-*.js', @@ -160,8 +156,6 @@ describe('expandGlobs()', () => { 'apps/frontend-theme-porygon', 'apps/frontend-theme-porygon/frontend-theme-porygon', 'apps/layout/layout-content-page-editor-web', - 'apps/portal-portlet-bridge', - 'apps/portal-portlet-bridge/portal-portlet-bridge-soy-impl', 'sdk/gradle-plugins-theme-builder', ]); }); diff --git a/projects/npm-tools/packages/npm-scripts/test/utils/getMergedConfig.js b/projects/npm-tools/packages/npm-scripts/test/utils/getMergedConfig.js index 63084000c..1356886ac 100644 --- a/projects/npm-tools/packages/npm-scripts/test/utils/getMergedConfig.js +++ b/projects/npm-tools/packages/npm-scripts/test/utils/getMergedConfig.js @@ -67,18 +67,6 @@ describe('getMergedConfig()', () => { presets: ['fancy', '@babel/preset-react'], }, ], - - plugins: [ - [ - 'incremental-dom', - { - components: true, - namespaceAttributes: true, - prefix: 'IncrementalDOM', - runtime: 'iDOMHelpers', - }, - ], - ], })); }); @@ -91,12 +79,14 @@ describe('getMergedConfig()', () => { targets: expect.stringContaining('Chrome version'), }, ], + '@babel/preset-react', '@babel/preset-typescript', ]); expect(config.overrides[0].presets).toMatchObject([ ['@babel/preset-env', expect.anything()], 'fancy', + '@babel/preset-react', ]); }); }); diff --git a/projects/npm-tools/packages/npm-scripts/test/utils/getRegExpForGlob.js b/projects/npm-tools/packages/npm-scripts/test/utils/getRegExpForGlob.js index 659871a37..549f977b1 100644 --- a/projects/npm-tools/packages/npm-scripts/test/utils/getRegExpForGlob.js +++ b/projects/npm-tools/packages/npm-scripts/test/utils/getRegExpForGlob.js @@ -198,9 +198,6 @@ describe('getRegExpForGlob()', () => { expect('apps/layout/layout-content-page-editor-web/.eslintrc.js') .not.toMatchGlob('!.prettierrc.js'); - expect('util/portal-tools-soy-builder/src/test/resources/com/liferay/portal/tools/soy/builder/commands/dependencies/build_soy/expected/hello_world.soy.js') - .toMatchGlob('**/*.soy.js'); - expect('apps/frontend-editor/frontend-editor-ckeditor-web/build/unzipped-jar/META-INF/resources/_diffs/plugins/media/dialogs/video.js') .toMatchGlob('**/build/**/*'); @@ -226,9 +223,6 @@ describe('getRegExpForGlob()', () => { expect('npmscripts.config.js') .not.toMatchGlob('/copyright.js'); - expect('apps/portal-portlet-bridge/portal-portlet-bridge-soy-impl/src/test/resources/com/liferay/portal/portlet/bridge/soy/internal/dependencies/ES6Command.es.js') - .toMatchGlob('apps/portal-portlet-bridge/portal-portlet-bridge-soy-impl/src/test/resources/com/liferay/portal/portlet/bridge/soy/internal/dependencies/**/*.js'); - expect('apps/fragment/fragment-demo-data-creator-impl/src/main/resources/com/liferay/fragment/demo/data/creator/internal/dependencies/fragment1/demo.js') .toMatchGlob('apps/fragment/fragment-demo-data-creator-impl/src/main/resources/com/liferay/fragment/demo/data/creator/internal/dependencies/**/*.js'); diff --git a/yarn.lock b/yarn.lock index 5b6de9c12..4cddeb603 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4035,11 +4035,6 @@ binaryextensions@^2.1.2: resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22" integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg== -binaryextensions@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-1.0.1.tgz#1e637488b35b58bda5f4774bf96a5212a8c90755" - integrity sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U= - bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" @@ -4396,7 +4391,7 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= -camelcase@^4.0.0, camelcase@^4.1.0: +camelcase@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= @@ -5892,7 +5887,7 @@ duplexer@^0.1.1, duplexer@~0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -duplexify@^3.2.0, duplexify@^3.5.0, duplexify@^3.6.0: +duplexify@^3.5.0, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== @@ -6197,7 +6192,7 @@ escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= @@ -7025,7 +7020,7 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.0.0, find-up@^2.1.0: +find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= @@ -7101,11 +7096,6 @@ finished@1.2.2, finished@~1.2.2: dependencies: ee-first "1.0.3" -first-chunk-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" - integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04= - first-chunk-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70" @@ -7519,7 +7509,7 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob-parent@^3.0.0, glob-parent@^3.0.1, glob-parent@^3.1.0: +glob-parent@^3.0.1, glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= @@ -7534,20 +7524,6 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob-stream@^5.3.2: - version "5.3.5" - resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22" - integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI= - dependencies: - extend "^3.0.0" - glob "^5.0.3" - glob-parent "^3.0.0" - micromatch "^2.3.7" - ordered-read-streams "^0.3.0" - through2 "^0.6.0" - to-absolute-glob "^0.1.1" - unique-stream "^2.0.2" - glob-stream@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" @@ -7587,17 +7563,6 @@ glob-watcher@^5.0.3: normalize-path "^3.0.0" object.defaults "^1.1.0" -glob@^5.0.3: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^6.0.1: version "6.0.4" resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" @@ -7970,7 +7935,7 @@ gulp-coveralls@0.1.4: gulp-util "^3.0.4" through2 "^1.1.1" -gulp-if@^2.0.0, gulp-if@^2.0.2: +gulp-if@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/gulp-if/-/gulp-if-2.0.2.tgz#a497b7e7573005041caa2bc8b7dda3c80444d629" integrity sha1-pJe351cwBQQcqivIt92jyARE1ik= @@ -7979,14 +7944,6 @@ gulp-if@^2.0.0, gulp-if@^2.0.2: ternary-stream "^2.0.1" through2 "^2.0.1" -gulp-ignore@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/gulp-ignore/-/gulp-ignore-2.0.2.tgz#5c2ea2a0a4402e0ab4a2bcd12efd9295344d78f2" - integrity sha1-XC6ioKRALgq0orzRLv2SlTRNePI= - dependencies: - gulp-match "^1.0.3" - through2 "^2.0.1" - gulp-inject@^5.0.2: version "5.0.5" resolved "https://registry.yarnpkg.com/gulp-inject/-/gulp-inject-5.0.5.tgz#c23df9cbf331447b6e13a1498cc51b63a7ceef67" @@ -8041,15 +7998,6 @@ gulp-replace-task@^0.11.0: gulp-util "^3.0.0" through2 "^2.0.0" -gulp-replace@^0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/gulp-replace/-/gulp-replace-0.5.4.tgz#69a67914bbd13c562bff14f504a403796aa0daa9" - integrity sha1-aaZ5FLvRPFYr/xT1BKQDeWqg2qk= - dependencies: - istextorbinary "1.0.2" - readable-stream "^2.0.1" - replacestream "^4.0.0" - gulp-sass@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/gulp-sass/-/gulp-sass-5.0.0.tgz#c338fc021e450a51ae977fea9014eda331ce66b7" @@ -8084,7 +8032,7 @@ gulp-terser@^2.0.0: through2 "^4.0.2" vinyl-sourcemaps-apply "^0.2.1" -gulp-util@^3.0.0, gulp-util@^3.0.4, gulp-util@^3.0.7, gulp-util@^3.0.8: +gulp-util@^3.0.0, gulp-util@^3.0.4, gulp-util@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08= @@ -8126,14 +8074,6 @@ gulp-watch@^5.0.1: vinyl "^2.1.0" vinyl-file "^2.0.0" -gulp-wrapper@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gulp-wrapper/-/gulp-wrapper-1.0.0.tgz#2bd3c3c852921d209ea448eac2810811dd6a2bf3" - integrity sha1-K9PDyFKSHSCepEjqwoEIEd1qK/M= - dependencies: - gulp-util "^3.0.4" - through2 "^0.6.5" - gulp-zip@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/gulp-zip/-/gulp-zip-3.2.0.tgz#ebd198dae6dc2d5f44d814569c8ec42118a93ef9" @@ -9341,7 +9281,7 @@ is-scoped@^1.0.0: dependencies: scoped-regex "^1.0.0" -is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: +is-stream@^1.0.0, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= @@ -9385,11 +9325,6 @@ is-utf8@^0.2.0, is-utf8@^0.2.1: resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= -is-valid-glob@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe" - integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4= - is-valid-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" @@ -9507,14 +9442,6 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -istextorbinary@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-1.0.2.tgz#ace19354d1a9a0173efeb1084ce0f87b0ad7decf" - integrity sha1-rOGTVNGpoBc+/rEITOD4ewrX3s8= - dependencies: - binaryextensions "~1.0.0" - textextensions "~1.0.0" - istextorbinary@^2.2.1, istextorbinary@^2.5.1: version "2.6.0" resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.6.0.tgz#60776315fb0fa3999add276c02c69557b9ca28ab" @@ -11257,16 +11184,6 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" @@ -11409,11 +11326,6 @@ lodash.isarray@^3.0.0: resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= -lodash.isequal@^4.0.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= - lodash.keys@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" @@ -11780,13 +11692,6 @@ mem-fs@^1.1.0, mem-fs@^1.2.0: vinyl "^2.0.1" vinyl-file "^3.0.0" -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= - dependencies: - mimic-fn "^1.0.0" - mem@^5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/mem/-/mem-5.1.1.tgz#7059b67bf9ac2c924c9f1cff7155a064394adfb3" @@ -11897,35 +11802,11 @@ merge2@^1.2.3, merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -merge@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" - integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== - merge@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98" integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w== -metal-tools-soy@4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/metal-tools-soy/-/metal-tools-soy-4.3.2.tgz#4ca9ba24f09d73990f47176ecec5a5621b158b5d" - integrity sha512-wtVtYHGP6vuPXq7/YTmuuiVkP2DHlxbSiiMJ7cdPzToGiCUoD+JszKv7vaab452uZfMHrfcmO5h6N+K+To4yqA== - dependencies: - globby "^6.1.0" - gulp-if "^2.0.0" - gulp-ignore "^2.0.1" - gulp-replace "^0.5.4" - gulp-util "^3.0.7" - gulp-wrapper "^1.0.0" - merge "^1.2.0" - soyparser "^1.0.3" - stream-combiner "^0.2.2" - stream-consume "^0.1.0" - through2 "^2.0.5" - vinyl-fs "^2.2.1" - yargs "^8.0.2" - methods@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.0.tgz#5dca4ee12df52ff3b056145986a8f01cbc86436f" @@ -11941,7 +11822,7 @@ metric-lcs@^0.1.2: resolved "https://registry.yarnpkg.com/metric-lcs/-/metric-lcs-0.1.2.tgz#87913f149410e39c7c5a19037512814eaf155e11" integrity sha512-+TZ5dUDPKPJaU/rscTzxyN8ZkX7eAVLAiQU/e+YINleXPv03SCmJShaMT1If1liTH8OcmWXZs0CmzCBRBLcMpA== -micromatch@^2.1.5, micromatch@^2.3.7: +micromatch@^2.1.5: version "2.3.11" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= @@ -12638,7 +12519,7 @@ object-assign@^3.0.0: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I= -object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -12861,14 +12742,6 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -ordered-read-streams@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b" - integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s= - dependencies: - is-stream "^1.0.1" - readable-stream "^2.0.1" - ordered-read-streams@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" @@ -12895,15 +12768,6 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA== - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - os-name@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801" @@ -13243,11 +13107,6 @@ parseurl@~1.3.2, parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -parsimmon@^1.2.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.16.0.tgz#2834e3db645b6a855ab2ea14fbaad10d82867e0f" - integrity sha512-tekGDz2Lny27SQ/5DzJdIK0lqsWwZ667SCLFIDCxaZM7VNgQjyKLbaL7FYPKpbjdxNAXFV/mSxkq5D2fnkW4pA== - pascal-case@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" @@ -13358,13 +13217,6 @@ path-type@^1.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= - dependencies: - pify "^2.0.0" - path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -14063,14 +13915,6 @@ read-pkg-up@^1.0.1: find-up "^1.0.0" read-pkg "^1.0.0" -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - read-pkg-up@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" @@ -14105,15 +13949,6 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - read-pkg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" @@ -14162,7 +13997,7 @@ read-pkg@^5.0.0, read-pkg@^5.2.0: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -14488,15 +14323,6 @@ replace-homedir@^1.0.0: is-absolute "^1.0.0" remove-trailing-separator "^1.1.0" -replacestream@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/replacestream/-/replacestream-4.0.3.tgz#3ee5798092be364b1cdb1484308492cb3dff2f36" - integrity sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA== - dependencies: - escape-string-regexp "^1.0.3" - object-assign "^4.0.1" - readable-stream "^2.0.2" - request-promise-core@1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" @@ -15502,13 +15328,6 @@ source-map@^0.7.3, source-map@~0.7.2: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== -soyparser@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/soyparser/-/soyparser-1.0.3.tgz#2203f335c6c35d39ea1e752aca2cc72c86e6bec8" - integrity sha512-1ThSQZHET12sMkg/vtX0UIwH6aW+t5YzmTzMi+SNeoDUCIX6vlKldzI3BchTJq/F+zWUgZgQPn8DB5FyeSN7HQ== - dependencies: - parsimmon "^1.2.0" - sparkles@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" @@ -15675,11 +15494,6 @@ stream-combiner@^0.2.2: duplexer "~0.1.1" through "~2.3.4" -stream-consume@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48" - integrity sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg== - stream-exhaust@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" @@ -15886,14 +15700,6 @@ strip-bom-buf@^1.0.0: dependencies: is-utf8 "^0.2.1" -strip-bom-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee" - integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4= - dependencies: - first-chunk-stream "^1.0.0" - strip-bom "^2.0.0" - strip-bom-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca" @@ -16313,24 +16119,11 @@ textextensions@^2.5.0: resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4" integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ== -textextensions@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-1.0.2.tgz#65486393ee1f2bb039a60cbba05b0b68bd9501d2" - integrity sha1-ZUhjk+4fK7A5pgy7oFsLaL2VAdI= - throat@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== -through2-filter@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec" - integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw= - dependencies: - through2 "~2.0.0" - xtend "~4.0.0" - through2-filter@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" @@ -16339,7 +16132,7 @@ through2-filter@^3.0.0: through2 "~2.0.0" xtend "~4.0.0" -through2@^0.6.0, through2@^0.6.3, through2@^0.6.5: +through2@^0.6.3: version "0.6.5" resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= @@ -16355,7 +16148,7 @@ through2@^1.1.1: readable-stream ">=1.1.13-1 <1.2.0-0" xtend ">=4.0.0 <4.1.0-0" -through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@^2.0.5, through2@~2.0.0: +through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -16434,13 +16227,6 @@ tmpl@1.0.x: resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= -to-absolute-glob@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f" - integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38= - dependencies: - extend-shallow "^2.0.1" - to-absolute-glob@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" @@ -17148,11 +16934,6 @@ v8flags@^3.2.0: dependencies: homedir-polyfill "^1.0.1" -vali-date@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6" - integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY= - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -17232,29 +17013,6 @@ vinyl-file@^3.0.0: strip-bom-stream "^2.0.0" vinyl "^2.0.1" -vinyl-fs@^2.2.1: - version "2.4.4" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239" - integrity sha1-vm/zJwy1Xf19MGNkDegfJddTIjk= - dependencies: - duplexify "^3.2.0" - glob-stream "^5.3.2" - graceful-fs "^4.0.0" - gulp-sourcemaps "1.6.0" - is-valid-glob "^0.3.0" - lazystream "^1.0.0" - lodash.isequal "^4.0.0" - merge-stream "^1.0.0" - mkdirp "^0.5.0" - object-assign "^4.0.0" - readable-stream "^2.0.4" - strip-bom "^2.0.0" - strip-bom-stream "^1.0.0" - through2 "^2.0.0" - through2-filter "^2.0.0" - vali-date "^1.0.0" - vinyl "^1.0.0" - vinyl-fs@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" @@ -18065,13 +17823,6 @@ yargs-parser@^18.1.2, yargs-parser@^18.1.3: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" - integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k= - dependencies: - camelcase "^4.1.0" - yargs@^13.3.2: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" @@ -18141,25 +17892,6 @@ yargs@^7.1.0: y18n "^3.2.1" yargs-parser "5.0.0-security.0" -yargs@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" - integrity sha1-YpmpBVsc78lp/355wdkY3Osiw2A= - dependencies: - camelcase "^4.1.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^7.0.0" - yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"