reorganize files

This commit is contained in:
Géry Debongnie
2019-01-22 19:25:12 +01:00
parent 5652ef65ad
commit 3766fbc7b8
101 changed files with 31 additions and 43 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
module.exports = { module.exports = {
roots: ["<rootDir>/src", "<rootDir>/tests"], roots: ["<rootDir>/web/static", "<rootDir>/tests"],
transform: { transform: {
"^.+\\.ts?$": "ts-jest" "^.+\\.ts?$": "ts-jest"
}, },
+6 -8
View File
@@ -6,14 +6,12 @@
"scripts": { "scripts": {
"test": "jest", "test": "jest",
"test:watch": "jest --watch", "test:watch": "jest --watch",
"bundle:core": "tsc -m es6 --lib es2017,dom --target esnext --outdir dist src/bundles/core.ts && rollup dist/bundles/core.js --file dist/bundle-core.js --format iife", "build": "cp -r web/ dist/app && npm run build:js && npm run build:css",
"bundle:core:watch": "npm run bundle:core -- --watch", "build:css": "sass web/static/src/scss/app.scss dist/app/app.css",
"demo:build": "cp -r demo/ dist/demo && npm run demo:build:js && npm run demo:build:css", "build:js": "tsc --allowjs -m amd --lib es2017,dom --target esnext --outfile dist/app/main.js web/static/src/ts/main.ts",
"demo:build:css": "sass demo/app.scss dist/demo/app.css", "serve": "live-server --entry-file=index.html dist/app/",
"demo:build:js": "tsc --allowjs -m amd --lib es2017,dom --target esnext --outfile dist/demo/main.js demo/src/main.ts", "predev": "npm run build",
"demo:serve": "live-server --entry-file=index.html dist/demo/", "dev": "npm-run-all --parallel \"build:* -- --watch\" serve"
"predemo:dev": "npm run demo:build",
"demo:dev": "npm-run-all --parallel \"demo:build:* -- --watch\" demo:serve"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
-10
View File
@@ -1,10 +0,0 @@
import QWeb from "../core/qweb_vdom";
import * as utils from "../core/utils";
import Widget from "../core/Widget";
(<any>window).core = {
QWeb,
utils,
Widget
}
+3 -3
View File
@@ -3,9 +3,9 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Odoo Web Core Demo</title> <title>Odoo Web Core Demo</title>
<script src="almond.js"></script> <script src="/web/static/libs/almond/almond.js"></script>
<script src="main.js"></script> <script src="/main.js"></script>
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="/app.css">
<script> <script>
require('main'); require('main');
</script> </script>
@@ -1,9 +1,9 @@
import QWeb from "./qweb_vdom"; import QWeb from "./qweb_vdom";
import { init } from "../libs/snabbdom/src/snabbdom"; import { init } from "../../../libs/snabbdom/src/snabbdom";
import sdListeners from "../libs/snabbdom/src/modules/eventlisteners"; import sdListeners from "../../../libs/snabbdom/src/modules/eventlisteners";
import sdAttrs from "../libs/snabbdom/src/modules/attributes"; import sdAttrs from "../../../libs/snabbdom/src/modules/attributes";
import { VNode } from "../libs/snabbdom/src/vnode"; import { VNode } from "../../../libs/snabbdom/src/vnode";
const patch = init([sdListeners, sdAttrs]); const patch = init([sdListeners, sdAttrs]);
@@ -1,5 +1,5 @@
import { VNode } from "../libs/snabbdom/src/vnode"; import { VNode } from "../../../libs/snabbdom/src/vnode";
import h from "../libs/snabbdom/src/h"; import h from "../../../libs/snabbdom/src/h";
export type EvalContext = { [key: string]: any }; export type EvalContext = { [key: string]: any };
type RawTemplate = string; type RawTemplate = string;
+2 -2
View File
@@ -1,5 +1,5 @@
import { Env } from "../../src/core/Widget"; import { Env } from "./core/Widget";
import QWeb from "../../src/core/qweb_vdom"; import QWeb from "./core/qweb_vdom";
import Router from "./services/router"; import Router from "./services/router";
import actions from "./services/actions"; import actions from "./services/actions";
@@ -1,6 +1,6 @@
import CRM from "../widgets/CRM"; import CRM from "../widgets/CRM";
import Discuss from "../widgets/Discuss"; import Discuss from "../widgets/Discuss";
import Widget from "../../../src/core/Widget"; import Widget from "../core/Widget";
export interface Action { export interface Action {
id: number; id: number;
@@ -1,4 +1,4 @@
import Widget from "../../../src/core/Widget"; import Widget from "../core/Widget";
const template = ` const template = `
<div class="o_crm"> <div class="o_crm">
@@ -1,4 +1,4 @@
import Widget from "../../../src/core/Widget"; import Widget from "../core/Widget";
const template = ` const template = `
<div> <div>
@@ -1,4 +1,4 @@
import Widget from "../../../src/core/Widget"; import Widget from "../core/Widget";
import Counter from "./Counter"; import Counter from "./Counter";
const template = ` const template = `
@@ -1,4 +1,4 @@
import Widget from "../../../src/core/Widget"; import Widget from "../core/Widget";
import { Action } from "../services/actions"; import { Action } from "../services/actions";
const template = ` const template = `
@@ -1,4 +1,4 @@
import Widget, { Env } from "../../../src/core/Widget"; import Widget, { Env } from "../core/Widget";
import Navbar from "./Navbar"; import Navbar from "./Navbar";
import { Action } from "../services/actions"; import { Action } from "../services/actions";
@@ -1,7 +1,7 @@
import QWeb, { EvalContext } from "../src/core/qweb_vdom"; import QWeb, { EvalContext } from "../src/ts/core/qweb_vdom";
import { init } from "../src/libs/snabbdom/src/snabbdom"; import { init } from "../libs/snabbdom/src/snabbdom";
import sdAttributes from "../src/libs/snabbdom/src/modules/attributes"; import sdAttributes from "../libs/snabbdom/src/modules/attributes";
import sdListeners from "../src/libs/snabbdom/src/modules/eventlisteners"; import sdListeners from "../libs/snabbdom/src/modules/eventlisteners";
const patch = init([sdAttributes, sdListeners]); const patch = init([sdAttributes, sdListeners]);
@@ -1,4 +1,4 @@
import { escape, htmlTrim } from "../src/core/utils"; import { escape, htmlTrim } from "../src/ts/core/utils";
describe("escape", () => { describe("escape", () => {
test("normal strings", () => { test("normal strings", () => {

Some files were not shown because too many files have changed in this diff Show More