Skip to content

Commit

Permalink
Not fire on nativescript vue #28
Browse files Browse the repository at this point in the history
  • Loading branch information
EddyVerbruggen committed Dec 20, 2018
1 parent 99d3d75 commit 6dfa0ff
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 40 deletions.
4 changes: 2 additions & 2 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
"nativescript-dev-webpack": "next",
"nativescript-unit-test-runner": "^0.3.4",
"tns-platform-declarations": "~5.0.0",
"typescript": "~2.7.2"
"typescript": "~3.2.2"
}
}
}
56 changes: 28 additions & 28 deletions demo/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es5",
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"noEmitHelpers": true,
"noEmitOnError": true,
"lib": [
"es6",
"dom"
],
"baseUrl": ".",
"paths": {
"*": [
"./node_modules/tns-core-modules/*",
"./node_modules/*"
],
"~/*": [
"app/*"
]
}
},
"exclude": [
"e2e",
"node_modules",
"platforms",
"**/*.aot.ts"
]
"compilerOptions": {
"module": "commonjs",
"target": "es5",
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"noEmitHelpers": true,
"noEmitOnError": true,
"lib": [
"es6",
"dom"
],
"baseUrl": ".",
"paths": {
"*": [
"./node_modules/tns-core-modules/*",
"./node_modules/*"
],
"~/*": [
"app/*"
]
}
},
"exclude": [
"e2e",
"node_modules",
"platforms",
"**/*.aot.ts"
]
}
22 changes: 13 additions & 9 deletions demo/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ const {NativeScriptWorkerPlugin} = require("nativescript-worker-loader/NativeScr
const UglifyJsPlugin = require("uglifyjs-webpack-plugin");

module.exports = env => {
// Add your custom Activities, Services and other Android app components here.
const appComponents = [
"tns-core-modules/ui/frame",
"tns-core-modules/ui/frame/activity",
resolve(__dirname, "node_modules/nativescript-nfc/nfc-activity.android.ts") // ADD THIS!
resolve(__dirname, "node_modules/nativescript-nfc/nfc-activity.android.js") // ADD THIS!
];

const platform = env && (env.android && "android" || env.ios && "ios");
Expand Down Expand Up @@ -87,8 +88,8 @@ module.exports = env => {
alias: {
'~': appFullPath
},
// don't resolve symlinks to symlinked modules
symlinks: false
// resolve symlinks to symlinked modules
symlinks: true
},
resolveLoader: {
// don't resolve symlinks to symlinked loaders
Expand Down Expand Up @@ -191,8 +192,11 @@ module.exports = env => {
{
test: /\.ts$/,
use: {
loader: "awesome-typescript-loader",
options: {configFileName: "tsconfig.tns.json"},
loader: "ts-loader",
options: {
configFile: "tsconfig.tns.json",
allowTsInNodeModules: true,
},
}
},
]
Expand All @@ -215,9 +219,9 @@ module.exports = env => {
]),
// Copy assets to out dir. Add your own globs as needed.
new CopyWebpackPlugin([
{from: "fonts/**"},
{from: "**/*.jpg"},
{from: "**/*.png"},
{from: {glob: "fonts/**"}},
{from: {glob: "**/*.jpg"}},
{from: {glob: "**/*.png"}},
], {ignore: [`${relative(appPath, appResourcesFullPath)}/**`]}),
// Generate a bundle starter script and activate it in package.json
new nsWebpack.GenerateBundleStarterPlugin([
Expand Down Expand Up @@ -264,4 +268,4 @@ module.exports = env => {


return config;
};
};
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nativescript-nfc",
"version": "3.0.0",
"version": "3.0.1",
"description": "NFC plugin for your NativeScript app",
"main": "nfc",
"typings": "index.d.ts",
Expand Down

0 comments on commit 6dfa0ff

Please sign in to comment.