Merge pull request ecomfe#66 from ecomfe/feature/release-1.0.0-beta.2

Exodia · web-flow · commit b517d9fb4e2b · 2016-07-17T19:46:13.000+08:00
release 1.0.0 beta.2
diff --git a/README.md b/README.md
@@ -115,4 +115,6 @@ ioc.getComponent('list').then(list => list.enter());
 
 # [API](https://doc.esdoc.org/github.com/ecomfe/uioc/)
 
+# [Changelog](https://github.com/ecomfe/uioc/wiki/Changelog)
+
 # [0.3.x版本文档](https://github.com/ecomfe/uioc/wiki/0.3.x-readme)
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/dist/bundle.js.map b/dist/bundle.js.map
diff --git a/examples/simple-amd-module/List.js b/examples/simple-amd-module/List.js
diff --git a/examples/simple-amd-module/ListModel.js b/examples/simple-amd-module/ListModel.js
diff --git a/examples/simple-amd-module/ListView.js b/examples/simple-amd-module/ListView.js
diff --git a/examples/simple-amd-module/README.md b/examples/simple-amd-module/README.md
@@ -0,0 +1,10 @@
+simple amd module
+===
+
+# install
+
+npm install
+
+# start
+
+npm start
diff --git a/examples/simple-amd-module/config.js b/examples/simple-amd-module/config.js
@@ -4,8 +4,8 @@
 define(
     {
         components: {
-            // 构件名
-            List: {
+            // 组件名
+            list: {
                 // 构件的模块路径
                 module: 'List',
                 // 默认为 transient，每次获取构件，都将调用一次 creator
@@ -25,14 +25,14 @@ define(
                 ],
                 // 属性依赖配置
                 properties: {
-                    model: { $ref: 'ListModel' },
-                    view: { $ref: 'ListView' }
+                    model: { $ref: 'listModel' },
+                    view: { $ref: 'listView' }
                 }
             },
-            ListModel: {
+            listModel: {
                 module: 'ListModel'
             },
-            ListView: {
+            listView: {
                 module: 'ListView',
                 properties: { template: '<li>${name}</li>' }
             },
diff --git a/examples/simple-amd-module/esl.js b/examples/simple-amd-module/esl.js
diff --git a/examples/simple-amd-module/index.html b/examples/simple-amd-module/index.html
@@ -6,11 +6,11 @@
     <script src="esl.js"></script>
     <script>
         require.config({
-            baseUrl: './',
+            baseUrl: '.',
             packages: [
                 {
                     name: 'ioc',
-                    location: '../dist',
+                    location: 'node_modules/uioc/dist',
                     main: 'bundle'
                 }
             ]
diff --git a/examples/simple-amd-module/main.js b/examples/simple-amd-module/main.js
@@ -1,11 +1,10 @@
 define(function (require) {
     return {
         init: function () {
-            // 配置化
             var config = require('./config');
             var IoC = require('ioc').IoC;
-            ioc = new IoC(config);
-            ioc.getComponent('List', function (list) {
+            var ioc = new IoC(config);
+            ioc.getComponent('list').then(function (list) {
                 list.enter();
             });
         }
diff --git a/examples/simple-amd-module/package.json b/examples/simple-amd-module/package.json
@@ -0,0 +1,15 @@
+{
+    "name": "simple-mvc",
+    "version": "1.0.0",
+    "description": "simple amd mvc",
+    "main": "main.js",
+    "scripts": {
+        "start": "open index.html",
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "author": "exodia",
+    "license": "MIT",
+    "dependencies": {
+        "uioc": "^1.0.0-beta.1"
+    }
+}
diff --git a/examples/simple-es6-module/README.md b/examples/simple-es6-module/README.md
@@ -0,0 +1,16 @@
+simple es6 module
+===
+
+# install
+
+npm install
+
+# start
+
+npm start
+
+# build
+
+npm run build
+
+
diff --git a/examples/simple-es6-module/dist/bundle.js b/examples/simple-es6-module/dist/bundle.js
diff --git a/examples/simple-es6-module/dist/bundle.js.map b/examples/simple-es6-module/dist/bundle.js.map
diff --git a/examples/simple-es6-module/index.html b/examples/simple-es6-module/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>simple module</title>
+    <script src="node_modules/babel-polyfill/dist/polyfill.min.js"></script>
+</head>
+<body>
+<div id="a"></div>
+<div id="b"></div>
+<script src="dist/bundle.js"></script>
+</body>
+</html>
diff --git a/examples/simple-es6-module/list.json b/examples/simple-es6-module/list.json
@@ -0,0 +1 @@
+"item1,item2,item3,item4"
diff --git a/examples/simple-es6-module/package.json b/examples/simple-es6-module/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "simple-es6-module",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "start": "lite-server",
+    "build": "webpack"
+  },
+  "author": "d_xinxin@163.com",
+  "license": "MIT",
+  "devDependencies": {
+    "babel-loader": "^6.2.4",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-stage-0": "^6.5.0",
+    "lite-server": "^2.2.2",
+    "source-map-loader": "^0.1.5",
+    "webpack": "^1.13.1"
+  },
+  "dependencies": {
+    "babel-polyfill": "^6.9.1",
+    "uioc": "^1.0.0-beta.1"
+  }
+}
diff --git a/examples/simple-es6-module/src/List.js b/examples/simple-es6-module/src/List.js
@@ -0,0 +1,11 @@
+// List.js
+export default class List {
+    constructor(container, loader) {
+        this.container = container;
+        this.loader = loader;
+    }
+
+    async render() {
+        this.container.textContent = await this.loader.load();
+    }
+}
diff --git a/examples/simple-es6-module/src/Loader.js b/examples/simple-es6-module/src/Loader.js
@@ -0,0 +1,10 @@
+export default class Loader {
+    constructor(url) {
+        this.url = url;
+    }
+
+    async load() {
+        let result = await fetch(this.url);
+        return result.json();
+    }
+}
diff --git a/examples/simple-es6-module/src/ThirdLoader.js b/examples/simple-es6-module/src/ThirdLoader.js
@@ -0,0 +1,6 @@
+import {request} from './third/sdk';
+export default class ThirdServiceLoader {
+    async load() {
+        return request();
+    }
+}
diff --git a/examples/simple-es6-module/src/config.js b/examples/simple-es6-module/src/config.js
@@ -0,0 +1,23 @@
+import List from './List';
+import Loader from './Loader';
+import ThirdLoader from './ThirdLoader'
+
+export default {
+    components: {
+        listA: {
+            creator: List,
+            args: [document.getElementById('a'), {$ref: 'loader'}]
+        },
+        listB: {
+            creator: List,
+            args: [document.getElementById('b'), {$ref: 'thirdLoader'}]
+        },
+        loader: {
+            creator: Loader,
+            args: ['list.json']
+        },
+        thirdLoader: {
+            creator: ThirdLoader
+        }
+    }
+};
diff --git a/examples/simple-es6-module/src/main.js b/examples/simple-es6-module/src/main.js
@@ -0,0 +1,10 @@
+import {IoC} from 'uioc';
+import config from './config';
+
+let ioc = new IoC(config);
+ioc.getComponent(['listA', 'listB']).then(([listA, listB]) => {
+    listA.render();
+    listB.render();
+}).catch(function (e) {
+    console.log(e);
+});
diff --git a/examples/simple-es6-module/src/third/sdk.js b/examples/simple-es6-module/src/third/sdk.js
@@ -0,0 +1,3 @@
+export function request() {
+    return Promise.resolve('thirdInfo1,thirdInfo2,thirdInfo3');
+}
diff --git a/examples/simple-es6-module/webpack.config.js b/examples/simple-es6-module/webpack.config.js
@@ -0,0 +1,31 @@
+var path = require('path');
+
+module.exports = {
+    entry: './src/main.js',
+    output: {
+        path: __dirname + '/dist',
+        filename: 'bundle.js'
+    },
+    module: {
+        preLoaders: [
+            {
+                include: [
+                    path.resolve(__dirname, 'node_modules/uioc/dist')
+                ],
+                loader: 'source-map-loader'
+            }
+        ],
+        loaders: [
+            {
+                include: [
+                    path.resolve(__dirname, 'src'),
+                ],
+                loader: 'babel',
+                query: {
+                    presets: ['es2015', 'stage-0'],
+                }
+            }
+        ]
+    },
+    devtool: 'source-map'
+};
diff --git a/karma.conf.js b/karma.conf.js
@@ -41,7 +41,7 @@ module.exports = function (config) {
             options: {
                 presets: ['es2015', 'stage-0'],
                 sourceMap: 'inline',
-                plugins: ["transform-es2015-modules-umd"]
+                plugins: ['transform-es2015-modules-umd']
             },
             sourceFileName: function (file) {
                 return file.originalPath;
diff --git a/package.json b/package.json
@@ -1,8 +1,9 @@
 {
     "name": "uioc",
-    "version": "1.0.0-beta.1",
-    "description": "an ioc framework",
+    "version": "1.0.0-beta.2",
+    "description": "An IoC framework",
     "main": "dist/bundle.js",
+    "jsnext:main": "src/main.js",
     "maintainers": {
         "name": "Exodia",
         "email": "d_xinxin@163.com"
@@ -21,6 +22,12 @@
         "build": "node scripts/build.js",
         "doc": "esdoc -c esdoc.json"
     },
+    "files": [
+        "dist",
+        "src",
+        "esdoc.json",
+        "README.md"
+    ],
     "author": {
         "name": "Exodia",
         "email": "d_xinxin@163.com"
diff --git a/src/Loader.js b/src/Loader.js
@@ -83,8 +83,10 @@ function getDependentModules(component, context, result, depTree, deps) {
     return result;
 }
 
+const global = Function('return this')();
+
 function getDefaultLoader() {
-    if (typeof define === 'function' && define.amd) {
+    if (typeof define === 'function' && define.amd && typeof global.require === 'function') {
         return require;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`	`<script src="esl.js"></script>`
`7`	`7`	`<script>`
`8`	`8`	`require.config({`
`9`		`- baseUrl: './',`
	`9`	`+ baseUrl: '.',`
`10`	`10`	`packages: [`
`11`	`11`	`{`
`12`	`12`	`name: 'ioc',`
`13`		`- location: '../dist',`
	`13`	`+ location: 'node_modules/uioc/dist',`
`14`	`14`	`main: 'bundle'`
`15`	`15`	`}`
`16`	`16`	`]`