From c5574a25ae278ede3caaa8fdb1c7781c4a7c5dc7 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Thu, 7 Dec 2023 11:48:55 +0800 Subject: [PATCH] upgraded console to ember 5.4.1 --- console/.ember-cli | 12 +- console/.eslintignore | 12 -- console/.eslintrc.js | 23 +- console/.github/workflows/ci.yml | 4 +- console/.gitignore | 9 +- console/.prettierignore | 14 +- console/.prettierrc.js | 2 +- console/.stylelintignore | 8 + console/.stylelintrc.js | 5 + console/.watchmanconfig | 2 +- console/app/styles/app.css | 2 +- console/config/ember-cli-update.json | 2 +- console/config/environment.js | 3 +- console/package.json | 301 ++++++++++++++------------- console/tests/helpers/index.js | 2 +- console/vendor/.gitkeep | 0 16 files changed, 191 insertions(+), 210 deletions(-) create mode 100644 console/.stylelintignore create mode 100644 console/.stylelintrc.js delete mode 100644 console/vendor/.gitkeep diff --git a/console/.ember-cli b/console/.ember-cli index 4ccb4bf4..465c4050 100644 --- a/console/.ember-cli +++ b/console/.ember-cli @@ -1,15 +1,7 @@ { /** - Ember CLI sends analytics information by default. The data is completely - anonymous, but there are times when you might want to disable this behavior. - - Setting `disableAnalytics` to true will prevent any data from being sent. - */ - "disableAnalytics": false, - - /** - Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript - rather than JavaScript by default, when a TypeScript version of a given blueprint is available. + Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript + rather than JavaScript by default, when a TypeScript version of a given blueprint is available. */ "isTypeScriptProject": false } diff --git a/console/.eslintignore b/console/.eslintignore index d474a40b..9385391f 100644 --- a/console/.eslintignore +++ b/console/.eslintignore @@ -1,25 +1,13 @@ # unconventional js /blueprints/*/files/ -/vendor/ # compiled output /dist/ -/tmp/ - -# dependencies -/bower_components/ -/node_modules/ # misc /coverage/ !.* .*/ -.eslintcache # ember-try /.node_modules.ember-try/ -/bower.json.ember-try -/npm-shrinkwrap.json.ember-try -/package.json.ember-try -/package-lock.json.ember-try -/yarn.lock.ember-try diff --git a/console/.eslintrc.js b/console/.eslintrc.js index 1cb05e98..dd6a74ec 100644 --- a/console/.eslintrc.js +++ b/console/.eslintrc.js @@ -2,12 +2,13 @@ module.exports = { root: true, - parser: 'babel-eslint', + parser: '@babel/eslint-parser', parserOptions: { - ecmaVersion: 2018, + ecmaVersion: 'latest', sourceType: 'module', - ecmaFeatures: { - legacyDecorators: true, + requireConfigFile: false, + babelOptions: { + plugins: [['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }]], }, }, plugins: ['ember'], @@ -50,18 +51,18 @@ module.exports = { 'no-prototype-builtins': 'off', }, overrides: [ - // node files { files: [ './.eslintrc.js', './.prettierrc.js', + './.stylelintrc.js', './.template-lintrc.js', './ember-cli-build.js', - './index.js', './testem.js', './blueprints/*/index.js', './config/**/*.js', - './tests/dummy/config/**/*.js', + './lib/*/index.js', + './server/**/*.js', ], parserOptions: { sourceType: 'script', @@ -70,13 +71,7 @@ module.exports = { browser: false, node: true, }, - plugins: ['node'], - extends: ['plugin:node/recommended'], - }, - { - // test files - files: ['tests/**/*-test.{js,ts}'], - extends: ['plugin:qunit/recommended'], + extends: ['plugin:n/recommended'], }, ], }; diff --git a/console/.github/workflows/ci.yml b/console/.github/workflows/ci.yml index cf5964ba..e4fa62fb 100644 --- a/console/.github/workflows/ci.yml +++ b/console/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - node-version: [16.x] # Build on Node.js 16 + node-version: [18.x] # Build on Node.js 18 steps: - uses: actions/checkout@v2 @@ -57,4 +57,4 @@ jobs: run: pnpm run lint - name: Build - run: npx ember build --environment production + run: npx ember build --environment production \ No newline at end of file diff --git a/console/.gitignore b/console/.gitignore index 3c83ab74..e25af2e1 100644 --- a/console/.gitignore +++ b/console/.gitignore @@ -1,22 +1,16 @@ -# See https://help.github.com/ignore-files/ for more about ignoring files. - # compiled output /dist/ -/tmp/ +/declarations/ # dependencies -/bower_components/ /node_modules/ # misc /.env* /environments/.env* /.pnp* -/.sass-cache /.eslintcache -/connect.lock /coverage/ -/libpeerconnection.log /npm-debug.log* /testem.log /yarn-error.log @@ -24,7 +18,6 @@ # ember-try /.node_modules.ember-try/ -/bower.json.ember-try /npm-shrinkwrap.json.ember-try /package.json.ember-try /package-lock.json.ember-try diff --git a/console/.prettierignore b/console/.prettierignore index 4178fd57..9385391f 100644 --- a/console/.prettierignore +++ b/console/.prettierignore @@ -1,25 +1,13 @@ # unconventional js /blueprints/*/files/ -/vendor/ # compiled output /dist/ -/tmp/ - -# dependencies -/bower_components/ -/node_modules/ # misc /coverage/ !.* -.eslintcache -.lint-todo/ +.*/ # ember-try /.node_modules.ember-try/ -/bower.json.ember-try -/npm-shrinkwrap.json.ember-try -/package.json.ember-try -/package-lock.json.ember-try -/yarn.lock.ember-try diff --git a/console/.prettierrc.js b/console/.prettierrc.js index cd88cc9f..bf64a902 100644 --- a/console/.prettierrc.js +++ b/console/.prettierrc.js @@ -8,7 +8,7 @@ module.exports = { printWidth: 190, overrides: [ { - files: '*.hbs', + files: '*.{hbs,js,ts}', options: { singleQuote: false, }, diff --git a/console/.stylelintignore b/console/.stylelintignore new file mode 100644 index 00000000..a0cf71cb --- /dev/null +++ b/console/.stylelintignore @@ -0,0 +1,8 @@ +# unconventional files +/blueprints/*/files/ + +# compiled output +/dist/ + +# addons +/.node_modules.ember-try/ diff --git a/console/.stylelintrc.js b/console/.stylelintrc.js new file mode 100644 index 00000000..021c539a --- /dev/null +++ b/console/.stylelintrc.js @@ -0,0 +1,5 @@ +'use strict'; + +module.exports = { + extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'], +}; diff --git a/console/.watchmanconfig b/console/.watchmanconfig index e7834e3e..f9c3d8f8 100644 --- a/console/.watchmanconfig +++ b/console/.watchmanconfig @@ -1,3 +1,3 @@ { - "ignore_dirs": ["tmp", "dist"] + "ignore_dirs": ["dist"] } diff --git a/console/app/styles/app.css b/console/app/styles/app.css index 80957554..197b6ba5 100644 --- a/console/app/styles/app.css +++ b/console/app/styles/app.css @@ -1,4 +1,4 @@ @import 'tailwindcss/base'; @import 'tailwindcss/components'; @import 'tailwindcss/utilities'; -@import 'inter-ui/inter.css'; \ No newline at end of file +@import 'inter-ui/inter.css'; diff --git a/console/config/ember-cli-update.json b/console/config/ember-cli-update.json index afacb169..d6a505bc 100644 --- a/console/config/ember-cli-update.json +++ b/console/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "4.6.0", + "version": "5.4.1", "blueprints": [ { "name": "app", diff --git a/console/config/environment.js b/console/config/environment.js index 3095d406..d6c43636 100644 --- a/console/config/environment.js +++ b/console/config/environment.js @@ -4,12 +4,13 @@ const getenv = require('./utils/getenv'); const fixApiHost = require('./utils/fix-api-host'); module.exports = function (environment) { - let ENV = { + const ENV = { modulePrefix: '@fleetbase/console', environment, rootURL: '/', locationType: 'history', EmberENV: { + EXTEND_PROTOTYPES: false, FEATURES: { // Here you can enable experimental features on an ember canary build // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true diff --git a/console/package.json b/console/package.json index 18ef4c4a..9c173943 100644 --- a/console/package.json +++ b/console/package.json @@ -1,148 +1,159 @@ { - "name": "@fleetbase/console", - "version": "0.3.1", - "private": true, - "description": "Fleetbase Console", - "repository": "", - "license": "MIT", - "author": "", - "directories": { - "doc": "doc", - "test": "tests" - }, - "scripts": { - "prebuild": "node prebuild.js", - "build": "pnpm run prebuild && ember build --environment=production", - "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"", - "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix", - "lint:hbs": "ember-template-lint .", - "lint:hbs:fix": "ember-template-lint . --fix", - "lint:js": "eslint . --cache", - "lint:js:fix": "eslint . --fix", - "start": "pnpm run prebuild && ember serve", - "test": "npm-run-all lint test:*", - "test:ember": "ember test" - }, - "dependencies": { - "@ember/legacy-built-in-components": "^0.4.1", - "@fleetbase/ember-core": "^0.1.8", - "@fleetbase/ember-ui": "^0.2.6", - "@fleetbase/fleetops-data": "^0.1.5", - "@fleetbase/fleetops-engine": "^0.3.5", - "@fleetbase/storefront-engine": "^0.2.4", - "@fleetbase/dev-engine": "^0.1.9", - "@fleetbase/iam-engine": "^0.0.7", - "@fleetbase/leaflet-routing-machine": "^3.2.16", - "@fortawesome/ember-fontawesome": "^0.4.1", - "ember-changeset": "^4.1.2", - "ember-changeset-validations": "^4.1.1", - "ember-composable-helpers": "^5.0.0", - "ember-concurrency": "^3.0.0", - "ember-concurrency-decorators": "^2.0.3", - "ember-intl": "6.0.0-beta.6", - "ember-math-helpers": "^2.18.2", - "ember-power-select": "^6.0.1", - "ember-prism": "^0.13.0", - "ember-radio-button": "3.0.0-beta.1", - "ember-tag-input": "^3.1.0", - "fleetbase-extensions-indexer": "^0.0.4", - "postcss-at-rules-variables": "^0.3.0", - "postcss-custom-properties": "^12.1.9", - "postcss-nth-list": "^1.0.2" - }, - "devDependencies": { - "@ember/optional-features": "^2.0.0", - "@ember/test-helpers": "^2.8.1", - "@fortawesome/fontawesome-svg-core": "^6.4.0", - "@fortawesome/free-brands-svg-icons": "^6.4.0", - "@fortawesome/free-solid-svg-icons": "^6.4.0", - "@glimmer/component": "^1.1.2", - "@glimmer/tracking": "^1.1.2", - "@tailwindcss/forms": "^0.5.3", - "autoprefixer": "^10.4.8", - "babel-eslint": "^10.1.0", - "broccoli-asset-rev": "^3.0.0", - "broccoli-funnel": "^3.0.8", - "date-fns": "^2.30.0", - "dragula": "^3.7.3", - "ember-auto-import": "^2.4.2", - "ember-cli": "~4.6.0", - "ember-cli-app-version": "^6.0.1", - "ember-cli-babel": "^7.26.11", - "ember-cli-dependency-checker": "^3.3.1", - "ember-cli-dotenv": "^3.1.0", - "ember-cli-es6-transform": "^1.0.0", - "ember-cli-htmlbars": "^6.1.0", - "ember-cli-inject-live-reload": "^2.1.0", - "ember-cli-postcss": "^8.2.0", - "ember-cli-sri": "^2.1.1", - "ember-cli-string-helpers": "^6.1.0", - "ember-cli-terser": "^4.0.2", - "ember-data": "^4.6.1", - "ember-engines": "^0.8.23", - "ember-fetch": "^8.1.1", - "ember-leaflet": "^5.1.1", - "ember-load-initializers": "^2.1.2", - "ember-page-title": "^7.0.0", - "ember-qunit": "^5.1.5", - "ember-resolver": "^8.0.3", - "ember-responsive": "^5.0.0", - "ember-source": "~4.6.0", - "ember-template-lint": "^4.10.1", - "ember-wormhole": "^0.6.0", - "eslint": "^7.32.0", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-ember": "^11.0.2", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-qunit": "^7.3.1", - "fast-glob": "^3.3.0", - "fs": "0.0.1-security", - "inter-ui": "^3.19.3", - "leaflet": "^1.9.4", - "loader.js": "^4.7.0", - "normalize.css": "^8.0.1", - "npm-run-all": "^4.1.5", - "postcss": "^8.4.21", - "postcss-conditionals-renewed": "^1.0.0", - "postcss-each": "^1.1.0", - "postcss-import": "14.1.0", - "postcss-mixins": "^9.0.4", - "postcss-preset-env": "^7.8.2", - "postcss-simple-vars": "^7.0.0", - "prettier": "^2.7.1", - "qunit": "^2.19.1", - "qunit-dom": "^2.0.0", - "recast": "^0.23.3", - "tailwindcss": "^3.1.8", - "webpack": "^5.74.0" - }, - "engines": { - "node": "14.* || >= 16" - }, - "ember": { - "edition": "octane" - }, - "pnpm": { - "overrides": { - "@fleetbase/fleetops-data": "^0.1.5", - "@fleetbase/ember-core": "^0.1.8", - "@fleetbase/ember-ui": "^0.2.6" - } - }, - "prettier": { - "trailingComma": "es5", - "tabWidth": 4, - "semi": true, - "singleQuote": true, - "printWidth": 190, - "overrides": [ - { - "files": "*.hbs", - "options": { - "singleQuote": false - } - } - ] + "name": "@fleetbase/console", + "version": "0.3.2", + "private": true, + "description": "Fleetbase Console", + "repository": "", + "license": "MIT", + "author": "", + "directories": { + "doc": "doc", + "test": "tests" + }, + "scripts": { + "prebuild": "node prebuild.js", + "build": "pnpm run prebuild && ember build --environment=production", + "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", + "lint:css": "stylelint \"**/*.css\"", + "lint:css:fix": "concurrently \"npm:lint:css -- --fix\"", + "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint:hbs": "ember-template-lint .", + "lint:hbs:fix": "ember-template-lint . --fix", + "lint:js": "eslint . --cache", + "lint:js:fix": "eslint . --fix", + "start": "pnpm run prebuild && ember serve", + "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"", + "test:ember": "ember test" + }, + "dependencies": { + "@ember/legacy-built-in-components": "^0.4.1", + "@fleetbase/dev-engine": "^0.1.9", + "@fleetbase/ember-core": "^0.1.8", + "@fleetbase/ember-ui": "^0.2.6", + "@fleetbase/fleetops-data": "^0.1.5", + "@fleetbase/fleetops-engine": "^0.3.5", + "@fleetbase/iam-engine": "^0.0.7", + "@fleetbase/leaflet-routing-machine": "^3.2.16", + "@fleetbase/storefront-engine": "^0.2.4", + "@fortawesome/ember-fontawesome": "^0.4.1", + "ember-changeset": "^4.1.2", + "ember-changeset-validations": "^4.1.1", + "ember-composable-helpers": "^5.0.0", + "ember-concurrency": "^3.0.0", + "ember-concurrency-decorators": "^2.0.3", + "ember-intl": "6.3.2", + "ember-math-helpers": "^2.18.2", + "ember-power-select": "^6.0.1", + "ember-prism": "^0.13.0", + "ember-radio-button": "3.0.0-beta.1", + "ember-tag-input": "^3.1.0", + "fleetbase-extensions-indexer": "^0.0.4", + "postcss-at-rules-variables": "^0.3.0", + "postcss-custom-properties": "^12.1.9", + "postcss-nth-list": "^1.0.2" + }, + "devDependencies": { + "@babel/core": "^7.23.2", + "@babel/eslint-parser": "^7.22.15", + "@babel/plugin-proposal-decorators": "^7.23.2", + "@ember/optional-features": "^2.0.0", + "@ember/string": "^3.1.1", + "@ember/test-helpers": "^3.2.0", + "@fortawesome/fontawesome-svg-core": "^6.4.0", + "@fortawesome/free-brands-svg-icons": "^6.4.0", + "@fortawesome/free-solid-svg-icons": "^6.4.0", + "@glimmer/component": "^1.1.2", + "@glimmer/tracking": "^1.1.2", + "@tailwindcss/forms": "^0.5.3", + "autoprefixer": "^10.4.8", + "broccoli-asset-rev": "^3.0.0", + "broccoli-funnel": "^3.0.8", + "concurrently": "^8.2.2", + "date-fns": "^2.30.0", + "dragula": "^3.7.3", + "ember-auto-import": "^2.6.3", + "ember-cli": "~5.4.1", + "ember-cli-app-version": "^6.0.1", + "ember-cli-babel": "^8.2.0", + "ember-cli-clean-css": "^3.0.0", + "ember-cli-dependency-checker": "^3.3.2", + "ember-cli-dotenv": "^3.1.0", + "ember-cli-es6-transform": "^1.0.0", + "ember-cli-htmlbars": "^6.3.0", + "ember-cli-inject-live-reload": "^2.1.0", + "ember-cli-postcss": "^8.2.0", + "ember-cli-sri": "^2.1.1", + "ember-cli-string-helpers": "^6.1.0", + "ember-cli-terser": "^4.0.2", + "ember-data": "^5.3.0", + "ember-engines": "^0.8.23", + "ember-fetch": "^8.1.2", + "ember-leaflet": "^5.1.1", + "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.1.0", + "ember-page-title": "^8.0.0", + "ember-qunit": "^8.0.1", + "ember-resolver": "^11.0.1", + "ember-responsive": "^5.0.0", + "ember-source": "~5.4.0", + "ember-template-lint": "^5.11.2", + "ember-wormhole": "^0.6.0", + "eslint": "^8.52.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-ember": "^11.11.1", + "eslint-plugin-n": "^16.2.0", + "eslint-plugin-prettier": "^5.0.1", + "eslint-plugin-qunit": "^8.0.1", + "fast-glob": "^3.3.0", + "fs": "0.0.1-security", + "inter-ui": "^3.19.3", + "leaflet": "^1.9.4", + "loader.js": "^4.7.0", + "normalize.css": "^8.0.1", + "postcss": "^8.4.21", + "postcss-conditionals-renewed": "^1.0.0", + "postcss-each": "^1.1.0", + "postcss-import": "14.1.0", + "postcss-mixins": "^9.0.4", + "postcss-preset-env": "^7.8.2", + "postcss-simple-vars": "^7.0.0", + "prettier": "^3.0.3", + "qunit": "^2.20.0", + "qunit-dom": "^2.0.0", + "recast": "^0.23.3", + "stylelint": "^15.11.0", + "stylelint-config-standard": "^34.0.0", + "stylelint-prettier": "^4.0.2", + "tailwindcss": "^3.1.8", + "tracked-built-ins": "^3.3.0", + "webpack": "^5.89.0" + }, + "engines": { + "node": ">= 18" + }, + "ember": { + "edition": "octane" + }, + "pnpm": { + "overrides": { + "@fleetbase/fleetops-data": "^0.1.5", + "@fleetbase/ember-core": "^0.1.8", + "@fleetbase/ember-ui": "^0.2.6" } + }, + "prettier": { + "trailingComma": "es5", + "tabWidth": 4, + "semi": true, + "singleQuote": true, + "printWidth": 190, + "overrides": [ + { + "files": "*.hbs", + "options": { + "singleQuote": false + } + } + ] + } } diff --git a/console/tests/helpers/index.js b/console/tests/helpers/index.js index 4b9e23f4..83a7e5cb 100644 --- a/console/tests/helpers/index.js +++ b/console/tests/helpers/index.js @@ -1,6 +1,6 @@ import { setupApplicationTest as upstreamSetupApplicationTest, setupRenderingTest as upstreamSetupRenderingTest, setupTest as upstreamSetupTest } from 'ember-qunit'; -// This file exists to provide wrappers around ember-qunit's / ember-mocha's +// This file exists to provide wrappers around ember-qunit's // test setup functions. This way, you can easily extend the setup that is // needed per test type. diff --git a/console/vendor/.gitkeep b/console/vendor/.gitkeep deleted file mode 100644 index e69de29b..00000000