forked from e-mission/e-mission-phone
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from Abby-Wheelis/framework_migration_prep
trying to fix my branch to be up to date
- Loading branch information
Showing
71 changed files
with
2,195 additions
and
2,104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,3 +12,5 @@ npm install | |
|
|
||
| echo "Pulling the plugin-specific UIs" | ||
| npm run setup-serve | ||
|
|
||
| npx cordova prepare | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "compilerOptions": { | ||
| "outDir": "./dist/", | ||
| "sourceMap": true, | ||
| "module": "es6", | ||
| "target": "es5", | ||
| "esModuleInterop": true, | ||
| "jsx": "react", | ||
| "allowJs": true, | ||
| "moduleResolution": "node" | ||
| }, | ||
| "include": ["www/**/*"], | ||
| "exclude": ["**/www/manual_lib/*", "**/node_modules/*", "**/dist/*"], | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| const { merge } = require('webpack-merge'); | ||
| const common = require('./webpack.config.js'); | ||
|
|
||
| module.exports = merge(common, { | ||
| mode: 'development', | ||
| devtool: 'inline-source-map', | ||
| devServer: { | ||
| historyApiFallback: true, | ||
| contentBase: './', | ||
| hot: true, | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| const path = require('path') | ||
| const common = require('./webpack.config.js'); | ||
| const { merge } = require('webpack-merge'); | ||
|
|
||
| module.exports = merge(common, { | ||
| mode: 'production', | ||
| devtool: 'source-map', | ||
| module: { | ||
| rules: [ | ||
| /* In production, Webpack minifies JS files and randomizes variable names. | ||
| This causes problems with AngularJS unless you use explicit annotations, | ||
| which we don't. | ||
| https://docs.angularjs.org/error/$injector/strictdi | ||
| (The syntax we use is like the 'bad' example: implicit annotations) | ||
| So rather than change every file in our codebase, I'm adding this | ||
| babel plugin which basically preprocesses our 'bad' code into 'good' code. | ||
| Only needed on production because minification doesn't happen on dev. */ | ||
| { | ||
| test: /\.(js)$/, | ||
| include: path.resolve(__dirname, 'www'), | ||
| loader: 'babel-loader', | ||
| options: { | ||
| presets: ['@babel/preset-env'], | ||
| plugins: ["angularjs-annotate"], | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.