Skip to content

Commit 69512c2

Browse files
committed
chore: remove dart source and tooling
1 parent c8f87a4 commit 69512c2

28 files changed

+12
-1688
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# TODO(hansl): When we're ready to test for Dart, readd every mention of Dart to this file.
2-
# Base the Dart config on the main repo travis.yml file.
3-
41
language: node_js
52
sudo: false
63

@@ -26,8 +23,6 @@ env:
2623
- BROWSER_STACK_USERNAME=angularteam1
2724
- BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
2825
- ARCH=linux-x64
29-
- DART_DEV_VERSION=latest
30-
- DART_STABLE_VERSION=latest
3126
- BROWSER_PROVIDER_READY_FILE=/tmp/angular-material2-build/readyfile
3227
# Token for tsd to increase github rate limit
3328
# See https://github.com/DefinitelyTyped/tsd#tsdrc
@@ -44,7 +39,6 @@ env:
4439
- MODE=e2e
4540
- MODE=saucelabs_required
4641
- MODE=browserstack_required
47-
- MODE=dart_required DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
4842
- MODE=saucelabs_optional
4943
- MODE=browserstack_optional
5044

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
103103
* In GitHub, send a pull request to `material2:master`.
104104
* If we suggest changes then:
105105
* Make the required updates.
106-
* Re-run the Angular Material test suites for JS and Dart to ensure tests are still passing.
106+
* Re-run the Angular Material test suites to ensure tests are still passing.
107107
* Rebase your branch and force push to your GitHub repository (this will update your Pull
108108
Request):
109109

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Also see our [`Good for community contribution`](https://github.com/angular/mate
4646

4747
## The goal of Angular Material
4848
Our goal is to build a set of high-quality UI components built with Angular 2 and TypeScript,
49-
following the Material Design spec, that are consumable by both JavaScript and Dart. These
49+
following the Material Design spec. These
5050
components will serve as an example of how to write Angular code following best practices.
5151

5252
### What do we mean by "high-quality"?

docs/dart/writing-compatible-typescript.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

ember-cli-build.js

Lines changed: 8 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,16 @@
11
'use strict';
2-
var fs = require('fs');
3-
var path = require('path');
2+
const fs = require('fs');
3+
const path = require('path');
44

55
// Import the require hook. Enables us to require TS files natively.
66
require('ts-node/register');
77

8-
const detect = require('./tools/build/dart').detect;
9-
10-
var mergeTrees = require('broccoli-merge-trees');
11-
var Angular2App = require('angular-cli/lib/broccoli/angular2-app');
12-
var BroccoliSass = require('broccoli-sass');
13-
var broccoliAutoprefixer = require('broccoli-autoprefixer');
14-
15-
const BroccoliTs2Dart = require('./tools/broccoli/broccoli-ts2dart').default;
16-
const BroccoliDartFmt = require('./tools/broccoli/broccoli-dartfmt').default;
8+
const mergeTrees = require('broccoli-merge-trees');
179
const BroccoliFunnel = require('broccoli-funnel');
18-
19-
var autoprefixerOptions = require('./build/autoprefixer-options');
20-
21-
/**
22-
* Almost the same as using a plain string for a tree; but unlike a plain
23-
* string, Broccoli won't watch this. Used only internally.
24-
*/
25-
class UnwatchedTree {
26-
constructor(dir) { this.dir = dir; }
27-
read() { return this.dir; }
28-
cleanup() { /* DoNothing */ }
29-
}
10+
const Angular2App = require('angular-cli/lib/broccoli/angular2-app');
11+
const BroccoliSass = require('broccoli-sass');
12+
const broccoliAutoprefixer = require('broccoli-autoprefixer');
13+
const autoprefixerOptions = require('./build/autoprefixer-options');
3014

3115

3216
module.exports = function(defaults) {
@@ -38,62 +22,14 @@ module.exports = function(defaults) {
3822
vendorNpmFiles: []
3923
});
4024

41-
var dartAppTree = getDartTree('src/');
4225
return mergeTrees([
4326
angularAppTree.toTree(),
4427
componentCssTree,
4528
mainCssTree,
4629
demoAppCssTree,
4730
demoCssTree
48-
].concat(dartAppTree || []));
49-
};
50-
51-
/** Gets the Dart tree - Transpile Dart files and format them afterward. */
52-
function getDartTree(root) {
53-
const dartSDK = detect();
54-
if (!dartSDK) {
55-
console.warn('---------------------------------------');
56-
console.warn('You do not have the Dart SDK installed.');
57-
console.warn('In order to contribute to this repo, please refer to');
58-
console.warn('https://github.com/angular/material2/blob/master/CONTRIBUTING.md');
59-
console.warn('');
60-
console.warn('You can still build and serve the demo app without dart support.');
61-
return null;
62-
}
63-
64-
const ts2dart = new BroccoliTs2Dart([root], {
65-
generateLibraryName: true,
66-
generateSourceMap: false,
67-
translateBuiltins: true,
68-
basePath: path.join(__dirname, root),
69-
typingsRoot: '../typings/browser/ambient/',
70-
additionalFiles: [path.join(process.cwd(), root, 'typings.d.ts')]
71-
});
72-
73-
const formatter = new BroccoliDartFmt([ts2dart], { dartSDK });
74-
75-
const dartSources = new BroccoliFunnel(root, {
76-
include: ['**/*.dart'],
77-
destDir: 'dart/lib',
78-
});
79-
80-
const allDartFiles = mergeTrees([
81-
dartSources,
82-
formatter
83-
]);
84-
85-
const pubSpecTree = new BroccoliFunnel(new UnwatchedTree('.'), {
86-
files: ['pubspec.yaml'],
87-
destDir: 'dart'
88-
});
89-
90-
// Publishes the Dart files and pubspec inside a
91-
return mergeTrees([
92-
pubSpecTree,
93-
new BroccoliFunnel(formatter, { destDir: 'dart/lib' }),
94-
allDartFiles
9531
]);
96-
}
32+
};
9733

