implab/implabjs-core Commit - r93:e1c9ce0d77b4

working build and test for browser and node targets

cin -

r93:e1c9ce0d77b4 ts-plugin

parent child

Context file:

r93:e1c9ce0d77b4

Collapse all files

src/testCjs/ts/tests/index.ts created 644 +1 0

	@@ -0,0 +1,1
				1	import "./plan";

src/testCjs/ts/tests/plan.ts created 644 +7 0

@@ -0,0 +1,7
	1	import "./ActivatableTests";
	2	import "./TraceSourceTests";
	3	import "./CancellationTests";
	4	import "./ObservableTests";
	5	import "./ContainerTests";
	6	import "./SafeTests";
	7	import "./TextTests";

build.gradle +69 -17

             plugins {
-              id "org.implab.gradle-typescript" version "1.0.1-rc2"
+              id "org.implab.gradle-typescript" version "1.0.1-rc3"
             }
             // если версия явно не заданы вычисляем ее из тэга ревизии v.{num}***
             // результатом будет версия '{num}.{distance}' где distance - расстояние от
             // текущей ревизии до ревизии с тэгом
             def tagDistance = 0;
+            ext {
+                packageName = "@$npmScope/$name"
+            }
             if (!version) {
                 def rev = ["hg", "log", "-r", ".", "--template", "{latesttag('re:^v') % '{tag}-{distance}'}"].execute().text.trim();
                 def tagVersion;
                 def match = (rev =~ /^v(\d+\.\d+\.\d+).*-(\d+)$/);
                 if (match.size()) {
                     tagVersion = match[0][1];
                     tagDistance = match[0][2].toInteger();
                 } else {
                     throw new Exception("A version must be specied");
                 }
                 version = tagVersion;
                 if (tagDistance > 0)
                     version++;
             } else {
                 println "explicit version: $version";
             }
             if (hasProperty('versionSuffix') && versionSuffix) {
                 version += "-$versionSuffix"
             }
