From 56ea49e2a9aa46254405284ecf6e63a0945e043f Mon Sep 17 00:00:00 2001 From: David Dooling Date: Mon, 8 May 2017 11:39:38 -0500 Subject: [PATCH] Remove node_modules from TypeScript sources path Move TypeScript sources up several levels to eliminate `node_modules/@atomist` in the source path. GitHub will now properly show diffs to the TypeScript source. Fixes #442 Move TypeScript copy and and generation tasks to the main build, not just on the npm-release profile. Consolidate antrun tasks and use Maven property replacement rather than brute force replace in npm-publish script. Eliminate duplicated string in POM by using atomist.node.module property. --- CHANGELOG.md | 2 + pom.xml | 181 ++++++++---------- src/main/scripts/npm-publish.bash | 13 +- .../@atomist => }/cortex/.gitignore | 0 .../@atomist => }/cortex/.npmignore | 0 .../@atomist => }/cortex/LICENSE | 0 .../@atomist => }/cortex/README.md | 0 .../@atomist => }/cortex/gulpfile.js | 0 src/main/typescript/cortex/package.json | 22 +++ .../@atomist => }/cortex/tsconfig.json | 0 .../@atomist/cortex/package.json.in | 22 --- .../@atomist => }/rug/.gitignore | 0 .../@atomist => }/rug/.npmignore | 0 .../{node_modules/@atomist => }/rug/LICENSE | 0 .../{node_modules/@atomist => }/rug/README.md | 0 .../@atomist => }/rug/ast/AstHelper.ts | 0 .../rug/ast/DecoratingPathExpressionEngine.ts | 0 .../@atomist => }/rug/ast/TextTreeNodeOps.ts | 0 .../@atomist => }/rug/ast/TreeDiff.ts | 0 .../@atomist => }/rug/ast/java/Expressions.ts | 0 .../@atomist => }/rug/ast/java/Model.ts | 0 .../@atomist => }/rug/ast/java/Structures.ts | 0 .../ast/scala/ScalaPathExpressionEngine.ts | 0 .../@atomist => }/rug/ast/scala/Types.ts | 0 .../@atomist => }/rug/ast/yaml/Types.ts | 0 .../rug/ast/yaml/YamlPathExpressionEngine.ts | 0 .../@atomist => }/rug/gulpfile.js | 0 .../rug/operations/Decorators.ts | 0 .../rug/operations/HandlerUtils.ts | 0 .../@atomist => }/rug/operations/Handlers.ts | 0 .../rug/operations/ProjectEditor.ts | 0 .../rug/operations/ProjectGenerator.ts | 0 .../rug/operations/RugOperation.ts | 0 .../rug/package.json.in => rug/package.json} | 4 +- .../@atomist => }/rug/test/Result.ts | 0 .../@atomist => }/rug/test/ScenarioWorld.ts | 0 .../@atomist => }/rug/test/handler/Core.ts | 0 .../rug/test/handler/WellKnownSteps.ts | 0 .../@atomist => }/rug/test/project/Core.ts | 0 .../@atomist => }/rug/test/project/Helpers.ts | 0 .../rug/test/project/WellKnownSteps.ts | 0 .../@atomist => }/rug/tree/Microgrammars.ts | 0 .../@atomist => }/rug/tree/PathExpression.ts | 0 .../tree/TransformingPathExpressionEngine.ts | 0 .../@atomist => }/rug/tree/TreeHelper.ts | 0 .../@atomist => }/rug/tsconfig.json | 0 .../@atomist => }/rug/tslint.json | 0 .../atomist/rug/ts/TypeScriptBuilder.scala | 5 +- 48 files changed, 118 insertions(+), 131 deletions(-) rename src/main/typescript/{node_modules/@atomist => }/cortex/.gitignore (100%) rename src/main/typescript/{node_modules/@atomist => }/cortex/.npmignore (100%) rename src/main/typescript/{node_modules/@atomist => }/cortex/LICENSE (100%) rename src/main/typescript/{node_modules/@atomist => }/cortex/README.md (100%) rename src/main/typescript/{node_modules/@atomist => }/cortex/gulpfile.js (100%) create mode 100644 src/main/typescript/cortex/package.json rename src/main/typescript/{node_modules/@atomist => }/cortex/tsconfig.json (100%) delete mode 100644 src/main/typescript/node_modules/@atomist/cortex/package.json.in rename src/main/typescript/{node_modules/@atomist => }/rug/.gitignore (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/.npmignore (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/LICENSE (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/README.md (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/AstHelper.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/DecoratingPathExpressionEngine.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/TextTreeNodeOps.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/TreeDiff.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/java/Expressions.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/java/Model.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/java/Structures.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/scala/ScalaPathExpressionEngine.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/scala/Types.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/yaml/Types.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/ast/yaml/YamlPathExpressionEngine.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/gulpfile.js (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/operations/Decorators.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/operations/HandlerUtils.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/operations/Handlers.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/operations/ProjectEditor.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/operations/ProjectGenerator.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/operations/RugOperation.ts (100%) rename src/main/typescript/{node_modules/@atomist/rug/package.json.in => rug/package.json} (77%) rename src/main/typescript/{node_modules/@atomist => }/rug/test/Result.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/test/ScenarioWorld.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/test/handler/Core.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/test/handler/WellKnownSteps.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/test/project/Core.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/test/project/Helpers.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/test/project/WellKnownSteps.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/tree/Microgrammars.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/tree/PathExpression.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/tree/TransformingPathExpressionEngine.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/tree/TreeHelper.ts (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/tsconfig.json (100%) rename src/main/typescript/{node_modules/@atomist => }/rug/tslint.json (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf255c120..1304a19e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,12 +44,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Fix StackOverflow when calling toString on LinkableContainerTreeNode, can't recurse as this is a graph not a tree. +- Remove node_modules from TypeScript sources path [#442][442] [569]: https://github.com/atomist/rug/issues/569 [566]: https://github.com/atomist/rug/issues/566 [561]: https://github.com/atomist/rug/issues/561 [570]: https://github.com/atomist/rug/issues/570 [574]: https://github.com/atomist/rug/issues/574 +[442]: https://github.com/atomist/rug/issues/442 ## [1.0.0-m.2] - 2017-04-26 diff --git a/pom.xml b/pom.xml index 64d1f38e7..807e18749 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,8 @@ 2.11 3.2.2 1.3.0 + 1.8 + .atomist/node_modules/@atomist @@ -342,6 +344,80 @@ + + org.apache.maven.plugins + maven-antrun-plugin + ${maven.antrun.plugin.version} + + + copy-typescript + + run + + generate-sources + + + + + + + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + generate-interfaces + + java + + compile + + com.atomist.rug.ts.TypeScriptInterfaceGenerator + + ${project.build.directory}/${atomist.node.modules} + + + + + generate-extended-model + + java + + compile + + com.atomist.rug.ts.CortexTypeGeneratorApp + + ${project.build.directory}/${atomist.node.modules} + + + + + @@ -460,7 +536,7 @@ gulp - typedoc --gulpfile .atomist/node_modules/@atomist/rug/gulpfile.js + typedoc --gulpfile ${atomist.node.modules}/rug/gulpfile.js process-test-resources @@ -470,7 +546,7 @@ gulp - typedoc --gulpfile .atomist/node_modules/@atomist/cortex/gulpfile.js + typedoc --gulpfile ${atomist.node.modules}/cortex/gulpfile.js process-test-resources @@ -483,7 +559,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 + ${maven.antrun.plugin.version} compile-typescript @@ -495,110 +571,15 @@ - + - + - - mk-ts-output-dir - - run - - generate-sources - - - - - - - - copy-ts - - run - - generate-sources - - - - - - - - - - mkdir-rug-model - - run - - generate-sources - - - - - - - - mkdir-cortex - - run - - generate-sources - - - - - - - - mkdir-cortex-stub - - run - - generate-sources - - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.5.0 - - - generate-interfaces - - java - - compile - - com.atomist.rug.ts.TypeScriptInterfaceGenerator - - ${project.build.directory}/.atomist/node_modules/@atomist - - - - - generate-extended-model - - java - - compile - - com.atomist.rug.ts.CortexTypeGeneratorApp - - ${project.build.directory}/.atomist/node_modules/@atomist - - - diff --git a/src/main/scripts/npm-publish.bash b/src/main/scripts/npm-publish.bash index 996e9432a..760e7b85f 100644 --- a/src/main/scripts/npm-publish.bash +++ b/src/main/scripts/npm-publish.bash @@ -3,7 +3,7 @@ set -o pipefail declare Pkg=npm-publish -declare Version=0.2.0 +declare Version=0.3.0 function msg() { echo "$Pkg: $*" @@ -31,11 +31,16 @@ function publish() { local target=target/.atomist/node_modules/@atomist/$module_name local package=$target/package.json - if ! sed "s/REPLACE_ME/$module_version/g" "$package.in" > "$package"; then - err "failed to set version in $package" + local package_version + package_version=$(jq --raw-output --exit-status .version "$package") + if [[ $? -ne 0 || ! $package_version ]]; then + err "failed to parse package version from $package: $package_version" + return 1 + fi + if [[ $package_version != $module_version ]]; then + err "version in $package ($package_version) does not match provided module version ($module_version)" return 1 fi - rm -f "$package.in" local registry if [[ $module_version =~ ^[0-9]+\.[0-9]+\.[0-9]+-[0-9]{14}$ ]]; then diff --git a/src/main/typescript/node_modules/@atomist/cortex/.gitignore b/src/main/typescript/cortex/.gitignore similarity index 100% rename from src/main/typescript/node_modules/@atomist/cortex/.gitignore rename to src/main/typescript/cortex/.gitignore diff --git a/src/main/typescript/node_modules/@atomist/cortex/.npmignore b/src/main/typescript/cortex/.npmignore similarity index 100% rename from src/main/typescript/node_modules/@atomist/cortex/.npmignore rename to src/main/typescript/cortex/.npmignore diff --git a/src/main/typescript/node_modules/@atomist/cortex/LICENSE b/src/main/typescript/cortex/LICENSE similarity index 100% rename from src/main/typescript/node_modules/@atomist/cortex/LICENSE rename to src/main/typescript/cortex/LICENSE diff --git a/src/main/typescript/node_modules/@atomist/cortex/README.md b/src/main/typescript/cortex/README.md similarity index 100% rename from src/main/typescript/node_modules/@atomist/cortex/README.md rename to src/main/typescript/cortex/README.md diff --git a/src/main/typescript/node_modules/@atomist/cortex/gulpfile.js b/src/main/typescript/cortex/gulpfile.js similarity index 100% rename from src/main/typescript/node_modules/@atomist/cortex/gulpfile.js rename to src/main/typescript/cortex/gulpfile.js diff --git a/src/main/typescript/cortex/package.json b/src/main/typescript/cortex/package.json new file mode 100644 index 000000000..578c59518 --- /dev/null +++ b/src/main/typescript/cortex/package.json @@ -0,0 +1,22 @@ +{ + "name": "@atomist/cortex", + "version": "1.0.0-SNAPSHOT", + "description": "TypeScript typings for event model, see http://docs.atomist.com/", + "repository": { + "type": "git", + "url": "git+https://github.com/atomist/cortex.git" + }, + "keywords": [ + "Atomist", + "Rug" + ], + "author": "Atomist, Inc", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/atomist/cortex/issues" + }, + "homepage": "https://github.com/atomist/cortex#readme", + "dependencies": { + "@atomist/rug": "${project.version}" + } +} diff --git a/src/main/typescript/node_modules/@atomist/cortex/tsconfig.json b/src/main/typescript/cortex/tsconfig.json similarity index 100% rename from src/main/typescript/node_modules/@atomist/cortex/tsconfig.json rename to src/main/typescript/cortex/tsconfig.json diff --git a/src/main/typescript/node_modules/@atomist/cortex/package.json.in b/src/main/typescript/node_modules/@atomist/cortex/package.json.in deleted file mode 100644 index 56384f25a..000000000 --- a/src/main/typescript/node_modules/@atomist/cortex/package.json.in +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "@atomist/cortex", - "version": "REPLACE_ME", - "description": "TypeScript typings for backing model", - "repository": { - "type": "git", - "url": "git+https://github.com/atomist/rug.git" - }, - "keywords": [ - "Atomist", - "Rug" - ], - "author": "Atomist, Inc", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/atomist/rug/issues" - }, - "homepage": "https://github.com/atomist/rug#readme", - "dependencies": { - "@atomist/rug": "REPLACE_ME" - } -} diff --git a/src/main/typescript/node_modules/@atomist/rug/.gitignore b/src/main/typescript/rug/.gitignore similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/.gitignore rename to src/main/typescript/rug/.gitignore diff --git a/src/main/typescript/node_modules/@atomist/rug/.npmignore b/src/main/typescript/rug/.npmignore similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/.npmignore rename to src/main/typescript/rug/.npmignore diff --git a/src/main/typescript/node_modules/@atomist/rug/LICENSE b/src/main/typescript/rug/LICENSE similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/LICENSE rename to src/main/typescript/rug/LICENSE diff --git a/src/main/typescript/node_modules/@atomist/rug/README.md b/src/main/typescript/rug/README.md similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/README.md rename to src/main/typescript/rug/README.md diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/AstHelper.ts b/src/main/typescript/rug/ast/AstHelper.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/AstHelper.ts rename to src/main/typescript/rug/ast/AstHelper.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/DecoratingPathExpressionEngine.ts b/src/main/typescript/rug/ast/DecoratingPathExpressionEngine.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/DecoratingPathExpressionEngine.ts rename to src/main/typescript/rug/ast/DecoratingPathExpressionEngine.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/TextTreeNodeOps.ts b/src/main/typescript/rug/ast/TextTreeNodeOps.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/TextTreeNodeOps.ts rename to src/main/typescript/rug/ast/TextTreeNodeOps.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/TreeDiff.ts b/src/main/typescript/rug/ast/TreeDiff.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/TreeDiff.ts rename to src/main/typescript/rug/ast/TreeDiff.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/java/Expressions.ts b/src/main/typescript/rug/ast/java/Expressions.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/java/Expressions.ts rename to src/main/typescript/rug/ast/java/Expressions.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/java/Model.ts b/src/main/typescript/rug/ast/java/Model.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/java/Model.ts rename to src/main/typescript/rug/ast/java/Model.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/java/Structures.ts b/src/main/typescript/rug/ast/java/Structures.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/java/Structures.ts rename to src/main/typescript/rug/ast/java/Structures.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/scala/ScalaPathExpressionEngine.ts b/src/main/typescript/rug/ast/scala/ScalaPathExpressionEngine.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/scala/ScalaPathExpressionEngine.ts rename to src/main/typescript/rug/ast/scala/ScalaPathExpressionEngine.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/scala/Types.ts b/src/main/typescript/rug/ast/scala/Types.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/scala/Types.ts rename to src/main/typescript/rug/ast/scala/Types.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/yaml/Types.ts b/src/main/typescript/rug/ast/yaml/Types.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/yaml/Types.ts rename to src/main/typescript/rug/ast/yaml/Types.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/ast/yaml/YamlPathExpressionEngine.ts b/src/main/typescript/rug/ast/yaml/YamlPathExpressionEngine.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/ast/yaml/YamlPathExpressionEngine.ts rename to src/main/typescript/rug/ast/yaml/YamlPathExpressionEngine.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/gulpfile.js b/src/main/typescript/rug/gulpfile.js similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/gulpfile.js rename to src/main/typescript/rug/gulpfile.js diff --git a/src/main/typescript/node_modules/@atomist/rug/operations/Decorators.ts b/src/main/typescript/rug/operations/Decorators.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/operations/Decorators.ts rename to src/main/typescript/rug/operations/Decorators.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/operations/HandlerUtils.ts b/src/main/typescript/rug/operations/HandlerUtils.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/operations/HandlerUtils.ts rename to src/main/typescript/rug/operations/HandlerUtils.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/operations/Handlers.ts b/src/main/typescript/rug/operations/Handlers.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/operations/Handlers.ts rename to src/main/typescript/rug/operations/Handlers.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/operations/ProjectEditor.ts b/src/main/typescript/rug/operations/ProjectEditor.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/operations/ProjectEditor.ts rename to src/main/typescript/rug/operations/ProjectEditor.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/operations/ProjectGenerator.ts b/src/main/typescript/rug/operations/ProjectGenerator.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/operations/ProjectGenerator.ts rename to src/main/typescript/rug/operations/ProjectGenerator.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/operations/RugOperation.ts b/src/main/typescript/rug/operations/RugOperation.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/operations/RugOperation.ts rename to src/main/typescript/rug/operations/RugOperation.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/package.json.in b/src/main/typescript/rug/package.json similarity index 77% rename from src/main/typescript/node_modules/@atomist/rug/package.json.in rename to src/main/typescript/rug/package.json index 4dcec31b9..c51f3bc57 100644 --- a/src/main/typescript/node_modules/@atomist/rug/package.json.in +++ b/src/main/typescript/rug/package.json @@ -1,7 +1,7 @@ { "name": "@atomist/rug", - "version": "REPLACE_ME", - "description": "TypeScript model for Atomist editors, generators etc", + "version": "${project.version}", + "description": "TypeScript model for Atomist Rugs, see http://docs.atomist.com/", "repository": { "type": "git", "url": "git+https://github.com/atomist/rug.git" diff --git a/src/main/typescript/node_modules/@atomist/rug/test/Result.ts b/src/main/typescript/rug/test/Result.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/test/Result.ts rename to src/main/typescript/rug/test/Result.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/test/ScenarioWorld.ts b/src/main/typescript/rug/test/ScenarioWorld.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/test/ScenarioWorld.ts rename to src/main/typescript/rug/test/ScenarioWorld.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/test/handler/Core.ts b/src/main/typescript/rug/test/handler/Core.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/test/handler/Core.ts rename to src/main/typescript/rug/test/handler/Core.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/test/handler/WellKnownSteps.ts b/src/main/typescript/rug/test/handler/WellKnownSteps.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/test/handler/WellKnownSteps.ts rename to src/main/typescript/rug/test/handler/WellKnownSteps.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/test/project/Core.ts b/src/main/typescript/rug/test/project/Core.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/test/project/Core.ts rename to src/main/typescript/rug/test/project/Core.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/test/project/Helpers.ts b/src/main/typescript/rug/test/project/Helpers.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/test/project/Helpers.ts rename to src/main/typescript/rug/test/project/Helpers.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/test/project/WellKnownSteps.ts b/src/main/typescript/rug/test/project/WellKnownSteps.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/test/project/WellKnownSteps.ts rename to src/main/typescript/rug/test/project/WellKnownSteps.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/tree/Microgrammars.ts b/src/main/typescript/rug/tree/Microgrammars.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/tree/Microgrammars.ts rename to src/main/typescript/rug/tree/Microgrammars.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/tree/PathExpression.ts b/src/main/typescript/rug/tree/PathExpression.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/tree/PathExpression.ts rename to src/main/typescript/rug/tree/PathExpression.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/tree/TransformingPathExpressionEngine.ts b/src/main/typescript/rug/tree/TransformingPathExpressionEngine.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/tree/TransformingPathExpressionEngine.ts rename to src/main/typescript/rug/tree/TransformingPathExpressionEngine.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/tree/TreeHelper.ts b/src/main/typescript/rug/tree/TreeHelper.ts similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/tree/TreeHelper.ts rename to src/main/typescript/rug/tree/TreeHelper.ts diff --git a/src/main/typescript/node_modules/@atomist/rug/tsconfig.json b/src/main/typescript/rug/tsconfig.json similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/tsconfig.json rename to src/main/typescript/rug/tsconfig.json diff --git a/src/main/typescript/node_modules/@atomist/rug/tslint.json b/src/main/typescript/rug/tslint.json similarity index 100% rename from src/main/typescript/node_modules/@atomist/rug/tslint.json rename to src/main/typescript/rug/tslint.json diff --git a/src/test/scala/com/atomist/rug/ts/TypeScriptBuilder.scala b/src/test/scala/com/atomist/rug/ts/TypeScriptBuilder.scala index d1c400974..87f78de98 100644 --- a/src/test/scala/com/atomist/rug/ts/TypeScriptBuilder.scala +++ b/src/test/scala/com/atomist/rug/ts/TypeScriptBuilder.scala @@ -41,11 +41,10 @@ object TypeScriptBuilder { val sources = rawSources.map(_.edit(testTimeUserModel)) val src = new FileSystemArtifactSource(FileSystemArtifactSourceIdentifier( new File("src/main/typescript")), new ArtifactFilter { - override def apply(s: String) = - !s.endsWith(".js") + override def apply(s: String) = !s.endsWith(".js") }) // THIS ONLY WORKS IN TESTS NOT IN PRODUCTION BY DESIGN - val compiled = compiler.compile(src.underPath("node_modules/@atomist").withPathAbove(".atomist") + val compiled = compiler.compile(src.withPathAbove(".atomist") + sources.reduce((a, b) => a + b)) compiled.underPath(".atomist").withPathAbove(".atomist/node_modules/@atomist") }