Skip to content

Commit 619e625

Browse files
chuckjazmhevery
chuckjaz
authored and
mhevery
committed
refactor(tsc-wrapped): move tsc-wrapped to the packages directory (#18160)
1 parent a6c635e commit 619e625

45 files changed

Lines changed: 74 additions & 41 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.pullapprove.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ groups:
6969
- "*.lock"
7070
- "tools/*"
7171
exclude:
72-
- "tools/@angular/tsc-wrapped/*"
7372
- "tools/public_api_guard/*"
7473
- "aio/*"
7574
users:
@@ -136,7 +135,7 @@ groups:
136135
compiler-cli:
137136
conditions:
138137
files:
139-
- "tools/@angular/tsc-wrapped/*"
138+
- "packages/tsc-wrapped/*"
140139
- "packages/compiler-cli/*"
141140
users:
142141
- alexeagle

‎build.sh‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ echo "====== BUILDING: Version ${VERSION}"
333333
N="
334334
"
335335
TSC=`pwd`/node_modules/.bin/tsc
336-
NGC="node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main"
336+
NGC="node --max-old-space-size=3000 dist/packages-dist/tsc-wrapped/src/main"
337337
MAP_SOURCES="node `pwd`/scripts/build/map_sources.js "
338338
UGLIFYJS=`pwd`/node_modules/.bin/uglifyjs
339339
TSCONFIG=./tools/tsconfig.json
@@ -345,8 +345,6 @@ if [[ ${BUILD_TOOLS} == true ]]; then
345345
rm -rf ./dist/tools/
346346
mkdir -p ./dist/tools/
347347
$(npm bin)/tsc -p ${TSCONFIG}
348-
349-
cp ./tools/@angular/tsc-wrapped/package.json ./dist/tools/@angular/tsc-wrapped
350348
travisFoldEnd "build tools"
351349
fi
352350

@@ -398,11 +396,11 @@ if [[ ${BUILD_ALL} == true && ${TYPECHECK_ALL} == true ]]; then
398396

399397
TSCONFIG="packages/tsconfig.json"
400398
travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
401-
$NGC -p ${TSCONFIG}
399+
$TSC -p ${TSCONFIG}
402400
travisFoldEnd "tsc -p ${TSCONFIG}"
403401
TSCONFIG="modules/tsconfig.json"
404402
travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
405-
$NGC -p ${TSCONFIG}
403+
$TSC -p ${TSCONFIG}
406404
travisFoldEnd "tsc -p ${TSCONFIG}"
407405

408406
fi
@@ -414,6 +412,15 @@ if [[ ${BUILD_ALL} == true ]]; then
414412
fi
415413
fi
416414

415+
if [[ ${BUILD_TOOLS} == true || ${BUILD_ALL} == true ]]; then
416+
echo "====== (tsc-wrapped)COMPILING: \$(npm bin)/tsc -p packages/tsc-wrapped/tsconfig.json ====="
417+
$(npm bin)/tsc -p packages/tsc-wrapped/tsconfig.json
418+
echo "====== (tsc-wrapped)COMPILING: \$(npm bin)/tsc -p packages/tsc-wrapped/tsconfig-build.json ====="
419+
$(npm bin)/tsc -p packages/tsc-wrapped/tsconfig-build.json
420+
cp ./packages/tsc-wrapped/package.json ./dist/packages-dist/tsc-wrapped
421+
cp ./packages/tsc-wrapped/README.md ./dist/packages-dist/tsc-wrapped
422+
fi
423+
417424
for PACKAGE in ${PACKAGES[@]}
418425
do
419426
travisFoldStart "build package: ${PACKAGE}" "no-xtrace"

‎integration/hello_world__closure/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@angular/core": "file:../../dist/packages-dist/core",
1111
"@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
1212
"@angular/platform-server": "file:../../dist/packages-dist/platform-server",
13-
"@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
13+
"@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
1414
"google-closure-compiler": "20170409.0.0",
1515
"rxjs": "5.3.1",
1616
"typescript": "2.1.6",

‎integration/language_service_plugin/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@angular/language-service": "file:../../dist/packages-dist/language-service",
1313
"@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
1414
"@angular/platform-server": "file:../../dist/packages-dist/platform-server",
15-
"@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
15+
"@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
1616
"@types/minimist": "^1.2.0",
1717
"@types/node": "^7.0.5",
1818
"minimist": "^1.2.0",

‎integration/typings_test_ts21/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
1616
"@angular/platform-server": "file:../../dist/packages-dist/platform-server",
1717
"@angular/router": "file:../../dist/packages-dist/router",
18-
"@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
18+
"@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
1919
"@angular/upgrade": "file:../../dist/packages-dist/upgrade",
2020
"@types/jasmine": "2.5.41",
2121
"rxjs": "file:../../node_modules/rxjs",

‎integration/typings_test_ts22/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
1616
"@angular/platform-server": "file:../../dist/packages-dist/platform-server",
1717
"@angular/router": "file:../../dist/packages-dist/router",
18-
"@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
18+
"@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
1919
"@angular/upgrade": "file:../../dist/packages-dist/upgrade",
2020
"@types/jasmine": "2.5.41",
2121
"rxjs": "file:../../node_modules/rxjs",

‎integration/typings_test_ts23/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
1616
"@angular/platform-server": "file:../../dist/packages-dist/platform-server",
1717
"@angular/router": "file:../../dist/packages-dist/router",
18-
"@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
18+
"@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
1919
"@angular/upgrade": "file:../../dist/packages-dist/upgrade",
2020
"@types/jasmine": "2.5.41",
2121
"rxjs": "file:../../node_modules/rxjs",

‎karma-js.conf.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ module.exports = function(config) {
5959
'dist/all/@angular/examples/**/e2e_test/*',
6060
'dist/all/@angular/language-service/**',
6161
'dist/all/@angular/router/test/**',
62+
'dist/all/@angular/tsc-wrapped/**',
6263
'dist/all/@angular/platform-browser/testing/e2e_util.js',
6364
'dist/all/angular1_router.js',
6465
'dist/examples/**/e2e_test/**',

‎modules/tsconfig.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"],
1414
"rxjs/*": ["../node_modules/rxjs/*"],
1515
"@angular/*": ["../dist/all/@angular/*"],
16-
"@angular/tsc-wrapped": ["../dist/tools/@angular/tsc-wrapped"],
17-
"@angular/tsc-wrapped/*": ["../dist/tools/@angular/tsc-wrapped/*"]
16+
"@angular/tsc-wrapped": ["../dist/packages-dist/tsc-wrapped"],
17+
"@angular/tsc-wrapped/*": ["../dist/packages-dist/tsc-wrapped/*"]
1818
},
1919
"rootDir": ".",
2020
"inlineSourceMap": true,

‎packages/compiler-cli/README.md‎

Lines changed: 0 additions & 3 deletions

0 commit comments

Comments
 (0)