Skip to content
This repository has been archived by the owner on Mar 19, 2019. It is now read-only.

Remove node_modules from TypeScript sources path #579

Merged
merged 1 commit into from
May 8, 2017
Merged

Remove node_modules from TypeScript sources path #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
181 changes: 81 additions & 100 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<scala.binary.version>2.11</scala.binary.version>
<scala.maven.plugin.version>3.2.2</scala.maven.plugin.version>
<scoverage.plugin.version>1.3.0</scoverage.plugin.version>
<maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
<atomist.node.modules>.atomist/node_modules/@atomist</atomist.node.modules>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -342,6 +344,80 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.plugin.version}</version>
<executions>
<execution>
<id>copy-typescript</id>
<goals>
<goal>run</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<target>
<mkdir dir="${project.build.directory}/${atomist.node.modules}"/>
<copy todir="${project.build.directory}/${atomist.node.modules}">
<fileset dir="${basedir}/src/main/typescript"/>
</copy>
<copy
file="${basedir}/src/main/typescript/rug/package.json"
tofile="${project.build.directory}/${atomist.node.modules}/rug/package.json"
overwrite="true">
<filterchain>
<expandproperties />
</filterchain>
</copy>
<copy
file="${basedir}/src/main/typescript/cortex/package.json"
tofile="${project.build.directory}/${atomist.node.modules}/cortex/package.json"
overwrite="true">
<filterchain>
<expandproperties />
</filterchain>
</copy>
<mkdir dir="${project.build.directory}/${atomist.node.modules}/rug/model"/>
<mkdir dir="${project.build.directory}/${atomist.node.modules}/cortex"/>
<mkdir dir="${project.build.directory}/${atomist.node.modules}/cortex/stub"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<executions>
<execution>
<id>generate-interfaces</id>
<goals>
<goal>java</goal>
</goals>
<phase>compile</phase>
<configuration>
<mainClass>com.atomist.rug.ts.TypeScriptInterfaceGenerator</mainClass>
<arguments>
<argument>${project.build.directory}/${atomist.node.modules}</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>generate-extended-model</id>
<goals>
<goal>java</goal>
</goals>
<phase>compile</phase>
<configuration>
<mainClass>com.atomist.rug.ts.CortexTypeGeneratorApp</mainClass>
<arguments>
<argument>${project.build.directory}/${atomist.node.modules}</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
Expand Down Expand Up @@ -460,7 +536,7 @@
<goal>gulp</goal>
</goals>
<configuration>
<arguments>typedoc --gulpfile .atomist/node_modules/@atomist/rug/gulpfile.js</arguments>
<arguments>typedoc --gulpfile ${atomist.node.modules}/rug/gulpfile.js</arguments>
</configuration>
<phase>process-test-resources</phase>
</execution>
Expand All @@ -470,7 +546,7 @@
<goal>gulp</goal>
</goals>
<configuration>
<arguments>typedoc --gulpfile .atomist/node_modules/@atomist/cortex/gulpfile.js</arguments>
<arguments>typedoc --gulpfile ${atomist.node.modules}/cortex/gulpfile.js</arguments>
</configuration>
<phase>process-test-resources</phase>
</execution>
Expand All @@ -483,7 +559,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<version>${maven.antrun.plugin.version}</version>
<executions>
<execution>
<id>compile-typescript</id>
Expand All @@ -495,110 +571,15 @@
<target>
<exec executable="${project.build.directory}/node_modules/typescript/bin/tsc" failonerror="true">
<arg value="-p"/>
<arg value="${project.build.directory}/.atomist/node_modules/@atomist/rug"/>
<arg value="${project.build.directory}/${atomist.node.modules}/rug"/>
</exec>
<exec executable="${project.build.directory}/node_modules/typescript/bin/tsc" failonerror="true">
<arg value="-p"/>
<arg value="${project.build.directory}/.atomist/node_modules/@atomist/cortex"/>
<arg value="${project.build.directory}/${atomist.node.modules}/cortex"/>
</exec>
</target>
</configuration>
</execution>
<execution>
<id>mk-ts-output-dir</id>
<goals>
<goal>run</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<target>
<mkdir dir="${project.build.directory}/.atomist"/>
</target>
</configuration>
</execution>
<execution>
<id>copy-ts</id>
<goals>
<goal>run</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<target>
<copy todir="${project.build.directory}/.atomist">
<fileset dir="src/main/typescript"/>
</copy>
</target>
</configuration>
</execution>
<execution>
<id>mkdir-rug-model</id>
<goals>
<goal>run</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<target>
<mkdir dir="${project.build.directory}/.atomist/node_modules/@atomist/rug/model"/>
</target>
</configuration>
</execution>
<execution>
<id>mkdir-cortex</id>
<goals>
<goal>run</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<target>
<mkdir dir="${project.build.directory}/.atomist/node_modules/@atomist/cortex"/>
</target>
</configuration>
</execution>
<execution>
<id>mkdir-cortex-stub</id>
<goals>
<goal>run</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<target>
<mkdir dir="${project.build.directory}/.atomist/node_modules/@atomist/cortex/stub"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<executions>
<execution>
<id>generate-interfaces</id>
<goals>
<goal>java</goal>
</goals>
<phase>compile</phase>
<configuration>
<mainClass>com.atomist.rug.ts.TypeScriptInterfaceGenerator</mainClass>
<arguments>
<argument>${project.build.directory}/.atomist/node_modules/@atomist</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>generate-extended-model</id>
<goals>
<goal>java</goal>
</goals>
<phase>compile</phase>
<configuration>
<mainClass>com.atomist.rug.ts.CortexTypeGeneratorApp</mainClass>
<arguments>
<argument>${project.build.directory}/.atomist/node_modules/@atomist</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
13 changes: 9 additions & 4 deletions src/main/scripts/npm-publish.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: $*"
Expand Down Expand Up @@ -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
Expand Down
0 ...t/node_modules/@atomist/cortex/.gitignore → src/main/typescript/cortex/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...t/node_modules/@atomist/cortex/.npmignore → src/main/typescript/cortex/.npmignore
View file
Open in desktop
File renamed without changes.
0 ...ript/node_modules/@atomist/cortex/LICENSE → src/main/typescript/cortex/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...pt/node_modules/@atomist/cortex/README.md → src/main/typescript/cortex/README.md
View file
Open in desktop
File renamed without changes.
0 .../node_modules/@atomist/cortex/gulpfile.js → src/main/typescript/cortex/gulpfile.js
View file
Open in desktop
File renamed without changes.
22 changes: 22 additions & 0 deletions src/main/typescript/cortex/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
}
}
0 ...ode_modules/@atomist/cortex/tsconfig.json → src/main/typescript/cortex/tsconfig.json
View file
Open in desktop
File renamed without changes.
22 changes: 0 additions & 22 deletions src/main/typescript/node_modules/@atomist/cortex/package.json.in
View file
Open in desktop

