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}***
              // текущей ревизии до ревизии с тэгом
              def tagDistance = 0;
+             ext {
+                 packageName = "@$npmScope/$name"
+             }
              if (!version) {
                  def rev = ["hg", "log", "-r", ".", "--template", "{latesttag('re:^v') % '{tag}-{distance}'}"].execute().text.trim();
                  version += "-$versionSuffix"
              }
-             ext {
-                 packageName = "@$npmScope/$npmName"
+             }
              sources {
                  amd {
                      typings {
              configureTsCjs {
                  dependsOn sources.main.output
+                 compilerOptions {
+                     types += [ "node" ]
+                 }
              }
              configureTsAmd {
                  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 {
                  }
              }
-             assembleTest {
-                 mustRunAfter assembleTestAmd
-                 dependsOn sources.main.output
-                 from(sources.main.output.compiledDir)
+             task assembleTestCjs {
+                 dependsOn sources.cjs.output
+                 dependsOn sources.testCjs.output
+                 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 {
              }
              task prepareTargetEsNext {
+                 prepare.mustRunAfter it
                  doLast {
                      typescript {
                          compilerOptions {
-                             target = "esnext"
-                             lib = ["esnext", "dom", "scripthost"]
+                             target = "es2017"
+                             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 {
-                 mustRunAfter prepareNode, prepareBrowser
+             task assembleBrowser {
+                 dependsOn prepareBrowser, assembleAmd, assemble
+             }
+             task assembleNode {
+                 dependsOn prepareNode, assembleCjs, assemble
+             }
+             task testBrowser {
+                 dependsOn prepareBrowser, assembleTestAmd, test
+             }
+             task testNode {
+                 dependsOn prepareNode, assembleTestCjs, test
              }
  No newline at end of file

gradle.properties +1 -2

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

package.json +1 -2

                  "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"
+                 ]
+                 }
              }
  No newline at end of file

src/tsconfig.json +1 -1

                      "noEmitOnError": true,
                      "listFiles": true,
                      "types": [],
-                     "lib": ["es5", "es2015.promise", "es2015.symbol", "dom", "scripthost"]
+                     "lib": ["es5", "es2015.promise", "es2015.symbol", "es2015.iterable", "dom", "scripthost"]
                  }
              }
  No newline at end of file

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