9834
/** Gets the tree for all of the components' CSS. */
9935
function getCssTree(folder) {

package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"scripts": {
1111
"ci:forbidden-identifiers": "node ./scripts/ci/forbidden-identifiers.js",
1212
"build": "ng build",
13-
"dartanalyzer": "cd dist/dart && pub install && cd ../.. && ts-node scripts/ci/dart_analyzer",
1413
"demo-app": "ng serve",
1514
"test": "karma start test/karma.conf.js",
1615
"tslint": "tslint -c tslint.json 'src/**/*.ts'",
@@ -55,15 +54,13 @@
5554
"karma": "^0.13.15",
5655
"karma-browserstack-launcher": "^0.1.7",
5756
"karma-chrome-launcher": "^0.2.1",
58-
"karma-dart": "^0.3.0",
5957
"karma-firefox-launcher": "^0.1.7",
6058
"karma-jasmine": "^0.3.6",
6159
"karma-sauce-launcher": "^0.2.14",
6260
"protractor": "^3.1.1",
6361
"strip-ansi": "^3.0.0",
6462
"symlink-or-copy": "^1.0.1",
6563
"ts-node": "^0.5.5",
66-
"ts2dart": "^0.7.27",
6764
"tslint": "^3.5.0",
6865
"typescript": "^1.7.5",
6966
"typings": "^0.6.8",

pubspec.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

scripts/ci/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,3 @@ This directory contains scripts that are related to CI only.
55
### `build-and-test.sh`
66

77
The main script. Setup the tests environment, build the files using the `angular-cli` tool and run the tests.
8-
9-
### `install_dart.sh`
10-
11-
Only run in Dart environments. Install Dart locally on the CI.
12-

scripts/ci/build-and-test.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,14 @@ cd $(dirname $0)/../..
1010
source scripts/ci/sources/mode.sh
1111
source scripts/ci/sources/tunnel.sh
1212

13-
# Setup environment.
14-
if is_dart; then
15-
./scripts/ci/install_dart.sh
16-
source scripts/ci/sources/env_dart.sh
17-
fi
18-
1913
start_tunnel
2014
npm run build
2115
npm run inline-resources
22-
echo
23-
is_dart && pub install
2416

2517
wait_for_tunnel
2618
if is_lint; then
2719
npm run tslint
2820
npm run ci:forbidden-identifiers
29-
elif is_dart; then
30-
npm run dartanalyzer
3121
elif is_e2e; then
3222
ng serve &
3323
sleep 20

scripts/ci/dart_analyzer.ts

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)