This file was deleted.

0 ...ript/node_modules/@atomist/rug/.gitignore → src/main/typescript/rug/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...ript/node_modules/@atomist/rug/.npmignore → src/main/typescript/rug/.npmignore
View file
Open in desktop
File renamed without changes.
0 ...escript/node_modules/@atomist/rug/LICENSE → src/main/typescript/rug/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...cript/node_modules/@atomist/rug/README.md → src/main/typescript/rug/README.md
View file
Open in desktop
File renamed without changes.
0 ...ode_modules/@atomist/rug/ast/AstHelper.ts → src/main/typescript/rug/ast/AstHelper.ts
View file
Open in desktop
File renamed without changes.
0 ...rug/ast/DecoratingPathExpressionEngine.ts → ...rug/ast/DecoratingPathExpressionEngine.ts
View file
Open in desktop
File renamed without changes.
0 ...dules/@atomist/rug/ast/TextTreeNodeOps.ts → ...ain/typescript/rug/ast/TextTreeNodeOps.ts
View file
Open in desktop
File renamed without changes.
0 ...node_modules/@atomist/rug/ast/TreeDiff.ts → src/main/typescript/rug/ast/TreeDiff.ts
View file
Open in desktop
File renamed without changes.
0 ...ules/@atomist/rug/ast/java/Expressions.ts → ...in/typescript/rug/ast/java/Expressions.ts
View file
Open in desktop
File renamed without changes.
0 ...de_modules/@atomist/rug/ast/java/Model.ts → src/main/typescript/rug/ast/java/Model.ts
View file
Open in desktop
File renamed without changes.
0 ...dules/@atomist/rug/ast/java/Structures.ts → ...ain/typescript/rug/ast/java/Structures.ts
View file
Open in desktop
File renamed without changes.
0 ...ug/ast/scala/ScalaPathExpressionEngine.ts → ...ug/ast/scala/ScalaPathExpressionEngine.ts
View file
Open in desktop
File renamed without changes.
0 ...e_modules/@atomist/rug/ast/scala/Types.ts → src/main/typescript/rug/ast/scala/Types.ts
View file
Open in desktop
File renamed without changes.
0 ...de_modules/@atomist/rug/ast/yaml/Types.ts → src/main/typescript/rug/ast/yaml/Types.ts
View file
Open in desktop
File renamed without changes.
0 .../rug/ast/yaml/YamlPathExpressionEngine.ts → .../rug/ast/yaml/YamlPathExpressionEngine.ts
View file
Open in desktop
File renamed without changes.
0 ...ipt/node_modules/@atomist/rug/gulpfile.js → src/main/typescript/rug/gulpfile.js
View file
Open in desktop
File renamed without changes.
0 ...les/@atomist/rug/operations/Decorators.ts → ...n/typescript/rug/operations/Decorators.ts
View file
Open in desktop
File renamed without changes.
0 ...s/@atomist/rug/operations/HandlerUtils.ts → ...typescript/rug/operations/HandlerUtils.ts
View file
Open in desktop
File renamed without changes.
0 ...dules/@atomist/rug/operations/Handlers.ts → ...ain/typescript/rug/operations/Handlers.ts
View file
Open in desktop
File renamed without changes.
0 .../@atomist/rug/operations/ProjectEditor.ts → ...ypescript/rug/operations/ProjectEditor.ts
View file
Open in desktop
File renamed without changes.
0 ...tomist/rug/operations/ProjectGenerator.ts → ...script/rug/operations/ProjectGenerator.ts
View file
Open in desktop
File renamed without changes.
0 ...s/@atomist/rug/operations/RugOperation.ts → ...typescript/rug/operations/RugOperation.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...node_modules/@atomist/rug/package.json.in → src/main/typescript/rug/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
0 .../node_modules/@atomist/rug/test/Result.ts → src/main/typescript/rug/test/Result.ts
View file
Open in desktop
File renamed without changes.
0 ...odules/@atomist/rug/test/ScenarioWorld.ts → ...main/typescript/rug/test/ScenarioWorld.ts
View file
Open in desktop
File renamed without changes.
0 ...modules/@atomist/rug/test/handler/Core.ts → src/main/typescript/rug/test/handler/Core.ts
View file
Open in desktop
File renamed without changes.
0 ...tomist/rug/test/handler/WellKnownSteps.ts → ...script/rug/test/handler/WellKnownSteps.ts
View file
Open in desktop
File renamed without changes.
0 ...modules/@atomist/rug/test/project/Core.ts → src/main/typescript/rug/test/project/Core.ts
View file
Open in desktop
File renamed without changes.
0 ...ules/@atomist/rug/test/project/Helpers.ts → ...in/typescript/rug/test/project/Helpers.ts
View file
Open in desktop
File renamed without changes.
0 ...tomist/rug/test/project/WellKnownSteps.ts → ...script/rug/test/project/WellKnownSteps.ts
View file
Open in desktop
File renamed without changes.
0 ...odules/@atomist/rug/tree/Microgrammars.ts → ...main/typescript/rug/tree/Microgrammars.ts
View file
Open in desktop
File renamed without changes.
0 ...dules/@atomist/rug/tree/PathExpression.ts → ...ain/typescript/rug/tree/PathExpression.ts
View file
Open in desktop
File renamed without changes.
0 .../tree/TransformingPathExpressionEngine.ts → .../tree/TransformingPathExpressionEngine.ts
View file
Open in desktop
File renamed without changes.
0 ...e_modules/@atomist/rug/tree/TreeHelper.ts → src/main/typescript/rug/tree/TreeHelper.ts
View file
Open in desktop
File renamed without changes.
0 ...t/node_modules/@atomist/rug/tsconfig.json → src/main/typescript/rug/tsconfig.json
View file
Open in desktop
File renamed without changes.
0 ...ipt/node_modules/@atomist/rug/tslint.json → src/main/typescript/rug/tslint.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions src/test/scala/com/atomist/rug/ts/TypeScriptBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down