From cf2f17333658d2f12330402914b202ea1660c634 Mon Sep 17 00:00:00 2001 From: dntzhang Date: Mon, 18 May 2020 21:28:50 +0800 Subject: [PATCH] chore(omi-cli): update base template --- packages/omi-cli/template/app/package.json | 6 +- .../app/src/elements/app-intro/index.js | 1 - .../app/src/elements/app-omil/_index.css | 18 ----- .../app/src/elements/app-omil/index.js | 70 ------------------- .../app/src/elements/app-omil/index.omi | 50 ------------- .../template/app/src/elements/app/index.js | 8 +-- 6 files changed, 5 insertions(+), 148 deletions(-) delete mode 100755 packages/omi-cli/template/app/src/elements/app-omil/_index.css delete mode 100644 packages/omi-cli/template/app/src/elements/app-omil/index.js delete mode 100644 packages/omi-cli/template/app/src/elements/app-omil/index.omi diff --git a/packages/omi-cli/template/app/package.json b/packages/omi-cli/template/app/package.json index f3b597cb7..3c84a95bc 100755 --- a/packages/omi-cli/template/app/package.json +++ b/packages/omi-cli/template/app/package.json @@ -14,6 +14,7 @@ "@babel/preset-env": "^7.2.3", "@babel/preset-react": "^7.0.0", "@babel/runtime": "^7.3.1", + "@omiu/button": "latest", "autoprefixer": "7.1.6", "babel-core": "^7.0.0-bridge.0", "babel-eslint": "7.2.3", @@ -45,7 +46,6 @@ "omi": "latest", "omi-router": "latest", "omio": "latest", - "omiu": "latest", "optimize-css-assets-webpack-plugin": "^5.0.1", "postcss-flexbugs-fixes": "3.2.0", "postcss-loader": "2.0.8", @@ -137,7 +137,5 @@ "tabWidth": 2, "useTabs": false }, - "alias": { - "omi": "omio" - } + "alias": {} } diff --git a/packages/omi-cli/template/app/src/elements/app-intro/index.js b/packages/omi-cli/template/app/src/elements/app-intro/index.js index 2fcbd5e64..2b0dd84b6 100755 --- a/packages/omi-cli/template/app/src/elements/app-intro/index.js +++ b/packages/omi-cli/template/app/src/elements/app-intro/index.js @@ -17,7 +17,6 @@ define('app-intro', class extends WeElement {

To get started, edit src/elements/*/*.* and save to reload.

- omijs.org } }) diff --git a/packages/omi-cli/template/app/src/elements/app-omil/_index.css b/packages/omi-cli/template/app/src/elements/app-omil/_index.css deleted file mode 100755 index 94fac9214..000000000 --- a/packages/omi-cli/template/app/src/elements/app-omil/_index.css +++ /dev/null @@ -1,18 +0,0 @@ -.app-omil { - margin-top: 20px; -} - -.weui-btn:after { - content: " "; - width: 200%; - height: 200%; - position: absolute; - top: 0; - left: 0; - -webkit-transform: scale(0.5); - transform: scale(0.5); - -webkit-transform-origin: 0 0; - transform-origin: 0 0; - box-sizing: border-box; - border-radius: 10px; -} diff --git a/packages/omi-cli/template/app/src/elements/app-omil/index.js b/packages/omi-cli/template/app/src/elements/app-omil/index.js deleted file mode 100644 index 9113add0e..000000000 --- a/packages/omi-cli/template/app/src/elements/app-omil/index.js +++ /dev/null @@ -1,70 +0,0 @@ -import { WeElement, define, h } from "omi"; - -// Recommend install omi-snippets plugins in VSC -// Omi-snippets: https://marketplace.visualstudio.com/items?itemName=Wscats.omi-snippets -import style from "./_index.css"; - -const appOmil = class extends WeElement { - render() { - return h( - "div", - { - class: "app-omil" - }, - h( - "button", - { - onClick: this.omiSnippets.bind(this), - class: "weui-btn weui-btn_primary", - style: "width: 200px;" - }, - this.data.title - ) - ); - } - - static css = - ` -.weui-btn { - position: relative; - display: block; - margin-left: auto; - margin-right: auto; - padding-left: 14px; - padding-right: 14px; - box-sizing: border-box; - font-size: 18px; - text-align: center; - text-decoration: none; - color: #FFFFFF; - line-height: 2.55555556; - border-radius: 3px; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); - overflow: hidden; - border-width: 0; - width: 100%; - border-width: 0; - outline: 0; - -webkit-appearance: none; -} -` + - style + - ` - button{ - background-color: #58bc58; - cursor: pointer; - } - `; - install() { - this.data = { - title: "Install Omi Snippets!" - }; - } - omiSnippets() { - window.open( - "https://marketplace.visualstudio.com/items?itemName=Wscats.omi-snippets" - ); - } -}; - -define("app-omil", appOmil); diff --git a/packages/omi-cli/template/app/src/elements/app-omil/index.omi b/packages/omi-cli/template/app/src/elements/app-omil/index.omi deleted file mode 100644 index 3db8f9023..000000000 --- a/packages/omi-cli/template/app/src/elements/app-omil/index.omi +++ /dev/null @@ -1,50 +0,0 @@ - - - diff --git a/packages/omi-cli/template/app/src/elements/app/index.js b/packages/omi-cli/template/app/src/elements/app/index.js index 6e2bb249f..bd167ea8b 100755 --- a/packages/omi-cli/template/app/src/elements/app/index.js +++ b/packages/omi-cli/template/app/src/elements/app/index.js @@ -1,8 +1,7 @@ import { define, WeElement } from 'omi' import logo from './logo.svg' import '../app-intro' -import '../app-omil' -import 'omiu/button' +import '@omiu/button' define('my-app', class extends WeElement { static css = require('./_index.less') @@ -10,7 +9,7 @@ define('my-app', class extends WeElement { name = 'Omi' clickHandler = () => { - this.name = 'Omio' + this.name = 'OMI' this.update() } @@ -27,8 +26,7 @@ define('my-app', class extends WeElement {

Welcome to {this.name}

- I am omiu button. - + I am omiu button ) }