[myfaces-tobago] branch master updated: fix: npm 'dev-css' script for development

[bo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bommel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new a8a596c  fix: npm 'dev-css' script for development
a8a596c is described below

commit a8a596c9fd83f500919ed9dd417f375fe73951aa
Author: Henning Nöth <hn...@apache.org>
AuthorDate: Thu Dec 3 21:32:57 2020 +0100

    fix: npm 'dev-css' script for development
    
    * fix dev-ts
    * cleanup dev-css
    * remove unused rollup config and tsconfig
---
 .../tobago-theme-standard/npm/dev-rollup.config.js | 35 ----------------------
 .../tobago-theme-standard/npm/dev-tsconfig.json    | 23 --------------
 .../tobago-theme-standard/npm/package.json         | 13 ++++----
 3 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/tobago-theme/tobago-theme-standard/npm/dev-rollup.config.js b/tobago-theme/tobago-theme-standard/npm/dev-rollup.config.js
deleted file mode 100644
index 1dbfccd..0000000
--- a/tobago-theme/tobago-theme-standard/npm/dev-rollup.config.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import resolve from "rollup-plugin-node-resolve"
-
-export default {
-  input: '../../../target/dist/js/tobago-all.js',
-  output: {
-    file: '../../../target/dist/js/bundle.js',
-    format: 'umd', /* tbd: check if "iife" is better? */
-    sourcemap: true,
-    name: 'tobago'
-  },
-  plugins: [
-    resolve({
-      customResolveOptions: {
-        moduleDirectory: 'src/main/npm/node_modules'
-      }
-    })
-  ]
-};
diff --git a/tobago-theme/tobago-theme-standard/npm/dev-tsconfig.json b/tobago-theme/tobago-theme-standard/npm/dev-tsconfig.json
deleted file mode 100644
index ccc5847..0000000
--- a/tobago-theme/tobago-theme-standard/npm/dev-tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "es6",
-    "target": "ES2015",
-    "noImplicitAny": false,
-    "rootDir": "ts",
-    "outDir": "../../../target/dist/js",
-    "sourceMap": true,
-    "removeComments": false,
-    "noEmitOnError": true,
-    "moduleResolution": "node",
-    "esModuleInterop": true
-  },
-  "include": [
-    "ts/*.ts"
-  ],
-  "exclude": [
-    "ts/*.test.ts",
-    "node_modules",
-    "node"
-  ],
-  "_comment for moduleResolution": "this is to fix a compiler problem with @babel/types, see: https://github.com/microsoft/TypeScript/issues/11103"
-}
diff --git a/tobago-theme/tobago-theme-standard/npm/package.json b/tobago-theme/tobago-theme-standard/npm/package.json
index 297e7f0..8d9d10c 100644
--- a/tobago-theme/tobago-theme-standard/npm/package.json
+++ b/tobago-theme/tobago-theme-standard/npm/package.json
@@ -41,14 +41,11 @@
     "ts-compile": "tsc",
     "rollup": "rollup --config",
     "test": "jest",
-    "dev-css": "npm-run-all dev-css-core-build css dev-mkdir dev-css-cp",
-    "dev-css-core-build": "npm run build --prefix ../../../tobago-core/npm",
-    "dev-css-cp": "cp -R dist/css ../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/$npm_package_version",
-    "dev-ts": "npm-run-all --sequential dev-ts-compile dev-ts-compile-bundle dev-mkdir dev-js-cp",
-    "dev-ts-compile": "tsc --project dev-tsconfig.json",
-    "dev-ts-compile-bundle": "rollup --config dev-rollup.config.js",
-    "dev-js-cp": "cp -R ../../../target/dist/js ../../../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/$npm_package_version",
-    "dev-mkdir": "mkdir -p ../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/$npm_package_version"
+    "dev-css": "npm-run-all dev-build-tobago-core css dev-mkdir dev-cp",
+    "dev-ts": "npm-run-all ts dev-mkdir dev-cp",
+    "dev-build-tobago-core": "npm run build --prefix ../../../tobago-core/npm",
+    "dev-mkdir": "mkdir -p ../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/$npm_package_version",
+    "dev-cp": "cp -R dist/. ../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/$npm_package_version"
   },
   "dependencies": {
     "@trevoreyre/autocomplete": "^2.2.0",