diff --git a/templates/basic/widget/WidgetName.tsx b/templates/basic/widget/WidgetName.tsx index 6127c2f..9e5a532 100644 --- a/templates/basic/widget/WidgetName.tsx +++ b/templates/basic/widget/WidgetName.tsx @@ -1,10 +1,6 @@ import { property, subclass } from '@arcgis/core/core/accessorSupport/decorators'; -/** - * renderable will be depreciated (possibly removed?) in 4.19 as - * all @property() decorated properties will be watched - */ -import { renderable, tsx } from '@arcgis/core/widgets/support/widget'; +import { tsx } from '@arcgis/core/widgets/support/widget'; import Widget from '@arcgis/core/widgets/Widget'; @@ -38,13 +34,11 @@ export default class <%name%> extends Widget { @property({ aliasOf: 'viewModel.name', }) - @renderable() name = ''; @property({ type: <%name%>ViewModel, }) - @renderable() viewModel = new <%name%>ViewModel(); constructor(properties?: <%name%>Properties) { diff --git a/templates/rollup/app/.gitignore b/templates/rollup/app/.gitignore new file mode 100644 index 0000000..42d7e67 --- /dev/null +++ b/templates/rollup/app/.gitignore @@ -0,0 +1,18 @@ +# override cli .gitignore +# can be removed from scaffolded app +!src/assets + +node_modules/* +.vscode/* +build/* +dist/* +html-report/* +~tmp/* +.baseDir* +.tsdrc +.tscache +npm-debug.log +coverage-final.* +*.env +coverage/* +debug.log diff --git a/templates/rollup/app/package.json b/templates/rollup/app/package.json index bcf6bcd..e7cb762 100644 --- a/templates/rollup/app/package.json +++ b/templates/rollup/app/package.json @@ -1,20 +1,20 @@ { "private": true, "dependencies": { - "@arcgis/core": "~4.18.0" + "@arcgis/core": "~4.19.0" }, "devDependencies": { - "@rollup/plugin-commonjs": "^15.0.0", + "@rollup/plugin-commonjs": "^18.0.0", "@rollup/plugin-html": "^0.2.0", - "@rollup/plugin-node-resolve": "^9.0.0", + "@rollup/plugin-node-resolve": "^11.2.1", "@rollup/plugin-typescript": "^8.0.0", "@types/jest": "^26.0.18", "@typescript-eslint/eslint-plugin": "^4.8.1", "@typescript-eslint/parser": "^4.8.1", "eslint": "^7.15.0", - "eslint-config-prettier": "^6.15.0", + "eslint-config-prettier": "^8.2.0", "eslint-plugin-prettier": "^3.2.0", - "husky": "^4.3.5", + "husky": "^6.0.0", "jest": "^26.6.3", "lint-staged": "^10.5.3", "ncp": "^2.0.0", diff --git a/templates/rollup/app/rollup.config.js b/templates/rollup/app/rollup.config.js index a263054..f0b2283 100644 --- a/templates/rollup/app/rollup.config.js +++ b/templates/rollup/app/rollup.config.js @@ -5,7 +5,6 @@ import postcss from 'rollup-plugin-postcss' import resolve from '@rollup/plugin-node-resolve'; import { terser } from 'rollup-plugin-terser'; import typescript from '@rollup/plugin-typescript'; -// import html from '@rollup/plugin-html'; import fs from 'fs'; import path from 'path'; @@ -14,14 +13,9 @@ import path from 'path'; // `npm run dev` -> `production` is false const production = !process.env.ROLLUP_WATCH; -// const src = (...args) => path.join('src', ...args); - -// const indexPage = fs.readFileSync(path.resolve(__dirname, 'src/index.html'), 'utf-8'); - export default { input: 'src/index.ts', output: { - // entryFileNames: '[name].js', chunkFileNames: 'chunks/[name].[hash].js', dir: 'dist', format: 'es' @@ -40,8 +34,7 @@ export default { copy({ targets: [ { src: 'src/index.html', dest: 'dist/' }, - { src: 'src/oauth-callback.html', dest: 'dist/' }, - { src: 'node_modules/@arcgis/core/assets/', dest: 'dist/' } + { src: 'src/oauth-callback.html', dest: 'dist/' } ], copyOnce: true }) diff --git a/templates/rollup/app/src/assets/favicon.ico b/templates/rollup/app/src/assets/favicon.ico new file mode 100644 index 0000000..bb17d35 Binary files /dev/null and b/templates/rollup/app/src/assets/favicon.ico differ diff --git a/templates/rollup/app/src/assets/icon.png b/templates/rollup/app/src/assets/icon.png new file mode 100644 index 0000000..3df231c Binary files /dev/null and b/templates/rollup/app/src/assets/icon.png differ diff --git a/templates/rollup/app/src/index.html b/templates/rollup/app/src/index.html index f726950..2d24c83 100644 --- a/templates/rollup/app/src/index.html +++ b/templates/rollup/app/src/index.html @@ -5,8 +5,8 @@ - - + +