-            ext {
-                packageName = "@$npmScope/$npmName"
             sources {
                 amd {
                     typings {
                         srcDir main.output.typingsDir
                     }
                 }
                 cjs {
                     typings {
                         srcDir main.output.typingsDir
                     }
                 }
                 testAmd {
                     typings {
                         srcDir main.output.typingsDir
                         srcDir amd.output.typingsDir
                         srcDir test.output.typingsDir
                     }
                 }
                 testCjs {
                     typings {
                         srcDir main.output.typingsDir
                         srcDir cjs.output.typingsDir
                         srcDir test.output.typingsDir
                     }
                 }
             }
             typescript {
                 compilerOptions {
                     types = []
                     declaration = true
                     listFiles = true
                 }
                 tscCmd = "$projectDir/node_modules/.bin/tsc"
                 tsLintCmd = "$projectDir/node_modules/.bin/tslint"
             	esLintCmd = "$projectDir/node_modules/.bin/eslint"
             	npmCmd = "npm"
             }
             task prepare {
             }
             task printVersion {
                 dependsOn prepare
                 doLast {
                     println "version: ${-> version}";
                     println "tagDistance: ${-> tagDistance}";
                     println "packageName: ${-> packageName}";
                     println "target: ${-> typescript.compilerOptions.target}";
                     println "module: ${-> typescript.compilerOptions.module}";
                 }
             }
             task clean {
                 doLast {
                     delete buildDir
                 }
             }
             npmPackMeta {
                 meta {
                     name = packageName
                 }
             }
             configureTsCjs {
                 dependsOn sources.main.output
+                compilerOptions {
+                    types += [ "node" ]
+                }
             }
             configureTsAmd {
                 dependsOn sources.main.output
                 compilerOptions {
                     types += [ "requirejs", "dojo-typings" ]
                 }
             }
             test {
                 workingDir layout.buildDirectory.dir("test");
                 commandLine "node", "tests/index.js"
             }
+            task assembleAmd {
+                dependsOn sources.amd.output
+                assemble.mustRunAfter it
+                doLast {
+                    assemble {
+                        from(sources.amd.output.compiledDir)
+                    }
+                }
+            }
+            task assembleCjs {
+                dependsOn sources.cjs.output
+                assemble.mustRunAfter it
+                doLast {
+                    assemble {
+                        from(sources.cjs.output.compiledDir)
+                    }
+                }
+            }
             task assembleTestAmd {
                 dependsOn sources.amd.output
                 dependsOn sources.testAmd.output
+                assembleTest.mustRunAfter it
                 doLast {
                     assembleTest {
                         from(sources.amd.output.compiledDir)
                         from(sources.testAmd.output.compiledDir)
                     }
                 }
             }
-            assembleTest {
+            task assembleTestCjs {
-                mustRunAfter assembleTestAmd
+                dependsOn sources.cjs.output
-                dependsOn sources.main.output
+                dependsOn sources.testCjs.output
-                from(sources.main.output.compiledDir)
+                assembleTest.mustRunAfter it
+                doLast {
+                    assembleTest {
+                        from(sources.cjs.output.compiledDir)
+                        from(sources.testCjs.output.compiledDir)
+                    }
+                }
             }
+            task prepareTargetEs5 {
+                prepare.mustRunAfter it
-            task prepareTargetEs5 {
                 doLast {
                     typescript {
                         compilerOptions {
                             target = "es5"
                             lib = ["es5", "dom", "scripthost", "es2015.promise", "es2015.symbol", "es2015.iterable"]
                         }
                     }
                 }
             }
             task prepareTargetEsNext {
+                prepare.mustRunAfter it
                 doLast {
                     typescript {
                         compilerOptions {
-                            target = "esnext"
+                            target = "es2017"
-                            lib = ["esnext", "dom", "scripthost"]
+                            lib = ["es2017", "dom", "scripthost"]
                         }
                     }
                 }
             }
             task prepareNode {
                 dependsOn prepareTargetEsNext
+                prepare.mustRunAfter it
                 doLast {
                     typescript {
                         compilerOptions {
-                            target = "esnext"
                             module = "commonjs"
                         }
                     }
                 }
             }
             task prepareBrowser {
                 dependsOn prepareTargetEs5
+                prepare.mustRunAfter it
                 doLast {
+                    packageName = "@$npmScope/$project.name-amd"
                     typescript {
                         compilerOptions {
-                            module = "requirejs"
+                            module = "amd"
                         }
                     }
                 }
             }
-            prepare {
+            task assembleBrowser {
-                mustRunAfter prepareNode, prepareBrowser
+                dependsOn prepareBrowser, assembleAmd, assemble
+            }
+            task assembleNode {
+                dependsOn prepareNode, assembleCjs, assemble
+            }
+            task testBrowser {
+                dependsOn prepareBrowser, assembleTestAmd, test
+            }
+            task testNode {
+                dependsOn prepareNode, assembleTestCjs, test
             }

gradle.properties +1 -2

             version=
             author=Implab team
             description=Dependency injection, logging, simple and fast text template engine
             license=BSD-2-Clause
             repository=https://bitbucket.org/implab/implabjs-core
-            npmScope=implab
+            npmScope=implab
  No newline at end of file
-            npmName=core-amd
  No newline at end of file

package.json +1 -2

             {
               "name": "@implab/core",
               "version": "0.0.1-dev",
               "description": "Dependency injection, logging, simple and fast text template engine",
               "main": "main.js",
               "keywords": [
                 "di",
                 "ioc",
                 "logging",
                 "template engine",
                 "dependency injection"
               ],
               "author": "Implab team",
               "license": "BSD-2-Clause",
               "repository": "https://bitbucket.org/implab/implabjs",
               "publishConfig": {
                 "access": "public"
               },
               "peerDependencies": {
                 "dojo": "^1.10.0"
               },
               "devDependencies": {
                 "@types/node": "^8.0.0",
                 "@types/requirejs": "~2.1.31",
                 "@types/tape": "~4.2.33",
                 "dojo": "~1.10.0",
                 "dojo-typings": "^1.11.9",
                 "requirejs": "latest",
                 "tape": "~4.11.0",
                 "typescript": "~3.6.4",
                 "eslint": "6.1.0",
                 "tslint": "5.18.0"
-              },
-              "types": "main.d.ts"
             }

src/amd/tsconfig.json +4 -6

             {
                 "extends": "../tsconfig",
                 "compilerOptions": {
                     "types": [
-                        "requirejs"
+                        "requirejs",
+                        "dojo-typings"
                     ],
                     "rootDir": "ts",
                     "rootDirs": [
                         "ts",
-                        "../typings/main"
+                        "../main/ts"
                     ]
-                },
-                "include": [
-                    "ts/**/*.ts"
             }

src/tsconfig.json +1 -1

             {
                 "compilerOptions": {
                     "moduleResolution": "node",
                     "noEmitOnError": true,
                     "listFiles": true,
                     "types": [],
-                    "lib": ["es5", "es2015.promise", "es2015.symbol", "dom", "scripthost"]
+                    "lib": ["es5", "es2015.promise", "es2015.symbol", "es2015.iterable", "dom", "scripthost"]
                 }
             }

src/testCjs/ts/plan.ts removed 0 -7

NO CONTENT: file was removed

src/testCjs/ts/run-tests.ts removed 0 -1

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages