diff --git a/.gitignore b/.gitignore index 1a391cd..1822a78 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ typings/ node_modules package-lock.json +.idea/ \ No newline at end of file diff --git a/.monaca/project_info.json b/.monaca/project_info.json index 09efb96..af6a2ef 100644 --- a/.monaca/project_info.json +++ b/.monaca/project_info.json @@ -1,5 +1,7 @@ { - "framework_version": "3.5", - "cordova_version": "11.0", - "xcode_version": "13" + "cordova_version": "12.0", + "framework_version": "3.5", + "xcode_version": "14.2.0", + "cordova_android_platform": "12.0.0", + "cordova_ios_platform": "6.2.0" } \ No newline at end of file diff --git a/config.xml b/config.xml index 778c85e..6d5a03d 100644 --- a/config.xml +++ b/config.xml @@ -20,7 +20,6 @@ - @@ -78,13 +77,8 @@ - - - - - - - + + diff --git a/package.json b/package.json old mode 100755 new mode 100644 index 297b7a2..92114cc --- a/package.json +++ b/package.json @@ -1,54 +1,36 @@ { "name": "onsenui-v2-react-minimum", - "version": "5.0.1", + "version": "6.0.0", "description": "", + "engines": { + "node": ">=18.16" + }, "dependencies": { - "cordova-plugin-splashscreen": "6.0.0", "monaca-plugin-monaca-core": "3.3.1", - "onsenui": "2.11.2", - "react": "^16.8.6", - "react-dom": "^16.4.1", - "react-onsenui": "1.11.4" + "onsenui": "~2.12.8", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-onsenui": "~1.13.3" }, "scripts": { "monaca:preview": "npm run dev & npm run watch", "monaca:transpile": "npm run build", "monaca:debug": "npm run watch", - "dev": "webpack serve --open", - "build": "webpack --mode production", - "watch": "webpack --watch --mode production" + "dev": "cross-env NODE_ENV=development vite", + "watch": "cross-env NODE_ENV=development vite build --watch", + "build": "cross-env NODE_ENV=production vite build" }, "cordova": { "plugins": { - "cordova-plugin-splashscreen": {}, "monaca-plugin-monaca-core": {} } }, "devDependencies": { - "@babel/core": "^7.17.5", - "@babel/preset-env": "^7.16.11", - "@babel/preset-react": "^7.16.7", - "babel-core": "^6.26.3", - "babel-loader": "^8.2.3", - "babel-preset-env": "^1.7.0", - "babel-preset-react": "^6.24.1", - "cordova": "^11.0.0", - "css-loader": "^6.6.0", - "cssnano": "^5.1.0", - "file-loader": "^6.2.0", - "html-loader": "^3.1.0", - "html-webpack-plugin": "^5.5.0", - "mini-css-extract-plugin": "^2.5.3", - "postcss": "^8.4.7", - "postcss-loader": "^6.2.1", - "postcss-preset-env": "^7.4.1", - "postcss-url": "^10.1.3", - "progress-bar-webpack-plugin": "^2.1.0", - "react-hot-loader": "^4.13.0", - "style-loader": "^3.3.1", - "webpack": "^5.69.1", - "webpack-cli": "^4.9.2", - "webpack-dev-server": "^4.7.4", - "yargs": "^17.3.1" + "@types/react": "^18.2.21", + "@types/react-dom": "^18.2.7", + "@vitejs/plugin-react": "^4.0.4", + "cross-env": "^7.0.3", + "vite": "^4.4.9", + "yargs": "^17.7.2" } } diff --git a/postcss.config.js b/postcss.config.js deleted file mode 100644 index ca19a10..0000000 --- a/postcss.config.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - plugins: [ - [ - "postcss-preset-env", - { - // Options - }, - ], - ], -}; \ No newline at end of file diff --git a/res/android/screen/splash-mdpi.png b/res/android/screen/splash-mdpi.png deleted file mode 100644 index a4581d6..0000000 Binary files a/res/android/screen/splash-mdpi.png and /dev/null differ diff --git a/res/android/screen/splash-port-hdpi.9.png b/res/android/screen/splash-port-hdpi.9.png deleted file mode 100644 index 211c64e..0000000 Binary files a/res/android/screen/splash-port-hdpi.9.png and /dev/null differ diff --git a/res/android/screen/splash-port-ldpi.9.png b/res/android/screen/splash-port-ldpi.9.png deleted file mode 100644 index 1eb8ab1..0000000 Binary files a/res/android/screen/splash-port-ldpi.9.png and /dev/null differ diff --git a/res/android/screen/splash-port-mdpi.9.png b/res/android/screen/splash-port-mdpi.9.png deleted file mode 100644 index a4581d6..0000000 Binary files a/res/android/screen/splash-port-mdpi.9.png and /dev/null differ diff --git a/res/android/screen/splash-port-xhdpi.9.png b/res/android/screen/splash-port-xhdpi.9.png deleted file mode 100644 index ab95434..0000000 Binary files a/res/android/screen/splash-port-xhdpi.9.png and /dev/null differ diff --git a/res/android/screen/splash-port-xxhdpi.9.png b/res/android/screen/splash-port-xxhdpi.9.png deleted file mode 100644 index 07fd3ed..0000000 Binary files a/res/android/screen/splash-port-xxhdpi.9.png and /dev/null differ diff --git a/res/android/screen/splash-port-xxxhdpi.9.png b/res/android/screen/splash-port-xxxhdpi.9.png deleted file mode 100644 index 447e656..0000000 Binary files a/res/android/screen/splash-port-xxxhdpi.9.png and /dev/null differ diff --git a/res/android/screen/window_splashscreen_icon.png b/res/android/screen/window_splashscreen_icon.png new file mode 100644 index 0000000..7bbf4d5 Binary files /dev/null and b/res/android/screen/window_splashscreen_icon.png differ diff --git a/src/App.jsx b/src/App.jsx index 1637312..efe84a4 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,11 +1,11 @@ import React from 'react'; import ReactDOM from 'react-dom'; import {Page, Button, Toolbar} from 'react-onsenui'; -import {notification} from 'onsenui'; +import ons from 'onsenui'; export default class App extends React.Component { alertPopup() { - notification.alert('This is an Onsen UI alert notification test.'); + ons.notification.alert('This is an Onsen UI alert notification test.'); } renderToolbar() { @@ -24,4 +24,4 @@ export default class App extends React.Component { ); } -} \ No newline at end of file +} diff --git a/src/public/index.html.ejs b/src/index.html similarity index 55% rename from src/public/index.html.ejs rename to src/index.html index 255ab8a..4e1d9e4 100644 --- a/src/public/index.html.ejs +++ b/src/index.html @@ -5,13 +5,6 @@ - - -<% for (var dep in htmlWebpackPlugin.options.externalJS) { %> - <% } %> -<% for (var dep in htmlWebpackPlugin.options.externalCSS) { %> - <% } %>
\ No newline at end of file + } + + + + + +
+ + + + + diff --git a/www/runtime~app.js b/www/runtime~app.js deleted file mode 100644 index f4a4c14..0000000 --- a/www/runtime~app.js +++ /dev/null @@ -1 +0,0 @@ -!function(){"use strict";var n,e={},r={};function t(n){var o=r[n];if(void 0!==o)return o.exports;var u=r[n]={exports:{}};return e[n].call(u.exports,u,u.exports,t),u.exports}t.m=e,n=[],t.O=function(e,r,o,u){if(!r){var i=1/0;for(l=0;l=u)&&Object.keys(t.O).every((function(n){return t.O[n](r[c])}))?r.splice(c--,1):(f=!1,u0&&n[l-1][2]>u;l--)n[l]=n[l-1];n[l]=[r,o,u]},t.n=function(n){var e=n&&n.__esModule?function(){return n.default}:function(){return n};return t.d(e,{a:e}),e},t.d=function(n,e){for(var r in e)t.o(e,r)&&!t.o(n,r)&&Object.defineProperty(n,r,{enumerable:!0,get:e[r]})},t.o=function(n,e){return Object.prototype.hasOwnProperty.call(n,e)},t.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},function(){var n={523:0};t.O.j=function(e){return 0===n[e]};var e=function(e,r){var o,u,i=r[0],f=r[1],c=r[2],a=0;if(i.some((function(e){return 0!==n[e]}))){for(o in f)t.o(f,o)&&(t.m[o]=f[o]);if(c)var l=c(t)}for(e&&e(r);a