TEST HEADER
+
- `);
+ `)
}
diff --git a/src/templates/error.js b/src/templates/error.js
index f584121..866d445 100644
--- a/src/templates/error.js
+++ b/src/templates/error.js
@@ -1,15 +1,17 @@
/**
* Template that renders a generic error message and link to our GitHub Issues page.
*/
-export default function() {
+export default function (error) {
return (`
- `);
+ `)
}
diff --git a/src/translations/en.json b/src/translations/en.json
index 3806127..dca6b31 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1,14 +1,17 @@
{
"app": {
- "name": "URL Builder App V2",
+ "name": "URL Builder App V3",
"short_description": "Generate Buttons from a list of URLs",
"long_description": "Generate Buttons from a list of URLs",
- "installation_instructions": "Simply click the install button",
+ "installation_instructions": "Use the install button",
"parameters": {
"uri_templates": {
"label": "A JSON Array of URLs.",
"helpText": "See [our README](https://github.com/Ibotta/url_builder_app/blob/master/README.md) for more information."
}
}
+ },
+ "default": {
+ "organizations": "organizations"
}
}
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index 25fea5f..e7b34f7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,17 +1,21 @@
-const path = require('path')
-const CleanWebpackPlugin = require('clean-webpack-plugin')
-const CopyWebpackPlugin = require('copy-webpack-plugin')
-const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const TranslationsPlugin = require('./webpack/translations-plugin')
-const devDependencies = require('./package.json').devDependencies
+import { resolve, join, dirname } from 'path'
+import { fileURLToPath } from 'url'
+import { CleanWebpackPlugin } from 'clean-webpack-plugin'
+import CopyWebpackPlugin from 'copy-webpack-plugin'
+import MiniCssExtractPlugin from 'mini-css-extract-plugin'
+import HtmlWebpackPlugin from 'html-webpack-plugin'
+import dependencies from './package.json' assert { type: 'json' }
+import { TranslationsPlugin } from './webpack/translations-plugin.js'
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
// this function reads Zendesk Garden npm dependencies from package.json and
// creates a jsDelivr url
const zendeskGardenJsDelivrUrl = (function () {
- const pkg = Object.keys(devDependencies).filter(item => item.includes('@zendeskgarden/css'))
+ const pkg = Object.keys(dependencies).filter(item => item.includes('@zendeskgarden/css'))
const getPkgName = (url, pkg) => {
- const version = devDependencies[pkg]
+ const version = dependencies[pkg]
.replace(/^[\^~]/g, '')
.replace(/\.\d$/, '')
url = `${url}npm/${pkg}@${version},`
@@ -26,67 +30,80 @@ const zendeskGardenJsDelivrUrl = (function () {
const externalAssets = {
css: [
zendeskGardenJsDelivrUrl,
- 'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/css/bootstrap.min.css'
+ 'https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css'
],
js: [
'https://assets.zendesk.com/apps/sdk/2.0/zaf_sdk.js',
- 'https://cdn.jsdelivr.net/g/lodash@4.3.0,handlebarsjs@4.0.5,jquery@2.2.0'
+ 'https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js',
+ 'https://cdn.jsdelivr.net/jquery/3.0.0/jquery.min.js'
]
}
-
-module.exports = {
- entry: {
+export default {
+ "entry": {
app: [
- 'babel-polyfill',
+ 'core-js/stable',
+ 'regenerator-runtime/runtime',
'./src/javascripts/locations/ticket_sidebar.js',
- './src/index.css'
+ './src/styles/index.css'
]
},
- output: {
+
+ "output": {
filename: '[name].js',
- path: path.resolve(__dirname, 'dist/assets')
+ path: resolve(__dirname, 'dist/assets')
},
- module: {
+
+ "module": {
rules: [
{
test: /\.js$/,
- use: {
- loader: 'babel-loader',
+ exclude: /node_modules/,
+ loader: 'babel-loader',
+ options: {
+ presets: ['@babel/preset-env']
}
},
{
type: 'javascript/auto',
test: /\.json$/,
- include: path.resolve(__dirname, './src/translations'),
+ include: resolve(__dirname, './src/translations'),
use: './webpack/translations-loader'
},
{
- test: /\.(sa|sc|c)ss$/,
+ test: /\.(sc|c)ss$/,
use: [
MiniCssExtractPlugin.loader,
- {loader: 'css-loader', options: { url: false }},
+ {
+ loader: 'css-loader',
+ options: { url: false }
+ },
'postcss-loader'
]
}
]
},
- plugins: [
+ "plugins": [
// Empties the dist folder
- new CleanWebpackPlugin(['dist/*']),
+ new CleanWebpackPlugin({
+ verbose: true,
+ cleanOnceBeforeBuildPatterns: [join(process.cwd(), 'dist/**/*')]
+ }),
// Copy over static assets
- new CopyWebpackPlugin([
- { from: 'src/manifest.json', to: '../', flatten: true },
- { from: 'src/images/*', to: '.', flatten: true }
- ]),
+ new CopyWebpackPlugin({
+ patterns: [
+ { from: 'src/manifest.json', to: '../[name][ext]' },
+ { from: 'src/images/*', to: './[name][ext]' }
+ ]
+ }),
new MiniCssExtractPlugin({
filename: '[name].css'
}),
new TranslationsPlugin({
- path: path.resolve(__dirname, './src/translations')
+ path: resolve(__dirname, './src/translations')
}),
new HtmlWebpackPlugin({
@@ -97,4 +114,4 @@ module.exports = {
filename: 'iframe.html'
})
]
-}
+}
\ No newline at end of file
diff --git a/webpack/translations-loader.js b/webpack/translations-loader.js
index 9843947..a2b2a99 100644
--- a/webpack/translations-loader.js
+++ b/webpack/translations-loader.js
@@ -22,6 +22,7 @@
* app.steps.click: 'this button'
* }
*/
+/* eslint-disable array-callback-return */
function translationFlatten (object, currentKeys = []) {
const res = {}
@@ -48,8 +49,9 @@ function translationFlatten (object, currentKeys = []) {
return res
}
+/* eslint-enable array-callback-return */
-function TranslationsLoader (content) {
+export default function TranslationsLoader (content) {
let translationsInput
try {
translationsInput = JSON.parse(content)
@@ -61,6 +63,4 @@ function TranslationsLoader (content) {
const compiledTranslations = translationFlatten(translationsInput)
return `module.exports = ${JSON.stringify(compiledTranslations)}`
-}
-
-module.exports = TranslationsLoader
+}
\ No newline at end of file
diff --git a/webpack/translations-plugin.js b/webpack/translations-plugin.js
index 9d23453..071fc60 100644
--- a/webpack/translations-plugin.js
+++ b/webpack/translations-plugin.js
@@ -1,5 +1,6 @@
-const path = require('path')
-const fs = require('fs')
+import { resolve } from 'path'
+import { readFileSync } from 'fs'
+
const JS_INDENT = 2
const marketplaceKeys = [
@@ -11,7 +12,7 @@ const marketplaceKeys = [
'parameters'
]
-class TranslationsPlugin {
+export class TranslationsPlugin {
constructor (options) {
this.options = options
}
@@ -32,7 +33,7 @@ class TranslationsPlugin {
function buildMarketplaceTranslationFile (filename, filepath) {
let translationsInput
try {
- translationsInput = JSON.parse(fs.readFileSync(path.resolve(filepath, filename)))
+ translationsInput = JSON.parse(readFileSync(resolve(filepath, filename)))
} catch (err) {
console.error(err)
process.exit(1)
@@ -62,6 +63,4 @@ function extractMarketplaceTranslation (translations, filename) {
)
return JSON.stringify(translationsOutput, null, JS_INDENT)
-}
-
-module.exports = TranslationsPlugin
+}
\ No newline at end of file
- ${loop(templateUris, uriMarkup)}
