From 4bbead6200dda354447086c731365130babfe90e Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 29 May 2020 19:15:49 +0300 Subject: [PATCH] [Gradle, JS] Remove custom source-map-loader #KT-39377 fixed --- .gitignore | 1 - .../kotlin/code/CodeConformanceTest.kt | 21 +- .../build.gradle.kts | 3 +- .../kotlin/gradle/targets/js/NpmVersions.kt | 7 +- .../targets/js/testing/karma/KotlinKarma.kt | 1 - .../targets/js/webpack/KotlinWebpackConfig.kt | 6 +- .../tools/kotlin-source-map-loader/.yarnclean | 45 -- .../kotlin-source-map-loader/build.gradle.kts | 103 ---- .../kotlin-source-map-loader.js | 151 ----- .../kotlin-source-map-loader/package.json | 20 - .../test/fixtures/.gitignore | 1 - .../absolute-sourceRoot-source-map.js | 3 - .../absolute-sourceRoot-source-map.txt | 2 - .../fixtures/charset-inline-source-map.js | 3 - .../fixtures/data/external-source-map2.map | 1 - .../data/relative-sourceRoot-source-map.txt | 2 - .../test/fixtures/external-source-map.js | 3 - .../test/fixtures/external-source-map.map | 1 - .../test/fixtures/external-source-map2.js | 3 - .../test/fixtures/external-source-map2.txt | 1 - .../test/fixtures/inline-source-map.js | 3 - .../fixtures/invalid-inline-source-map.js | 3 - .../fixtures/invalid-inline-source-map2.js | 3 - .../test/fixtures/invalid-source-map.js | 3 - .../test/fixtures/invalid-source-map.map | 1 - .../test/fixtures/missing-source-map.js | 3 - .../test/fixtures/missing-source-map2.js | 3 - .../test/fixtures/missing-source-map2.map | 1 - .../test/fixtures/multi-source-map.js | 4 - .../test/fixtures/normal-file.js | 1 - .../relative-sourceRoot-source-map.js | 3 - .../relative-sourceRoot-source-map.map | 1 - .../test/index.test.js | 306 ---------- .../tools/kotlin-source-map-loader/yarn.lock | 533 ------------------ license/README.md | 4 - .../third_party/source-map-loader_LICENSE.txt | 20 - settings.gradle | 2 - 37 files changed, 9 insertions(+), 1263 deletions(-) delete mode 100644 libraries/tools/kotlin-source-map-loader/.yarnclean delete mode 100644 libraries/tools/kotlin-source-map-loader/build.gradle.kts delete mode 100644 libraries/tools/kotlin-source-map-loader/kotlin-source-map-loader.js delete mode 100644 libraries/tools/kotlin-source-map-loader/package.json delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/.gitignore delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/absolute-sourceRoot-source-map.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/absolute-sourceRoot-source-map.txt delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/charset-inline-source-map.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/data/external-source-map2.map delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/data/relative-sourceRoot-source-map.txt delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map.map delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map2.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map2.txt delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/inline-source-map.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-inline-source-map.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-inline-source-map2.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-source-map.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-source-map.map delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map2.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map2.map delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/multi-source-map.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/normal-file.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/relative-sourceRoot-source-map.js delete mode 100644 libraries/tools/kotlin-source-map-loader/test/fixtures/relative-sourceRoot-source-map.map delete mode 100644 libraries/tools/kotlin-source-map-loader/test/index.test.js delete mode 100644 libraries/tools/kotlin-source-map-loader/yarn.lock delete mode 100644 license/third_party/source-map-loader_LICENSE.txt diff --git a/.gitignore b/.gitignore index 176f34959a5..c007b0eb8ae 100644 --- a/.gitignore +++ b/.gitignore @@ -58,5 +58,4 @@ kotlin-ultimate/ node_modules/ .rpt2_cache/ libraries/tools/kotlin-test-js-runner/lib/ -libraries/tools/kotlin-source-map-loader/lib/ local.properties diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index da9ad990b76..9c341d7bf5b 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.code @@ -57,9 +46,6 @@ class CodeConformanceTest : TestCase() { "libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp", "libraries/tools/kotlin-js-tests/src/test/web/qunit.js", "libraries/tools/kotlin-maven-plugin/target", - "libraries/tools/kotlin-source-map-loader/.gradle", - "libraries/tools/kotlin-source-map-loader/lib", - "libraries/tools/kotlin-source-map-loader/node_modules", "libraries/tools/kotlin-test-js-runner/.gradle", "libraries/tools/kotlin-test-js-runner/lib", "libraries/tools/kotlin-test-js-runner/node_modules", @@ -94,9 +80,6 @@ class CodeConformanceTest : TestCase() { "libraries/stdlib/js-v1/node_modules", "libraries/tools/kotlin-gradle-plugin-integration-tests/build", "libraries/tools/kotlin-maven-plugin-test/target", - "libraries/tools/kotlin-source-map-loader/.gradle", - "libraries/tools/kotlin-source-map-loader/lib", - "libraries/tools/kotlin-source-map-loader/node_modules", "libraries/tools/kotlin-test-js-runner/.gradle", "libraries/tools/kotlin-test-js-runner/lib", "libraries/tools/kotlin-test-js-runner/node_modules", diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index c52f5e2d99b..5c0f86e5102 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -128,8 +128,7 @@ tasks.withType { ":kotlin-scripting-jvm:install", ":kotlin-scripting-compiler-embeddable:install", ":kotlin-scripting-compiler-impl-embeddable:install", - ":kotlin-test-js-runner:install", - ":kotlin-source-map-loader:install" + ":kotlin-test-js-runner:install" ) executable = "${rootProject.extra["JDK_18"]!!}/bin/java" diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt index 1bc6828a791..d39d17480d0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -20,10 +20,7 @@ class NpmVersions { val webpackBundleAnalyzer = NpmPackageVersion("webpack-bundle-analyzer", "3.6.1") val webpackDevServer = NpmPackageVersion("webpack-dev-server", "3.10.3") - // Temporarily use our own source-map-loader, while original source-map-loader is not updated - // https://github.com/webpack-contrib/source-map-loader/pull/91 - val kotlinSourceMapLoader = KotlinGradleNpmPackage("source-map-loader") - val sourceMapLoader = NpmPackageVersion("source-map-loader", "0.2.4") + val sourceMapLoader = NpmPackageVersion("source-map-loader", "1.0.0") val sourceMapSupport = NpmPackageVersion("source-map-support", "0.5.16") val cssLoader = NpmPackageVersion("css-loader", "3.4.2") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index 78b38338f79..8aec508a936 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -214,7 +214,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : requiredDependencies.add(versions.webpack) requiredDependencies.add(versions.webpackCli) - requiredDependencies.add(versions.kotlinSourceMapLoader) requiredDependencies.add(versions.sourceMapLoader) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt index c06d7742859..aac15d5bbf3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt @@ -50,7 +50,6 @@ data class KotlinWebpackConfig( } if (sourceMaps) { - it.add(versions.kotlinSourceMapLoader) it.add(versions.sourceMapLoader) } @@ -214,10 +213,13 @@ data class KotlinWebpackConfig( // source maps config.module.rules.push({ test: /\.js${'$'}/, - use: ["kotlin-source-map-loader"], + use: ["source-map-loader"], enforce: "pre" }); config.devtool = ${devtool?.let { "'$it'" } ?: false}; + config.stats = { + warningsFilter: [/Failed to parse source map/], + }, """.trimIndent() ) diff --git a/libraries/tools/kotlin-source-map-loader/.yarnclean b/libraries/tools/kotlin-source-map-loader/.yarnclean deleted file mode 100644 index b591611ea7a..00000000000 --- a/libraries/tools/kotlin-source-map-loader/.yarnclean +++ /dev/null @@ -1,45 +0,0 @@ -# test directories -__tests__ -test -tests -powered-test - -# asset directories -docs -doc -website -images -assets - -# examples -example -examples - -# code coverage directories -coverage -.nyc_output - -# build scripts -Makefile -Gulpfile.js -Gruntfile.js - -# configs -appveyor.yml -circle.yml -codeship-services.yml -codeship-steps.yml -wercker.yml -.tern-project -.gitattributes -.editorconfig -.*ignore -.eslintrc -.jshintrc -.flowconfig -.documentup.json -.yarn-metadata.json -.travis.yml - -# misc -*.md diff --git a/libraries/tools/kotlin-source-map-loader/build.gradle.kts b/libraries/tools/kotlin-source-map-loader/build.gradle.kts deleted file mode 100644 index b1aab277631..00000000000 --- a/libraries/tools/kotlin-source-map-loader/build.gradle.kts +++ /dev/null @@ -1,103 +0,0 @@ -import com.moowork.gradle.node.yarn.YarnTask - -description = "Source Map Loader for Webpack" - -plugins { - id("base") - id("com.github.node-gradle.node") version "2.2.0" -} - -val default = configurations.getByName(Dependency.DEFAULT_CONFIGURATION) -val archives = configurations.getByName(Dependency.ARCHIVES_CONFIGURATION) - -default.extendsFrom(archives) - -plugins.apply("maven") - -convention.getPlugin(MavenPluginConvention::class.java).also { - it.conf2ScopeMappings.addMapping(MavenPlugin.RUNTIME_PRIORITY, archives, Conf2ScopeMappingContainer.RUNTIME) -} - -node { - version = "11.9.0" - download = true - nodeModulesDir = projectDir -} - -tasks { - named("yarn") { - outputs.upToDateWhen { - projectDir.resolve("node_modules").isDirectory - } - // Without it several yarns can works incorrectly - (this as YarnTask).apply { - args = args + "--network-concurrency" + "1" + "--mutex" + "network" - } - } - - register("yarnBuild") { - group = "build" - - dependsOn("yarn") - setWorkingDir(projectDir) - args = listOf("build") - - inputs.files( - "kotlin-source-map-loader.js", - "package.json", - "yarn.lock" - ) - outputs.dir("lib") - } - - register("yarnTest") { - group = "verification" - - dependsOn("yarn") - setWorkingDir(projectDir) - args = listOf("test") - - inputs.dir( - "test" - ) - inputs.files( - "kotlin-source-map-loader.js", - "package.json", - "yarn.lock" - ) - } - - register("cleanYarn") { - group = "build" - - delete = setOf( - "node_modules", - "lib", - ".rpt2_cache" - ) - } - - named("clean") { - dependsOn("cleanYarn") - } - - named("check") { - dependsOn("yarnTest") - } -} - -val jar by tasks.creating(Jar::class) { - dependsOn(tasks.named("yarnBuild")) - from(projectDir.resolve("lib")) -} - -artifacts { - add( - "archives", - jar.archiveFile.get().asFile - ) { - builtBy(jar) - } -} - -publish() \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/kotlin-source-map-loader.js b/libraries/tools/kotlin-source-map-loader/kotlin-source-map-loader.js deleted file mode 100644 index 7d392c18f62..00000000000 --- a/libraries/tools/kotlin-source-map-loader/kotlin-source-map-loader.js +++ /dev/null @@ -1,151 +0,0 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -var fs = require("fs"); -var path = require("path"); -var async = require("async"); -var loaderUtils = require("loader-utils"); - -var separatorRegex = /[/\\]/; - -// Matches only the last occurrence of sourceMappingURL -var baseRegex = "\\s*[@#]\\s*sourceMappingURL\\s*=\\s*([^\\s]*)(?![\\S\\s]*sourceMappingURL)", - // Matches /* ... */ comments - regex1 = new RegExp("/\\*" + baseRegex + "\\s*\\*/"), - // Matches // .... comments - regex2 = new RegExp("//" + baseRegex + "($|\n|\r\n?)"), - // Matches DataUrls - regexDataUrl = /data:[^;\n]+(?:;charset=[^;\n]+)?;base64,([a-zA-Z0-9+/]+={0,2})/; - -module.exports = function (input, inputMap) { - this.cacheable && this.cacheable(); - var resolve = this.resolve; - var addDependency = this.addDependency; - var emitWarning = this.emitWarning || function () { - }; - var match = input.match(regex1) || input.match(regex2); - if (match) { - var url = match[1]; - var dataUrlMatch = regexDataUrl.exec(url); - var callback = this.async(); - if (dataUrlMatch) { - var mapBase64 = dataUrlMatch[1]; - var mapStr = (new Buffer(mapBase64, "base64")).toString(); - var map; - try { - map = JSON.parse(mapStr) - } - catch (e) { - emitWarning("Cannot parse inline SourceMap '" + mapBase64.substr(0, 50) + "': " + e); - return untouched(); - } - processMap(map, this.context, callback); - } - else { - resolve(this.context, loaderUtils.urlToRequest(url, true), function (err, result) { - if (err) { - emitWarning("Cannot find SourceMap '" + url + "': " + err); - return untouched(); - } - addDependency(result); - fs.readFile(result, "utf-8", function (err, content) { - if (err) { - emitWarning("Cannot open SourceMap '" + result + "': " + err); - return untouched(); - } - var map; - try { - map = JSON.parse(content); - } - catch (e) { - emitWarning("Cannot parse SourceMap '" + url + "': " + e); - return untouched(); - } - processMap(map, path.dirname(result), callback); - }); - }.bind(this)); - - } - } - else { - var callback = this.callback; - return untouched(); - } - - function untouched() { - callback(null, input, inputMap); - } - - function resize(arr, size, defval) { - while (arr.length > size) { - arr.pop(); - } - while (arr.length < size) { - arr.push(defval); - } - } - - function processMap(map, context, callback) { - function setResult(map) { - callback(null, input.replace(match[0], ''), map); - } - - var sourcesWithoutContent = []; - map.sourcesContent = map.sourcesContent || []; - resize(map.sourcesContent, map.sources.length, null); - map.sourcesContent.forEach(function (sourceContent, i) { - if (!sourceContent) { - sourcesWithoutContent.push({source: map.sources[i], index: i}) - } - else { - var source = map.sources[i]; - if (separatorRegex.test(source) && !path.isAbsolute(source)) { - map.sources[i] = path.resolve(context, source); - } - } - }); - - if (sourcesWithoutContent.length == 0) { - setResult(map) - } - else { - var sourcePrefix = map.sourceRoot ? map.sourceRoot + "/" : ""; - async.map(sourcesWithoutContent, function (item, callback) { - var source = sourcePrefix + item.source; - map.sources = map.sources.map(function (s) { - return sourcePrefix + s; - }); - delete map.sourceRoot; - resolve(context, loaderUtils.urlToRequest(source, true), function (err, result) { - if (err) { - // TODO(ilgonmic): Not all JS files have sources content, and we don't extract sources from jar, - // so there is no content for these files - // emitWarning("Cannot find source file '" + source + "': " + err); - return callback(null, null); - } - addDependency(result); - fs.readFile(result, "utf-8", function (err, content) { - if (err) { - emitWarning("Cannot open source file '" + result + "': " + err); - return callback(null, null); - } - callback(null, { - index: item.index, - source: result, - content: content - }); - }); - }); - }, function (err, info) { - info.forEach(function (item) { - if (item) { - map.sources[item.index] = item.source; - map.sourcesContent[item.index] = item.content; - } - }); - setResult(map); - }); - } - } -}; diff --git a/libraries/tools/kotlin-source-map-loader/package.json b/libraries/tools/kotlin-source-map-loader/package.json deleted file mode 100644 index 999089afbf2..00000000000 --- a/libraries/tools/kotlin-source-map-loader/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "@kotlin/source-map-loader", - "version": "0.0.1", - "description": "Modern source-map-loader with additional features", - "main": "kotlin-source-map-loader.js", - "scripts": { - "build": "rimraf lib/* && copyfiles \"kotlin-source-map-loader.js\" lib", - "test": "mocha -R spec" - }, - "dependencies": { - "async": "^2.5.0", - "loader-utils": "^1.1.0" - }, - "devDependencies": { - "copyfiles": "^2.1.0", - "rimraf": "^2.6.3", - "mocha": "^5.0.5", - "should": "^13.2.1" - } -} diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/.gitignore b/libraries/tools/kotlin-source-map-loader/test/fixtures/.gitignore deleted file mode 100644 index 46b6e08a65d..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/.gitignore +++ /dev/null @@ -1 +0,0 @@ -absolute-sourceRoot-source-map.map diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/absolute-sourceRoot-source-map.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/absolute-sourceRoot-source-map.js deleted file mode 100644 index e10ac759502..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/absolute-sourceRoot-source-map.js +++ /dev/null @@ -1,3 +0,0 @@ -with SourceMap -//#sourceMappingURL=absolute-sourceRoot-source-map.map -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/absolute-sourceRoot-source-map.txt b/libraries/tools/kotlin-source-map-loader/test/fixtures/absolute-sourceRoot-source-map.txt deleted file mode 100644 index 7509bf56927..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/absolute-sourceRoot-source-map.txt +++ /dev/null @@ -1,2 +0,0 @@ -with SourceMap -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/charset-inline-source-map.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/charset-inline-source-map.js deleted file mode 100644 index f096e987f4a..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/charset-inline-source-map.js +++ /dev/null @@ -1,3 +0,0 @@ -with SourceMap -// @ sourceMappingURL = data:application/source-map;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnNldC1pbmxpbmUtc291cmNlLW1hcC5qcyIsInNvdXJjZXMiOlsiY2hhcnNldC1pbmxpbmUtc291cmNlLW1hcC50eHQiXSwic291cmNlc0NvbnRlbnQiOlsid2l0aCBTb3VyY2VNYXAiXSwibWFwcGluZ3MiOiJBQUFBIn0= -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/data/external-source-map2.map b/libraries/tools/kotlin-source-map-loader/test/fixtures/data/external-source-map2.map deleted file mode 100644 index 577cee46166..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/data/external-source-map2.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"external-source-map2.js","sources":["../external-source-map2.txt"],"mappings":"AAAA"} \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/data/relative-sourceRoot-source-map.txt b/libraries/tools/kotlin-source-map-loader/test/fixtures/data/relative-sourceRoot-source-map.txt deleted file mode 100644 index 7509bf56927..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/data/relative-sourceRoot-source-map.txt +++ /dev/null @@ -1,2 +0,0 @@ -with SourceMap -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map.js deleted file mode 100644 index 64dbc5445b3..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map.js +++ /dev/null @@ -1,3 +0,0 @@ -with SourceMap -//#sourceMappingURL=external-source-map.map -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map.map b/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map.map deleted file mode 100644 index 76163ccdfcc..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"external-source-map.js","sources":["external-source-map.txt"],"sourcesContent":["with SourceMap"],"mappings":"AAAA"} \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map2.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map2.js deleted file mode 100644 index 844e38ddec5..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map2.js +++ /dev/null @@ -1,3 +0,0 @@ -with SourceMap -//#sourceMappingURL=data/external-source-map2.map -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map2.txt b/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map2.txt deleted file mode 100644 index 3f2f36da5c6..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/external-source-map2.txt +++ /dev/null @@ -1 +0,0 @@ -with SourceMap \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/inline-source-map.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/inline-source-map.js deleted file mode 100644 index 6fc86a8ccf5..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/inline-source-map.js +++ /dev/null @@ -1,3 +0,0 @@ -with SourceMap -// @ sourceMappingURL = data:application/source-map;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5saW5lLXNvdXJjZS1tYXAuanMiLCJzb3VyY2VzIjpbImlubGluZS1zb3VyY2UtbWFwLnR4dCJdLCJzb3VyY2VzQ29udGVudCI6WyJ3aXRoIFNvdXJjZU1hcCJdLCJtYXBwaW5ncyI6IkFBQUEifQ== -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-inline-source-map.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-inline-source-map.js deleted file mode 100644 index f9b7d7c7fcc..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-inline-source-map.js +++ /dev/null @@ -1,3 +0,0 @@ -without SourceMap -// @sourceMappingURL=data:application/source-map;base64,"something invalid" -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-inline-source-map2.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-inline-source-map2.js deleted file mode 100644 index 1c667525971..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-inline-source-map2.js +++ /dev/null @@ -1,3 +0,0 @@ -without SourceMap -// @sourceMappingURL=data:application/source-map;base64,invalid/base64= -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-source-map.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-source-map.js deleted file mode 100644 index bd240483d89..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-source-map.js +++ /dev/null @@ -1,3 +0,0 @@ -with SourceMap -//#sourceMappingURL=invalid-source-map.map -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-source-map.map b/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-source-map.map deleted file mode 100644 index cdcf0176749..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/invalid-source-map.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"invalid-source-map.js","sources":["../invalid-source-map.txt"],"mappings":"AAAA"}"} \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map.js deleted file mode 100644 index f2bf71c0016..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map.js +++ /dev/null @@ -1,3 +0,0 @@ -with SourceMap -//#sourceMappingURL=missing-source-map.map -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map2.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map2.js deleted file mode 100644 index 62572666963..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map2.js +++ /dev/null @@ -1,3 +0,0 @@ -with SourceMap -//#sourceMappingURL=missing-source-map2.map -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map2.map b/libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map2.map deleted file mode 100644 index a4d9d96eda6..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/missing-source-map2.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"missing-source-map2.js","sources":["missing-source-map2.txt"],"mappings":"AAAA"} \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/multi-source-map.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/multi-source-map.js deleted file mode 100644 index f8444358a88..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/multi-source-map.js +++ /dev/null @@ -1,4 +0,0 @@ -with SourceMap -anInvalidDirective = "\n/*# sourceMappingURL=data:application/json;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))))+" */"; -// @ sourceMappingURL = data:application/source-map;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5saW5lLXNvdXJjZS1tYXAuanMiLCJzb3VyY2VzIjpbImlubGluZS1zb3VyY2UtbWFwLnR4dCJdLCJzb3VyY2VzQ29udGVudCI6WyJ3aXRoIFNvdXJjZU1hcCJdLCJtYXBwaW5ncyI6IkFBQUEifQ== -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/normal-file.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/normal-file.js deleted file mode 100644 index 85c95f070d4..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/normal-file.js +++ /dev/null @@ -1 +0,0 @@ -without SourceMap \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/relative-sourceRoot-source-map.js b/libraries/tools/kotlin-source-map-loader/test/fixtures/relative-sourceRoot-source-map.js deleted file mode 100644 index 2d1807d7aab..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/relative-sourceRoot-source-map.js +++ /dev/null @@ -1,3 +0,0 @@ -with SourceMap -//#sourceMappingURL=relative-sourceRoot-source-map.map -// comment \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/fixtures/relative-sourceRoot-source-map.map b/libraries/tools/kotlin-source-map-loader/test/fixtures/relative-sourceRoot-source-map.map deleted file mode 100644 index 09fb0d25112..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/fixtures/relative-sourceRoot-source-map.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"relative-sourceRoot-source-map.js","sourceRoot":"../fixtures/data/","sources":["relative-sourceRoot-source-map.txt"],"mappings":"AAAA"} \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/test/index.test.js b/libraries/tools/kotlin-source-map-loader/test/index.test.js deleted file mode 100644 index 62c3a6f4b75..00000000000 --- a/libraries/tools/kotlin-source-map-loader/test/index.test.js +++ /dev/null @@ -1,306 +0,0 @@ -var path = require("path"); -var fs = require("fs"); -var should = require("should"); -var loader = require("../"); - -function execLoader(filename, callback) { - var async = false; - var deps = []; - var warns = []; - var context = { - context: path.dirname(filename), - resolve: function(context, request, callback) { - process.nextTick(function() { - var p = path.isAbsolute(request) ? request : path.resolve(context, request); - if(fs.existsSync(p)) - callback(null, p); - else - callback(new Error("File not found")); - }); - }, - addDependency: function(dep) { - deps.push(dep); - }, - emitWarning: function(warn) { - warns.push(warn); - }, - callback: function(err, res, map) { - async = true; - callback(err, res, map, deps, warns); - }, - async: function() { - async = true; - return this.callback; - } - }; - // Remove CRs to make test line ending invariant - var fixtureContent = fs.readFileSync(filename, "utf-8").replace(/\r/g, ''); - var res = loader.call(context, fixtureContent); - if(!async) return callback(null, res, null, deps, warns); -} - -describe("source-map-loader", function() { - const fixturesPath = path.join(__dirname, "fixtures"); - const dataPath = path.join(fixturesPath, "data"); - - it("should leave normal files untouched", function(done) { - execLoader(path.join(fixturesPath, "normal-file.js"), function(err, res, map, deps, warns) { - should.equal(err, null); - warns.should.be.eql([]); - should.equal(res, "without SourceMap"), - should.equal(map, null); - deps.should.be.eql([]); - done(); - }); - }); - - it("should process inlined SourceMaps", function(done) { - execLoader(path.join(fixturesPath, "inline-source-map.js"), function(err, res, map, deps, warns) { - should.equal(err, null); - warns.should.be.eql([]); - should.equal(res, "with SourceMap\n// comment"), - map.should.be.eql({ - "version":3, - "file":"inline-source-map.js", - "sources":[ - "inline-source-map.txt" - ], - "sourcesContent":["with SourceMap"], - "mappings":"AAAA" - }); - deps.should.be.eql([]); - done(); - }); - }); - - it("should process external SourceMaps", function(done) { - execLoader(path.join(fixturesPath, "external-source-map.js"), function(err, res, map, deps, warns) { - should.equal(err, null); - warns.should.be.eql([]); - should.equal(res, "with SourceMap\n// comment"), - map.should.be.eql({ - "version":3, - "file":"external-source-map.js", - "sources":[ - "external-source-map.txt" - ], - "sourcesContent":["with SourceMap"], - "mappings":"AAAA" - }); - deps.should.be.eql([ - path.join(fixturesPath, "external-source-map.map") - ]); - done(); - }); - }); - - it("should process external SourceMaps (external sources)", function(done) { - execLoader(path.join(fixturesPath, "external-source-map2.js"), function(err, res, map, deps, warns) { - should.equal(err, null); - warns.should.be.eql([]); - should.equal(res, "with SourceMap\n// comment"), - map.should.be.eql({ - "version":3, - "file":"external-source-map2.js", - "sources":[ - path.join(fixturesPath, "external-source-map2.txt") - ], - "sourcesContent":["with SourceMap"], - "mappings":"AAAA" - }); - deps.should.be.eql([ - path.join(dataPath, "external-source-map2.map"), - path.join(fixturesPath, "external-source-map2.txt") - ]); - done(); - }); - }); - - it("should use last SourceMap directive", function (done) { - execLoader(path.join(fixturesPath, "multi-source-map.js"), function (err, res, map, deps, warns) { - should.equal(err, null); - warns.should.be.eql([]); - should.equal(res, "with SourceMap\nanInvalidDirective = \"\\n/*# sourceMappingURL=data:application/json;base64,\"+btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))))+\" */\";\n// comment"), - map.should.be.eql({ - "version": 3, - "file": "inline-source-map.js", - "sources": [ - "inline-source-map.txt" - ], - "sourcesContent": ["with SourceMap"], - "mappings": "AAAA" - }); - deps.should.be.eql([]); - done(); - }); - }); - - it("should skip invalid base64 SourceMap", function (done) { - execLoader(path.join(fixturesPath, "invalid-inline-source-map.js"), function (err, res, map, deps, warns) { - should.equal(err, null); - warns.should.be.eql([]); - should.equal(res, "without SourceMap\n// @sourceMappingURL=data:application/source-map;base64,\"something invalid\"\n// comment"); - should.equal(map, null); - deps.should.be.eql([]); - done(); - }); - }); - it("should warn on invalid base64 SourceMap", function (done) { - execLoader(path.join(fixturesPath, "invalid-inline-source-map2.js"), function (err, res, map, deps, warns) { - should.equal(err, null); - warns.should.matchEach( - new RegExp("Cannot parse inline SourceMap 'invalid\/base64=': SyntaxError: Unexpected token") - ); - should.equal(res, "without SourceMap\n// @sourceMappingURL=data:application/source-map;base64,invalid/base64=\n// comment"); - should.equal(map, null); - deps.should.be.eql([]); - done(); - }); - }); - - it("should warn on invalid SourceMap", function (done) { - execLoader(path.join(fixturesPath, "invalid-source-map.js"), function (err, res, map, deps, warns) { - should.equal(err, null); - warns.should.matchEach( - new RegExp("Cannot parse SourceMap 'invalid-source-map.map': SyntaxError: Unexpected string in JSON at position 102") - ); - should.equal(res, "with SourceMap\n//#sourceMappingURL=invalid-source-map.map\n// comment"); - should.equal(map, null); - deps.should.be.eql([ - path.join(fixturesPath, "invalid-source-map.map") - ]); - done(); - }); - }); - - it("should warn on missing SourceMap", function(done) { - execLoader(path.join(fixturesPath, "missing-source-map.js"), function(err, res, map, deps, warns) { - should.equal(err, null); - warns.should.be.eql([ - "Cannot find SourceMap 'missing-source-map.map': Error: File not found" - ]); - should.equal(res, "with SourceMap\n//#sourceMappingURL=missing-source-map.map\n// comment"), - should.equal(map, null); - deps.should.be.eql([]); - done(); - }); - }); - - xit("should warn on missing source file", function (done) { - execLoader(path.join(fixturesPath, "missing-source-map2.js"), function(err, res, map, deps, warns) { - should.equal(err, null); - warns.should.be.eql([ - "Cannot find source file 'missing-source-map2.txt': Error: File not found" - ]); - should.equal(res, "with SourceMap\n// comment"), - map.should.be.eql({ - "version":3, - "file":"missing-source-map2.js", - "sources":[ - "missing-source-map2.txt" - ], - "sourcesContent":[null], - "mappings":"AAAA" - }); - deps.should.be.eql([ - path.join(fixturesPath, "missing-source-map2.map") - ]); - done(); - }); - }); - - it("should process inlined SourceMaps with charset", function(done) { - execLoader(path.join(fixturesPath, "charset-inline-source-map.js"), function(err, res, map, deps, warns) { - should.equal(err, null); - warns.should.be.eql([]); - should.equal(res, "with SourceMap\n// comment"), - map.should.be.eql({ - "version":3, - "file":"charset-inline-source-map.js", - "sources":[ - "charset-inline-source-map.txt" - ], - "sourcesContent":["with SourceMap"], - "mappings":"AAAA" - }); - deps.should.be.eql([]); - done(); - }); - }); - - it("should support absolute sourceRoot paths in sourcemaps", (done) => { - const sourceRoot = path.join(fixturesPath); - const javaScriptFilename = "absolute-sourceRoot-source-map.js"; - const sourceFilename = "absolute-sourceRoot-source-map.txt"; - const rootRelativeSourcePath = path.join(sourceRoot, sourceFilename); - const sourceMapPath = path.join(sourceRoot, "absolute-sourceRoot-source-map.map"); - - // Create the sourcemap file - const rawSourceMap = { - "version": 3, - "file": javaScriptFilename, - "sourceRoot": sourceRoot, - "sources": [ - sourceFilename - ], - "mappings": "AAAA" - }; - fs.writeFileSync(sourceMapPath, JSON.stringify(rawSourceMap)); - - execLoader( - path.join(fixturesPath, javaScriptFilename), - (err, res, map, deps, warns) => { - should.equal(err, null); - warns.should.be.eql([]); - should.equal(res, "with SourceMap\n// comment"), - map.should.be.eql({ - "version": 3, - "file": javaScriptFilename, - "sources": [ - rootRelativeSourcePath - ], - "sourcesContent": [ - "with SourceMap\n// comment" - ], - "mappings": "AAAA" - }); - deps.should.be.eql([ - sourceMapPath, - rootRelativeSourcePath - ]); - done(); - } -) -}) - it("should support relative sourceRoot paths in sourcemaps", (done) => { - const javaScriptFilename = "relative-sourceRoot-source-map.js"; - const sourceFilename = "relative-sourceRoot-source-map.txt"; - const rootRelativeSourcePath = path.join(dataPath, sourceFilename); - const sourceMapPath = path.join(fixturesPath, "relative-sourceRoot-source-map.map"); - - execLoader( - path.join(fixturesPath, javaScriptFilename), - (err, res, map, deps, warns) => { - should.equal(err, null); - warns.should.be.eql([]); - should.equal(res, "with SourceMap\n// comment"), - map.should.be.eql({ - "version": 3, - "file": javaScriptFilename, - "sources": [ - rootRelativeSourcePath - ], - "sourcesContent": [ - "with SourceMap\n// comment" - ], - "mappings": "AAAA" - }); - deps.should.be.eql([ - sourceMapPath, - rootRelativeSourcePath - ]); - done(); - } -) -}) -}); \ No newline at end of file diff --git a/libraries/tools/kotlin-source-map-loader/yarn.lock b/libraries/tools/kotlin-source-map-loader/yarn.lock deleted file mode 100644 index 24b987c935e..00000000000 --- a/libraries/tools/kotlin-source-map-loader/yarn.lock +++ /dev/null @@ -1,533 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -ansi-styles@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -async@^2.5.0: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== - dependencies: - lodash "^4.17.14" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - -camelcase@^5.0.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== - dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -commander@2.15.1: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" - integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -copyfiles@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.1.1.tgz#d430e122d7880f92c45d372208b0af03b0c39db6" - integrity sha512-y6DZHve80whydXzBal7r70TBgKMPKesVRR1Sn/raUu7Jh/i7iSLSyGvYaq0eMJ/3Y/CKghwzjY32q1WzEnpp3Q== - dependencies: - glob "^7.0.5" - minimatch "^3.0.3" - mkdirp "^0.5.1" - noms "0.0.0" - through2 "^2.0.1" - yargs "^13.2.4" - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -debug@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - -decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -diff@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" - integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== - -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= - -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= - -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -get-caller-file@^2.0.1: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -glob@7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.0.5, glob@^7.1.3: - version "7.1.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" - integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -growl@1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" - integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -he@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" - integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0= - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== - dependencies: - minimist "^1.2.0" - -loader-utils@^1.1.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" - integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== - dependencies: - big.js "^5.2.2" - emojis-list "^2.0.0" - json5 "^1.0.1" - -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - -lodash@^4.17.14: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== - -minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - -mkdirp@0.5.1, mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - dependencies: - minimist "0.0.8" - -mocha@^5.0.5: - version "5.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" - integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== - dependencies: - browser-stdout "1.3.1" - commander "2.15.1" - debug "3.1.0" - diff "3.5.0" - escape-string-regexp "1.0.5" - glob "7.1.2" - growl "1.10.5" - he "1.1.1" - minimatch "3.0.4" - mkdirp "0.5.1" - supports-color "5.4.0" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -noms@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859" - integrity sha1-2o69nzr51nYJGbJ9nNyAkqczKFk= - dependencies: - inherits "^2.0.1" - readable-stream "~1.0.31" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -p-limit@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" - integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== - dependencies: - p-try "^2.0.0" - -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -readable-stream@~1.0.31: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@~2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - -rimraf@^2.6.3: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -should-equal@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-2.0.0.tgz#6072cf83047360867e68e98b09d71143d04ee0c3" - integrity sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA== - dependencies: - should-type "^1.4.0" - -should-format@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/should-format/-/should-format-3.0.3.tgz#9bfc8f74fa39205c53d38c34d717303e277124f1" - integrity sha1-m/yPdPo5IFxT04w01xcwPidxJPE= - dependencies: - should-type "^1.3.0" - should-type-adaptors "^1.0.1" - -should-type-adaptors@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz#401e7f33b5533033944d5cd8bf2b65027792e27a" - integrity sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA== - dependencies: - should-type "^1.3.0" - should-util "^1.0.0" - -should-type@^1.3.0, should-type@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/should-type/-/should-type-1.4.0.tgz#0756d8ce846dfd09843a6947719dfa0d4cff5cf3" - integrity sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM= - -should-util@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/should-util/-/should-util-1.0.1.tgz#fb0d71338f532a3a149213639e2d32cbea8bcb28" - integrity sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g== - -should@^13.2.1: - version "13.2.3" - resolved "https://registry.yarnpkg.com/should/-/should-13.2.3.tgz#96d8e5acf3e97b49d89b51feaa5ae8d07ef58f10" - integrity sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ== - dependencies: - should-equal "^2.0.0" - should-format "^3.0.3" - should-type "^1.4.0" - should-type-adaptors "^1.0.1" - should-util "^1.0.0" - -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - -supports-color@5.4.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w== - dependencies: - has-flag "^3.0.0" - -through2@^2.0.1: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= - -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - -y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== - -yargs-parser@^13.1.1: - version "13.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" - integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -yargs@^13.2.4: - version "13.3.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" - integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.1" diff --git a/license/README.md b/license/README.md index f9c31bb47a7..9ed84957d45 100644 --- a/license/README.md +++ b/license/README.md @@ -204,10 +204,6 @@ any distributions of the tools or libraries: - License: MIT ([license/third_party/mocha-teamcity-reporter_LICENSE.txt](third_party/mocha-teamcity-reporter_LICENSE.txt) and [license/third_party/teamcity-service-messages_LICENSE.txt](third_party/teamcity-service-messages_LICENSE.txt)) - Origin: Copyright (c) 2016 Jamie Sherriff and Copyright (c) 2013 Aaron Forsander - - - Path: libraries/tools/kotlin-source-map-loader/kotlin-source-map-loader.js - - License: MIT ([license/third_party/source-map-loader_LICENSE.txt](third_party/source-map-loader_LICENSE.txt)) - - Origin: Copyright JS Foundation and other contributors ## Example Code diff --git a/license/third_party/source-map-loader_LICENSE.txt b/license/third_party/source-map-loader_LICENSE.txt deleted file mode 100644 index 3d5fa732588..00000000000 --- a/license/third_party/source-map-loader_LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright JS Foundation and other contributors - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -'Software'), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 7c3eeaffb6e..8c3ca5ac1f3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -218,7 +218,6 @@ include ":kotlin-build-common", ":kotlin-test:kotlin-test-junit5", ":kotlin-test:kotlin-test-testng", ":kotlin-test-js-runner", - ":kotlin-source-map-loader", ":kotlinx-metadata", ":kotlinx-metadata-jvm", ":kotlinx-metadata-klib", @@ -416,7 +415,6 @@ project(':kotlin-test:kotlin-test-junit').projectDir = "$rootDir/libraries/kotli project(':kotlin-test:kotlin-test-junit5').projectDir = "$rootDir/libraries/kotlin.test/junit5" as File project(':kotlin-test:kotlin-test-testng').projectDir = "$rootDir/libraries/kotlin.test/testng" as File project(':kotlin-test-js-runner').projectDir = "$rootDir/libraries/tools/kotlin-test-js-runner" as File -project(':kotlin-source-map-loader').projectDir = "$rootDir/libraries/tools/kotlin-source-map-loader" as File project(':kotlin-reflect').projectDir = "$rootDir/libraries/reflect" as File project(':kotlin-reflect-api').projectDir = "$rootDir/libraries/reflect/api" as File project(':kotlinx-metadata').projectDir = "$rootDir/libraries/kotlinx-metadata" as File