implab/implabjs-core Commit - r99:7071c0e728fe

added properties to the build project...

cin -

r99:7071c0e728fe ts-plugin

parent child

Context file:

r99:7071c0e728fe

Collapse all files

.vscode/launch.json created 644 +14 0

			@@ -0,0 +1,14
		1	{
		2	"version": "0.2.0",
		3	"configurations": [
		4	{
		5	"name": "Launch browser tests",
		6	"type": "node",
		7	"request": "launch",
		8	"program": "${workspaceFolder}/build/test/tests/index.js",
		9	"cwd": "${workspaceFolder}/build/test",
		10	"sourceMaps": true,
		11	"preLaunchTask": "Build browser test"
		12	}
		13	]
		14	} No newline at end of file

.vscode/tasks.json created 644 +15 0

			@@ -0,0 +1,15
		1	{
		2	"version": "2.0.0",
		3	"command": "./gradlew",
		4	"type": "shell",
		5	"tasks": [
		6	{
		7	"label": "Build browser test",
		8	"args": [
		9	"assembleTest",
		10	"-Psymbols=local",
		11	"-Pflavour=browser"
		12	]
		13	}
		14	]
		15	} No newline at end of file

build.gradle +74 -109

                id "ivy-publish"
              }
-             // если версия явно не заданы вычисляем ее из тэга ревизии v.{num}***
-             // результатом будет версия '{num}.{distance}' где distance - расстояние от
-             // текущей ревизии до ревизии с тэгом
-             def tagDistance = 0;
+             if (!symbols in ['local', 'pack', 'none'])
+                 throw new Exception("The symbols property value is invalid: $symbols");
+             if (!flavour in ['browser', 'node'])
+                 throw new Exception("The flavour property value is invalid: $flavour");
              ext {
-                 packageName = "@$npmScope/$name"
-                 lint = project.hasProperty('lint') ? lint : false
+             }
-             configurations {
+                 packageName = flavour == 'browser' ? "@$npmScope/$name-amd" : "@$npmScope/$name"
+                 lint = project.hasProperty('lint') ? project.lint : false
              }
              sources {
                  compilerOptions {
                      types = []
                      declaration = true
-                     sourceMap = true
-                     sourceRoot = "_src"
+                     if(symbols != 'none') {
+                         sourceMap = true
+                         sourceRoot = "_src"
+                     }
+                     if (flavour == 'node') {
+                         module = "commonjs"
+                         target = "es2017"
+                         lib = ["es2017", "dom", "scripthost"]
+                     } else if (flavour == 'browser') {
+                         module = "amd"
+                         target = "es5"
+                         lib = ["es5", "dom", "scripthost", "es2015.promise", "es2015.symbol", "es2015.iterable" ]
+                     }
                  }
                  tscCmd = "$projectDir/node_modules/.bin/tsc"
                  tsLintCmd = "$projectDir/node_modules/.bin/tslint"
              	npmCmd = "npm"
              }
-             tasks.matching{ it.name =~ /^configureTs/ }.configureEach {
-                 dependsOn "prepare"
+             }
              tasks.matching{ it.name =~ /^lint/ }.configureEach {
                  onlyIf { lint }
              }
