Skip to content

Commit c632e71

Browse files
committed
[fixes #290] prepublish typescript
1 parent a1c3686 commit c632e71

File tree

7 files changed

+486
-14
lines changed

7 files changed

+486
-14
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@
2323
/.node_modules.ember-try/
2424
/bower.json.ember-try
2525
/package.json.ember-try
26+
/addon/**/*.js
27+
28+
/**/*.d.ts
29+
!/types/**/*.d.ts

.npmignore

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,42 @@
66
/bower_components/
77

88
# misc
9-
/.bowerrc
109
/.editorconfig
1110
/.ember-cli
1211
/.env*
12+
/.eslintcache
1313
/.eslintignore
1414
/.eslintrc.js
15+
/.git/
16+
/.github
1517
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1620
/.template-lintrc.js
17-
/.travis.yml
1821
/.watchmanconfig
19-
/bower.json
2022
/config/ember-try.js
2123
/CONTRIBUTING.md
2224
/ember-cli-build.js
2325
/testem.js
2426
/tests/
27+
/node-tests/
28+
/yarn-error.log
2529
/yarn.lock
2630
.gitkeep
2731

2832
# ember-try
2933
/.node_modules.ember-try/
30-
/bower.json.ember-try
3134
/package.json.ember-try
35+
36+
# TS
37+
**/*.ts
38+
!**/*.d.ts
39+
40+
/.prettierrc.js
41+
/vendor/
42+
/tsconfig.json
43+
/config/
44+
/node-tests/
45+
/release.md
46+
/tests
47+
/changelog.md

.prettierignore

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try
22+
23+
addon/**/*.js
24+
**/*.d.ts

app/.gitkeep

Whitespace-only changes.

index.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,18 @@ module.exports = {
3838
multiple modules (@ember/test-helpers and ember-test-helpers).
3939
*/
4040
let babel = this.addons.find((a) => a.name === 'ember-cli-babel');
41+
42+
let input;
4143

42-
return babel.transpileTree(tree);
44+
// ember-cli-typescript should ultimately handle this for us.
45+
if (this.isDevelopingAddon()) {
46+
const {
47+
BroccoliBabelPresetTypeScript,
48+
} = require('broccoli-babel-preset-typescript'); // eslint-disable-line node/no-unpublished-require
49+
input = new BroccoliBabelPresetTypeScript([tree]);
50+
} else {
51+
input = tree;
52+
}
53+
return babel.transpileTree(input);
4354
},
4455
};

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
"lint:js": "eslint --ext ts,js .",
2525
"lint:js:fix": "eslint --ext ts,js . --fix",
2626
"lint:ts": "tsc -p tsconfig.json --noEmit",
27-
"prepublishOnly": "ember ts:precompile",
27+
"prepublishOnly": "npm-run-all prepublishOnly:*",
28+
"prepublishOnly:d.ts": "ember ts:precompile",
29+
"prepublishOnly:addon": "babel --extensions '.ts' --presets @babel/preset-typescript addon --out-dir addon --ignore '**/*.d.ts'",
2830
"postpublish": "ember ts:clean",
2931
"start": "ember serve",
3032
"test": "npm-run-all lint \"test:!(ember-compatibility|prod)\"",
@@ -36,11 +38,12 @@
3638
"dependencies": {
3739
"calculate-cache-key-for-tree": "^2.0.0",
3840
"ember-cli-babel": "^7.26.6",
39-
"ember-cli-typescript": "^4.1.0",
4041
"ember-cli-version-checker": "^5.1.2",
4142
"semver": "^7.3.5"
4243
},
4344
"devDependencies": {
45+
"@babel/cli": "^7.14.8",
46+
"@babel/preset-typescript": "^7.15.0",
4447
"@ember/optional-features": "^2.0.0",
4548
"@glimmer/env": "^0.1.7",
4649
"@types/ember": "^3.16.5",
@@ -51,6 +54,7 @@
5154
"@types/rsvp": "^4.0.3",
5255
"@typescript-eslint/eslint-plugin": "^2.34.0",
5356
"@typescript-eslint/parser": "^2.34.0",
57+
"broccoli-babel-preset-typescript": "^1.0.0",
5458
"co": "^4.6.0",
5559
"ember-auto-import": "^1.11.3",
5660
"ember-cli": "~3.24.0",
@@ -59,6 +63,7 @@
5963
"ember-cli-inject-live-reload": "^2.0.2",
6064
"ember-cli-sri": "^2.1.1",
6165
"ember-cli-test-loader": "^3.0.0",
66+
"ember-cli-typescript": "^4.2.1",
6267
"ember-cli-typescript-blueprints": "^3.0.0",
6368
"ember-cli-uglify": "^3.0.0",
6469
"ember-concurrency": "^1.3.0",

0 commit comments

Comments
 (0)