upd hooks, change prebuild folder name from build to lib

olton · May 7, 2024 · b29bcf8 · b29bcf8
1 parent 824e223
commit b29bcf8
Show file tree

Hide file tree

Showing 12 changed files with 175 additions and 182 deletions.
diff --git a/build/metro.all.js b/build/metro.all.js
diff --git a/build/metro.js b/build/metro.js
diff --git a/build/icons.css → lib/icons.css b/build/icons.css → lib/icons.css
diff --git a/lib/metro.all.js b/lib/metro.all.js
diff --git a/build/metro.css → lib/metro.css b/build/metro.css → lib/metro.css
diff --git a/lib/metro.js b/lib/metro.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
   "main": "src/index.js",
   "type": "module",
   "scripts": {
-    "clear": "shx rm -rf build/*",
+    "clear": "shx rm -rf lib/*",
     "clear:icons": "shx rm -rf build/icons.*",
     "clear:metro": "shx rm -rf build/metro*.*",
     "build": "npm run clear && npm install && cross-env NODE_ENV=production rollup --config",
@@ -41,7 +41,8 @@
     "cy:run": "cypress run",
     "deploy": "node deploy.cjs",
     "deploy:dev": "node deploy-dev.cjs",
-    "pub": "npm publish --access public"
+    "pub": "npm publish --access public",
+    "build:es": "shx rm -rf dist/* && node esbuild.js"
   },
   "browserslist": [
     "last 2 versions",
@@ -58,7 +59,6 @@
     "autoprefixer": "^10.4.19",
     "cross-env": "^7.0.3",
     "cypress": "^13.8.1",
-    "esbuild": "^0.20.2",
     "ftp-deploy": "^2.4.7",
     "less": "^4.2.0",
     "postcss": "^8.4.38",
@@ -75,7 +75,7 @@
     "@olton/animation": "^0.2.0",
     "@olton/color": "^1.0.0",
     "@olton/datetime": "^3.0.3",
-    "@olton/hooks": "^0.1.0",
+    "@olton/hooks": "^0.2.0",
     "@olton/html": "^0.7.0",
     "@olton/string": "^0.4.4",
     "m4q": "^2.0.0-rc7"

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -8,7 +8,6 @@ import noEmit from 'rollup-plugin-no-emit'
 import multi from '@rollup/plugin-multi-entry'
 import pkg from './package.json' assert {type: "json"}
 import fs from "fs";
-import esbuild from "rollup-plugin-esbuild";
 
 const production = !(process.env.ROLLUP_WATCH),
     sourcemap = !production
@@ -52,19 +51,9 @@ export default [
             nodeResolve({
                 browser: true
             }),
-            // esbuild({
-            //     sourceMap: false,
-            //     minify: true,
-            //     loaders: {
-            //         '.less': 'text',
-            //         '.json': 'json',
-            //         '.css': 'css',
-            //         '.js': 'js',
-            //     }
-            // })
         ],
         output: {
-            file: './build/metro.js',
+            file: './lib/metro.js',
             format: 'iife',
             sourcemap,
             banner,
@@ -108,7 +97,7 @@ export default [
             }),
         ],
         output: {
-            dir: './build',
+            dir: './lib',
             banner,
         },
         onwarn: message => {
@@ -142,19 +131,9 @@ export default [
             nodeResolve({
                 browser: true
             }),
-            // esbuild({
-            //     sourceMap: false,
-            //     minify: true,
-            //     loaders: {
-            //         '.less': 'text',
-            //         '.json': 'json',
-            //         '.css': 'css',
-            //         '.js': 'js',
-            //     }
-            // })
         ],
         output: {
-            file: './build/metro.all.js',
+            file: './lib/metro.all.js',
             format: 'iife',
             sourcemap: sourcemap,
             banner,

diff --git a/rollup.dev.mjs b/rollup.dev.mjs
@@ -5,7 +5,6 @@ import replace from '@rollup/plugin-replace'
 import progress from 'rollup-plugin-progress';
 import fs from "fs";
 import pkg from "./package.json" assert {type: "json"}
-import esbuild from 'rollup-plugin-esbuild'
 
 const production = process.env.NODE_ENV === "production",
     sourcemap = !production
@@ -48,17 +47,9 @@ export default [
             nodeResolve({
                 browser: true
             }),
-            // esbuild({
-            //     loaders: {
-            //         '.less': 'text',
-            //         '.json': 'json',
-            //         '.css': 'css',
-            //         '.js': 'js',
-            //     }
-            // })
         ],
         output: {
-            file: './build/metro.js',
+            file: './lib/metro.js',
             format: 'iife',
             sourcemap,
             banner,

diff --git a/rollup.icons.mjs b/rollup.icons.mjs
@@ -59,7 +59,7 @@ export default [
             }),
         ],
         output: {
-            dir: './build',
+            dir: './lib',
             banner,
         },
         onwarn: message => {

diff --git a/source/core/metro.js b/source/core/metro.js
@@ -20,7 +20,7 @@
     var Metro = {
 
         version: "5.0.0-rc9",
-        build_time: "06.05.2024, 20:15:14",
+        build_time: "07.05.2024, 11:55:39",
         buildNumber: 0,
         isTouchable: isTouch,
         fullScreenEnabled: document.fullscreenEnabled,