-             task prepare {
+             if (symbols == 'local') {
+                 tasks.matching{ it.name =~ /^configureTs/ }.configureEach {
+                     compilerOptions {
+                         sourceRoot = "file://" + it.rootDir
+                     }
+                 }
              }
              task printVersion {
-                 dependsOn prepare
                  doLast {
+                     println "packageName: ${-> packageName}";
                      println "version: ${-> version}";
-                     println "packageName: ${-> packageName}";
+                     println "flavour: ${-> flavour}";
                      println "target: ${-> typescript.compilerOptions.target}";
                      println "module: ${-> typescript.compilerOptions.module}";
+                     println "lint: ${-> lint}";
+                     println "symbols: ${-> symbols}";
                  }
              }
              task clean {
-                 prepare.mustRunAfter it
                  doLast {
                      delete buildDir
                  }
              }
              assemble {
-                 mustRunAfter sources.amd.output,
-                     sources.cjs.output
-                 from sources.amd.output.compiledDir
-                 from sources.cjs.output.compiledDir
+             }
-             assembleTest {
-                 mustRunAfter sources.amd.output,
-                     sources.cjs.output,
-                     sources.testAmd.output,
-                     sources.testCjs.output
-                 from sources.amd.output.compiledDir
-                 from sources.cjs.output.compiledDir
-                 from sources.testAmd.output.compiledDir
-                 from sources.testCjs.output.compiledDir
+             }
-             task prepareLocalDebug {
-                 prepare.mustRunAfter it
-                 doLast {
-                     tasks.matching{ it.name =~ /^configureTs/ }.configureEach {
-                         compilerOptions {
-                             sourceRoot = "file://" + it.rootDir
+                         }
+                     }
+                 if (flavour == 'browser') {
+                     dependsOn sources.amd.output
+                     from sources.amd.output.compiledDir
+                 }
+                 if (flavour == 'node') {
+                     dependsOn sources.cjs.output
+                     from sources.cjs.output.compiledDir
                  }
              }
-             task prepareNode {
-                 prepare.mustRunAfter it
+             assembleTest {
+                 if (flavour == 'browser') {
+                     dependsOn sources.amd.output, sources.testAmd.output
-                 doLast {
-                     typescript {
-                         compilerOptions {
-                             module = "commonjs"
-                             target = "es2017"
-                             lib = ["es2017", "dom", "scripthost"]
+                         }
+                     }
+                     from sources.amd.output.compiledDir
+                     from sources.testAmd.output.compiledDir
+                 }
+                 if (flavour == 'node') {
+                     dependsOn sources.cjs.output, sources.testCjs.output
+                     from sources.cjs.output.compiledDir
+                     from sources.testCjs.output.compiledDir
                  }
              }
-             task prepareBrowser {
-                 prepare.mustRunAfter it
-                 doLast {
-                     packageName = "@$npmScope/$project.name-amd"
+             task npmPackTypings(type: Copy) {
+                 npmPack.dependsOn it
+                 dependsOn sources.main.output
+                 from sources.main.output.typingsDir
-                     typescript {
-                         compilerOptions {
-                             module = "amd"
-                             target = "es5"
-                             lib = ["es5", "dom", "scripthost", "es2015.promise", "es2015.symbol", "es2015.iterable"]
+                         }
+                     }
+                 if (flavour == 'browser') {
+                     dependsOn sources.amd.output
+                     from sources.amd.output.typingsDir
                  }
+             }
-             task npmPackTypingsAmd(type: Copy) {
-                 dependsOn sources.main.output
-                 dependsOn sources.amd.output
-                 npmPack.mustRunAfter it
-                 from sources.main.output.typingsDir
-                 from sources.amd.output.typingsDir
+                 if (flavour == 'node') {
+                     dependsOn sources.cjs.output
+                     from sources.cjs.output.typingsDir
+                 }
                  into "${->buildDir}/npm/pack"
              }
-             task npmPackSourcesAmd(type: Copy) {
+             task npmPackSources(type: Copy) {
                  from sources.main.ts
-                 from sources.amd.ts
-                 npmPack.mustRunAfter it
+                 if (flavour == 'browser') {
+                     from sources.amd.ts
+                 }
+                 if (flavour == 'node') {
+                     from sources.cjs.ts
+                 }
                  into "${->buildDir}/npm/pack/_src"
              }
-             task assembleBrowser {
-                 dependsOn prepareBrowser, assemble, sources.amd.output
+             }
-             task assembleNode {
-                 dependsOn prepareNode, assemble, sources.cjs.output
+             }
-             task assembleTestBrowser {
-                 dependsOn prepareBrowser, prepareLocalDebug, assembleTest, sources.amd.output, sources.testAmd.output
+             if (symbols == 'pack') {
+                 npmPack {
+                     dependsOn npmPackSources
+                 }
              }
-             task testBrowser {
-                 dependsOn prepareBrowser, test, sources.amd.output, sources.testAmd.output
+             }
-             task testNode {
-                 dependsOn prepareNode, test, sources.cjs.output, sources.testCjs.output
+             }
-             task npmPackBrowser {
-                 dependsOn assembleBrowser, npmPack, npmPackSourcesAmd, npmPackTypingsAmd
+             }
              task packJsTar(type: Tar) {
                  dependsOn assemble;

gradle.properties +3 -1

              description=Dependency injection, logging, simple and fast text processing tools
              license=BSD-2-Clause
              repository=https://bitbucket.org/implab/implabjs-core
-             npmScope=implab
  No newline at end of file
+             npmScope=implab
+             flavour=browser
+             symbols=pack
  No newline at end of file

src/amd/ts/di/ResolverHelper.ts +1 -1

              import m = require("module");
              const sandboxId = Uuid();
-             define(sandboxId, ["require"], r => r);
+             define(sandboxId, ["require"], (r: any) => r);
              const globalRequire = getGlobal().require as Require || requirejs;

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