Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 42604f2

Browse files
committed
Merge branch 'polymer-3-updates' into 3.0-preview
2 parents 6e04bbf + 44bccb4 commit 42604f2

18 files changed

+14810
-1512
lines changed

.eslintrc.json

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

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ cache:
1515
directories:
1616
- node_modules
1717
install:
18-
- npm install -g polymer-cli
1918
- npm install
20-
- polymer install
2119
before_script:
2220
- npm run lint
2321
script:

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ Install [Polymer CLI](https://github.com/Polymer/polymer-cli) using
4545

4646
mkdir my-app
4747
cd my-app
48-
polymer init polymer-2-starter-kit
48+
polymer init polymer-3-starter-kit
4949

5050
### Start the development server
5151

5252
This command serves the app at `http://127.0.0.1:8081` and provides basic URL
5353
routing for the app:
5454

55-
polymer serve
55+
npm start
5656

5757
### Build
5858

59-
The `polymer build` command builds your Polymer application for production, using build configuration options provided by the command line or in your project's `polymer.json` file.
59+
The `npm run build` command builds your Polymer application for production, using build configuration options provided by the command line or in your project's `polymer.json` file.
6060

6161
You can configure your `polymer.json` file to create multiple builds. This is necessary if you will be serving different builds optimized for different browsers. You can define your own named builds, or use presets. See the documentation on [building your project for production](https://www.polymer-project.org/2.0/toolbox/build-for-production) for more information.
6262

@@ -79,14 +79,14 @@ Run `polymer help build` for the full list of available options and optimization
7979

8080
This command serves your app. Replace `build-folder-name` with the folder name of the build you want to serve.
8181

82-
polymer serve build/build-folder-name/
82+
npm start build/build-folder-name/
8383

8484
### Run tests
8585

8686
This command will run [Web Component Tester](https://github.com/Polymer/web-component-tester)
8787
against the browsers currently installed on your machine:
8888

89-
polymer test
89+
npm test
9090

9191
If running Windows you will need to set the following environment variables:
9292

bower.json

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

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@
8585
</script>
8686

8787
<!-- Load webcomponents-loader.js to check and load any polyfills your browser needs -->
88-
<script src="./node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
88+
<script src="node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
8989

9090
<!-- Load your application shell -->
91-
<script type="module" src="./src/my-app.js"></script>
91+
<script type="module" src="src/my-app.js"></script>
9292

9393
<!-- Add any global styles for body, document, etc. -->
9494
<style>

0 commit comments

Comments
 (0)